[Patchanim-commit] SF.net SVN: patchanim:[302] trunk/patchanim/src/com/mebigfatguy/patchanim/ gui/JPatchSamplePanel.java

[<dbr...@us...>]

Revision: 302
          http://patchanim.svn.sourceforge.net/patchanim/?rev=302&view=rev
Author:   dbrosius
Date:     2010-06-09 06:05:26 +0000 (Wed, 09 Jun 2010)

Log Message:
-----------
warnings

Modified Paths:
--------------
    trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java

Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java
===================================================================
--- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java	2010-06-07 02:56:25 UTC (rev 301)
+++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java	2010-06-09 06:05:26 UTC (rev 302)
@@ -147,22 +147,22 @@
 				PatchAnimDocument doc = dce.getDocument();
 				image = PatchGenerator.buildImage(rgb, doc.useAlpha(), SAMPLE_SIZE, SAMPLE_SIZE);
 				oob = doc.getOutOfBoundsColor();
-				PatchPanelMediator mediator = PatchPanelMediator.getMediator();
-				if ((color != PatchColor.Alpha) || mediator.getDocument().useAlpha())
-					recalcImage(color, mediator.getActivePatch());
+				PatchPanelMediator ppMediator = PatchPanelMediator.getMediator();
+				if ((color != PatchColor.Alpha) || ppMediator.getDocument().useAlpha())
+					recalcImage(color, ppMediator.getActivePatch());
 			}
 		});
 		mediator.addSettingsChangedListener(new SettingsChangedListener() {
 			public void settingsChanged(SettingsChangedEvent sce) {
 				oob = sce.getDocument().getOutOfBoundsColor();
-				PatchPanelMediator mediator = PatchPanelMediator.getMediator();
-				if ((color != PatchColor.Alpha) || mediator.getDocument().useAlpha())
-					recalcImage(color, mediator.getActivePatch());
+				PatchPanelMediator ppMediator = PatchPanelMediator.getMediator();
+				if ((color != PatchColor.Alpha) || ppMediator.getDocument().useAlpha())
+					recalcImage(color, ppMediator.getActivePatch());
 			}
 		});
 	}
 	
-	public void recalcImage(final PatchColor color, final CombinedPatch patch) {
+	public void recalcImage(final PatchColor patchColor, final CombinedPatch patch) {
 		synchronized(redrawLock) {
 			if (redrawing) {
 				try {
@@ -180,10 +180,10 @@
 				if (oob == null)
 					oob = OutOfBoundsColor.Clip;
 				
-				if (color == PatchColor.Combined) {
+				if (patchColor == PatchColor.Combined) {
 					PatchGenerator.recalcCombinedImage(patch, image, oob);
 				} else {
-					PatchGenerator.recalcIndexedImage(color, patch, image, oob);
+					PatchGenerator.recalcIndexedImage(patchColor, patch, image, oob);
 				}
 				
 				redraw();
@@ -534,30 +534,30 @@
 		CombinedPatch patch = mediator.getActivePatch();
 		PatchCoords coords = patch.getPatch(color);
 		int order = coords.getOrder();
-		double color = 0.0;
+		double clr = 0.0;
 
 		for (int i = 0; i < order; i++) {
 			for (int j = 0; j < order; j++) {
 				Coordinate c = coords.getCoordinate(i, j);
 				switch (direction) {
 					case LeftToRight:
-						color = (255.0 * i) / (order - 1);
+						clr = (255.0 * i) / (order - 1);
 					break;
 						
 					case TopToBottom:
-						color = (255.0 * j) / (order - 1);
+						clr = (255.0 * j) / (order - 1);
 					break;
 					
 					case RightToLeft:
-						color = (255.0 * (order - 1 - i)) / (order - 1);
+						clr = (255.0 * (order - 1 - i)) / (order - 1);
 					break;
 					
 					case BottomToTop:
-						color = (255.0 * (order - 1 - j)) / (order - 1);
+						clr = (255.0 * (order - 1 - j)) / (order - 1);
 					break;
 				}
 				
-				c.setColor(color);
+				c.setColor(clr);
 				coords.setCoordinate(i, j, c);
 			}
 		}
@@ -569,7 +569,7 @@
 		CombinedPatch patch = mediator.getActivePatch();
 		PatchCoords coords = patch.getPatch(color);
 		int order = coords.getOrder();
-		double color = 0.0;
+		double clr = 0.0;
 
 		double midOrder = (order - 1) / 2.0;
 		double midOrderSq = midOrder * midOrder;
@@ -578,15 +578,15 @@
 				Coordinate c = coords.getCoordinate(i, j);
 				switch (direction) {
 					case Outward:
-						color = (int)((255.0 * Math.abs(i - midOrder) * Math.abs(j - midOrder)) / midOrderSq);
+						clr = (int)((255.0 * Math.abs(i - midOrder) * Math.abs(j - midOrder)) / midOrderSq);
 					break;
 						
 					case Inward:
-						color = (int)(255.0 - (255.0 * (Math.abs(i - midOrder) * Math.abs(j - midOrder))) / midOrderSq);
+						clr = (int)(255.0 - (255.0 * (Math.abs(i - midOrder) * Math.abs(j - midOrder))) / midOrderSq);
 					break;
 				}
 				
-				c.setColor(color);
+				c.setColor(clr);
 				coords.setCoordinate(i, j, c);
 			}
 		}
@@ -598,7 +598,7 @@
 		CombinedPatch patch = mediator.getActivePatch();
 		PatchCoords coords = patch.getPatch(color);
 		int order = coords.getOrder();
-		double color = 0.0;
+		double clr = 0.0;
 
 		double midOrder = (order - 1) / 2.0;
 		for (int i = 0; i < order; i++) {
@@ -607,15 +607,15 @@
 				double outside = Math.max(Math.abs(i - midOrder), Math.abs(j - midOrder));
 				switch (direction) {
 					case Outward:
-						color = (int)(255.0 * (outside / midOrder));
+						clr = (int)(255.0 * (outside / midOrder));
 					break;
 						
 					case Inward:
-						color = (int)(255.0 - (255.0 * (outside / midOrder)));
+						clr = (int)(255.0 - (255.0 * (outside / midOrder)));
 					break;
 				}
 				
-				c.setColor(color);
+				c.setColor(clr);
 				coords.setCoordinate(i, j, c);
 			}
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.