modules/graphics/src/main/java/javafx/css/converter/FontConverter.java

rev 9240 : 8076423: JEP 253: Prepare JavaFX UI Controls & CSS APIs for Modularization

@@ -21,15 +21,14 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
-package com.sun.javafx.css.converters;
+package javafx.css.converter;
 
 import com.sun.javafx.util.Utils;
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.Size;
 import javafx.css.CssMetaData;
 import javafx.css.ParsedValue;
 import javafx.css.StyleConverter;
 import javafx.css.Styleable;
 import javafx.scene.text.Font;

@@ -38,11 +37,14 @@
 
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 
-public final class FontConverter extends StyleConverterImpl<ParsedValue[], Font> {
+/**
+ * @since 9
+ */
+public final class FontConverter extends StyleConverter<ParsedValue[], Font> {
 
     // lazy, thread-safe instatiation
     private static class Holder {
         static final FontConverter INSTANCE = new FontConverter();
     }

@@ -106,11 +108,11 @@
     @Override
     public String toString() {
         return "FontConverter";
     }
 
-    public static final class FontStyleConverter extends StyleConverterImpl<String, FontPosture> {
+    public static final class FontStyleConverter extends StyleConverter<String, FontPosture> {
 
         // lazy, thread-safe instatiation
         private static class Holder {
             static final FontStyleConverter INSTANCE = new FontStyleConverter();
         }

@@ -152,11 +154,11 @@
         public String toString() {
             return "FontConverter.StyleConverter";
         }
     }
 
-    public static final class FontWeightConverter extends StyleConverterImpl<String, FontWeight> {
+    public static final class FontWeightConverter extends StyleConverter<String, FontWeight> {
 
         // lazy, thread-safe instatiation
         private static class Holder {
             static final FontWeightConverter INSTANCE = new FontWeightConverter();
         }

@@ -199,11 +201,11 @@
         public String toString() {
             return "FontConverter.WeightConverter";
         }
     }
     
-    public static final class FontSizeConverter extends StyleConverterImpl<ParsedValue<?, Size>, Number> {
+    public static final class FontSizeConverter extends StyleConverter<ParsedValue<?, Size>, Number> {
 
         // lazy, thread-safe instatiation
         private static class Holder {
             static final FontSizeConverter INSTANCE = new FontSizeConverter();
         }