Author: rwhitcomb
Date: Fri Jan 5 21:43:34 2018
New Revision: 1820359
URL: http://svn.apache.org/viewvc?rev=1820359&view=rev
Log:
Use the new "wtk.FontUtilities" class to move the common code to one place.
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/text/Element.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java?rev=1820359&r1=1820358&r2=1820359&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java Fri Jan 5
21:43:34 2018
@@ -39,6 +39,7 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.DragSource;
import org.apache.pivot.wtk.DropTarget;
import org.apache.pivot.wtk.FocusTraversalDirection;
+import org.apache.pivot.wtk.FontUtilities;
import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.Keyboard.Modifier;
@@ -404,22 +405,10 @@ public abstract class ComponentSkin impl
* @return The font corresponding to the specification.
* @throws IllegalArgumentException if the given string is <tt>null</tt>
* or empty or the font specification cannot be decoded.
+ * @see FontUtilities#decodeFont(String)
*/
public static Font decodeFont(String value) {
- Utils.checkNullOrEmpty(value, "font");
-
- Font font;
- if (value.startsWith("{")) {
- try {
- font = Theme.deriveFont(JSONSerializer.parseMap(value));
- } catch (SerializationException exception) {
- throw new IllegalArgumentException(exception);
- }
- } else {
- font = Font.decode(value);
- }
-
- return font;
+ return FontUtilities.decodeFont(value);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/text/Element.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/text/Element.java?rev=1820359&r1=1820358&r2=1820359&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/text/Element.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/text/Element.java Fri Jan 5
21:43:34 2018
@@ -27,9 +27,9 @@ import org.apache.pivot.serialization.Se
import org.apache.pivot.util.ImmutableIterator;
import org.apache.pivot.util.ListenerList;
import org.apache.pivot.util.Utils;
+import org.apache.pivot.wtk.FontUtilities;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Theme;
-import org.apache.pivot.wtk.skin.ComponentSkin;
/**
* Abstract base class for elements. <p> TODO Add style properties. <p> TODO
Add
@@ -578,7 +578,7 @@ public abstract class Element extends No
}
public final void setFont(String font) {
- setFont(ComponentSkin.decodeFont(font));
+ setFont(FontUtilities.decodeFont(font));
}
/**
