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/10/05 19:35:00 UTC
svn commit: r821930 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin: ./ terra/
Author: gbrown
Date: Mon Oct 5 17:34:59 2009
New Revision: 821930
URL: http://svn.apache.org/viewvc?rev=821930&view=rev
Log:
Add enhanced font setters to remaining text-based skin classes.
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraLinkButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java Mon Oct 5 17:34:59 2009
@@ -280,7 +280,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java Mon Oct 5 17:34:59 2009
@@ -182,7 +182,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java Mon Oct 5 17:34:59 2009
@@ -47,6 +47,7 @@
import org.apache.pivot.wtk.Cursor;
import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.Direction;
+import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Insets;
import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.Mouse;
@@ -1363,7 +1364,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Insets getMargin() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java Mon Oct 5 17:34:59 2009
@@ -590,10 +590,18 @@
public final void setButtonFont(String buttonFont) {
if (buttonFont == null) {
- throw new IllegalArgumentException("buttonFont is null.");
+ throw new IllegalArgumentException("font is null.");
}
- setButtonFont(Font.decode(buttonFont));
+ setButtonFont(GraphicsUtilities.decodeFont(buttonFont));
+ }
+
+ public final void setButtonFont(Dictionary<String, ?> buttonFont) {
+ if (buttonFont == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setButtonFont(GraphicsUtilities.decodeFont(buttonFont));
}
public Color getButtonColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java Mon Oct 5 17:34:59 2009
@@ -297,7 +297,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java Mon Oct 5 17:34:59 2009
@@ -24,6 +24,7 @@
import java.util.GregorianCalendar;
import java.util.Locale;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.CalendarDate;
import org.apache.pivot.util.Filter;
import org.apache.pivot.wtk.Bounds;
@@ -708,7 +709,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java Mon Oct 5 17:34:59 2009
@@ -25,6 +25,7 @@
import java.awt.RenderingHints;
import java.awt.geom.Rectangle2D;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.Checkbox;
import org.apache.pivot.wtk.Dimensions;
@@ -255,7 +256,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java Mon Oct 5 17:34:59 2009
@@ -436,7 +436,15 @@
throw new IllegalArgumentException("titleBarFont is null.");
}
- setTitleBarFont(Font.decode(titleBarFont));
+ setTitleBarFont(GraphicsUtilities.decodeFont(titleBarFont));
+ }
+
+ public final void setTitleBarFont(Dictionary<String, ?> titleBarFont) {
+ if (titleBarFont == null) {
+ throw new IllegalArgumentException("titleBarFont is null.");
+ }
+
+ setTitleBarFont(GraphicsUtilities.decodeFont(titleBarFont));
}
public Color getTitleBarColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraLinkButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraLinkButtonSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraLinkButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraLinkButtonSkin.java Mon Oct 5 17:34:59 2009
@@ -20,6 +20,7 @@
import java.awt.Font;
import java.awt.Graphics2D;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.GraphicsUtilities;
@@ -104,7 +105,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java Mon Oct 5 17:34:59 2009
@@ -313,7 +313,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java Mon Oct 5 17:34:59 2009
@@ -309,7 +309,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java Mon Oct 5 17:34:59 2009
@@ -19,6 +19,7 @@
import java.awt.Color;
import java.awt.Font;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Dimensions;
@@ -162,7 +163,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java Mon Oct 5 17:34:59 2009
@@ -248,7 +248,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java Mon Oct 5 17:34:59 2009
@@ -20,6 +20,7 @@
import java.awt.Font;
import java.awt.Graphics2D;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Dimensions;
@@ -231,7 +232,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java Mon Oct 5 17:34:59 2009
@@ -26,6 +26,7 @@
import java.awt.geom.Ellipse2D;
import java.awt.geom.Rectangle2D;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.GraphicsUtilities;
@@ -222,7 +223,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java Mon Oct 5 17:34:59 2009
@@ -24,6 +24,7 @@
import java.awt.RenderingHints;
import java.awt.geom.Rectangle2D;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
import org.apache.pivot.wtk.ApplicationContext;
import org.apache.pivot.wtk.Bounds;
@@ -750,7 +751,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public boolean isSizeToContent() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java Mon Oct 5 17:34:59 2009
@@ -976,10 +976,18 @@
public final void setButtonFont(String buttonFont) {
if (buttonFont == null) {
- throw new IllegalArgumentException("buttonFont is null.");
+ throw new IllegalArgumentException("font is null.");
}
- setButtonFont(Font.decode(buttonFont));
+ setButtonFont(GraphicsUtilities.decodeFont(buttonFont));
+ }
+
+ public final void setButtonFont(Dictionary<String, ?> buttonFont) {
+ if (buttonFont == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setButtonFont(GraphicsUtilities.decodeFont(buttonFont));
}
public Color getButtonColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java Mon Oct 5 17:34:59 2009
@@ -25,6 +25,7 @@
import java.awt.geom.GeneralPath;
import org.apache.pivot.collections.ArrayList;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
@@ -402,7 +403,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java Mon Oct 5 17:34:59 2009
@@ -23,6 +23,7 @@
import java.awt.Transparency;
import org.apache.pivot.collections.ArrayList;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.util.Filter;
@@ -580,7 +581,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java Mon Oct 5 17:34:59 2009
@@ -529,7 +529,15 @@
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=821930&r1=821929&r2=821930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java Mon Oct 5 17:34:59 2009
@@ -27,6 +27,7 @@
import java.util.NoSuchElementException;
import org.apache.pivot.collections.ArrayList;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.collections.Sequence.Tree.Path;
@@ -703,12 +704,20 @@
invalidateComponent();
}
- public void setFont(String font) {
+ public final void setFont(String font) {
if (font == null) {
throw new IllegalArgumentException("font is null.");
}
- setFont(Font.decode(font));
+ setFont(GraphicsUtilities.decodeFont(font));
+ }
+
+ public final void setFont(Dictionary<String, ?> font) {
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
+
+ setFont(GraphicsUtilities.decodeFont(font));
}
public Color getColor() {