From 96516dd72369290b09bd6eac82240d3016b370dc Mon Sep 17 00:00:00 2001 From: Sergii Stoian Date: Mon, 16 Mar 2009 23:32:00 +0000 Subject: [PATCH] * Framework/PCProjectManager.m: (openProjectAt:): Setactive project to loaded after all initalization completed. * Framework/PCProject.m: (saveProjectWindowsAndPanels): Save project windows and panels according to preferences setting. (close:): Remove unsused code. * Framework/PCProjectBuilder.m: Cleanup. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@28087 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 13 ++++++++++++- Framework/PCBundleManager.m | 6 +++--- Framework/PCButton.m | 3 +-- Framework/PCProject.m | 13 +++---------- Framework/PCProjectBuilder.m | 26 ++++++++++++++++++-------- Framework/PCProjectBuilderPanel.m | 5 ++--- Framework/PCProjectManager.m | 3 ++- Framework/PCProjectWindow.m | 8 ++++---- Framework/PCSplitView.m | 2 +- 9 files changed, 46 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46910be..aad1f8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,17 @@ +2009-03-17 02:14 Sergii Stoian + + * Framework/PCProjectManager.m: + (openProjectAt:): Setactive project to loaded after all initalization + completed. + * Framework/PCProject.m: + (saveProjectWindowsAndPanels): Save project windows and panels + according to preferences setting. + (close:): Remove unsused code. + * Framework/PCProjectBuilder.m: Cleanup. + 2009-03-15 02:14 Sergii Stoian - * * Headers/Protocols/Preferences.h: Add new methods. + * Headers/Protocols/Preferences.h: Add new methods. * PCPrefController.m: Implemented set/get of preferences value dependent. All values are stored in preferences as NSString values and converted upon request to specified type. diff --git a/Framework/PCBundleManager.m b/Framework/PCBundleManager.m index a30add5..8084134 100644 --- a/Framework/PCBundleManager.m +++ b/Framework/PCBundleManager.m @@ -209,8 +209,8 @@ bundlePaths = [bundlesInfo allKeys]; enumerator = [bundlePaths objectEnumerator]; - NSLog(@"Bundle fullpath method #1: %@", - [[self resourcePath] stringByAppendingPathComponent:bundleName]); +// NSLog(@"Bundle fullpath method #1: %@", +// [[self resourcePath] stringByAppendingPathComponent:bundleName]); while ((bundleFullPath = [enumerator nextObject])) { @@ -220,7 +220,7 @@ } } - NSLog(@"Bundle fullpath method #2: %@", bundleFullPath); +// NSLog(@"Bundle fullpath method #2: %@", bundleFullPath); return bundleFullPath; } diff --git a/Framework/PCButton.m b/Framework/PCButton.m index 7a70435..394f84e 100644 --- a/Framework/PCButton.m +++ b/Framework/PCButton.m @@ -37,8 +37,7 @@ //- (id)initWithFrame:(NSRect)frameRect - (id)initWithCoder:(NSCoder *)coder { - NSLog(@"PCButton: initWithCoder"); -// self = [super initWithFrame:frameRect]; +// NSLog(@"PCButton: initWithCoder"); self = [super initWithCoder:coder]; [_cell setGradientType:NSGradientConcaveWeak]; [_cell setImageDimsWhenDisabled:YES]; diff --git a/Framework/PCProject.m b/Framework/PCProject.m index bde1caf..b4f376f 100644 --- a/Framework/PCProject.m +++ b/Framework/PCProject.m @@ -110,8 +110,8 @@ NSString RELEASE(projectBrowser); RELEASE(projectLoadedFiles); RELEASE(projectEditor); - if (projectBuilder) RELEASE(projectBuilder); - if (projectLauncher) RELEASE(projectLauncher); + TEST_RELEASE(projectBuilder); + TEST_RELEASE(projectLauncher); if (isSubproject == YES) { @@ -357,14 +357,13 @@ NSString forKey:@"ProjectBrowser"]; // Write to file and exit if prefernces wasn't set to save panels - if (rememberWindows) + if (!rememberWindows) { [projectFileDict setObject:windows forKey:@"PC_WINDOWS"]; [projectFileDict writeToFile:projectFile atomically:YES]; return YES; } - // Project Build if (projectBuilder && [[projectManager buildPanel] isVisible]) { @@ -543,12 +542,6 @@ NSString return NO; } - // Project Builder -/* if (projectBuilder) - { - [projectBuilder release]; - }*/ - // Project window if (sender != projectWindow) { diff --git a/Framework/PCProjectBuilder.m b/Framework/PCProjectBuilder.m index f443548..fd67534 100644 --- a/Framework/PCProjectBuilder.m +++ b/Framework/PCProjectBuilder.m @@ -57,9 +57,11 @@ - (id)initWithProject:(PCProject *)aProject { - NSAssert(aProject, @"No project specified!"); +#ifdef DEBUG + NSLog (@"PCProjectBuilder: initWithProject"); +#endif -// PCLogInfo(self, @"initWithProject %@", [aProject projectName]); + NSAssert(aProject, @"No project specified!"); if ((self = [super init])) { @@ -93,12 +95,17 @@ - (void)dealloc { -#ifdef DEVELOPMENT +#ifdef DEBUG NSLog (@"PCProjectBuilder: dealloc"); #endif [[NSNotificationCenter defaultCenter] removeObserver:self]; + if ([componentView superview]) + { + [componentView removeFromSuperview]; + } + RELEASE(buildStatusTarget); RELEASE(buildTarget); RELEASE(buildArgs); @@ -109,12 +116,15 @@ RELEASE(rootBuildDir); RELEASE(buildTool); -// PCLogInfo(self, @"componentView RC: %i", [componentView retainCount]); -// PCLogInfo(self, @"RC: %i", [self retainCount]); +// NSLog(@"Project Builder--> componentView RC: %i", +// [componentView retainCount]); + RELEASE(componentView); RELEASE(errorArray); RELEASE(errorString); +// NSLog(@"Project Builder--> RC: %i", [self retainCount]); + [super dealloc]; } @@ -128,13 +138,13 @@ return; } - NSLog(@"ProjectBuilder awakeFromNib"); +// NSLog(@"ProjectBuilder awakeFromNib"); [componentView retain]; [componentView removeFromSuperview]; - NSLog(@"ProjectBuilder awakeFromNib: componentView RC:%i", - [componentView retainCount]); +// NSLog(@"ProjectBuilder awakeFromNib: componentView RC:%i", +// [componentView retainCount]); /* * 4 build Buttons diff --git a/Framework/PCProjectBuilderPanel.m b/Framework/PCProjectBuilderPanel.m index 3b97c8e..353452f 100644 --- a/Framework/PCProjectBuilderPanel.m +++ b/Framework/PCProjectBuilderPanel.m @@ -131,9 +131,8 @@ currentProject = rootProject; -/* PCLogInfo(self, @"activeProjectDidChange to: %@", - [rootProject projectName]);*/ - NSLog(@"activeProjectDidChange to: %@", [rootProject projectName]); +// NSLog(@"Buider Panel: activeProjectDidChange to: %@", +// [rootProject projectName]); if (!rootProject) { diff --git a/Framework/PCProjectManager.m b/Framework/PCProjectManager.m index cc1f7f0..baea0b8 100644 --- a/Framework/PCProjectManager.m +++ b/Framework/PCProjectManager.m @@ -617,7 +617,6 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange"; } [loadedProjects setObject:project forKey:projectName]; - [self setActiveProject:project]; [project setProjectManager:self]; // Windows and panels @@ -637,6 +636,8 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange"; [[project projectWindow] makeKeyAndOrderFront:self]; + [self setActiveProject:project]; + return YES; } diff --git a/Framework/PCProjectWindow.m b/Framework/PCProjectWindow.m index d4f33c8..1eaed5e 100644 --- a/Framework/PCProjectWindow.m +++ b/Framework/PCProjectWindow.m @@ -310,8 +310,8 @@ rootActiveProject = [[project projectManager] rootActiveProject]; - NSLog(@"ProjectWindow showProjectBuild: componentView RC:%i", - [view retainCount]); +// NSLog(@"ProjectWindow showProjectBuild: componentView RC:%i", +// [view retainCount]); if ([prefs boolForKey:UseTearOffWindows]) { @@ -548,7 +548,7 @@ { id prefs = [aNotif object]; - PCLogStatus(self, @"Preferences did change"); + NSLog(@"ProjectWindow: Preferences did change"); /* if ([[project projectManager] rootActiveProject] != project) { @@ -858,7 +858,7 @@ NSRect vSplitRect; NSRect boxRect; - NSLog(@"resizeHorizontalSubiewsWithOldSize entered split view width: %f, height %f", splitSize.width, splitSize.height); +// NSLog(@"resizeHorizontalSubiewsWithOldSize entered split view width: %f, height %f", splitSize.width, splitSize.height); if (splitSize.width == oldSize.width && splitSize.height == oldSize.height) { diff --git a/Framework/PCSplitView.m b/Framework/PCSplitView.m index 6880617..9e5ec50 100644 --- a/Framework/PCSplitView.m +++ b/Framework/PCSplitView.m @@ -251,7 +251,7 @@ static NSNotificationCenter *nc = nil; // Save the old position op = p; - NSLog(@"SplitView: entering knob loop"); +// NSLog(@"SplitView: entering knob loop"); //--- Dragging start ---------------------------------------------------------- // user is moving the knob loop until left mouse up while ([e type] != NSLeftMouseUp)