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

[<vic...@us...>]

Revision: 8550
          http://svn.sourceforge.net/foray/?rev=8550&view=rev
Author:   victormote
Date:     2007-01-30 17:06:34 -0800 (Tue, 30 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
    trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.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:41:38 UTC (rev 8549)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java	2007-01-31 01:06:34 UTC (rev 8550)
@@ -251,7 +251,7 @@
                     org.axsl.fontR.Font.Style.NORMAL,
                     org.axsl.fontR.Font.Weight.NORMAL,
                     org.axsl.fontR.Font.Variant.NORMAL,
-                    FOrayFont.FONT_STRETCH_NORMAL,
+                    org.axsl.fontR.Font.Stretch.NORMAL,
                     freeStandingFont,
                     ! freeStandingFont);
             if (defaultFont != null) {
@@ -262,7 +262,7 @@
                     org.axsl.fontR.Font.Style.ANY,
                     org.axsl.fontR.Font.Weight.ANY,
                     org.axsl.fontR.Font.Variant.ANY,
-                    FOrayFont.FONT_STRETCH_ANY,
+                    org.axsl.fontR.Font.Stretch.ANY,
                     freeStandingFont,
                     ! freeStandingFont);
         }
@@ -277,7 +277,7 @@
                     org.axsl.fontR.Font.Style.ANY,
                     org.axsl.fontR.Font.Weight.ANY,
                     org.axsl.fontR.Font.Variant.ANY,
-                    FOrayFont.FONT_STRETCH_ANY,
+                    org.axsl.fontR.Font.Stretch.ANY,
                     freeStandingFont,
                     ! freeStandingFont);
         }
@@ -587,7 +587,7 @@
                 style,
                 weight,
                 org.axsl.fontR.Font.Variant.NORMAL,
-                org.axsl.fontR.Font.FONT_STRETCH_NORMAL,
+                org.axsl.fontR.Font.Stretch.NORMAL,
                 DEFAULT_SMALL_CAPS_SIZE,
                 Float.NaN,
                 Float.NaN,
@@ -651,7 +651,7 @@
                 fontWeight = org.axsl.fontR.Font.Weight.BOLD;
             }
             final byte fontVariant = org.axsl.fontR.Font.Variant.NORMAL;
