fix author information property method (+1 squashed commit)

adison · adison · commit bf36eddd0a5c · 2014-09-13T01:09:21.000+08:00
Squashed commits: [3470b91] refine the author information format (+1 squashed commit) Squashed commits: [da46975] temp
diff --git a/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m b/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m
@@ -48,8 +48,6 @@ -(NSString *) startComment
     NSString *authorInfo = @"";
 
     if ([[VVDocumenterSetting defaultSetting] useAuthorInformation] && !self.forSwift) {
-        authorInfo = [NSString stringWithFormat:@"%@@Author",
-                      self.prefixString];
         NSMutableString *authorCotent = @"".mutableCopy;
         
         if ([[VVDocumenterSetting defaultSetting] authorInformation].length > 0) {
@@ -69,13 +67,14 @@ -(NSString *) startComment
             }
             [authorCotent appendString:[formatter stringFromDate:[NSDate date]]];            
         }
-        authorInfo = [NSString stringWithFormat:@"%@\n", authorInfo];
+
+        authorInfo = [NSString stringWithFormat:@"%@@Author %@\n%@\n", self.prefixString, authorCotent, self.prefixString];
     }
     
     if ([[VVDocumenterSetting defaultSetting] useHeaderDoc]) {
-        return [NSString stringWithFormat:@"%@/*!\n%@%@<#Description#>\n", self.indent, self.prefixString, descriptionTag];
+        return [NSString stringWithFormat:@"%@/*!\n%@%@%@<#Description#>\n", self.indent, authorInfo, self.prefixString, descriptionTag];
     } else if ([[VVDocumenterSetting defaultSetting] prefixWithSlashes]) {
-        return [NSString stringWithFormat:@"%@%@<#Description#>\n", self.prefixString, descriptionTag];
+        return [NSString stringWithFormat:@"%@%@%@<#Description#>\n", self.prefixString, authorInfo, descriptionTag];
     } else {
         return [NSString stringWithFormat:@"%@/**\n%@%@%@<#Description#>\n", self.indent, authorInfo, self.prefixString, descriptionTag];
     }
diff --git a/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m b/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m
@@ -181,11 +181,11 @@ -(void) setAlignArgumentComments:(BOOL)alignArgumentComments
 
 -(BOOL)useAuthorInformation
 {
-    return ![[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseAuthorInformation];
+    return [[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseAuthorInformation];
 }
 -(void) setUseAuthorInformation:(BOOL)useAuthorInformation
 {
-    [[NSUserDefaults standardUserDefaults] setBool:!useAuthorInformation forKey:kVVDUseAuthorInformation];
+    [[NSUserDefaults standardUserDefaults] setBool:useAuthorInformation forKey:kVVDUseAuthorInformation];
     [[NSUserDefaults standardUserDefaults] synchronize];
 }
 
@@ -203,11 +203,11 @@ -(void)setAuthorInformation:(NSString *)authorInformation {
 
 -(BOOL)useDateInformation
 {
-    return ![[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseDateInformation];
+    return [[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseDateInformation];
 }
 -(void) setUseDateInformation:(BOOL)useDateInformation
 {
-    [[NSUserDefaults standardUserDefaults] setBool:!useDateInformation forKey:kVVDUseDateInformation];
+    [[NSUserDefaults standardUserDefaults] setBool:useDateInformation forKey:kVVDUseDateInformation];
     [[NSUserDefaults standardUserDefaults] synchronize];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,6 @@ -(NSString *) startComment`
`48`	`48`	`NSString *authorInfo = @"";`
`49`	`49`
`50`	`50`	`if ([[VVDocumenterSetting defaultSetting] useAuthorInformation] && !self.forSwift) {`
`51`		`- authorInfo = [NSString stringWithFormat:@"%@@Author",`
`52`		`- self.prefixString];`
`53`	`51`	`NSMutableString *authorCotent = @"".mutableCopy;`
`54`	`52`
`55`	`53`	`if ([[VVDocumenterSetting defaultSetting] authorInformation].length > 0) {`
`@@ -69,13 +67,14 @@ -(NSString *) startComment`
`69`	`67`	`}`
`70`	`68`	`[authorCotent appendString:[formatter stringFromDate:[NSDate date]]];`
`71`	`69`	`}`
`72`		`- authorInfo = [NSString stringWithFormat:@"%@\n", authorInfo];`
	`70`	`+`
	`71`	`+ authorInfo = [NSString stringWithFormat:@"%@@Author %@\n%@\n", self.prefixString, authorCotent, self.prefixString];`
`73`	`72`	`}`
`74`	`73`
`75`	`74`	`if ([[VVDocumenterSetting defaultSetting] useHeaderDoc]) {`
`76`		`- return [NSString stringWithFormat:@"%@/*!\n%@%@<#Description#>\n", self.indent, self.prefixString, descriptionTag];`
	`75`	`+ return [NSString stringWithFormat:@"%@/*!\n%@%@%@<#Description#>\n", self.indent, authorInfo, self.prefixString, descriptionTag];`
`77`	`76`	`} else if ([[VVDocumenterSetting defaultSetting] prefixWithSlashes]) {`
`78`		`- return [NSString stringWithFormat:@"%@%@<#Description#>\n", self.prefixString, descriptionTag];`
	`77`	`+ return [NSString stringWithFormat:@"%@%@%@<#Description#>\n", self.prefixString, authorInfo, descriptionTag];`
`79`	`78`	`} else {`
`80`	`79`	`return [NSString stringWithFormat:@"%@/**\n%@%@%@<#Description#>\n", self.indent, authorInfo, self.prefixString, descriptionTag];`
`81`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,11 +181,11 @@ -(void) setAlignArgumentComments:(BOOL)alignArgumentComments`
`181`	`181`
`182`	`182`	`-(BOOL)useAuthorInformation`
`183`	`183`	`{`
`184`		`- return ![[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseAuthorInformation];`
	`184`	`+ return [[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseAuthorInformation];`
`185`	`185`	`}`
`186`	`186`	`-(void) setUseAuthorInformation:(BOOL)useAuthorInformation`
`187`	`187`	`{`
`188`		`- [[NSUserDefaults standardUserDefaults] setBool:!useAuthorInformation forKey:kVVDUseAuthorInformation];`
	`188`	`+ [[NSUserDefaults standardUserDefaults] setBool:useAuthorInformation forKey:kVVDUseAuthorInformation];`
`189`	`189`	`[[NSUserDefaults standardUserDefaults] synchronize];`
`190`	`190`	`}`
`191`	`191`
`@@ -203,11 +203,11 @@ -(void)setAuthorInformation:(NSString *)authorInformation {`
`203`	`203`
`204`	`204`	`-(BOOL)useDateInformation`
`205`	`205`	`{`
`206`		`- return ![[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseDateInformation];`
	`206`	`+ return [[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseDateInformation];`
`207`	`207`	`}`
`208`	`208`	`-(void) setUseDateInformation:(BOOL)useDateInformation`
`209`	`209`	`{`
`210`		`- [[NSUserDefaults standardUserDefaults] setBool:!useDateInformation forKey:kVVDUseDateInformation];`
	`210`	`+ [[NSUserDefaults standardUserDefaults] setBool:useDateInformation forKey:kVVDUseDateInformation];`
`211`	`211`	`[[NSUserDefaults standardUserDefaults] synchronize];`
`212`	`212`	`}`
`213`	`213`