diff --git a/Documentation/ChangeLog b/Documentation/ChangeLog index f045d1c..204b7d9 100644 --- a/Documentation/ChangeLog +++ b/Documentation/ChangeLog @@ -1,4 +1,13 @@ -2008-02-19 Sergii Stoian +2008-02-20 Sergii Stoian + + * Framework/PCProjectBuilder.m: + (-parseErorLine:): Fixed type of saved row and column values. + Cleanup. + * Framework/PCEditorManager.m: + (-openEditorForFile:editable:windowed:): Fixed another NSLog + parameter missing. + +2008-02-19 Sergii Stoian * PCMenuController.m: Start thinking about "Go to line:" popup. * English.lproj/ProjectCenter.gorm: Added "Edit->Find->Line Number..." diff --git a/Documentation/TODO b/Documentation/TODO index 284498b..0640907 100644 --- a/Documentation/TODO +++ b/Documentation/TODO @@ -19,28 +19,28 @@ ProjectCenter 0.4 Owner/Status ProjectCenter 0.5 ----------------- -- Create ProjectWindow GORM file [done!] +- Create ProjectWindow GORM file [done!] - Add "Framework" project type [done!] - Add "Resource Set" project type [done!] - Implement on demand loading of bundles [done!] - Localization support for projects [done!] + Finish save/restore size of split views in Project Window [done!] --- Project Editor: - - Implement on demand loading (editor for file type) [done!] - - Open some files read only (Supporting Files) [done!] + - Implement on demand loading (editor for file type) [done!] + - Open some files read only (Supporting Files) [done!] - Implement code parser (get it from CodeEditor?) [done!] - - Project Browser should show file structure. [done!] - - Click on Browser item should move cursor to line in file [done!] + - Project Browser should show file structure. [done!] + - Click on Browser item should move cursor to line in file [done!] --- Project Builder: - - Create panel and builder GORM files [done!] + - Create panel and builder GORM files [done!] - Implement root build directory handling [done!] - Finish options handling [done!] - Parse gcc output [95% done!] - Display warnings,errors,options etc. as clickable list [done!] - GNUstep make version 2.0 compliance [done!] - Finish FileNameIcon (draggable, files can be dragged to it) stoyan -- Save last used path separately for different file panels [done!] -- Review all situations when dialogs must be popped up stoyan +- Save last used path separately for different file panels [done!] +- Review all situations when dialogs must be popped up stoyan ProjectCenter 0.6 ----------------- diff --git a/Framework/PCProjectBuilder.m b/Framework/PCProjectBuilder.m index d93490e..cfdd311 100644 --- a/Framework/PCProjectBuilder.m +++ b/Framework/PCProjectBuilder.m @@ -933,27 +933,13 @@ if ([string rangeOfString:@"In file included from "].location != NSNotFound) { -// NSLog(@"In file included from "); currentEL = ELIncluded; return nil; - file = [self lineTail:[components objectAtIndex:0] - afterString:@"In file included from "]; - file = [[currentBuildPath lastObject] - stringByAppendingPathComponent:file]; - if ([file isEqualToString:lastFile]) - { - return nil; - } - position = [NSString stringWithFormat:@"{x=0; y=%f}", - [components objectAtIndex:1]]; - message = [components objectAtIndex:0]; } else if ([string rangeOfString:@"In function '"].location != NSNotFound) { - return nil; - file = [components objectAtIndex:0]; - message = [self lineTail:string afterString:@"In function "]; currentEL = ELFunction; + return nil; } else if ([string rangeOfString:@" At top level:"].location != NSNotFound) { @@ -966,7 +952,6 @@ NSString *substr; // file and includedFile -// file = [components objectAtIndex:0]; file = [[currentBuildPath lastObject] stringByAppendingPathComponent:currentBuildFile]; if (lastEL == ELIncluded @@ -1000,7 +985,7 @@ NSNumber *lNumber = [NSNumber numberWithInt:lInt]; position = [NSString stringWithFormat:@"{x=%i; y=0}", - [lNumber floatValue]]; + [lNumber intValue]]; } else if (typeIndex == 3) // :line:column: { @@ -1009,8 +994,8 @@ NSNumber *lNumber = [NSNumber numberWithInt:lInt]; NSNumber *cNumber = [NSNumber numberWithInt:cInt]; - position = [NSString stringWithFormat:@"{x=%f; y=%f}", - [lNumber floatValue], [cNumber floatValue]]; + position = [NSString stringWithFormat:@"{x=%i; y=%i}", + [lNumber intValue], [cNumber floatValue]]; } // message substr = [NSString stringWithFormat:@"%@:", type]; @@ -1046,11 +1031,6 @@ lastIndentString = [indentString copy]; // Create array items -/* else if ((lastEL == ELNone - || ![file isEqualToString:lastFile] - || lastEL == ELIncludedError) - && currentEL != ELIncluded - && currentEL != ELIncludedError)*/ if ((lastEL == ELNone || ![file isEqualToString:lastFile]) && [includedFile isEqualToString:@""]) { @@ -1149,13 +1129,13 @@ { position = NSPointFromString([error objectForKey:@"Position"]); [editor scrollToLineNumber:(unsigned int)position.x]; - } -/* NSLog(@"%f: %@(%@): %@", - position.x, - [error objectForKey:@"File"], - [error objectForKey:@"IncludedFile"], - [error objectForKey:@"Error"]);*/ +/* NSLog(@"%i: %@(%@): %@", + position.x, + [error objectForKey:@"File"], + [error objectForKey:@"IncludedFile"], + [error objectForKey:@"Error"]);*/ + } } @end