-            final byte fontStretch = org.axsl.fontR.Font.FONT_STRETCH_NORMAL;
+            final byte fontStretch = org.axsl.fontR.Font.Stretch.NORMAL;
             new RegisteredFontDesc(rf, rff, null, fontStyle, fontWeight,
                     fontVariant, fontStretch);
             try {

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:41:38 UTC (rev 8549)
+++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java	2007-01-31 01:06:34 UTC (rev 8550)
@@ -605,7 +605,7 @@
      */
     public boolean stretchMatches(final int desiredStretch,
             final boolean considerSimulated) {
-        if (desiredStretch == FOrayFont.FONT_STRETCH_ANY) {
+        if (desiredStretch == Font.Stretch.ANY) {
             return true;
         }
         final int actualStretch = getFontStretch();

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:41:38 UTC (rev 8549)
+++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java	2007-01-31 01:06:34 UTC (rev 8550)
@@ -108,7 +108,7 @@
         }
         byte fontStretch = FontUtility.foFontStretch(stretch, false);
         if (fontStretch < 0) {
-            fontStretch = Font.FONT_STRETCH_NORMAL;
+            fontStretch = Font.Stretch.NORMAL;
         }
         final float simSmallCaps = convertPercent(simulatedSmallCaps);
         final float simOblique = convertPercent(simulatedOblique);

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:41:38 UTC (rev 8549)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2007-01-31 01:06:34 UTC (rev 8550)
@@ -3309,33 +3309,33 @@
     public static int convertFontStretch(final short parsedFontStretch) {
         switch (parsedFontStretch) {
         case FoValue.ULTRA_CONDENSED: {
-            return org.axsl.fontR.Font.FONT_STRETCH_ULTRA_CONDENSED;
+            return org.axsl.fontR.Font.Stretch.ULTRA_CONDENSED;
         }
         case FoValue.EXTRA_CONDENSED: {
-            return org.axsl.fontR.Font.FONT_STRETCH_EXTRA_CONDENSED;
+            return org.axsl.fontR.Font.Stretch.EXTRA_CONDENSED;
         }
         case FoValue.CONDENSED: {
-            return org.axsl.fontR.Font.FONT_STRETCH_CONDENSED;
+            return org.axsl.fontR.Font.Stretch.CONDENSED;
         }
         case FoValue.SEMI_CONDENSED: {
-            return org.axsl.fontR.Font.FONT_STRETCH_SEMI_CONDENSED;
+            return org.axsl.fontR.Font.Stretch.SEMI_CONDENSED;
         }
         case FoValue.NORMAL: {
-            return org.axsl.fontR.Font.FONT_STRETCH_NORMAL;
+            return org.axsl.fontR.Font.Stretch.NORMAL;
         }
         case FoValue.SEMI_EXPANDED: {
-            return org.axsl.fontR.Font.FONT_STRETCH_SEMI_EXPANDED;
+            return org.axsl.fontR.Font.Stretch.SEMI_EXPANDED;
         }
         case FoValue.EXPANDED: {
-            return org.axsl.fontR.Font.FONT_STRETCH_EXPANDED;
+            return org.axsl.fontR.Font.Stretch.EXPANDED;
         }
         case FoValue.EXTRA_EXPANDED: {
-            return org.axsl.fontR.Font.FONT_STRETCH_EXTRA_EXPANDED;
+            return org.axsl.fontR.Font.Stretch.EXTRA_EXPANDED;
         }
         case FoValue.ULTRA_EXPANDED: {
-            return org.axsl.fontR.Font.FONT_STRETCH_ULTRA_EXPANDED;
+            return org.axsl.fontR.Font.Stretch.ULTRA_EXPANDED;
         }
         }
-        return org.axsl.fontR.Font.FONT_STRETCH_NORMAL;
+        return org.axsl.fontR.Font.Stretch.NORMAL;
     }
 }

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:41:38 UTC (rev 8549)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java	2007-01-31 01:06:34 UTC (rev 8550)
@@ -932,7 +932,7 @@
                     FontUtility.foFontFamily(fontFamily),
                     fontStyle, fontWeight,
                     org.axsl.fontR.Font.Variant.NORMAL,
-                    org.axsl.fontR.Font.FONT_STRETCH_NORMAL,
+                    org.axsl.fontR.Font.Stretch.NORMAL,
                     (int) (fontSize * WKConstants.MILLIPOINTS_PER_POINT),
                     ' ');
         } catch (final FontException exception) {

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java	2007-01-30 04:41:38 UTC (rev 8549)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java	2007-01-31 01:06:34 UTC (rev 8550)
@@ -306,7 +306,7 @@
                 font = this.fontConsumer.selectFontCSS(
                         FontUtility.foFontFamily(this.fontFamily),
                         style, weight, 0,
-                        org.axsl.fontR.Font.FONT_STRETCH_NORMAL,
+                        org.axsl.fontR.Font.Stretch.NORMAL,
                         fsize * WKConstants.MILLIPOINTS_PER_POINT,
                         ' ');
                 if (font != null) {
@@ -323,7 +323,7 @@
             return this.fontConsumer.selectFontXSL(
                     org.axsl.fontR.Font.FONT_SELECTION_AUTO,
                     new String[] {"any"}, style, weight, 0,
-                    org.axsl.fontR.Font.FONT_STRETCH_NORMAL,
+                    org.axsl.fontR.Font.Stretch.NORMAL,
                     fsize * WKConstants.MILLIPOINTS_PER_POINT,
                     ' ');
         }


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