Code modernization. Removed SWImageAdditions as it was broken.

ioquatix · ioquatix · commit 2f5cc8d194d0 · 2016-07-03T01:38:39.000+12:00
diff --git a/NSComboBox+SWBindingsAdditions.m b/NSComboBox+SWBindingsAdditions.m
@@ -12,14 +12,14 @@
 @implementation NSComboBox (SWBindingsAdditions)
 
 - (id) selectedObjectInArray: (id)collection {
-	int index = [self indexOfSelectedItem];
+	int index = self.indexOfSelectedItem;
 	NSLog (@"Index: %d", index);
 	
 	NSArray *array = nil;
 	
 	if (index == -1) {
 		// We need to match by string value
-		index = [self indexOfItemWithObjectValue:[self stringValue]];
+		index = [self indexOfItemWithObjectValue:self.stringValue];
 	}
 	
 	// If index is still -1
diff --git a/NSDecimalNumber+RoundingExtensions.m b/NSDecimalNumber+RoundingExtensions.m
@@ -31,7 +31,7 @@ - (NSDecimalNumber *)decimalNumberByCeiling {
 }
 
 - (NSDecimalNumber *)fractionalPart {
-	return [self decimalNumberBySubtracting:[self decimalNumberByFlooring]];
+	return [self decimalNumberBySubtracting:self.decimalNumberByFlooring];
 }
 
 + (NSDecimalNumber *) decimalNumberWithUnsignedInteger:(NSUInteger)integer {
diff --git a/NSFileManager+DirectoryLocations.m b/NSFileManager+DirectoryLocations.m
@@ -60,7 +60,7 @@ - (NSString *)findOrCreateDirectory:(NSSearchPathDirectory)searchPathDirectory i
 }
 
 - (NSString *)applicationSupportDirectory {
-	NSString *executableName = [[NSBundle mainBundle] infoDictionary][@"CFBundleExecutable"];
+	NSString *executableName = [NSBundle mainBundle].infoDictionary[@"CFBundleExecutable"];
 
 	NSError *error = nil;
 	NSString *result = [self findOrCreateDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask subdirectory:executableName error:&error];
diff --git a/NSImage+CenteredDrawing.m b/NSImage+CenteredDrawing.m
@@ -15,7 +15,7 @@ @implementation NSImage (CenteredDrawing)
 - (void)drawCenteredInRect:(NSRect)inRect operation:(NSCompositingOperation)op fraction:(CGFloat)delta
 {
 	NSRect srcRect = NSZeroRect;
-	srcRect.size = [self size];
+	srcRect.size = self.size;
 	
 	// create a destination rect scaled to fit inside the frame
 	NSRect drawnRect = srcRect;
diff --git a/NSMenuItem+SWShowHideAdditions.m b/NSMenuItem+SWShowHideAdditions.m
@@ -32,7 +32,7 @@ - (void) updateTitle:(NSString*)postfix isHidden: (BOOL)hidden {
 	
 	title = [NSString stringWithFormat:@"%@ %@", prefix, postfix];
 	
-	[self setTitle:title];
+	self.title = title;
 }
 
 @end
diff --git a/NSSet+SWSetAdditions.m b/NSSet+SWSetAdditions.m
@@ -15,7 +15,7 @@ @implementation NSSet (SWSetAdditions)
 
 - (NSSet*) subsetConformingTo: (SEL)selector {
 	NSEnumerator *setEnumerator = [self objectEnumerator];
-	NSMutableSet *newSet = [NSMutableSet setWithCapacity:[self count]];
+	NSMutableSet *newSet = [NSMutableSet setWithCapacity:self.count];
 	id object = nil;
 	
 	while ((object = [setEnumerator nextObject])) {
@@ -28,7 +28,7 @@ - (NSSet*) subsetConformingTo: (SEL)selector {
 
 - (NSSet*) subsetNotConformingTo: (SEL)selector {
 	NSEnumerator *setEnumerator = [self objectEnumerator];
-	NSMutableSet *newSet = [NSMutableSet setWithCapacity:[self count]];
+	NSMutableSet *newSet = [NSMutableSet setWithCapacity:self.count];
 	id object = nil;
 	
 	while ((object = [setEnumerator nextObject])) {
@@ -41,7 +41,7 @@ - (NSSet*) subsetNotConformingTo: (SEL)selector {
 
 - (NSSet*) subsetConformingTo: (SEL)selector withObject: (id)arg {
 	NSEnumerator *setEnumerator = [self objectEnumerator];
-	NSMutableSet *newSet = [NSMutableSet setWithCapacity:[self count]];
+	NSMutableSet *newSet = [NSMutableSet setWithCapacity:self.count];
 	id object = nil;
 	
 	while ((object = [setEnumerator nextObject])) {
@@ -54,7 +54,7 @@ - (NSSet*) subsetConformingTo: (SEL)selector withObject: (id)arg {
 
 - (NSSet*) subsetNotConformingTo: (SEL)selector withObject: (id)arg {
 	NSEnumerator *setEnumerator = [self objectEnumerator];
-	NSMutableSet *newSet = [NSMutableSet setWithCapacity:[self count]];
+	NSMutableSet *newSet = [NSMutableSet setWithCapacity:self.count];
 	id object = nil;
 	
 	while ((object = [setEnumerator nextObject])) {
diff --git a/NSView+SetSubviewsEnabled.m b/NSView+SetSubviewsEnabled.m
@@ -19,7 +19,7 @@ - (void) setSubviewsEnabled: (BOOL)enabled {
 }
 
 - (void) recursivelySetEnabled: (BOOL)enabled {
-	NSArray *subviews = [self subviews];
+	NSArray *subviews = self.subviews;
 	NSEnumerator *iter = [subviews objectEnumerator];
 	id childView;
 	
diff --git a/SWControlValueAdditions.m b/SWControlValueAdditions.m
@@ -12,39 +12,39 @@
 @implementation NSControl (SWControlNumberValue)
 
 - (NSNumber*)numberValue {
-	if ([self formatter])
-		return [[self formatter] numberFromString:[self stringValue]];
+	if (self.formatter)
+		return [self.formatter numberFromString:self.stringValue];
 	else
 		return nil;
 }
 
 - (NSDecimalNumber*)decimalNumberValue {
-	if ([self formatter])
-		return [NSDecimalNumber decimalNumberWithDecimal:[[self numberValue] decimalValue]];
+	if (self.formatter)
+		return [NSDecimalNumber decimalNumberWithDecimal:self.numberValue.decimalValue];
 	else
-		return [NSDecimalNumber decimalNumberWithString:[self stringValue]];
+		return [NSDecimalNumber decimalNumberWithString:self.stringValue];
 }
 
 - (void) setNumberValue: (NSNumber*)number {
-	if ([self formatter])
-		[self setStringValue:[[self formatter] stringFromNumber:number]];
+	if (self.formatter)
+		self.stringValue = [self.formatter stringFromNumber:number];
 	else// if ([number isKindOfClass:[NSDecimalNumber class]])
-		[self setStringValue:[(NSDecimalNumber*)number description]];
+		self.stringValue = ((NSDecimalNumber*)number).description;
 }
 
 @end
 
 @implementation NSButton (SWControlBoolValue)
 
 - (BOOL) boolValue {
-	if ([self state] == NSOnState)
+	if (self.state == NSOnState)
 		return YES;
 	else
 		return NO;
 }
 
 - (NSNumber*) boolNumberValue {
-	return @([self boolValue]);
+	return @(self.boolValue);
 }
 
 @end
diff --git a/SWDocumentWindowController.m b/SWDocumentWindowController.m
@@ -12,10 +12,10 @@
 @implementation NSWindowController (SWDocumentWindowController)
 
 - (NSManagedObjectContext*) managedObjectContext {
-	NSPersistentDocument *doc = [self document];
+	NSPersistentDocument *doc = self.document;
 	
 	if (doc)
-		return [doc managedObjectContext];
+		return doc.managedObjectContext;
 	
 	return nil;
 }
diff --git a/SWGradientFillAdditions.m b/SWGradientFillAdditions.m
@@ -19,39 +19,39 @@ + (CIVector*) vectorWithPoint: (NSPoint)point {
 }
 
 - (float) lesserX: (CIVector*)other {
-	if ([self X] < [other X])
-		return [self X];
+	if (self.X < other.X)
+		return self.X;
 	else
-		return [other X];
+		return other.X;
 }
 
 - (float) lesserY: (CIVector*)other {
-	if ([self Y] < [other Y])
-		return [self Y];
+	if (self.Y < other.Y)
+		return self.Y;
 	else
-		return [other Y];
+		return other.Y;
 }
 
 - (float) lesserZ: (CIVector*)other {
-	if ([self Z] < [other Z])
-		return [self Z];
+	if (self.Z < other.Z)
+		return self.Z;
 	else
-		return [other Z];
+		return other.Z;
 }
 
 - (float) lesserW: (CIVector*)other {
-	if ([self W] < [other W])
-		return [self W];
+	if (self.W < other.W)
+		return self.W;
 	else
-		return [other W];
+		return other.W;
 }
 
 - (CIVector*) bottomLeft: (CIVector*)other {
 	return [CIVector vectorWithX:[self lesserX:other] Y:[self lesserY:other] Z:[self lesserZ:other] W:[self lesserW:other]];
 }
 
 - (CGPoint) toCGPoint {
-	return CGPointMake([self X], [self Y]);
+	return CGPointMake(self.X, self.Y);
 }
 
 @end
@@ -64,8 +64,8 @@ - (void)fillGradientFrom: (CIVector*)startVector color:(NSColor*)inStartColor to
 	inStartColor = [inStartColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
 	inEndColor = [inEndColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
 	
-	CIColor* startColor = [CIColor colorWithRed:[inStartColor redComponent] green:[inStartColor greenComponent] blue:[inStartColor blueComponent] alpha:[inStartColor alphaComponent]];
-	CIColor* endColor = [CIColor colorWithRed:[inEndColor redComponent] green:[inEndColor greenComponent] blue:[inEndColor blueComponent] alpha:[inEndColor alphaComponent]];
+	CIColor* startColor = [CIColor colorWithRed:inStartColor.redComponent green:inStartColor.greenComponent blue:inStartColor.blueComponent alpha:inStartColor.alphaComponent];
+	CIColor* endColor = [CIColor colorWithRed:inEndColor.redComponent green:inEndColor.greenComponent blue:inEndColor.blueComponent alpha:inEndColor.alphaComponent];
 	
 	CIVector *bottomLeft = [startVector bottomLeft:endVector];
 	
@@ -82,7 +82,7 @@ - (void)fillGradientFrom: (CIVector*)startVector color:(NSColor*)inStartColor to
 	
 	[[NSGraphicsContext currentContext] saveGraphicsState];
 	
-	CIContext* context = [[NSGraphicsContext currentContext] CIContext];
+	CIContext* context = [NSGraphicsContext currentContext].CIContext;
 	
 	//can be setClip, but this may increase the current clipping rect beyond that intended
 	[self addClip];
@@ -93,7 +93,7 @@ - (void)fillGradientFrom: (CIVector*)startVector color:(NSColor*)inStartColor to
 	};
 
 	CGRect gradientBounds = {
-		[bottomLeft toCGPoint],
+		bottomLeft.toCGPoint,
 		self.bounds.size
 	};
 
@@ -103,7 +103,7 @@ - (void)fillGradientFrom: (CIVector*)startVector color:(NSColor*)inStartColor to
 }
 
 - (void) fillVerticalGradientTop: (NSColor*)top bottom: (NSColor*)bottom {
-	NSRect bounds = [self bounds];
+	NSRect bounds = self.bounds;
 	
 	NSPoint a = bounds.origin;
 	NSPoint b = NSMakePoint(bounds.origin.x, bounds.origin.y + bounds.size.height);
@@ -112,7 +112,7 @@ - (void) fillVerticalGradientTop: (NSColor*)top bottom: (NSColor*)bottom {
 }
 
 - (void) fillHorizontalGradientLeft: (NSColor*)left right: (NSColor*)right {
-	NSRect bounds = [self bounds];
+	NSRect bounds = self.bounds;
 	
 	NSPoint a = bounds.origin;
 	NSPoint b = NSMakePoint(bounds.origin.x + bounds.size.width, bounds.origin.y);
@@ -133,7 +133,7 @@ - (instancetype)initWithFrame:(NSRect)frameRect
 }
 
 - (void)drawRect:(NSRect)rect {
-	NSRect viewBounds = [self bounds];
+	NSRect viewBounds = self.bounds;
 	NSBezierPath *p = [NSBezierPath bezierPathWithRect:viewBounds];
 	NSColor *c = [[NSColor blueColor] colorWithAlphaComponent:0.1];
 	
diff --git a/SWImageAdditions.h b/SWImageAdditions.h
diff --git a/SWImageAdditions.m b/SWImageAdditions.m
diff --git a/SWIsNilDate.m b/SWIsNilDate.m
@@ -34,7 +34,7 @@ - (id)transformedValue:(id)value {
 
 - (id)reverseTransformedValue:(id)value {
 	//NSLog (@"Reverse Transforming: %@", value);
-	if ([(NSNumber*)value boolValue])
+	if (((NSNumber*)value).boolValue)
 		return [NSDate date];
 	else
 		return nil;
diff --git a/SWMonthSelectTable.m b/SWMonthSelectTable.m
diff --git a/SWPluginLoader.m b/SWPluginLoader.m
diff --git a/SWSheetController.m b/SWSheetController.m

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ - (NSDecimalNumber *)decimalNumberByCeiling {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`- (NSDecimalNumber *)fractionalPart {`
`34`		`- return [self decimalNumberBySubtracting:[self decimalNumberByFlooring]];`
	`34`	`+ return [self decimalNumberBySubtracting:self.decimalNumberByFlooring];`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`+ (NSDecimalNumber *) decimalNumberWithUnsignedInteger:(NSUInteger)integer {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ - (NSString *)findOrCreateDirectory:(NSSearchPathDirectory)searchPathDirectory i`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`- (NSString *)applicationSupportDirectory {`
`63`		`- NSString *executableName = [[NSBundle mainBundle] infoDictionary][@"CFBundleExecutable"];`
	`63`	`+ NSString *executableName = [NSBundle mainBundle].infoDictionary[@"CFBundleExecutable"];`
`64`	`64`
`65`	`65`	`NSError *error = nil;`
`66`	`66`	`NSString *result = [self findOrCreateDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask subdirectory:executableName error:&error];`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ @implementation NSImage (CenteredDrawing)`
`15`	`15`	`- (void)drawCenteredInRect:(NSRect)inRect operation:(NSCompositingOperation)op fraction:(CGFloat)delta`
`16`	`16`	`{`
`17`	`17`	`NSRect srcRect = NSZeroRect;`
`18`		`- srcRect.size = [self size];`
	`18`	`+ srcRect.size = self.size;`
`19`	`19`
`20`	`20`	`// create a destination rect scaled to fit inside the frame`
`21`	`21`	`NSRect drawnRect = srcRect;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ - (void) updateTitle:(NSString*)postfix isHidden: (BOOL)hidden {`
`32`	`32`
`33`	`33`	`title = [NSString stringWithFormat:@"%@ %@", prefix, postfix];`
`34`	`34`
`35`		`- [self setTitle:title];`
	`35`	`+ self.title = title;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ - (void) setSubviewsEnabled: (BOOL)enabled {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`- (void) recursivelySetEnabled: (BOOL)enabled {`
`22`		`- NSArray *subviews = [self subviews];`
	`22`	`+ NSArray *subviews = self.subviews;`
`23`	`23`	`NSEnumerator *iter = [subviews objectEnumerator];`
`24`	`24`	`id childView;`
`25`	`25`