Permalink
Browse files

Fixed method merging for cases when instance method is merged on a cl…

…ass method. Closes #90.

This was working when instance method was registered first and class method with the same name was merged on it later on. But it didn't handle the other ordering. Hopefully this will allow handling all cases. Note that there might still be cases when merging properties and class methods - keep in mind if the issue get's re-opened.

Also updated build number to 703.
  • Loading branch information...
1 parent 32ff996 commit 5487b721f19349783ab4b1d07fd9aaabc703c488 @tomaz tomaz committed Jun 27, 2011
Showing with 4 additions and 2 deletions.
  1. +1 −1 AppledocTests-Info.plist
  2. +1 −1 Application/GBApplicationStringsProvider.m
  3. +2 −0 Model/GBMethodData.m
View
@@ -17,6 +17,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>702</string>
+ <string>703</string>
</dict>
</plist>
@@ -138,7 +138,7 @@ - (NSDictionary *)appledocData {
result = [[NSMutableDictionary alloc] init];
[result setObject:@"appledoc" forKey:@"tool"];
[result setObject:@"2.0.4" forKey:@"version"];
- [result setObject:@"702" forKey:@"build"];
+ [result setObject:@"703" forKey:@"build"];
[result setObject:@"http://appledoc.gentlebytes.com" forKey:@"homepage"];
}
return result;
View
@@ -249,6 +249,8 @@ - (BOOL)validateMergeWith:(GBMethodData *)source {
manualData = self;
} else if (self.methodType == GBMethodTypeInstance && source.methodType == GBMethodTypeClass) {
return NO;
+ } else if (self.methodType == GBMethodTypeClass && source.methodType == GBMethodTypeInstance) {
+ return NO;
} else if (self.methodType == GBMethodTypeProperty && source.methodType == GBMethodTypeClass) {
return NO;
} else {

0 comments on commit 5487b72

Please sign in to comment.