[Schmitzm-commits] r1459 - in trunk/schmitzm-core/src: main/java/de/schmitzm/swing test/java/de/schmitzm/testing

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2011-01-27 18:15:40 +0100 (Thu, 27 Jan 2011)
New Revision: 1459

Modified:
   trunk/schmitzm-core/src/main/java/de/schmitzm/swing/ColorButton.java
   trunk/schmitzm-core/src/main/java/de/schmitzm/swing/SwingUtil.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/testing/SwingUtilTest.java
Log:


Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/swing/ColorButton.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/swing/ColorButton.java	2011-01-27 16:31:36 UTC (rev 1458)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/swing/ColorButton.java	2011-01-27 17:15:40 UTC (rev 1459)
@@ -31,10 +31,10 @@
 		return color;
 	}
 
-//	public void setColor(Expression colorExpression) {
-//		setColor(StylingUtil.getColorFromExpression(colorExpression));
-//	}
-	
+	// public void setColor(Expression colorExpression) {
+	// setColor(StylingUtil.getColorFromExpression(colorExpression));
+	// }
+
 	@Override
 	public void setAction(Action a) {
 		super.setAction(a);
@@ -42,15 +42,16 @@
 	}
 
 	/**
-	 * Updates a {@link JButton}'s {@link Icon} with a {@link Color}.
+	 * Updates a {@link JButton}'s {@link Icon} with a {@link Color}. To set a
+	 * color from a Geotools Color Expression, @see
+	 * StylingUtil#getColorFromExpression
 	 * 
 	 * @param button
 	 *            The {@link JButton} to change the {@link Icon}
 	 * @param newColor
 	 *            {@link Color} to set.
 	 * 
-	 * @author <a href="mailto:tzeggai at wikisquare.de">Stefan Alfons
-	 *         Tzeggai</a>
+	 * @author <a href="mailto:tzeggai at wikisquare.de">Stefan Alfons Tzeggai</a>
 	 */
 	public void setColor(final Color newColor) {
 		color = newColor;

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/swing/SwingUtil.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/swing/SwingUtil.java	2011-01-27 16:31:36 UTC (rev 1458)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/swing/SwingUtil.java	2011-01-27 17:15:40 UTC (rev 1459)
@@ -149,7 +149,7 @@
 	// ****************************************************************************
 	/** Cursor in Form einer Lupe mit Plus Symbol */
 	public static final Cursor ZOOMIN_CURSOR = createCursorFromResourcePath(
-			"resource/cursor/zoom_in.gif", 8, 8, null);
+			"/de/schmitzm/swing/resource/cursor/zoom_in.gif", 8, 8, null);
 	/** Cursor in Form einer Lupe mit Minus Symbol */
 	public static final Cursor ZOOMOUT_CURSOR = createCursorFromResourcePath(
 			"resource/cursor/zoom_out.gif", 8, 8, null);

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/testing/SwingUtilTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/testing/SwingUtilTest.java	2011-01-27 16:31:36 UTC (rev 1458)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/testing/SwingUtilTest.java	2011-01-27 17:15:40 UTC (rev 1459)
@@ -42,7 +42,7 @@
 	
 	@Test
 	public void testIconsAndCursors(){
-		assertNotNull(SwingUtil.ZOOMIN_CURSOR);
+		assertNotNull("zoom_in.gif not found", SwingUtil.ZOOMIN_CURSOR);
 		assertNotNull(SwingUtil.ZOOMOUT_CURSOR);
 		assertNotNull(SwingUtil.ZOOM_CURSOR);
 		assertNotNull(SwingUtil.PAN_CURSOR);