[FOray-commit] SF.net SVN: foray: [8549] trunk/foray

Revision: 8549
          http://svn.sourceforge.net/foray/?rev=8549&view=rev
Author:   victormote
Date:     2007-01-29 20:41:38 -0800 (Mon, 29 Jan 2007)

Log Message:
-----------
Conform to axsl changes for a new inner enumeration class.

Modified Paths:
--------------
    trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
    trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java
    trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java

Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java	2007-01-30 04:16:00 UTC (rev 8548)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java	2007-01-30 04:41:38 UTC (rev 8549)
@@ -250,7 +250,7 @@
             defaultFont = rff.findRegisteredFontDesc(
                     org.axsl.fontR.Font.Style.NORMAL,
                     org.axsl.fontR.Font.Weight.NORMAL,
-                    FOrayFont.FONT_VARIANT_NORMAL,
+                    org.axsl.fontR.Font.Variant.NORMAL,
                     FOrayFont.FONT_STRETCH_NORMAL,
                     freeStandingFont,
                     ! freeStandingFont);
@@ -261,7 +261,7 @@
             defaultFont = rff.findRegisteredFontDesc(
                     org.axsl.fontR.Font.Style.ANY,
                     org.axsl.fontR.Font.Weight.ANY,
-                    FOrayFont.FONT_VARIANT_ANY,
+                    org.axsl.fontR.Font.Variant.ANY,
                     FOrayFont.FONT_STRETCH_ANY,
                     freeStandingFont,
                     ! freeStandingFont);
@@ -276,7 +276,7 @@
             defaultFont = rff.findRegisteredFontDesc(
                     org.axsl.fontR.Font.Style.ANY,
                     org.axsl.fontR.Font.Weight.ANY,
-                    FOrayFont.FONT_VARIANT_ANY,
+                    org.axsl.fontR.Font.Variant.ANY,
                     FOrayFont.FONT_STRETCH_ANY,
                     freeStandingFont,
                     ! freeStandingFont);
@@ -586,7 +586,7 @@
                 encoding,
                 style,
                 weight,
-                org.axsl.fontR.Font.FONT_VARIANT_NORMAL,
+                org.axsl.fontR.Font.Variant.NORMAL,
                 org.axsl.fontR.Font.FONT_STRETCH_NORMAL,
                 DEFAULT_SMALL_CAPS_SIZE,
                 Float.NaN,
@@ -650,7 +650,7 @@
             if (awtFont.isBold()) {
                 fontWeight = org.axsl.fontR.Font.Weight.BOLD;
             }
-            final byte fontVariant = org.axsl.fontR.Font.FONT_VARIANT_NORMAL;
+            final byte fontVariant = org.axsl.fontR.Font.Variant.NORMAL;
             final byte fontStretch = org.axsl.fontR.Font.FONT_STRETCH_NORMAL;
             new RegisteredFontDesc(rf, rff, null, fontStyle, fontWeight,
                     fontVariant, fontStretch);

Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java	2007-01-30 04:16:00 UTC (rev 8548)
+++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java	2007-01-30 04:41:38 UTC (rev 8549)
@@ -579,7 +579,7 @@
      */
     public boolean variantMatches(final int desiredVariant,
             final boolean considerSimulated) {
-        if (desiredVariant == FOrayFont.FONT_VARIANT_ANY) {
+        if (desiredVariant == Font.Variant.ANY) {
             return true;
         }
         if (considerSimulated) {

Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java	2007-01-30 04:16:00 UTC (rev 8548)
+++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java	2007-01-30 04:41:38 UTC (rev 8549)
@@ -104,7 +104,7 @@
         }
         byte fontVariant = FontUtility.foFontVariant(variant, false);
         if (fontVariant < 0) {
-            fontVariant = Font.FONT_VARIANT_NORMAL;
+            fontVariant = Font.Variant.NORMAL;
         }
         byte fontStretch = FontUtility.foFontStretch(stretch, false);
         if (fontStretch < 0) {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2007-01-30 04:16:00 UTC (rev 8548)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2007-01-30 04:41:38 UTC (rev 8549)
@@ -3283,9 +3283,9 @@
      */
     public static int convertFontVariant(final int parsedFontVariant) {
         if (parsedFontVariant == FoValue.SMALL_CAPS) {
-            return org.axsl.fontR.Font.FONT_VARIANT_SMALL_CAPS;
+            return org.axsl.fontR.Font.Variant.SMALL_CAPS;
         }
-        return org.axsl.fontR.Font.FONT_VARIANT_NORMAL;
+        return org.axsl.fontR.Font.Variant.NORMAL;
     }
 
     public static byte convertFontStyle(final short parsedFontStyle) {

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java	2007-01-30 04:16:00 UTC (rev 8548)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java	2007-01-30 04:41:38 UTC (rev 8549)
@@ -931,7 +931,7 @@
                     org.axsl.fontR.Font.FONT_SELECTION_AUTO,
                     FontUtility.foFontFamily(fontFamily),
                     fontStyle, fontWeight,
-                    org.axsl.fontR.Font.FONT_VARIANT_NORMAL,
+                    org.axsl.fontR.Font.Variant.NORMAL,
                     org.axsl.fontR.Font.FONT_STRETCH_NORMAL,
                     (int) (fontSize * WKConstants.MILLIPOINTS_PER_POINT),
                     ' ');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.