colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 04:57:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added missing class checks in +initialize, regularized checking code

Browse Source
This commit is contained in:
Aparajita Fishman
2012-06-28 12:05:18 -07:00
parent d923fb56e2
commit cae5486ec6
26 changed files with 60 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPControl.j
+11 -11
View File
@@ -134,18 +134,18 @@ var CPControlBlackColor = [CPColor blackColor];
+ (void)initialize
{
if (self === [CPControl class])
{
[self exposeBinding:@"value"];
[self exposeBinding:@"objectValue"];
[self exposeBinding:@"stringValue"];
[self exposeBinding:@"integerValue"];
[self exposeBinding:@"intValue"];
[self exposeBinding:@"doubleValue"];
[self exposeBinding:@"floatValue"];
if (self !== [CPControl class])
return;
[self exposeBinding:@"enabled"];
}
[self exposeBinding:@"value"];
[self exposeBinding:@"objectValue"];
[self exposeBinding:@"stringValue"];
[self exposeBinding:@"integerValue"];
[self exposeBinding:@"intValue"];
[self exposeBinding:@"doubleValue"];
[self exposeBinding:@"floatValue"];
[self exposeBinding:@"enabled"];
}
+ (Class)_binderClassForBinding:(CPString)theBinding
AppKit/CPFont.j
+4 -1
View File
@@ -67,7 +67,7 @@ var _CPFonts = {},
@code
<key>CPSystemFontFace</key>
<string>Lucida Grande</string>
@endcode
@endcode
*/
@implementation CPFont : CPObject
{
@@ -84,6 +84,9 @@ var _CPFonts = {},
+ (void)initialize
{
if (self !== [CPFont class])
return;
var systemFontFace = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontFace"];
if (!systemFontFace)
AppKit/CPImageView.j
+3
View File
@@ -59,6 +59,9 @@ var CPImageViewEmptyPlaceholderImage = nil;
+ (void)initialize
{
if (self !== [CPImageView class])
return;
var bundle = [CPBundle bundleForClass:[CPView class]];
CPImageViewEmptyPlaceholderImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"empty.png"]];
AppKit/CPKeyBinding.j
+1 -1
View File
@@ -153,7 +153,7 @@ var CPKeyBindingCache = {};
+ (void)initialize
{
if ([self class] !== CPKeyBinding)
if (self !== [CPKeyBinding class])
return;
[self createKeyBindingsFromJSObject:CPStandardKeyBindings];
AppKit/CPLevelIndicator.j
+3
View File
@@ -64,6 +64,9 @@ var _CPLevelIndicatorBezelColor = nil,
+ (void)initialize
{
if (self !== [CPLevelIndicator class])
return;
var bundle = [CPBundle bundleForClass:CPLevelIndicator];
_CPLevelIndicatorBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
AppKit/CPMenu/CPMenu.j
+1 -1
View File
@@ -80,7 +80,7 @@ var _CPMenuBarVisible = NO,
+ (void)initialize
{
if (self !== CPMenu)
if (self !== [CPMenu class])
return;
[[self class] setMenuBarAttributes:[CPDictionary dictionary]];
AppKit/CPMenu/_CPMenuBarWindow.j
+1 -1
View File
@@ -34,7 +34,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
+ (void)initialize
{
if (self != [_CPMenuBarWindow class])
if (self !== [_CPMenuBarWindow class])
return;
var bundle = [CPBundle bundleForClass:self];
AppKit/CPMenu/_CPMenuWindow.j
+1 -1
View File
@@ -65,7 +65,7 @@ var STICKY_TIME_INTERVAL = 500,
+ (void)initialize
{
if (self != [_CPMenuWindow class])
if (self !== [_CPMenuWindow class])
return;
var bundle = [CPBundle bundleForClass:self];
AppKit/CPMenuItem/_CPMenuItemView.j
+1 -1
View File
@@ -40,7 +40,7 @@ var _CPMenuItemSelectionColor = nil,
+ (void)initialize
{
if (self != [_CPMenuItemView class])
if (self !== [_CPMenuItemView class])
return;
_CPMenuItemSelectionColor = [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
AppKit/CPObjectController.j
+3
View File
@@ -51,6 +51,9 @@
+ (id)initialize
{
if (self !== [CPObjectController class])
return;
[self exposeBinding:@"editable"];
[self exposeBinding:@"contentObject"];
}
AppKit/CPPasteboard.j
+1 -1
View File
@@ -73,7 +73,7 @@ var CPPasteboards = nil,
*/
+ (void)initialize
{
if (self != [CPPasteboard class])
if (self !== [CPPasteboard class])
return;
[self setVersion:1.0];
AppKit/CPProgressIndicator.j
+6 -6
View File
@@ -78,7 +78,7 @@ var CPProgressIndicatorSpinningStyleColors = nil,
*/
+ (void)initialize
{
if (self != [CPProgressIndicator class])
if (self !== [CPProgressIndicator class])
return;
var bundle = [CPBundle bundleForClass:self];
@@ -120,11 +120,11 @@ var CPProgressIndicatorSpinningStyleColors = nil,
// Bar Style
var prefixes = [
CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle],
CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]
];
CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle],
CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]
];
for (var i = 0, count = prefixes.length; i < count; i++)
{
AppKit/CPScrollView.j
+3
View File
@@ -125,6 +125,9 @@ var CPScrollerStyleGlobal = CPScrollerStyleOverlay,
+ (void)initialize
{
if (self !== [CPScrollView class])
return;
var globalValue = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPScrollersGlobalStyle"];
if (globalValue == nil || globalValue == -1)
AppKit/CPSearchField.j
+1 -1
View File
@@ -72,7 +72,7 @@ var RECENT_SEARCH_PREFIX = @" ";
+ (void)initialize
{
if (self != [CPSearchField class])
if (self !== [CPSearchField class])
return;
var bundle = [CPBundle bundleForClass:self];
AppKit/CPShadowView.j
+1 -1
View File
@@ -54,7 +54,7 @@ var LIGHT_LEFT_INSET = 3.0,
+ (void)initialize
{
if (self != [CPShadowView class])
if (self !== [CPShadowView class])
return;
var bundle = [CPBundle bundleForClass:[self class]];
AppKit/CPSplitView.j
+1 -1
View File
@@ -113,7 +113,7 @@ var CPSplitViewHorizontalImage = nil,
*/
+ (void)initialize
{
if (self != [CPSplitView class])
if (self !== [CPSplitView class])
return;
var bundle = [CPBundle bundleForClass:self];
AppKit/CPToolbar.j
+1 -1
View File
@@ -114,7 +114,7 @@ var CPToolbarsByIdentifier = nil,
/* @ignore */
+ (void)initialize
{
if (self != [CPToolbar class])
if (self !== [CPToolbar class])
return;
CPToolbarsByIdentifier = [CPDictionary dictionary];
AppKit/CPViewController.j
+4 -2
View File
@@ -78,8 +78,10 @@ var CPViewControllerCachedCibs;
+ (void)initialize
{
if (self === CPViewController)
CPViewControllerCachedCibs = [CPDictionary dictionary];
if (self !== [CPViewController class])
return;
CPViewControllerCachedCibs = [CPDictionary dictionary];
}
/*!
AppKit/CPWindow/CPWindow.j
+1 -1
View File
@@ -343,7 +343,7 @@ var CPWindowActionMessageKeys = [
*/
+ (void)initialize
{
if (self != [CPWindow class])
if (self !== [CPWindow class])
return;
var bundle = [CPBundle bundleForClass:[CPWindow class]];
AppKit/CPWindow/_CPHUDWindowView.j
+1 -1
View File
@@ -38,7 +38,7 @@ var HUD_TITLEBAR_HEIGHT = 26.0;
+ (void)initialize
{
if (self != [_CPHUDWindowView class])
if (self !== [_CPHUDWindowView class])
return;
var bundle = [CPBundle bundleForClass:self];
AppKit/CPWindow/_CPWindowView.j
+1 -1
View File
@@ -45,7 +45,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
+ (void)initialize
{
if (self != [_CPWindowView class])
if (self !== [_CPWindowView class])
return;
_CPWindowViewResizeIndicatorImage = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPWindow class]] pathForResource:@"_CPWindowView/_CPWindowViewResizeIndicator.png"] size:CGSizeMake(12.0, 12.0)];
Foundation/CPKeyedArchiver.j
+1 -1
View File
@@ -125,7 +125,7 @@ var _CPKeyedArchiverStringClass = Nil,
*/
+ (void)initialize
{
if (self != [CPKeyedArchiver class])
if (self !== [CPKeyedArchiver class])
return;
_CPKeyedArchiverStringClass = [CPString class];
Foundation/CPRunLoop.j
+1 -1
View File
@@ -166,7 +166,7 @@ var CPRunLoopLastNativeRunLoop = 0;
*/
+ (void)initialize
{
if (self != [CPRunLoop class])
if (self !== [CPRunLoop class])
return;
CPMainRunLoop = [[CPRunLoop alloc] init];
Tests/AppKit/WithAndWithoutBindingsIntegration/02_WithBindings/StringToURLTransformer.j
+3
View File
@@ -26,6 +26,9 @@
+ (void)initialize
{
if (self !== [StringToURLTransformer class])
return;
[CPValueTransformer setValueTransformer:[self new]
forName:@"StringToURLTransformer"];
}
Tests/Manual/UserlandNSTest/BorderView.j
+2 -1
View File
@@ -21,7 +21,8 @@ BorderViewDefaultBorderColor = nil;
+ (void)initialize
{
BorderViewDefaultBorderColor = [CPColor colorWithHexString:@"0000ff"];
if (self === [BorderView class])
BorderViewDefaultBorderColor = [CPColor colorWithHexString:@"0000ff"];
}
- (id)initWithFrame:(CGRect)aFrame
Tools/nib2cib/NSFont.j
+3
View File
@@ -54,6 +54,9 @@ var IBDefaultFontFace = @"Lucida Grande",
+ (void)initialize
{
if (self !== [NSFont class])
return;
CPLog.debug("NSFont: default IB font: %s %f", IBDefaultFontFace, IBDefaultFontSize);
}