PlugIns/Dialog2.tmplugin/Contents/MacOS/Dialog2 @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> -@interface TMDChameleon : NSObject +@interface TMD2Chameleon : NSObject { } + (BOOL)createSubclassNamed:(NSString*)aName withValues:(NSDictionary*)values; Tools/Dialog/Commands/prototype/TMDChameleon.h @@ -15,7 +15,7 @@ static Class find_root (Class cl) return cl; } -@implementation TMDChameleon +@implementation TMD2Chameleon - (id)init { id res = [DefaultValues objectForKey:NSStringFromClass([self class])]; @@ -28,7 +28,7 @@ static Class find_root (Class cl) if(NSClassFromString(aName)) return YES; - Class super_cl = [TMDChameleon class]; + Class super_cl = [TMD2Chameleon class]; Class sub_cl = (Class)calloc(1, sizeof(objc_class)); Class meta_cl = (Class)calloc(1, sizeof(objc_class)); Tools/Dialog/Commands/prototype/TMDChameleon.mm @@ -24,7 +24,7 @@ values = [NSPropertyListSerialization propertyListFromData:[(NSString*)values dataUsingEncoding:NSUTF8StringEncoding] mutabilityOption:NSPropertyListImmutable format:nil errorDescription:NULL]; enumerate([values allKeys], id key) - [TMDChameleon createSubclassNamed:key withValues:[values objectForKey:key]]; + [TMD2Chameleon createSubclassNamed:key withValues:[values objectForKey:key]]; } if(NSString* show = [args objectForKey:@"show"]) Tools/Dialog/Commands/prototype/prototype.mm @@ -32,7 +32,6 @@ 91D6F9060CF23E7F000F8170 /* menu.mm in Sources */ = {isa = PBXBuildFile; fileRef = 91D6F9040CF23E7F000F8170 /* menu.mm */; }; 91D6F90B0CF23EAE000F8170 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91D6F90A0CF23EAE000F8170 /* Carbon.framework */; }; 91D6F97E0CF2C8EF000F8170 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91D6F97D0CF2C8EF000F8170 /* WebKit.framework */; }; - 91D6F9950CF33A7A000F8170 /* ValueTransformers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 91D6F9920CF33A7A000F8170 /* ValueTransformers.mm */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -366,7 +365,6 @@ 91D6F8FE0CF23E51000F8170 /* alert.mm in Sources */, 91D6F9020CF23E79000F8170 /* help.mm in Sources */, 91D6F9060CF23E7F000F8170 /* menu.mm in Sources */, - 91D6F9950CF33A7A000F8170 /* ValueTransformers.mm in Sources */, 91BF40BA0D6792CB001834B3 /* CLIProxy.mm in Sources */, 910713760D99768B0091C83C /* TextMate.mm in Sources */, 91234F960D9A84E900E346BA /* insert.mm in Sources */, Tools/Dialog/Dialog2.xcodeproj/project.pbxproj 743b93693f62bf4d8056fa4093e56a21527b0bb8 duff duff@dfb7d73b-c2ec-0310-8fea-fb051d288c6d http://github.com/kballard/textmate-bundles/commit/15dd84437c5b2a119bb84f9d51f1f5f667b448e7 15dd84437c5b2a119bb84f9d51f1f5f667b448e7 2009-06-21T13:48:02-07:00 2009-06-21T13:48:02-07:00 Disable value transformers and rename class TMDChameleon to TMD2Chameleon. This is because Dialog 1 exports identically named classes (which presently are also identically implemented, but two plug-ins should not export classes with same names, and since Dialog 1 is “frozen” I found it most appropriate to change Dialog 2). git-svn-id: http://svn.textmate.org/trunk@11678 dfb7d73b-c2ec-0310-8fea-fb051d288c6d 164f6b612f7abab9e93e556f8fecda5338dc63a8 duff duff@dfb7d73b-c2ec-0310-8fea-fb051d288c6d