You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/09/02 17:30:22 UTC
svn commit: r810568 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk: content/ColorItem.java
content/ListButtonColorRenderer.java content/ListViewColorRenderer.java
effects/DropShadowDecorator.java effects/ShadeDecorator.java
media/Drawing.java
Author: tvolkert
Date: Wed Sep 2 15:30:22 2009
New Revision: 810568
URL: http://svn.apache.org/viewvc?rev=810568&view=rev
Log:
PIVOT-269 :: Change to use GraphicsUtilities where applicable
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ColorItem.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorRenderer.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorRenderer.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ColorItem.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ColorItem.java?rev=810568&r1=810567&r2=810568&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ColorItem.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ColorItem.java Wed Sep 2 15:30:22 2009
@@ -18,6 +18,8 @@
import java.awt.Color;
+import org.apache.pivot.wtk.GraphicsUtilities;
+
/**
* List item representing a color.
*/
@@ -34,8 +36,8 @@
}
public ColorItem(Color color, String name) {
- this.color = color;
- this.name = name;
+ setColor(color);
+ setName(name);
}
public Color getColor() {
@@ -55,7 +57,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(Color.decode(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public String getName() {
@@ -72,4 +74,15 @@
public void setName(String name) {
this.name = name;
}
+
+ @Override
+ public boolean equals(Object o) {
+ return (o instanceof ColorItem
+ && ((ColorItem)o).color.equals(color));
+ }
+
+ @Override
+ public int hashCode() {
+ return color.hashCode();
+ }
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorRenderer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorRenderer.java?rev=810568&r1=810567&r2=810568&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorRenderer.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListButtonColorRenderer.java Wed Sep 2 15:30:22 2009
@@ -19,9 +19,9 @@
import java.awt.Color;
import org.apache.pivot.wtk.Button;
+import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.ImageView;
-
/**
* List button renderer for displaying color swatches.
*/
@@ -44,7 +44,7 @@
if (data instanceof Color) {
color = (Color)data;
} else {
- color = Color.decode(data.toString());
+ color = GraphicsUtilities.decodeColor(data.toString());
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorRenderer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorRenderer.java?rev=810568&r1=810567&r2=810568&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorRenderer.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewColorRenderer.java Wed Sep 2 15:30:22 2009
@@ -83,7 +83,7 @@
if (item instanceof Color) {
color = (Color)item;
} else {
- color = Color.decode(item.toString());
+ color = GraphicsUtilities.decodeColor(item.toString());
}
colorItem = new ColorItem(color);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java?rev=810568&r1=810567&r2=810568&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java Wed Sep 2 15:30:22 2009
@@ -25,6 +25,7 @@
import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
+import org.apache.pivot.wtk.GraphicsUtilities;
/**
* Decorator that adds a drop shadows to a component.
@@ -82,7 +83,7 @@
throw new IllegalArgumentException("shadowColor is null.");
}
- setShadowColor(Color.decode(shadowColor));
+ setShadowColor(GraphicsUtilities.decodeColor(shadowColor));
}
/**
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java?rev=810568&r1=810567&r2=810568&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java Wed Sep 2 15:30:22 2009
@@ -23,6 +23,7 @@
import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
+import org.apache.pivot.wtk.GraphicsUtilities;
/**
* Decorator that applies a "shade" to a component. The shade is a rectangle
@@ -102,7 +103,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(Color.decode(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
@Override
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java?rev=810568&r1=810567&r2=810568&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Drawing.java Wed Sep 2 15:30:22 2009
@@ -16,13 +16,13 @@
*/
package org.apache.pivot.wtk.media;
-import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Paint;
import java.awt.RenderingHints;
import org.apache.pivot.util.ListenerList;
import org.apache.pivot.wtk.Bounds;
+import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.media.drawing.Canvas;
import org.apache.pivot.wtk.media.drawing.CanvasListener;
@@ -143,7 +143,7 @@
throw new IllegalArgumentException("background is null.");
}
- setBackground(Color.decode(background));
+ setBackground(GraphicsUtilities.decodePaint(background));
}
@Override