You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/05/07 16:39:08 UTC
svn commit: r772666 [1/2] - in /incubator/pivot/trunk/wtk: src/pivot/wtk/
src/pivot/wtk/content/ src/pivot/wtk/media/drawing/ src/pivot/wtk/skin/
src/pivot/wtk/skin/obsidian/ src/pivot/wtk/skin/terra/
test/pivot/wtk/media/drawing/test/
Author: gbrown
Date: Thu May 7 14:39:07 2009
New Revision: 772666
URL: http://svn.apache.org/viewvc?rev=772666&view=rev
Log:
Fix issue in ComponentSkin.decodeColor() and move to GraphicsUtilities; move GraphicsUtilities to pivot.wtk so Shape class can use it.
Added:
incubator/pivot/trunk/wtk/src/pivot/wtk/GraphicsUtilities.java
incubator/pivot/trunk/wtk/test/pivot/wtk/media/drawing/test/activity.wtkd
incubator/pivot/trunk/wtk/test/pivot/wtk/media/drawing/test/drawing_test.wtkx
- copied, changed from r772477, incubator/pivot/trunk/wtk/test/pivot/wtk/media/drawing/test/simple_drawing_test.wtkx
Removed:
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/GraphicsUtilities.java
incubator/pivot/trunk/wtk/test/pivot/wtk/media/drawing/test/simple_drawing_test.wtkx
Modified:
incubator/pivot/trunk/wtk/src/pivot/wtk/content/ListViewColorRenderer.java
incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/BorderSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ComponentSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ContainerSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ImageViewSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/LabelSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/MovieViewSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/SeparatorSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/TablePaneSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/obsidian/ObsidianRadioButtonSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraAccordionSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCalendarSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCheckboxSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraExpanderSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraFrameSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraLinkButtonSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListButtonSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListViewSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuBarSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMeterSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPaletteSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPanoramaSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPushButtonSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraRollupSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraScrollBarSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraScrollPaneCornerSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSheetSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSliderSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSpinnerSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSplitPaneSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTabPaneSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTextInputSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTreeViewSkin.java
Added: incubator/pivot/trunk/wtk/src/pivot/wtk/GraphicsUtilities.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/GraphicsUtilities.java?rev=772666&view=auto
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/GraphicsUtilities.java (added)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/GraphicsUtilities.java Thu May 7 14:39:07 2009
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pivot.wtk;
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.RenderingHints;
+import java.awt.geom.AffineTransform;
+
+import pivot.wtk.Orientation;
+
+/**
+ * Contains utility methods dealing with the Java2D API.
+ *
+ * @author tvolkert
+ */
+public final class GraphicsUtilities {
+ private GraphicsUtilities() {
+ }
+
+ public static final void drawLine(final Graphics2D graphics, final int x, final int y,
+ final int length, final Orientation orientation) {
+ drawLine(graphics, x, y, length, orientation, 1);
+ }
+
+ public static final void drawLine(final Graphics2D graphics, final int x, final int y,
+ final int length, final Orientation orientation, final int thickness) {
+ if (length > 0 && thickness > 0) {
+ switch (orientation) {
+ case HORIZONTAL:
+ graphics.fillRect(x, y, length, thickness);
+ break;
+
+ case VERTICAL:
+ graphics.fillRect(x, y, thickness, length);
+ break;
+ }
+ }
+ }
+
+ /**
+ * Draws a rectangle with a thickness of 1 pixel at the specified
+ * coordinates whose <u>outer border</u> is the specified width and height.
+ * In other words, the distance from the left edge of the leftmost pixel to
+ * the left edge of the rightmost pixel is <tt>width - 1</tt>.
+ * <p>
+ * This method provides more reliable pixel rounding behavior than
+ * <tt>java.awt.Graphics#drawRect</tt> when scaling is applied because this
+ * method does not stroke the shape but instead explicitly fills the
+ * desired pixels with the graphics context's paint. For this reason, and
+ * because Pivot supports scaling the display host, it is recommended that
+ * skins use this method over <tt>java.awt.Graphics#drawRect</tt>.
+ *
+ * @param graphics
+ * The graphics context that will be used to perform the operation.
+ *
+ * @param x
+ * The x-coordinate of the upper-left corner of the rectangle.
+ *
+ * @param y
+ * The y-coordinate of the upper-left corner of the rectangle.
+ *
+ * @param width
+ * The <i>outer width</i> of the rectangle.
+ *
+ * @param height
+ * The <i>outer height</i> of the rectangle.
+ */
+ public static final void drawRect(final Graphics2D graphics, final int x, final int y,
+ final int width, final int height) {
+ drawRect(graphics, x, y, width, height, 1);
+ }
+
+ /**
+ * Draws a rectangle with the specified thickness at the specified
+ * coordinates whose <u>outer border</u> is the specified width and height.
+ * In other words, the distance from the left edge of the leftmost pixel to
+ * the left edge of the rightmost pixel is <tt>width - thickness</tt>.
+ * <p>
+ * This method provides more reliable pixel rounding behavior than
+ * <tt>java.awt.Graphics#drawRect</tt> when scaling is applied because this
+ * method does not stroke the shape but instead explicitly fills the
+ * desired pixels with the graphics context's paint. For this reason, and
+ * because Pivot supports scaling the display host, it is recommended that
+ * skins use this method over <tt>java.awt.Graphics#drawRect</tt>.
+ *
+ * @param graphics
+ * The graphics context that will be used to perform the operation.
+ *
+ * @param x
+ * The x-coordinate of the upper-left corner of the rectangle.
+ *
+ * @param y
+ * The y-coordinate of the upper-left corner of the rectangle.
+ *
+ * @param width
+ * The <i>outer width</i> of the rectangle.
+ *
+ * @param height
+ * The <i>outer height</i> of the rectangle.
+ *
+ * @param thickness
+ * The thickness of each edge.
+ */
+ public static final void drawRect(final Graphics2D graphics, final int x, final int y,
+ final int width, final int height, final int thickness) {
+ Graphics2D rectGraphics = graphics;
+
+ if ((graphics.getTransform().getType() & AffineTransform.TYPE_MASK_SCALE) != 0) {
+ rectGraphics = (Graphics2D)graphics.create();
+ rectGraphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+ }
+
+ if (width > 0 && height > 0 && thickness > 0) {
+ drawLine(rectGraphics, x, y, width, Orientation.HORIZONTAL, thickness);
+ drawLine(rectGraphics, x + width - thickness, y, height, Orientation.VERTICAL, thickness);
+ drawLine(rectGraphics, x, y + height - thickness, width, Orientation.HORIZONTAL, thickness);
+ drawLine(rectGraphics, x, y, height, Orientation.VERTICAL, thickness);
+ }
+
+ if (rectGraphics != graphics) {
+ rectGraphics.dispose();
+ }
+ }
+
+ public static Color decodeColor(String name) throws NumberFormatException {
+ if (name == null) {
+ throw new IllegalArgumentException();
+ }
+
+ name = name.toLowerCase();
+
+ int rgb;
+ float alpha;
+ if (name.startsWith("0x")) {
+ name = name.substring(2);
+ if (name.length() != 8) {
+ throw new IllegalArgumentException();
+ }
+
+ rgb = Integer.parseInt(name.substring(0, 6), 16);
+ alpha = (float)Integer.parseInt(name.substring(6, 8), 16) / 255f;
+ } else if (name.startsWith("#")) {
+ name = name.substring(1);
+ if (name.length() != 6) {
+ throw new IllegalArgumentException();
+ }
+
+ rgb = Integer.parseInt(name, 16);
+ alpha = 1.0f;
+ } else {
+ throw new IllegalArgumentException();
+ }
+
+ float red = ((rgb >> 16) & 0xff) / 255f;
+ float green = ((rgb >> 8) & 0xff) / 255f;
+ float blue = (rgb >> 0 & 0xff) / 255f;
+
+ Color color = new Color(red, green, blue, alpha);
+
+ return color;
+ }
+
+ public static Paint decodePaint(String name) {
+ // TODO
+ return null;
+ }
+}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/content/ListViewColorRenderer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/content/ListViewColorRenderer.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/content/ListViewColorRenderer.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/content/ListViewColorRenderer.java Thu May 7 14:39:07 2009
@@ -19,9 +19,9 @@
import java.awt.Color;
import java.awt.Graphics2D;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.ListView;
import pivot.wtk.media.Image;
-import pivot.wtk.skin.GraphicsUtilities;
/**
* List view renderer for displaying color swatches.
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java Thu May 7 14:39:07 2009
@@ -28,6 +28,7 @@
import pivot.util.ImmutableIterator;
import pivot.util.ListenerList;
import pivot.wtk.Bounds;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Point;
/**
@@ -503,7 +504,7 @@
throw new IllegalArgumentException("fill is null.");
}
- setFill(Color.decode(fill));
+ setFill(GraphicsUtilities.decodeColor(fill));
}
public Paint getStroke() {
@@ -520,7 +521,7 @@
throw new IllegalArgumentException("stroke is null.");
}
- setStroke(Color.decode(stroke));
+ setStroke(GraphicsUtilities.decodeColor(stroke));
}
public int getStrokeThickness() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/BorderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/BorderSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/BorderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/BorderSkin.java Thu May 7 14:39:07 2009
@@ -33,6 +33,7 @@
import pivot.wtk.Component;
import pivot.wtk.CornerRadii;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Insets;
import pivot.wtk.Platform;
import pivot.wtk.Theme;
@@ -313,7 +314,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getTitleColor() {
@@ -334,7 +335,7 @@
throw new IllegalArgumentException("titleColor is null.");
}
- setTitleColor(decodeColor(titleColor));
+ setTitleColor(GraphicsUtilities.decodeColor(titleColor));
}
public int getThickness() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ComponentSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ComponentSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ComponentSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ComponentSkin.java Thu May 7 14:39:07 2009
@@ -16,8 +16,6 @@
*/
package pivot.wtk.skin;
-import java.awt.Color;
-
import pivot.wtk.ApplicationContext;
import pivot.wtk.Component;
import pivot.wtk.ComponentKeyListener;
@@ -291,33 +289,4 @@
component.repaint(x, y, width, height);
}
}
-
- public static Color decodeColor(String name) throws NumberFormatException {
- int numericIndex = 0;
- if (name.startsWith("0x")
- || name.startsWith("0X")) {
- numericIndex += 2;
- } else if (name.startsWith("#")) {
- numericIndex++;
- }
-
- int rgb = Integer.decode(name);
-
- Color color;
-
- if (((rgb >> 24) & 0xff) > 0
- || name.length() - numericIndex > 6) {
- // Extract the alpha channel
- float red = ((rgb >> 16) & 0xff) / 255f;
- float green = ((rgb >> 8) & 0xff) / 255f;
- float blue = (rgb & 0xff) / 255f;
- float alpha = ((rgb >> 24) & 0xff) / 255f;
-
- color = new Color(red, green, blue, alpha);
- } else {
- color = new Color((rgb >> 16) & 0xff, (rgb >> 8) & 0xff, rgb & 0xff);
- }
-
- return color;
- }
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ContainerSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ContainerSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ContainerSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ContainerSkin.java Thu May 7 14:39:07 2009
@@ -26,6 +26,7 @@
import pivot.wtk.Container;
import pivot.wtk.ContainerListener;
import pivot.wtk.Direction;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.FocusTraversalPolicy;
/**
@@ -217,7 +218,7 @@
throw new IllegalArgumentException("backgroundColor is null");
}
- setBackgroundColor(decodeColor(backgroundColor));
+ setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor));
}
// Container events
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ImageViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ImageViewSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ImageViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/ImageViewSkin.java Thu May 7 14:39:07 2009
@@ -25,6 +25,7 @@
import pivot.wtk.Bounds;
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.HorizontalAlignment;
import pivot.wtk.ImageView;
import pivot.wtk.ImageViewListener;
@@ -237,7 +238,7 @@
throw new IllegalArgumentException("backgroundColor is null.");
}
- setBackgroundColor(decodeColor(backgroundColor));
+ setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor));
}
public float getOpacity() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/LabelSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/LabelSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/LabelSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/LabelSkin.java Thu May 7 14:39:07 2009
@@ -34,6 +34,7 @@
import pivot.collections.Dictionary;
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.HorizontalAlignment;
import pivot.wtk.Insets;
import pivot.wtk.Label;
@@ -390,7 +391,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public TextDecoration getTextDecoration() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/MovieViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/MovieViewSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/MovieViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/MovieViewSkin.java Thu May 7 14:39:07 2009
@@ -22,6 +22,7 @@
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.HorizontalAlignment;
import pivot.wtk.MovieView;
import pivot.wtk.MovieViewListener;
@@ -203,7 +204,7 @@
throw new IllegalArgumentException("backgroundColor is null.");
}
- setBackgroundColor(decodeColor(backgroundColor));
+ setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor));
}
public float getScale() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/SeparatorSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/SeparatorSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/SeparatorSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/SeparatorSkin.java Thu May 7 14:39:07 2009
@@ -29,6 +29,7 @@
import pivot.collections.Dictionary;
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Insets;
import pivot.wtk.Platform;
import pivot.wtk.Separator;
@@ -206,7 +207,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getHeadingColor() {
@@ -227,7 +228,7 @@
throw new IllegalArgumentException("headingColor is null.");
}
- setHeadingColor(decodeColor(headingColor));
+ setHeadingColor(GraphicsUtilities.decodeColor(headingColor));
}
public int getThickness() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/TablePaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/TablePaneSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/TablePaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/TablePaneSkin.java Thu May 7 14:39:07 2009
@@ -28,12 +28,12 @@
import pivot.wtk.Bounds;
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Insets;
import pivot.wtk.Orientation;
import pivot.wtk.TablePane;
import pivot.wtk.TablePaneListener;
import pivot.wtk.TablePaneAttributeListener;
-import pivot.wtk.skin.GraphicsUtilities;
/**
* Table pane skin.
@@ -767,7 +767,7 @@
throw new IllegalArgumentException("gridColor is null.");
}
- setGridColor(decodeColor(gridColor));
+ setGridColor(GraphicsUtilities.decodeColor(gridColor));
}
/**
@@ -797,7 +797,7 @@
throw new IllegalArgumentException("selectionBackgroundColor is null.");
}
- setSelectionBackgroundColor(decodeColor(selectionBackgroundColor));
+ setSelectionBackgroundColor(GraphicsUtilities.decodeColor(selectionBackgroundColor));
}
/**
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/obsidian/ObsidianRadioButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/obsidian/ObsidianRadioButtonSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/obsidian/ObsidianRadioButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/obsidian/ObsidianRadioButtonSkin.java Thu May 7 14:39:07 2009
@@ -25,6 +25,7 @@
import pivot.wtk.Button;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.RadioButton;
import pivot.wtk.skin.RadioButtonSkin;
@@ -219,7 +220,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getDisabledColor() {
@@ -240,7 +241,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public int getSpacing() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraAccordionSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraAccordionSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraAccordionSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraAccordionSkin.java Thu May 7 14:39:07 2009
@@ -28,6 +28,7 @@
import pivot.wtk.Button;
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.HorizontalAlignment;
import pivot.wtk.Insets;
import pivot.wtk.Mouse;
@@ -47,7 +48,6 @@
import pivot.wtk.media.Image;
import pivot.wtk.skin.ButtonSkin;
import pivot.wtk.skin.ContainerSkin;
-import pivot.wtk.skin.GraphicsUtilities;
/**
* Accordion skin.
@@ -527,7 +527,7 @@
throw new IllegalArgumentException("borderColor is null.");
}
- setBorderColor(decodeColor(borderColor));
+ setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
public Insets getPadding() {
@@ -602,7 +602,7 @@
throw new IllegalArgumentException("buttonColor is null.");
}
- setButtonColor(decodeColor(buttonColor));
+ setButtonColor(GraphicsUtilities.decodeColor(buttonColor));
}
public Insets getButtonPadding() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java Thu May 7 14:39:07 2009
@@ -31,6 +31,7 @@
import pivot.wtk.Button;
import pivot.wtk.Dimensions;
import pivot.wtk.Display;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Insets;
import pivot.wtk.CalendarButton;
import pivot.wtk.Bounds;
@@ -41,7 +42,6 @@
import pivot.wtk.effects.Transition;
import pivot.wtk.effects.TransitionListener;
import pivot.wtk.skin.CalendarButtonSkin;
-import pivot.wtk.skin.GraphicsUtilities;
/**
* Terra calendar button skin.
@@ -328,7 +328,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getDisabledColor() {
@@ -349,7 +349,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public Color getBackgroundColor() {
@@ -372,7 +372,7 @@
throw new IllegalArgumentException("backgroundColor is null.");
}
- setBackgroundColor(decodeColor(backgroundColor));
+ setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor));
}
public Color getDisabledBackgroundColor() {
@@ -394,7 +394,7 @@
throw new IllegalArgumentException("disabledBackgroundColor is null.");
}
- setDisabledBackgroundColor(decodeColor(disabledBackgroundColor));
+ setDisabledBackgroundColor(GraphicsUtilities.decodeColor(disabledBackgroundColor));
}
public Color getBorderColor() {
@@ -416,7 +416,7 @@
throw new IllegalArgumentException("borderColor is null.");
}
- setBorderColor(decodeColor(borderColor));
+ setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
public Color getDisabledBorderColor() {
@@ -437,7 +437,7 @@
throw new IllegalArgumentException("disabledBorderColor is null.");
}
- setDisabledBorderColor(decodeColor(disabledBorderColor));
+ setDisabledBorderColor(GraphicsUtilities.decodeColor(disabledBorderColor));
}
public Insets getPadding() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCalendarSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCalendarSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCalendarSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCalendarSkin.java Thu May 7 14:39:07 2009
@@ -35,6 +35,7 @@
import pivot.wtk.Cursor;
import pivot.wtk.Dimensions;
import pivot.wtk.FlowPane;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.HorizontalAlignment;
import pivot.wtk.Insets;
import pivot.wtk.Keyboard;
@@ -51,7 +52,6 @@
import pivot.wtk.content.SpinnerItemRenderer;
import pivot.wtk.skin.ButtonSkin;
import pivot.wtk.skin.CalendarSkin;
-import pivot.wtk.skin.GraphicsUtilities;
/**
* Terra calendar skin.
@@ -715,7 +715,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getDisabledColor() {
@@ -736,7 +736,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public Color getSelectionColor() {
@@ -757,7 +757,7 @@
throw new IllegalArgumentException("selectionColor is null.");
}
- setSelectionColor(decodeColor(selectionColor));
+ setSelectionColor(GraphicsUtilities.decodeColor(selectionColor));
}
public Color getSelectionBackgroundColor() {
@@ -779,7 +779,7 @@
throw new IllegalArgumentException("selectionBackgroundColor is null.");
}
- setSelectionBackgroundColor(decodeColor(selectionBackgroundColor));
+ setSelectionBackgroundColor(GraphicsUtilities.decodeColor(selectionBackgroundColor));
}
public Color getHighlightColor() {
@@ -800,7 +800,7 @@
throw new IllegalArgumentException("highlightColor is null.");
}
- setHighlightColor(decodeColor(highlightColor));
+ setHighlightColor(GraphicsUtilities.decodeColor(highlightColor));
}
public Color getHighlightBackgroundColor() {
@@ -821,7 +821,7 @@
throw new IllegalArgumentException("highlightBackgroundColor is null.");
}
- setHighlightBackgroundColor(decodeColor(highlightBackgroundColor));
+ setHighlightBackgroundColor(GraphicsUtilities.decodeColor(highlightBackgroundColor));
}
public Color getDividerColor() {
@@ -842,7 +842,7 @@
throw new IllegalArgumentException("dividerColor is null.");
}
- setDividerColor(decodeColor(dividerColor));
+ setDividerColor(GraphicsUtilities.decodeColor(dividerColor));
}
public int getPadding() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCheckboxSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCheckboxSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCheckboxSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraCheckboxSkin.java Thu May 7 14:39:07 2009
@@ -27,10 +27,10 @@
import pivot.wtk.Button;
import pivot.wtk.Dimensions;
import pivot.wtk.Checkbox;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Orientation;
import pivot.wtk.Theme;
import pivot.wtk.skin.CheckboxSkin;
-import pivot.wtk.skin.GraphicsUtilities;
/**
* Terra checkbox skin.
@@ -284,7 +284,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getDisabledColor() {
@@ -305,7 +305,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public int getSpacing() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraExpanderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraExpanderSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraExpanderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraExpanderSkin.java Thu May 7 14:39:07 2009
@@ -32,6 +32,7 @@
import pivot.wtk.Expander;
import pivot.wtk.ExpanderListener;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.HorizontalAlignment;
import pivot.wtk.Insets;
import pivot.wtk.Label;
@@ -49,7 +50,6 @@
import pivot.wtk.effects.easing.Quadratic;
import pivot.wtk.media.Image;
import pivot.wtk.skin.ContainerSkin;
-import pivot.wtk.skin.GraphicsUtilities;
/**
* Expander skin.
@@ -484,7 +484,7 @@
throw new IllegalArgumentException("titleBarColor is null.");
}
- setTitleBarColor(decodeColor(titleBarColor));
+ setTitleBarColor(GraphicsUtilities.decodeColor(titleBarColor));
}
public Color getTitleBarBackgroundColor() {
@@ -502,7 +502,7 @@
throw new IllegalArgumentException("titleBarBackgroundColor is null.");
}
- setTitleBarBackgroundColor(decodeColor(titleBarBackgroundColor));
+ setTitleBarBackgroundColor(GraphicsUtilities.decodeColor(titleBarBackgroundColor));
}
public Color getTitleBarBorderColor() {
@@ -519,7 +519,7 @@
throw new IllegalArgumentException("titleBarBorderColor is null.");
}
- setTitleBarBorderColor(decodeColor(titleBarBorderColor));
+ setTitleBarBorderColor(GraphicsUtilities.decodeColor(titleBarBorderColor));
}
public Color getShadeButtonColor() {
@@ -536,7 +536,7 @@
throw new IllegalArgumentException("shadeButtonColor is null.");
}
- setShadeButtonColor(decodeColor(shadeButtonColor));
+ setShadeButtonColor(GraphicsUtilities.decodeColor(shadeButtonColor));
}
public Color getShadeButtonBackgroundColor() {
@@ -554,7 +554,7 @@
throw new IllegalArgumentException("shadeButtonBackgroundColor is null.");
}
- setShadeButtonBackgroundColor(decodeColor(shadeButtonBackgroundColor));
+ setShadeButtonBackgroundColor(GraphicsUtilities.decodeColor(shadeButtonBackgroundColor));
}
public Color getBorderColor() {
@@ -571,7 +571,7 @@
throw new IllegalArgumentException("borderColor is null.");
}
- setBorderColor(decodeColor(borderColor));
+ setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
public Insets getPadding() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraFrameSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraFrameSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraFrameSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraFrameSkin.java Thu May 7 14:39:07 2009
@@ -31,6 +31,7 @@
import pivot.wtk.Dimensions;
import pivot.wtk.Display;
import pivot.wtk.FlowPane;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.HorizontalAlignment;
import pivot.wtk.ImageView;
import pivot.wtk.Insets;
@@ -45,7 +46,6 @@
import pivot.wtk.Window;
import pivot.wtk.effects.DropShadowDecorator;
import pivot.wtk.media.Image;
-import pivot.wtk.skin.GraphicsUtilities;
import pivot.wtk.skin.WindowSkin;
/**
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraLinkButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraLinkButtonSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraLinkButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraLinkButtonSkin.java Thu May 7 14:39:07 2009
@@ -22,6 +22,7 @@
import pivot.wtk.Button;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.LinkButton;
import pivot.wtk.Theme;
import pivot.wtk.skin.LinkButtonSkin;
@@ -121,7 +122,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getDisabledColor() {
@@ -142,6 +143,6 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListButtonSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListButtonSkin.java Thu May 7 14:39:07 2009
@@ -32,6 +32,7 @@
import pivot.wtk.Button;
import pivot.wtk.Dimensions;
import pivot.wtk.Display;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Insets;
import pivot.wtk.ListButton;
import pivot.wtk.ListView;
@@ -43,7 +44,6 @@
import pivot.wtk.effects.FadeTransition;
import pivot.wtk.effects.Transition;
import pivot.wtk.effects.TransitionListener;
-import pivot.wtk.skin.GraphicsUtilities;
import pivot.wtk.skin.ListButtonSkin;
/**
@@ -345,7 +345,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getDisabledColor() {
@@ -366,7 +366,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public Color getBackgroundColor() {
@@ -389,7 +389,7 @@
throw new IllegalArgumentException("backgroundColor is null.");
}
- setBackgroundColor(decodeColor(backgroundColor));
+ setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor));
}
public Color getDisabledBackgroundColor() {
@@ -411,7 +411,7 @@
throw new IllegalArgumentException("disabledBackgroundColor is null.");
}
- setDisabledBackgroundColor(decodeColor(disabledBackgroundColor));
+ setDisabledBackgroundColor(GraphicsUtilities.decodeColor(disabledBackgroundColor));
}
public Color getBorderColor() {
@@ -433,7 +433,7 @@
throw new IllegalArgumentException("borderColor is null.");
}
- setBorderColor(decodeColor(borderColor));
+ setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
public Color getDisabledBorderColor() {
@@ -454,7 +454,7 @@
throw new IllegalArgumentException("disabledBorderColor is null.");
}
- setDisabledBorderColor(decodeColor(disabledBorderColor));
+ setDisabledBorderColor(GraphicsUtilities.decodeColor(disabledBorderColor));
}
public Insets getPadding() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraListViewSkin.java Thu May 7 14:39:07 2009
@@ -27,6 +27,7 @@
import pivot.wtk.Checkbox;
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Insets;
import pivot.wtk.Keyboard;
import pivot.wtk.ListView;
@@ -322,7 +323,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getDisabledColor() {
@@ -343,7 +344,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public Color getBackgroundColor() {
@@ -364,7 +365,7 @@
throw new IllegalArgumentException("backgroundColor is null.");
}
- setBackgroundColor(decodeColor(backgroundColor));
+ setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor));
}
@@ -386,7 +387,7 @@
throw new IllegalArgumentException("selectionColor is null.");
}
- setSelectionColor(decodeColor(selectionColor));
+ setSelectionColor(GraphicsUtilities.decodeColor(selectionColor));
}
public Color getSelectionBackgroundColor() {
@@ -407,7 +408,7 @@
throw new IllegalArgumentException("selectionBackgroundColor is null.");
}
- setSelectionBackgroundColor(decodeColor(selectionBackgroundColor));
+ setSelectionBackgroundColor(GraphicsUtilities.decodeColor(selectionBackgroundColor));
}
public Color getInactiveSelectionColor() {
@@ -428,7 +429,7 @@
throw new IllegalArgumentException("inactiveSelectionColor is null.");
}
- setInactiveSelectionColor(decodeColor(inactiveSelectionColor));
+ setInactiveSelectionColor(GraphicsUtilities.decodeColor(inactiveSelectionColor));
}
public Color getInactiveSelectionBackgroundColor() {
@@ -449,7 +450,7 @@
throw new IllegalArgumentException("inactiveSelectionBackgroundColor is null.");
}
- setInactiveSelectionBackgroundColor(decodeColor(inactiveSelectionBackgroundColor));
+ setInactiveSelectionBackgroundColor(GraphicsUtilities.decodeColor(inactiveSelectionBackgroundColor));
}
public Color getHighlightColor() {
@@ -470,7 +471,7 @@
throw new IllegalArgumentException("highlightColor is null.");
}
- setHighlightColor(decodeColor(highlightColor));
+ setHighlightColor(GraphicsUtilities.decodeColor(highlightColor));
}
public Color getHighlightBackgroundColor() {
@@ -491,7 +492,7 @@
throw new IllegalArgumentException("highlightBackgroundColor is null.");
}
- setHighlightBackgroundColor(decodeColor(highlightBackgroundColor));
+ setHighlightBackgroundColor(GraphicsUtilities.decodeColor(highlightBackgroundColor));
}
public boolean getShowHighlight() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuBarSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuBarSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuBarSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuBarSkin.java Thu May 7 14:39:07 2009
@@ -22,6 +22,7 @@
import pivot.collections.Sequence;
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.MenuBar;
import pivot.wtk.MenuBarListener;
import pivot.wtk.Theme;
@@ -194,7 +195,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public final void setColor(int color) {
@@ -220,7 +221,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public final void setDisabledColor(int color) {
@@ -246,7 +247,7 @@
throw new IllegalArgumentException("highlightColor is null.");
}
- setHighlightColor(decodeColor(highlightColor));
+ setHighlightColor(GraphicsUtilities.decodeColor(highlightColor));
}
public final void setHighlightColor(int color) {
@@ -272,7 +273,7 @@
throw new IllegalArgumentException("highlightBackgroundColor is null.");
}
- setHighlightBackgroundColor(decodeColor(highlightBackgroundColor));
+ setHighlightBackgroundColor(GraphicsUtilities.decodeColor(highlightBackgroundColor));
}
public final void setHighlightBackgroundColor(int color) {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuButtonSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuButtonSkin.java Thu May 7 14:39:07 2009
@@ -30,10 +30,10 @@
import pivot.wtk.Button;
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Insets;
import pivot.wtk.MenuButton;
import pivot.wtk.Theme;
-import pivot.wtk.skin.GraphicsUtilities;
import pivot.wtk.skin.MenuButtonSkin;
/**
@@ -253,7 +253,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getDisabledColor() {
@@ -274,7 +274,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public Color getBackgroundColor() {
@@ -297,7 +297,7 @@
throw new IllegalArgumentException("backgroundColor is null.");
}
- setBackgroundColor(decodeColor(backgroundColor));
+ setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor));
}
public Color getDisabledBackgroundColor() {
@@ -319,7 +319,7 @@
throw new IllegalArgumentException("disabledBackgroundColor is null.");
}
- setDisabledBackgroundColor(decodeColor(disabledBackgroundColor));
+ setDisabledBackgroundColor(GraphicsUtilities.decodeColor(disabledBackgroundColor));
}
public Color getBorderColor() {
@@ -341,7 +341,7 @@
throw new IllegalArgumentException("borderColor is null.");
}
- setBorderColor(decodeColor(borderColor));
+ setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
public Color getDisabledBorderColor() {
@@ -362,7 +362,7 @@
throw new IllegalArgumentException("disabledBorderColor is null.");
}
- setDisabledBorderColor(decodeColor(disabledBorderColor));
+ setDisabledBorderColor(GraphicsUtilities.decodeColor(disabledBorderColor));
}
public Insets getPadding() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMenuSkin.java Thu May 7 14:39:07 2009
@@ -23,6 +23,7 @@
import pivot.collections.Sequence;
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Menu;
import pivot.wtk.MenuListener;
import pivot.wtk.Theme;
@@ -244,7 +245,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getDisabledColor() {
@@ -265,7 +266,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public Color getHighlightColor() {
@@ -286,7 +287,7 @@
throw new IllegalArgumentException("highlightColor is null.");
}
- setHighlightColor(decodeColor(highlightColor));
+ setHighlightColor(GraphicsUtilities.decodeColor(highlightColor));
}
public Color getHighlightBackgroundColor() {
@@ -307,7 +308,7 @@
throw new IllegalArgumentException("highlightBackgroundColor is null.");
}
- setHighlightBackgroundColor(decodeColor(highlightBackgroundColor));
+ setHighlightBackgroundColor(GraphicsUtilities.decodeColor(highlightBackgroundColor));
}
public Color getMarginColor() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMeterSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMeterSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMeterSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraMeterSkin.java Thu May 7 14:39:07 2009
@@ -23,12 +23,12 @@
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Meter;
import pivot.wtk.MeterListener;
import pivot.wtk.Orientation;
import pivot.wtk.Theme;
import pivot.wtk.skin.ComponentSkin;
-import pivot.wtk.skin.GraphicsUtilities;
/**
* Meter skin.
@@ -133,7 +133,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getGridColor() {
@@ -150,7 +150,7 @@
throw new IllegalArgumentException("gridColor is null.");
}
- setGridColor(decodeColor(gridColor));
+ setGridColor(GraphicsUtilities.decodeColor(gridColor));
}
public float getGridFrequency() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPaletteSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPaletteSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPaletteSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPaletteSkin.java Thu May 7 14:39:07 2009
@@ -32,6 +32,7 @@
import pivot.wtk.Dimensions;
import pivot.wtk.Display;
import pivot.wtk.FlowPane;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.HorizontalAlignment;
import pivot.wtk.Insets;
import pivot.wtk.Label;
@@ -46,7 +47,6 @@
import pivot.wtk.WindowListener;
import pivot.wtk.effects.DropShadowDecorator;
import pivot.wtk.media.Image;
-import pivot.wtk.skin.GraphicsUtilities;
import pivot.wtk.skin.WindowSkin;
/**
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPanoramaSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPanoramaSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPanoramaSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPanoramaSkin.java Thu May 7 14:39:07 2009
@@ -25,6 +25,7 @@
import pivot.wtk.Component;
import pivot.wtk.ComponentMouseListener;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Keyboard;
import pivot.wtk.Mouse;
import pivot.wtk.Panorama;
@@ -513,7 +514,7 @@
throw new IllegalArgumentException("buttonColor is null.");
}
- setButtonColor(decodeColor(buttonColor));
+ setButtonColor(GraphicsUtilities.decodeColor(buttonColor));
}
public Color getButtonBackgroundColor() {
@@ -534,7 +535,7 @@
throw new IllegalArgumentException("buttonBackgroundColor is null.");
}
- setButtonBackgroundColor(decodeColor(buttonBackgroundColor));
+ setButtonBackgroundColor(GraphicsUtilities.decodeColor(buttonBackgroundColor));
}
public int getButtonPadding() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPushButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPushButtonSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPushButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPushButtonSkin.java Thu May 7 14:39:07 2009
@@ -28,10 +28,10 @@
import pivot.wtk.Button;
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Insets;
import pivot.wtk.PushButton;
import pivot.wtk.Theme;
-import pivot.wtk.skin.GraphicsUtilities;
import pivot.wtk.skin.PushButtonSkin;
/**
@@ -294,7 +294,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public final void setColor(int color) {
@@ -320,7 +320,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public final void setDisabledColor(int disabledColor) {
@@ -348,7 +348,7 @@
throw new IllegalArgumentException("backgroundColor is null.");
}
- setBackgroundColor(decodeColor(backgroundColor));
+ setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor));
}
public final void setBackgroundColor(int backgroundColor) {
@@ -375,7 +375,7 @@
throw new IllegalArgumentException("disabledBackgroundColor is null.");
}
- setDisabledBackgroundColor(decodeColor(disabledBackgroundColor));
+ setDisabledBackgroundColor(GraphicsUtilities.decodeColor(disabledBackgroundColor));
}
public final void setDisabledBackgroundColor(int disabledBackgroundColor) {
@@ -401,7 +401,7 @@
throw new IllegalArgumentException("borderColor is null.");
}
- setBorderColor(decodeColor(borderColor));
+ setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
public final void setBorderColor(int borderColor) {
@@ -427,7 +427,7 @@
throw new IllegalArgumentException("disabledBorderColor is null.");
}
- setDisabledBorderColor(decodeColor(disabledBorderColor));
+ setDisabledBorderColor(GraphicsUtilities.decodeColor(disabledBorderColor));
}
public final void setDisabledBorderColor(int disabledBorderColor) {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraRadioButtonSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraRadioButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraRadioButtonSkin.java Thu May 7 14:39:07 2009
@@ -27,6 +27,7 @@
import pivot.wtk.Button;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.RadioButton;
import pivot.wtk.Theme;
import pivot.wtk.skin.RadioButtonSkin;
@@ -231,7 +232,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getDisabledColor() {
@@ -252,7 +253,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public int getSpacing() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraRollupSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraRollupSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraRollupSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraRollupSkin.java Thu May 7 14:39:07 2009
@@ -27,6 +27,7 @@
import pivot.wtk.ComponentMouseButtonListener;
import pivot.wtk.Cursor;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Mouse;
import pivot.wtk.Rollup;
import pivot.wtk.Theme;
@@ -415,7 +416,7 @@
throw new IllegalArgumentException("buttonColor is null.");
}
- setButtonColor(decodeColor(buttonColor));
+ setButtonColor(GraphicsUtilities.decodeColor(buttonColor));
}
public int getSpacing() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraScrollBarSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraScrollBarSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraScrollBarSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraScrollBarSkin.java Thu May 7 14:39:07 2009
@@ -26,6 +26,7 @@
import pivot.wtk.ApplicationContext;
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Mouse;
import pivot.wtk.Orientation;
import pivot.wtk.ScrollBar;
@@ -35,7 +36,6 @@
import pivot.wtk.media.Image;
import pivot.wtk.skin.ComponentSkin;
import pivot.wtk.skin.ContainerSkin;
-import pivot.wtk.skin.GraphicsUtilities;
/**
* Scroll bar skin.
@@ -860,7 +860,7 @@
throw new IllegalArgumentException("borderColor is null");
}
- setBorderColor(decodeColor(borderColor));
+ setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
public final void setBorderColor(int borderColor) {
@@ -886,7 +886,7 @@
throw new IllegalArgumentException("scrollButtonImageColor is null");
}
- setScrollButtonImageColor(decodeColor(scrollButtonImageColor));
+ setScrollButtonImageColor(GraphicsUtilities.decodeColor(scrollButtonImageColor));
}
public final void setScrollButtonImageColor(int scrollButtonImageColor) {
@@ -912,7 +912,7 @@
throw new IllegalArgumentException("scrollButtonBackgroundColor is null");
}
- setScrollButtonBackgroundColor(decodeColor(scrollButtonBackgroundColor));
+ setScrollButtonBackgroundColor(GraphicsUtilities.decodeColor(scrollButtonBackgroundColor));
}
public final void setScrollButtonBackgroundColor(int scrollButtonBackgroundColor) {
@@ -938,7 +938,7 @@
throw new IllegalArgumentException("scrollButtonDisabledBackgroundColor is null");
}
- setScrollButtonDisabledBackgroundColor(decodeColor(scrollButtonDisabledBackgroundColor));
+ setScrollButtonDisabledBackgroundColor(GraphicsUtilities.decodeColor(scrollButtonDisabledBackgroundColor));
}
public final void setScrollButtonDisabledBackgroundColor(int scrollButtonDisabledBackgroundColor) {
@@ -964,7 +964,7 @@
throw new IllegalArgumentException("scrollButtonPressedBackgroundColor is null");
}
- setScrollButtonPressedBackgroundColor(decodeColor(scrollButtonPressedBackgroundColor));
+ setScrollButtonPressedBackgroundColor(GraphicsUtilities.decodeColor(scrollButtonPressedBackgroundColor));
}
public final void setScrollButtonPressedBackgroundColor(int scrollButtonPressedBackgroundColor) {
@@ -990,7 +990,7 @@
throw new IllegalArgumentException("scrollButtonHighlightedBackgroundColor is null");
}
- setScrollButtonHighlightedBackgroundColor(decodeColor(scrollButtonHighlightedBackgroundColor));
+ setScrollButtonHighlightedBackgroundColor(GraphicsUtilities.decodeColor(scrollButtonHighlightedBackgroundColor));
}
public final void setScrollButtonHighlightedBackgroundColor(int scrollButtonHighlightedBackgroundColor) {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraScrollPaneCornerSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraScrollPaneCornerSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraScrollPaneCornerSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraScrollPaneCornerSkin.java Thu May 7 14:39:07 2009
@@ -21,6 +21,7 @@
import java.awt.geom.Rectangle2D;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.skin.ComponentSkin;
/**
@@ -78,7 +79,7 @@
throw new IllegalArgumentException("backgroundColor is null.");
}
- setBackgroundColor(decodeColor(backgroundColor));
+ setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor));
}
public Color getColor() {
@@ -95,6 +96,6 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSheetSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSheetSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSheetSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSheetSkin.java Thu May 7 14:39:07 2009
@@ -25,6 +25,7 @@
import pivot.wtk.Component;
import pivot.wtk.ComponentMouseButtonListener;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Insets;
import pivot.wtk.Keyboard;
import pivot.wtk.Mouse;
@@ -37,7 +38,6 @@
import pivot.wtk.effects.SlideTransition;
import pivot.wtk.effects.Transition;
import pivot.wtk.effects.TransitionListener;
-import pivot.wtk.skin.GraphicsUtilities;
import pivot.wtk.skin.WindowSkin;
/**
@@ -265,7 +265,7 @@
throw new IllegalArgumentException("borderColor is null.");
}
- setBorderColor(decodeColor(borderColor));
+ setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
public Insets getPadding() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSliderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSliderSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSliderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSliderSkin.java Thu May 7 14:39:07 2009
@@ -23,13 +23,13 @@
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Mouse;
import pivot.wtk.Orientation;
import pivot.wtk.Point;
import pivot.wtk.Slider;
import pivot.wtk.Theme;
import pivot.wtk.skin.ComponentSkin;
-import pivot.wtk.skin.GraphicsUtilities;
import pivot.wtk.skin.SliderSkin;
/**
@@ -284,7 +284,7 @@
throw new IllegalArgumentException("trackColor is null");
}
- setTrackColor(decodeColor(trackColor));
+ setTrackColor(GraphicsUtilities.decodeColor(trackColor));
}
public int getTrackWidth() {
@@ -323,7 +323,7 @@
throw new IllegalArgumentException("buttonBackgroundColor is null");
}
- setButtonBackgroundColor(decodeColor(buttonBackgroundColor));
+ setButtonBackgroundColor(GraphicsUtilities.decodeColor(buttonBackgroundColor));
}
public Color getButtonBorderColor() {
@@ -344,7 +344,7 @@
throw new IllegalArgumentException("buttonBorderColor is null.");
}
- setButtonBorderColor(decodeColor(buttonBorderColor));
+ setButtonBorderColor(GraphicsUtilities.decodeColor(buttonBorderColor));
}
public int getThumbWidth() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSpinnerSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSpinnerSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSpinnerSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSpinnerSkin.java Thu May 7 14:39:07 2009
@@ -29,6 +29,7 @@
import pivot.wtk.Bounds;
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Keyboard;
import pivot.wtk.Mouse;
import pivot.wtk.Orientation;
@@ -39,7 +40,6 @@
import pivot.wtk.media.Image;
import pivot.wtk.skin.ComponentSkin;
import pivot.wtk.skin.ContainerSkin;
-import pivot.wtk.skin.GraphicsUtilities;
/**
* Spinner skin.
@@ -656,7 +656,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public Color getDisabledColor() {
@@ -678,7 +678,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public Color getBorderColor() {
@@ -700,7 +700,7 @@
throw new IllegalArgumentException("borderColor is null.");
}
- setBorderColor(decodeColor(borderColor));
+ setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
public Color getButtonColor() {
@@ -717,7 +717,7 @@
throw new IllegalArgumentException("buttonColor is null");
}
- setButtonImageColor(decodeColor(buttonColor));
+ setButtonImageColor(GraphicsUtilities.decodeColor(buttonColor));
}
public Color getButtonBackgroundColor() {
@@ -734,7 +734,7 @@
throw new IllegalArgumentException("buttonBackgroundColor is null");
}
- setButtonBackgroundColor(decodeColor(buttonBackgroundColor));
+ setButtonBackgroundColor(GraphicsUtilities.decodeColor(buttonBackgroundColor));
}
public Font getFont() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSplitPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSplitPaneSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSplitPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraSplitPaneSkin.java Thu May 7 14:39:07 2009
@@ -23,6 +23,7 @@
import pivot.wtk.Component;
import pivot.wtk.Cursor;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Mouse;
import pivot.wtk.Orientation;
import pivot.wtk.Span;
@@ -409,7 +410,7 @@
throw new IllegalArgumentException("splitterHandlePrimaryColor is null.");
}
- setSplitterHandlePrimaryColor(decodeColor(splitterHandlePrimaryColor));
+ setSplitterHandlePrimaryColor(GraphicsUtilities.decodeColor(splitterHandlePrimaryColor));
}
public final void setSplitterHandlePrimaryColor(int splitterHandlePrimaryColor) {
@@ -435,7 +436,7 @@
throw new IllegalArgumentException("splitterHandleSecondaryColor is null.");
}
- setSplitterHandleSecondaryColor(decodeColor(splitterHandleSecondaryColor));
+ setSplitterHandleSecondaryColor(GraphicsUtilities.decodeColor(splitterHandleSecondaryColor));
}
public final void setSplitterHandleSecondaryColor(int splitterHandleSecondaryColor) {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTabPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTabPaneSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTabPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTabPaneSkin.java Thu May 7 14:39:07 2009
@@ -28,6 +28,7 @@
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
import pivot.wtk.FlowPane;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.HorizontalAlignment;
import pivot.wtk.Insets;
import pivot.wtk.Mouse;
@@ -51,7 +52,6 @@
import pivot.wtk.media.Image;
import pivot.wtk.skin.ButtonSkin;
import pivot.wtk.skin.ContainerSkin;
-import pivot.wtk.skin.GraphicsUtilities;
/**
* Tab pane skin.
@@ -897,7 +897,7 @@
throw new IllegalArgumentException("activeTabColor is null.");
}
- setActiveTabColor(decodeColor(activeTabColor));
+ setActiveTabColor(GraphicsUtilities.decodeColor(activeTabColor));
}
public Color getInactiveTabColor() {
@@ -919,7 +919,7 @@
throw new IllegalArgumentException("inactiveTabColor is null.");
}
- setInactiveTabColor(decodeColor(inactiveTabColor));
+ setInactiveTabColor(GraphicsUtilities.decodeColor(inactiveTabColor));
}
public Color getBorderColor() {
@@ -941,7 +941,7 @@
throw new IllegalArgumentException("borderColor is null.");
}
- setBorderColor(decodeColor(borderColor));
+ setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
public Insets getPadding() {
@@ -1016,7 +1016,7 @@
throw new IllegalArgumentException("buttonColor is null.");
}
- setButtonColor(decodeColor(buttonColor));
+ setButtonColor(GraphicsUtilities.decodeColor(buttonColor));
}
public Insets getButtonPadding() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java Thu May 7 14:39:07 2009
@@ -29,6 +29,7 @@
import pivot.wtk.Component;
import pivot.wtk.Cursor;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Mouse;
import pivot.wtk.Orientation;
import pivot.wtk.SortDirection;
@@ -39,7 +40,6 @@
import pivot.wtk.Theme;
import pivot.wtk.media.Image;
import pivot.wtk.skin.ComponentSkin;
-import pivot.wtk.skin.GraphicsUtilities;
/**
* Table view header skin.
@@ -433,7 +433,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public final void setColor(int color) {
@@ -459,7 +459,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public final void setDisabledColor(int disabledColor) {
@@ -487,7 +487,7 @@
throw new IllegalArgumentException("backgroundColor is null.");
}
- setBackgroundColor(decodeColor(backgroundColor));
+ setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor));
}
public final void setBackgroundColor(int backgroundColor) {
@@ -514,7 +514,7 @@
throw new IllegalArgumentException("disabledBackgroundColor is null.");
}
- setDisabledBackgroundColor(decodeColor(disabledBackgroundColor));
+ setDisabledBackgroundColor(GraphicsUtilities.decodeColor(disabledBackgroundColor));
}
public final void setDisabledBackgroundColor(int disabledBackgroundColor) {
@@ -540,7 +540,7 @@
throw new IllegalArgumentException("borderColor is null.");
}
- setBorderColor(decodeColor(borderColor));
+ setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
public final void setBorderColor(int borderColor) {
@@ -566,7 +566,7 @@
throw new IllegalArgumentException("disabledBorderColor is null.");
}
- setDisabledBorderColor(decodeColor(disabledBorderColor));
+ setDisabledBorderColor(GraphicsUtilities.decodeColor(disabledBorderColor));
}
public final void setDisabledBorderColor(int disabledBorderColor) {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTableViewSkin.java Thu May 7 14:39:07 2009
@@ -27,6 +27,7 @@
import pivot.wtk.Bounds;
import pivot.wtk.Component;
import pivot.wtk.Dimensions;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Keyboard;
import pivot.wtk.Mouse;
import pivot.wtk.Orientation;
@@ -40,7 +41,6 @@
import pivot.wtk.TableViewSelectionListener;
import pivot.wtk.Theme;
import pivot.wtk.skin.ComponentSkin;
-import pivot.wtk.skin.GraphicsUtilities;
/**
* Table view skin.
@@ -503,7 +503,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public final void setColor(int color) {
@@ -529,7 +529,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public final void setDisabledColor(int disabledColor) {
@@ -555,7 +555,7 @@
throw new IllegalArgumentException("backgroundColor is null.");
}
- setBackgroundColor(decodeColor(backgroundColor));
+ setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor));
}
public final void setBackgroundColor(int backgroundColor) {
@@ -581,7 +581,7 @@
throw new IllegalArgumentException("selectionColor is null.");
}
- setSelectionColor(decodeColor(selectionColor));
+ setSelectionColor(GraphicsUtilities.decodeColor(selectionColor));
}
public final void setSelectionColor(int selectionColor) {
@@ -607,7 +607,7 @@
throw new IllegalArgumentException("selectionBackgroundColor is null.");
}
- setSelectionBackgroundColor(decodeColor(selectionBackgroundColor));
+ setSelectionBackgroundColor(GraphicsUtilities.decodeColor(selectionBackgroundColor));
}
public final void setSelectionBackgroundColor(int selectionBackgroundColor) {
@@ -633,7 +633,7 @@
throw new IllegalArgumentException("inactiveSelectionColor is null.");
}
- setInactiveSelectionColor(decodeColor(inactiveSelectionColor));
+ setInactiveSelectionColor(GraphicsUtilities.decodeColor(inactiveSelectionColor));
}
public final void setInactiveSelectionColor(int inactiveSelectionColor) {
@@ -659,7 +659,7 @@
throw new IllegalArgumentException("inactiveSelectionBackgroundColor is null.");
}
- setInactiveSelectionBackgroundColor(decodeColor(inactiveSelectionBackgroundColor));
+ setInactiveSelectionBackgroundColor(GraphicsUtilities.decodeColor(inactiveSelectionBackgroundColor));
}
public final void setInactiveSelectionBackgroundColor(int inactiveSelectionBackgroundColor) {
@@ -685,7 +685,7 @@
throw new IllegalArgumentException("highlightBackgroundColor is null.");
}
- setHighlightBackgroundColor(decodeColor(highlightBackgroundColor));
+ setHighlightBackgroundColor(GraphicsUtilities.decodeColor(highlightBackgroundColor));
}
public final void setHighlightBackgroundColor(int highlightBackgroundColor) {
@@ -707,7 +707,7 @@
throw new IllegalArgumentException("alternateRowColor is null.");
}
- setAlternateRowColor(decodeColor(alternateRowColor));
+ setAlternateRowColor(GraphicsUtilities.decodeColor(alternateRowColor));
}
public final void setAlternateRowColor(int alternateRowColor) {
@@ -733,7 +733,7 @@
throw new IllegalArgumentException("gridColor is null.");
}
- setGridColor(decodeColor(gridColor));
+ setGridColor(GraphicsUtilities.decodeColor(gridColor));
}
public final void setGridColor(int gridColor) {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTextInputSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTextInputSkin.java?rev=772666&r1=772665&r2=772666&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTextInputSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTextInputSkin.java Thu May 7 14:39:07 2009
@@ -35,6 +35,7 @@
import pivot.wtk.Cursor;
import pivot.wtk.Dimensions;
import pivot.wtk.Direction;
+import pivot.wtk.GraphicsUtilities;
import pivot.wtk.Insets;
import pivot.wtk.Keyboard;
import pivot.wtk.Mouse;
@@ -46,7 +47,6 @@
import pivot.wtk.TextInputSelectionListener;
import pivot.wtk.Theme;
import pivot.wtk.skin.ComponentSkin;
-import pivot.wtk.skin.GraphicsUtilities;
import pivot.wtk.text.TextNode;
import pivot.wtk.text.validation.Validator;
@@ -557,7 +557,7 @@
throw new IllegalArgumentException("color is null.");
}
- setColor(decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color));
}
public final void setColor(int color) {
@@ -583,7 +583,7 @@
throw new IllegalArgumentException("promptColor is null.");
}
- setPromptColor(decodeColor(promptColor));
+ setPromptColor(GraphicsUtilities.decodeColor(promptColor));
}
public final void setPromptColor(int promptColor) {
@@ -609,7 +609,7 @@
throw new IllegalArgumentException("disabledColor is null.");
}
- setDisabledColor(decodeColor(disabledColor));
+ setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
public final void setDisabledColor(int disabledColor) {
@@ -636,7 +636,7 @@
throw new IllegalArgumentException("backgroundColor is null.");
}
- setBackgroundColor(decodeColor(backgroundColor));
+ setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor));
}
public final void setBackgroundColor(int color) {
@@ -662,7 +662,7 @@
throw new IllegalArgumentException("color is null.");
}
- setInvalidColor(decodeColor(color));
+ setInvalidColor(GraphicsUtilities.decodeColor(color));
}
public final void setInvalidColor(int color) {
@@ -689,7 +689,7 @@
throw new IllegalArgumentException("invalidBackgroundColor is null.");
}
- setInvalidBackgroundColor(decodeColor(color));
+ setInvalidBackgroundColor(GraphicsUtilities.decodeColor(color));
}
public final void setInvalidBackgroundColor(int color) {
@@ -716,7 +716,7 @@
throw new IllegalArgumentException("disabledBackgroundColor is null.");
}
- setDisabledBackgroundColor(decodeColor(disabledBackgroundColor));
+ setDisabledBackgroundColor(GraphicsUtilities.decodeColor(disabledBackgroundColor));
}
public final void setDisabledBackgroundColor(int color) {
@@ -742,7 +742,7 @@
throw new IllegalArgumentException("borderColor is null.");
}
- setBorderColor(decodeColor(borderColor));
+ setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
public final void setBorderColor(int color) {
@@ -768,7 +768,7 @@
throw new IllegalArgumentException("disabledBorderColor is null.");
}
- setDisabledBorderColor(decodeColor(disabledBorderColor));
+ setDisabledBorderColor(GraphicsUtilities.decodeColor(disabledBorderColor));
}
public final void setDisabledBorderColor(int color) {
@@ -794,7 +794,7 @@
throw new IllegalArgumentException("selectionColor is null.");
}
- setSelectionColor(decodeColor(selectionColor));
+ setSelectionColor(GraphicsUtilities.decodeColor(selectionColor));
}
public final void setSelectionColor(int color) {
@@ -820,7 +820,7 @@
throw new IllegalArgumentException("selectionBackgroundColor is null.");
}
- setSelectionBackgroundColor(decodeColor(selectionBackgroundColor));
+ setSelectionBackgroundColor(GraphicsUtilities.decodeColor(selectionBackgroundColor));
}
public final void setSelectionBackgroundColor(int color) {
@@ -846,7 +846,7 @@
throw new IllegalArgumentException("inactiveSelectionColor is null.");
}
- setInactiveSelectionColor(decodeColor(inactiveSelectionColor));
+ setInactiveSelectionColor(GraphicsUtilities.decodeColor(inactiveSelectionColor));
}
public final void setInactiveSelectionColor(int color) {
@@ -872,7 +872,7 @@
throw new IllegalArgumentException("inactiveSelectionBackgroundColor is null.");
}
- setInactiveSelectionBackgroundColor(decodeColor(inactiveSelectionBackgroundColor));
+ setInactiveSelectionBackgroundColor(GraphicsUtilities.decodeColor(inactiveSelectionBackgroundColor));
}
public final void setInactiveSelectionBackgroundColor(int color) {