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

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

Revision: 9910
          http://svn.sourceforge.net/foray/?rev=9910&view=rev
Author:   victormote
Date:     2007-07-02 12:20:26 -0700 (Mon, 02 Jul 2007)

Log Message:
-----------
Make EncodingVector abstract, and create a concrete subclass for non-predefined instances.

Modified Paths:
--------------
    trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java
    trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java

Modified: trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java	2007-07-02 18:42:13 UTC (rev 9909)
+++ trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java	2007-07-02 19:20:26 UTC (rev 9910)
@@ -30,6 +30,7 @@
 
 import org.foray.common.RandomReader;
 import org.foray.common.url.URLFactory;
+import org.foray.ps.encode.EncodingCustom;
 import org.foray.ps.encode.EncodingParser;
 import org.foray.ps.encode.EncodingVector;
 import org.foray.ps.encode.GlyphList;
@@ -768,7 +769,7 @@
         } catch (final IOException e2) {
             logError("Error parsing: " + encodingFile);
         }
-        encoding = new EncodingVector(name, parser.getGlyphListsToCheck(),
+        encoding = new EncodingCustom(name, parser.getGlyphListsToCheck(),
                 parser.getCodePoints(),
                 parser.getCodePointIndexes());
         EncodingVector.registerEncoding(name, encoding);

Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java	2007-07-02 18:42:13 UTC (rev 9909)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java	2007-07-02 19:20:26 UTC (rev 9910)
@@ -31,6 +31,7 @@
 import org.foray.common.Bit;
 import org.foray.font.charset.CharSet;
 import org.foray.font.output.FOrayFontPDF;
+import org.foray.ps.encode.EncodingCustom;
 import org.foray.ps.encode.EncodingVector;
 import org.foray.ps.encode.GlyphList;
 
@@ -1624,7 +1625,7 @@
         EncodingVector.sortCodePoints(this.internalCodePoints,
                 this.internalCodePointIndexes);
         /* Create a tentative EncodingVector instance. */
-        final EncodingVector newEncoding = new EncodingVector("internal-"
+        final EncodingVector newEncoding = new EncodingCustom("internal-"
                 + this.getPostscriptName(), null, this.internalCodePoints,
                 this.internalCodePointIndexes);
         /* Is this a predefined encoding? */

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java	2007-07-02 18:42:13 UTC (rev 9909)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java	2007-07-02 19:20:26 UTC (rev 9910)
@@ -83,7 +83,7 @@
  * the first array.
  * Methods are provided to encode and decode characters.</p>
  */
-public class EncodingVector extends Encoding
+public abstract class EncodingVector extends Encoding
         implements org.axsl.psR.EncodingVector, Serializable {
 
     /** Constant needed for serialization. */


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