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

Revision: 8553
          http://svn.sourceforge.net/foray/?rev=8553&view=rev
Author:   victormote
Date:     2007-01-30 17:48:36 -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/FSTrueTypeFont.java
    trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java
    trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java
    trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java
    trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java
    trunk/foray/foray-font/src/java/org/foray/font/format/FontFileReader.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java

Modified: trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java	2007-01-31 01:37:05 UTC (rev 8552)
+++ trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java	2007-01-31 01:48:36 UTC (rev 8553)
@@ -57,7 +57,7 @@
     private int stemV = 0;
 
     /** The font format. */
-    private byte fontFormat = FORMAT_UNKNOWN;
+    private byte fontFormat = Format.UNKNOWN;
 
     /**
      * Construct an instance.

Modified: trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java	2007-01-31 01:37:05 UTC (rev 8552)
+++ trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java	2007-01-31 01:48:36 UTC (rev 8553)
@@ -215,7 +215,7 @@
      * {@inheritDoc}
      */
     public byte getFontFormat() {
-        return FOrayFont.FORMAT_TYPE1;
+        return Format.TYPE1;
     }
 
     /**

Modified: trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java	2007-01-31 01:37:05 UTC (rev 8552)
+++ trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java	2007-01-31 01:48:36 UTC (rev 8553)
@@ -273,7 +273,7 @@
             return false;
         }
         /* TODO: We don't know how to subset CFF fonts yet. */
