gnustep/apps-projectcenter
0
0
Fork 0
mirror of https://github.com/gnustep/apps-projectcenter.git synced 2025-02-20 18:32:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Framework/PCProject.m: Add new project directory name.

Browse source 
* Framework/PCProjectManager.m: Fix issue reported with loading of
	subprojects from an aggregate project.   Changed loadProjectAt: method
	to handle both the current and old file locations.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@28288 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2009-05-18 21:27:56 +00:00
parent b8a1ac5612
commit 194e62f47a
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2009-05-18 17:27-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Framework/PCProject.m: Add new project directory name.
* Framework/PCProjectManager.m: Fix issue reported with loading of
subprojects from an aggregate project. Changed loadProjectAt: method
to handle both the current and old file locations.
2009-04-27 17:09-EDT Gregory John Casamento <greg.casamento@gmail.com> 2009-04-27 17:09-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Framework/PCProjectManager.m: Remove logic requiring projectWindow * Framework/PCProjectManager.m: Remove logic requiring projectWindow

4
Framework/PCProject.m
View file

@ -1551,9 +1551,11 @@ NSString
// Subproject not found in array, load it // Subproject not found in array, load it
if (sp == nil) if (sp == nil)
{ {
NSString *pname = [NSString stringWithFormat: @"%@.pcproj",name];
spFile = [projectPath stringByAppendingPathComponent:name]; spFile = [projectPath stringByAppendingPathComponent:name];
spFile = [spFile stringByAppendingPathExtension:@"subproj"]; spFile = [spFile stringByAppendingPathExtension:@"subproj"];
spFile = [spFile stringByAppendingPathComponent:@"PC.project"]; spFile = [spFile stringByAppendingPathComponent: pname];
spFile = [spFile stringByAppendingPathComponent: @"PC.project"];
/* PCLogInfo(self, @"Not found! Load subproject: %@ at path: %@", /* PCLogInfo(self, @"Not found! Load subproject: %@ at path: %@",
name, spFile);*/ name, spFile);*/
sp = [projectManager loadProjectAt:spFile]; sp = [projectManager loadProjectAt:spFile];

8
Framework/PCProjectManager.m
View file

@ -546,7 +546,13 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange";
NSString *projectClassName = nil; NSString *projectClassName = nil;
PCProject<ProjectType> *project = nil; PCProject<ProjectType> *project = nil;
projectFile = [NSMutableDictionary dictionaryWithContentsOfFile:aPath]; projectFile = [NSMutableDictionary dictionaryWithContentsOfFile: aPath];
if(projectFile == nil)
{
NSString *altPath = [[[aPath stringByDeletingLastPathComponent] stringByDeletingLastPathComponent]
stringByAppendingPathComponent: @"PC.project"];
projectFile = [NSMutableDictionary dictionaryWithContentsOfFile:altPath];
}
// For compatibility with 0.3.x projects // For compatibility with 0.3.x projects
project = [self convertLegacyProject:projectFile atPath:aPath]; project = [self convertLegacyProject:projectFile atPath:aPath];