Skip to content

Commit

Permalink
Rename cleanupHTML: to escapeHTML:
Browse files Browse the repository at this point in the history
  • Loading branch information
RomainMuller committed May 1, 2011
1 parent 3f416bb commit 7d82aa0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion GLFileView.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
- (void)showFile;
- (void)didLoad;
- (NSString *)parseBlame:(NSString *)txt;
+ (NSString *)cleanupHTML:(NSString *)txt;
+ (NSString *)escapeHTML:(NSString *)txt;
+ (NSString *)parseDiff:(NSString *)txt;
+ (NSString *)parseDiffTree:(NSString *)txt withStats:(NSMutableDictionary *)stats;
+ (NSString *)getFileName:(NSString *)line;
Expand Down
8 changes: 4 additions & 4 deletions GLFileView.m
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ - (void) showFile
if(startFile==@"fileview"){
fileTxt=[file textContents:&theError];
if(!theError)
fileTxt=[GLFileView cleanupHTML:fileTxt];
fileTxt=[GLFileView escapeHTML:fileTxt];
}else if(startFile==@"blame"){
fileTxt=[file blame:&theError];
if(!theError)
Expand Down Expand Up @@ -240,7 +240,7 @@ - (void)closeView
[super closeView];
}

+ (NSString *) cleanupHTML:(NSString *)txt
+ (NSString *) escapeHTML:(NSString *)txt
{
NSMutableString *newTxt = [NSMutableString stringWithString:txt];
[newTxt replaceOccurrencesOfString:@"&" withString:@"&" options:NSLiteralSearch range:NSMakeRange(0, [newTxt length])];
Expand Down Expand Up @@ -299,7 +299,7 @@ + (NSString *)parseDiffTree:(NSString *)txt withStats:(NSMutableDictionary *)sta

+ (NSString *)parseDiff:(NSString *)txt
{
txt=[self cleanupHTML:txt];
txt=[self escapeHTML:txt];

NSMutableString *res=[NSMutableString string];
NSScanner *scan=[NSScanner scannerWithString:txt];
Expand Down Expand Up @@ -507,7 +507,7 @@ +(BOOL)isStartBlock:(NSString *)line

- (NSString *) parseBlame:(NSString *)txt
{
txt=[GLFileView cleanupHTML:txt];
txt=[GLFileView escapeHTML:txt];

NSArray *lines = [txt componentsSeparatedByString:@"\n"];
NSString *line;
Expand Down
2 changes: 1 addition & 1 deletion PBWebHistoryController.m
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ - (NSString *)parseHeader:(NSString *)txt withRefs:(NSString *)badges
}else{
if (subj) {
NSString *trimmedLine = [line stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
[subject appendString:[NSString stringWithFormat:@"%@<br/>",[GLFileView cleanupHTML:trimmedLine]]];
[subject appendString:[NSString stringWithFormat:@"%@<br/>",[GLFileView escapeHTML:trimmedLine]]];
}else{
NSArray *comps=[line componentsSeparatedByString:@" "];
if([comps count]==2){
Expand Down

0 comments on commit 7d82aa0

Please sign in to comment.