-        if (getFontFormat() == FORMAT_OTF_CFF) {
+        if (getFontFormat() == Format.OTF_CFF) {
             return false;
         }
         /* Only subset if we have been told to. */
@@ -332,10 +332,10 @@
      */
     public int getAWTFontFormat() {
         switch (this.getFontFormat()) {
-        case Font.FORMAT_TRUETYPE: {
+        case Font.Format.TRUETYPE: {
             return java.awt.Font.TRUETYPE_FONT;
         }
-        case Font.FORMAT_TYPE1: {
+        case Font.Format.TYPE1: {
             /* TODO: When Java 1.5 is the lowest supported platform, change
              * this constant to java.awt.Font.TYPE1_FONT. */
             return 1;

Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java	2007-01-31 01:37:05 UTC (rev 8552)
+++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java	2007-01-31 01:48:36 UTC (rev 8553)
@@ -32,6 +32,7 @@
 import org.foray.font.format.MetricsFileReader;
 import org.foray.font.format.Panose;
 
+import org.axsl.fontR.Font;
 import org.axsl.fontR.FontException;
 
 import org.apache.commons.logging.Log;
@@ -100,7 +101,7 @@
 
     /** {@link FOrayFont#FORMAT_UNKNOWN}, {@link FOrayFont#FORMAT_TYPE1}, or
      * {@link FOrayFont#FORMAT_TRUETYPE}. */
-    private int fontFormat = FOrayFont.FORMAT_UNKNOWN;
+    private int fontFormat = Font.Format.UNKNOWN;
 
     /** URL to the font metrics file, if any. */
     private MetricsFileReader metricsFile = null;
@@ -235,17 +236,17 @@
         if (this.fontFileReader == null) {
             /* The assumption here is that we have a metrics file for this
              * font, but not a font file, therefore it is Type 1. */
-            this.fontFormat = FOrayFont.FORMAT_TYPE1;
+            this.fontFormat = Font.Format.TYPE1;
         } else {
             this.fontFormat = this.fontFileReader.getFontFormat();
         }
         switch (this.fontFormat) {
-        case FOrayFont.FORMAT_TYPE1: {
+        case Font.Format.TYPE1: {
             return new FSType1Font(this);
         }
-        case FOrayFont.FORMAT_TRUETYPE:
-        case FOrayFont.FORMAT_OTF_CFF:
-        case FOrayFont.FORMAT_OTF_TRUETYPE: {
+        case Font.Format.TRUETYPE:
+        case Font.Format.OTF_CFF:
+        case Font.Format.OTF_TRUETYPE: {
             return new FSTrueTypeFont(this);
         }
         }

Modified: trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java	2007-01-31 01:37:05 UTC (rev 8552)
+++ trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java	2007-01-31 01:48:36 UTC (rev 8553)
@@ -273,7 +273,7 @@
         final FreeStandingFont relatedFSFont =
                 this.freeStandingFontManifestation();
         if (relatedFSFont == null) {
-            return org.foray.font.FOrayFont.FORMAT_UNKNOWN;
+            return org.axsl.fontR.Font.Format.UNKNOWN;
         }
         return relatedFSFont.getFontFormat();
     }

Modified: trunk/foray/foray-font/src/java/org/foray/font/format/FontFileReader.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/FontFileReader.java	2007-01-31 01:37:05 UTC (rev 8552)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/FontFileReader.java	2007-01-31 01:48:36 UTC (rev 8553)
@@ -29,8 +29,9 @@
 package org.foray.font.format;
 
 import org.foray.common.RandomReader;
-import org.foray.font.FOrayFont;
 
+import org.axsl.fontR.Font;
+
 import org.apache.commons.logging.Log;
 
 import java.io.IOException;
@@ -90,7 +91,7 @@
     private static final int SHORT_TO_DECIMAL_FACTOR = 10000;
 
     /** Set to one of the Font.FORMAT constants. */
-    private byte fontFormat = FOrayFont.FORMAT_UNKNOWN;
+    private byte fontFormat = Font.Format.UNKNOWN;
 
     /** Set to one of the FILEFORMAT constants. */
     private byte fileFormat = FontFileReader.FILEFORMAT_UNKNOWN;
@@ -147,7 +148,7 @@
         tag = readString(TYPE_1_HEADER_1.length(), CHAR_ENCODE_US_ASCII);
         if (tag.startsWith(TYPE_1_HEADER_2)
                 || tag.equals(TYPE_1_HEADER_1)) {
-            this.fontFormat = FOrayFont.FORMAT_TYPE1;
+            this.fontFormat = Font.Format.TYPE1;
             this.fileFormat = FontFileReader.FILEFORMAT_TYPE1_PFA;
             return;
         }
@@ -159,7 +160,7 @@
             tag = readString(TYPE_1_HEADER_1.length(), CHAR_ENCODE_US_ASCII);
             if (tag.startsWith(TYPE_1_HEADER_2)
                     || tag.equals(TYPE_1_HEADER_1)) {
-                this.fontFormat = FOrayFont.FORMAT_TYPE1;
+                this.fontFormat = Font.Format.TYPE1;
                 this.fileFormat = FontFileReader.FILEFORMAT_TYPE1_PFB;
                 return;
             }
@@ -168,7 +169,7 @@
         seek(0);
         sfntVersion = readInt();
         if (sfntVersion == TTFTableDirectory.TTF_FILE_SFNT_VERSION_1) {
-            this.fontFormat = FOrayFont.FORMAT_TRUETYPE;
+            this.fontFormat = Font.Format.TRUETYPE;
             this.fileFormat = FontFileReader.FILEFORMAT_TTF_SINGLEFONT;
             return;
         }
@@ -176,7 +177,7 @@
         seek(0);
         tag = readString(TTF_HEADER.length(), CHAR_ENCODE_US_ASCII);
         if (tag.equals(TTF_HEADER)) {
-            this.fontFormat = FOrayFont.FORMAT_TRUETYPE;
+            this.fontFormat = Font.Format.TRUETYPE;
             this.fileFormat = FontFileReader.FILEFORMAT_TTF_COLLECTION;
             return;
         }
@@ -184,7 +185,7 @@
         seek(0);
         tag = readString(OPENTYPE_CFF_HEADER.length(), CHAR_ENCODE_US_ASCII);
         if (tag.equals(OPENTYPE_CFF_HEADER)) {
-            this.fontFormat = FOrayFont.FORMAT_OTF_CFF;
+            this.fontFormat = Font.Format.OTF_CFF;
             this.fileFormat = FontFileReader.FILEFORMAT_OTF_CFF;
             return;
         }

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java	2007-01-31 01:37:05 UTC (rev 8552)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java	2007-01-31 01:48:36 UTC (rev 8553)
@@ -138,7 +138,7 @@
     }
 
     protected static byte getCidType(final Font fsFont) {
-        if (fsFont.getFontFormat() == Font.FORMAT_TRUETYPE) {
+        if (fsFont.getFontFormat() == Font.Format.TRUETYPE) {
             return PDFCIDFont.CID_TYPE2;
         }
         return PDFCIDFont.CID_TYPE0;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java	2007-01-31 01:37:05 UTC (rev 8552)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java	2007-01-31 01:48:36 UTC (rev 8553)
@@ -333,7 +333,7 @@
         if (font.getFont().getFontComplexity() == Font.Complexity.COMPOSITE) {
             return PDFFont.TYPE0;
         }
-        if (font.getFont().getFontFormat() == Font.FORMAT_TYPE1) {
+        if (font.getFont().getFontFormat() == Font.Format.TYPE1) {
             return PDFFont.TYPE1;
         }
         return PDFFont.TRUETYPE;


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