Refactored inline if (?:) statements to mitigate an uncrustify bug.

eskroch · eskroch · commit 5f22f26f7019 · 2011-09-27T21:23:10.000-04:00
diff --git a/examples/AAPLot/Classes/RootViewController.m b/examples/AAPLot/Classes/RootViewController.m
@@ -65,7 +65,8 @@ - (IBAction)toggleView {
     
     [UIView beginAnimations:nil context:NULL];
     [UIView setAnimationDuration:1];
-    [UIView setAnimationTransition:([mainView superview] ? UIViewAnimationTransitionFlipFromRight : UIViewAnimationTransitionFlipFromLeft) forView:self.view cache:YES];
+	UIViewAnimationTransition transition = ([mainView superview] ? UIViewAnimationTransitionFlipFromRight : UIViewAnimationTransitionFlipFromLeft);
+    [UIView setAnimationTransition:transition forView:self.view cache:YES];
     
     if ([mainView superview] != nil) {
         [flipsideViewController viewWillAppear:YES];
diff --git a/examples/CPTTestApp-iPad/Classes/CPTTestApp_iPadViewController.m b/examples/CPTTestApp-iPad/Classes/CPTTestApp_iPadViewController.m
@@ -389,7 +389,8 @@ -(NSNumber *)numberForPlot:(CPTPlot *)plot field:(NSUInteger)fieldEnum recordInd
     }
 	else {
 		if ( index % 8 ) {
-			num = [[dataForPlot objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];
+			NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");
+			num = [[dataForPlot objectAtIndex:index] valueForKey:key];
 			// Green plot gets shifted above the blue
 			if ( [(NSString *)plot.identifier isEqualToString:@"Green Plot"] ) {
 				if ( fieldEnum == CPTScatterPlotFieldY ) {
diff --git a/examples/CPTTestApp-iPhone/Classes/CPTTestAppScatterPlotController.m b/examples/CPTTestApp-iPhone/Classes/CPTTestAppScatterPlotController.m
@@ -161,7 +161,8 @@ -(NSUInteger)numberOfRecordsForPlot:(CPTPlot *)plot {
 
 -(NSNumber *)numberForPlot:(CPTPlot *)plot field:(NSUInteger)fieldEnum recordIndex:(NSUInteger)index 
 {
-    NSNumber *num = [[dataForPlot objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];
+	NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");
+    NSNumber *num = [[dataForPlot objectAtIndex:index] valueForKey:key];
 	// Green plot gets shifted above the blue
 	if ([(NSString *)plot.identifier isEqualToString:@"Green Plot"])
 	{
diff --git a/examples/CPTTestApp/Source/Controller.m b/examples/CPTTestApp/Source/Controller.m
@@ -366,7 +366,8 @@ -(NSNumber *)numberForPlot:(CPTPlot *)plot field:(NSUInteger)fieldEnum recordInd
             num = [(NSDecimalNumber *)num decimalNumberBySubtracting:[NSDecimalNumber decimalNumberWithString:@"10"]];
     }
     else {
-        num = [[self.arrangedObjects objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];
+		NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");
+        num = [[self.arrangedObjects objectAtIndex:index] valueForKey:key];
         if ( fieldEnum == CPTScatterPlotFieldY ) {
 			num = [NSNumber numberWithDouble:([num doubleValue] + 1.0)];	
 		}
diff --git a/examples/CPTTestApp/Source/SelectionDemoController.m b/examples/CPTTestApp/Source/SelectionDemoController.m
@@ -196,7 +196,8 @@ -(NSNumber *)numberForPlot:(CPTPlot *)plot field:(NSUInteger)fieldEnum recordInd
     NSNumber *num = nil;
 	
     if ( [(NSString *)plot.identifier isEqualToString:MAIN_PLOT] ) {
-        num = [[self.dataForPlot objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];
+		NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");
+        num = [[self.dataForPlot objectAtIndex:index] valueForKey:key];
     }
     else if ( [(NSString *)plot.identifier isEqualToString:SELECTION_PLOT] ) {
 		CPTXYPlotSpace *thePlotSpace = (CPTXYPlotSpace *)graph.defaultPlotSpace;
diff --git a/examples/CorePlotGallery/src/plots/CompositePlot.m b/examples/CorePlotGallery/src/plots/CompositePlot.m
@@ -443,7 +443,8 @@ -(NSNumber *)numberForPlot:(CPTPlot *)plot field:(NSUInteger)fieldEnum recordInd
         }
     }
     else {
-        num = [[dataForPlot objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];
+		NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");
+        num = [[dataForPlot objectAtIndex:index] valueForKey:key];
 
 		// Green plot gets shifted above the blue
         if ([(NSString *)plot.identifier isEqualToString:@"Green Plot"])
diff --git a/examples/CorePlotGallery/src/plots/GradientScatterPlot.m b/examples/CorePlotGallery/src/plots/GradientScatterPlot.m
@@ -173,7 +173,8 @@ -(NSUInteger)numberOfRecordsForPlot:(CPTPlot *)plot
 
 -(NSNumber *)numberForPlot:(CPTPlot *)plot field:(NSUInteger)fieldEnum recordIndex:(NSUInteger)index
 {
-    NSNumber* num = [[plotData objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];
+	NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");
+    NSNumber* num = [[plotData objectAtIndex:index] valueForKey:key];
     if (fieldEnum == CPTScatterPlotFieldY) {
         num = [NSNumber numberWithDouble:[num doubleValue]];
     }
diff --git a/examples/CorePlotGallery/src/plots/RealTimePlot.m b/examples/CorePlotGallery/src/plots/RealTimePlot.m
@@ -152,7 +152,8 @@ -(void)newData:(NSTimer *)theTimer
 		}
 		
 		CPTXYPlotSpace *plotSpace = (CPTXYPlotSpace *)theGraph.defaultPlotSpace;
-		plotSpace.xRange = [CPTPlotRange plotRangeWithLocation:CPTDecimalFromUnsignedInteger(currentIndex >= kMaxDataPoints ? currentIndex - kMaxDataPoints + 1: 0)
+		NSUInteger location = (currentIndex >= kMaxDataPoints ? currentIndex - kMaxDataPoints + 1 : 0);
+		plotSpace.xRange = [CPTPlotRange plotRangeWithLocation:CPTDecimalFromUnsignedInteger(location)
 														length:CPTDecimalFromUnsignedInteger(kMaxDataPoints - 1)];
 		
 		currentIndex++;
diff --git a/examples/CorePlotGallery/src/plots/SimpleScatterPlot.m b/examples/CorePlotGallery/src/plots/SimpleScatterPlot.m
@@ -194,7 +194,8 @@ -(NSUInteger)numberOfRecordsForPlot:(CPTPlot *)plot
 
 -(NSNumber *)numberForPlot:(CPTPlot *)plot field:(NSUInteger)fieldEnum recordIndex:(NSUInteger)index
 {
-    NSNumber *num = [[plotData objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];
+	NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");
+    NSNumber *num = [[plotData objectAtIndex:index] valueForKey:key];
     if (fieldEnum == CPTScatterPlotFieldY) {
         num = [NSNumber numberWithDouble:[num doubleValue]];
     }
diff --git a/examples/CorePlotGallery/src/plots/SteppedScatterPlot.m b/examples/CorePlotGallery/src/plots/SteppedScatterPlot.m
@@ -118,7 +118,8 @@ -(NSUInteger)numberOfRecordsForPlot:(CPTPlot *)plot
 
 -(NSNumber *)numberForPlot:(CPTPlot *)plot field:(NSUInteger)fieldEnum recordIndex:(NSUInteger)index
 {
-    NSNumber* num = [[plotData objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];
+	NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");
+    NSNumber* num = [[plotData objectAtIndex:index] valueForKey:key];
     if (fieldEnum == CPTScatterPlotFieldY) {
         num = [NSNumber numberWithDouble:[num doubleValue]];
     }
diff --git a/examples/DropPlot/CPTPlotDocument.m b/examples/DropPlot/CPTPlotDocument.m
@@ -208,10 +208,11 @@ -(NSUInteger)numberOfRecordsForPlot:(CPTPlot *)plot {
 }
 
 -(NSNumber *)numberForPlot:(CPTPlot *)plot field:(NSUInteger)fieldEnum recordIndex:(NSUInteger)index {
+	NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");
 #ifdef USE_NSDECIMAL
-    NSDecimalNumber *num = [[dataPoints objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];
+    NSDecimalNumber *num = [[dataPoints objectAtIndex:index] valueForKey:key];
 #else
-    NSNumber *num = [[dataPoints objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];
+    NSNumber *num = [[dataPoints objectAtIndex:index] valueForKey:key];
 #endif
     return num;
 }
diff --git a/framework/Source/CPTBarPlot.m b/framework/Source/CPTBarPlot.m
@@ -792,7 +792,8 @@ -(void)positionLabelAnnotation:(CPTPlotSpaceAnnotation *)label forIndex:(NSUInte
 	
 	BOOL positiveDirection = CPTDecimalGreaterThanOrEqualTo([length decimalValue], theBaseDecimalValue);
 	BOOL horizontalBars = self.barsAreHorizontal;
-	CPTPlotRange *lengthRange = [self.plotSpace plotRangeForCoordinate:horizontalBars ? CPTCoordinateX : CPTCoordinateY];
+	CPTCoordinate coordinate = ( horizontalBars ? CPTCoordinateX : CPTCoordinateY );
+	CPTPlotRange *lengthRange = [self.plotSpace plotRangeForCoordinate:coordinate];
 	if ( CPTDecimalLessThan(lengthRange.length, CPTDecimalFromInteger(0)) ) {
 		positiveDirection = !positiveDirection;
 	}
@@ -1008,19 +1009,20 @@ -(NSArray *)fieldIdentifiers
 
 -(NSArray *)fieldIdentifiersForCoordinate:(CPTCoordinate)coord 
 {
-	NSArray *result = nil;
+	CPTBarPlotField fieldIdentifier;
+
 	switch (coord) {
         case CPTCoordinateX:
-            result = [NSArray arrayWithObject:[NSNumber numberWithUnsignedInt:(self.barsAreHorizontal ? CPTBarPlotFieldBarTip : CPTBarPlotFieldBarLocation)]];
+            fieldIdentifier = (self.barsAreHorizontal ? CPTBarPlotFieldBarTip : CPTBarPlotFieldBarLocation);
             break;
         case CPTCoordinateY:
-            result = [NSArray arrayWithObject:[NSNumber numberWithUnsignedInt:(self.barsAreHorizontal ? CPTBarPlotFieldBarLocation : CPTBarPlotFieldBarTip)]];
+            fieldIdentifier = (self.barsAreHorizontal ? CPTBarPlotFieldBarLocation : CPTBarPlotFieldBarTip);
             break;
         default:
         	[NSException raise:CPTException format:@"Invalid coordinate passed to fieldIdentifiersForCoordinate:"];
             break;
     }
-    return result;
+    return [NSArray arrayWithObject:[NSNumber numberWithUnsignedInt:fieldIdentifier]];
 }
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,8 @@ -(NSUInteger)numberOfRecordsForPlot:(CPTPlot *)plot {`
`161`	`161`
`162`	`162`	`-(NSNumber )numberForPlot:(CPTPlot )plot field:(NSUInteger)fieldEnum recordIndex:(NSUInteger)index`
`163`	`163`	`{`
`164`		`- NSNumber *num = [[dataForPlot objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];`
	`164`	`+ NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");`
	`165`	`+ NSNumber *num = [[dataForPlot objectAtIndex:index] valueForKey:key];`
`165`	`166`	`// Green plot gets shifted above the blue`
`166`	`167`	`if ([(NSString *)plot.identifier isEqualToString:@"Green Plot"])`
`167`	`168`	`{`
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,8 @@ -(NSNumber )numberForPlot:(CPTPlot )plot field:(NSUInteger)fieldEnum recordInd`
`366`	`366`	`num = [(NSDecimalNumber *)num decimalNumberBySubtracting:[NSDecimalNumber decimalNumberWithString:@"10"]];`
`367`	`367`	`}`
`368`	`368`	`else {`
`369`		`- num = [[self.arrangedObjects objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];`
	`369`	`+ NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");`
	`370`	`+ num = [[self.arrangedObjects objectAtIndex:index] valueForKey:key];`
`370`	`371`	`if ( fieldEnum == CPTScatterPlotFieldY ) {`
`371`	`372`	`num = [NSNumber numberWithDouble:([num doubleValue] + 1.0)];`
`372`	`373`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,8 @@ -(NSNumber )numberForPlot:(CPTPlot )plot field:(NSUInteger)fieldEnum recordInd`
`196`	`196`	`NSNumber *num = nil;`
`197`	`197`
`198`	`198`	`if ( [(NSString *)plot.identifier isEqualToString:MAIN_PLOT] ) {`
`199`		`- num = [[self.dataForPlot objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];`
	`199`	`+ NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");`
	`200`	`+ num = [[self.dataForPlot objectAtIndex:index] valueForKey:key];`
`200`	`201`	`}`
`201`	`202`	`else if ( [(NSString *)plot.identifier isEqualToString:SELECTION_PLOT] ) {`
`202`	`203`	`CPTXYPlotSpace thePlotSpace = (CPTXYPlotSpace )graph.defaultPlotSpace;`
Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,8 @@ -(NSNumber )numberForPlot:(CPTPlot )plot field:(NSUInteger)fieldEnum recordInd`
`443`	`443`	`}`
`444`	`444`	`}`
`445`	`445`	`else {`
`446`		`- num = [[dataForPlot objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];`
	`446`	`+ NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");`
	`447`	`+ num = [[dataForPlot objectAtIndex:index] valueForKey:key];`
`447`	`448`
`448`	`449`	`// Green plot gets shifted above the blue`
`449`	`450`	`if ([(NSString *)plot.identifier isEqualToString:@"Green Plot"])`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,8 @@ -(NSUInteger)numberOfRecordsForPlot:(CPTPlot *)plot`
`173`	`173`
`174`	`174`	`-(NSNumber )numberForPlot:(CPTPlot )plot field:(NSUInteger)fieldEnum recordIndex:(NSUInteger)index`
`175`	`175`	`{`
`176`		`- NSNumber* num = [[plotData objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];`
	`176`	`+ NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");`
	`177`	`+ NSNumber* num = [[plotData objectAtIndex:index] valueForKey:key];`
`177`	`178`	`if (fieldEnum == CPTScatterPlotFieldY) {`
`178`	`179`	`num = [NSNumber numberWithDouble:[num doubleValue]];`
`179`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,8 @@ -(void)newData:(NSTimer *)theTimer`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`CPTXYPlotSpace plotSpace = (CPTXYPlotSpace )theGraph.defaultPlotSpace;`
`155`		`- plotSpace.xRange = [CPTPlotRange plotRangeWithLocation:CPTDecimalFromUnsignedInteger(currentIndex >= kMaxDataPoints ? currentIndex - kMaxDataPoints + 1: 0)`
	`155`	`+ NSUInteger location = (currentIndex >= kMaxDataPoints ? currentIndex - kMaxDataPoints + 1 : 0);`
	`156`	`+ plotSpace.xRange = [CPTPlotRange plotRangeWithLocation:CPTDecimalFromUnsignedInteger(location)`
`156`	`157`	`length:CPTDecimalFromUnsignedInteger(kMaxDataPoints - 1)];`
`157`	`158`
`158`	`159`	`currentIndex++;`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,8 @@ -(NSUInteger)numberOfRecordsForPlot:(CPTPlot *)plot`
`194`	`194`
`195`	`195`	`-(NSNumber )numberForPlot:(CPTPlot )plot field:(NSUInteger)fieldEnum recordIndex:(NSUInteger)index`
`196`	`196`	`{`
`197`		`- NSNumber *num = [[plotData objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];`
	`197`	`+ NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");`
	`198`	`+ NSNumber *num = [[plotData objectAtIndex:index] valueForKey:key];`
`198`	`199`	`if (fieldEnum == CPTScatterPlotFieldY) {`
`199`	`200`	`num = [NSNumber numberWithDouble:[num doubleValue]];`
`200`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,8 @@ -(NSUInteger)numberOfRecordsForPlot:(CPTPlot *)plot`
`118`	`118`
`119`	`119`	`-(NSNumber )numberForPlot:(CPTPlot )plot field:(NSUInteger)fieldEnum recordIndex:(NSUInteger)index`
`120`	`120`	`{`
`121`		`- NSNumber* num = [[plotData objectAtIndex:index] valueForKey:(fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y")];`
	`121`	`+ NSString *key = (fieldEnum == CPTScatterPlotFieldX ? @"x" : @"y");`
	`122`	`+ NSNumber* num = [[plotData objectAtIndex:index] valueForKey:key];`
`122`	`123`	`if (fieldEnum == CPTScatterPlotFieldY) {`
`123`	`124`	`num = [NSNumber numberWithDouble:[num doubleValue]];`
`124`	`125`	`}`