[FOray-commit] SF.net SVN: foray: [7928] trunk/foray/foray-ps/src/java/org/foray/ps/encode

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

Revision: 7928
          http://svn.sourceforge.net/foray/?rev=7928&view=rev
Author:   victormote
Date:     2006-09-05 17:13:44 -0700 (Tue, 05 Sep 2006)

Log Message:
-----------
Fix runtime problem caused by reordering of variables.

Modified Paths:
--------------
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java	2006-09-06 00:07:11 UTC (rev 7927)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java	2006-09-06 00:13:44 UTC (rev 7928)
@@ -917,7 +917,7 @@
     };
 
     public EncodingCE() {
-        super("CEEncoding", GlyphList.standardSourceGlyphLists,
+        super("CEEncoding", GlyphList.standardSourceGlyphLists(),
                 EncodingCE.codePoints,
                 EncodingCE.codePointIndexes);
     }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java	2006-09-06 00:07:11 UTC (rev 7927)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java	2006-09-06 00:13:44 UTC (rev 7928)
@@ -715,7 +715,7 @@
     };
 
     public EncodingExpert() {
-        super("ExpertEncoding", GlyphList.standardSourceGlyphLists,
+        super("ExpertEncoding", GlyphList.standardSourceGlyphLists(),
                 EncodingExpert.codePoints,
                 EncodingExpert.codePointIndexes);
     }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java	2006-09-06 00:07:11 UTC (rev 7927)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java	2006-09-06 00:13:44 UTC (rev 7928)
@@ -400,7 +400,7 @@
     };
 
     public EncodingExpertSubset() {
-        super("ExpertSubsetEncoding", GlyphList.standardSourceGlyphLists,
+        super("ExpertSubsetEncoding", GlyphList.standardSourceGlyphLists(),
                 EncodingExpertSubset.codePoints,
                 EncodingExpertSubset.codePointIndexes);
     }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java	2006-09-06 00:07:11 UTC (rev 7927)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java	2006-09-06 00:13:44 UTC (rev 7928)
@@ -250,7 +250,7 @@
     };
 
     public EncodingFOrayLatinExtra() {
-        super("FOrayLatinExtraEncoding", GlyphList.standardSourceGlyphLists,
+        super("FOrayLatinExtraEncoding", GlyphList.standardSourceGlyphLists(),
                 EncodingFOrayLatinExtra.codePoints,
                 EncodingFOrayLatinExtra.codePointIndexes);
     }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java	2006-09-06 00:07:11 UTC (rev 7927)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java	2006-09-06 00:13:44 UTC (rev 7928)
@@ -855,7 +855,7 @@
     };
 
     public EncodingISOLatin1() {
-        super("ISOLatin1Encoding", GlyphList.standardSourceGlyphLists,
+        super("ISOLatin1Encoding", GlyphList.standardSourceGlyphLists(),
                 EncodingISOLatin1.codePoints,
                 EncodingISOLatin1.codePointIndexes);
     }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java	2006-09-06 00:07:11 UTC (rev 7927)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java	2006-09-06 00:13:44 UTC (rev 7928)
@@ -715,7 +715,7 @@
     };
 
     public EncodingMacExpert() {
-        super("MacExpertEncoding", GlyphList.standardSourceGlyphLists,
+        super("MacExpertEncoding", GlyphList.standardSourceGlyphLists(),
                 EncodingMacExpert.codePoints,
                 EncodingMacExpert.codePointIndexes);
     }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java	2006-09-06 00:07:11 UTC (rev 7927)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java	2006-09-06 00:13:44 UTC (rev 7928)
@@ -883,7 +883,7 @@
     };
 
     public EncodingMacRoman() {
-        super("MacRomanEncoding", GlyphList.standardSourceGlyphLists,
+        super("MacRomanEncoding", GlyphList.standardSourceGlyphLists(),
                 EncodingMacRoman.codePoints,
                 EncodingMacRoman.codePointIndexes);
     }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java	2006-09-06 00:07:11 UTC (rev 7927)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java	2006-09-06 00:13:44 UTC (rev 7928)
@@ -1094,7 +1094,7 @@
     };
 
     public EncodingMacStandard() {
-        super(STANDARD_MACINTOSH_ORDERING, GlyphList.standardSourceGlyphLists,
+        super(STANDARD_MACINTOSH_ORDERING, GlyphList.standardSourceGlyphLists(),
                 EncodingMacStandard.codePoints,
                 EncodingMacStandard.codePointIndexes);
     }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java	2006-09-06 00:07:11 UTC (rev 7927)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java	2006-09-06 00:13:44 UTC (rev 7928)
@@ -971,7 +971,7 @@
     };
 
     public EncodingPDFDoc() {
-        super("PDFDocEncoding", GlyphList.standardSourceGlyphLists,
+        super("PDFDocEncoding", GlyphList.standardSourceGlyphLists(),
                 EncodingPDFDoc.codePoints,
                 EncodingPDFDoc.codePointIndexes);
     }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java	2006-09-06 00:07:11 UTC (rev 7927)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java	2006-09-06 00:13:44 UTC (rev 7928)
@@ -654,7 +654,7 @@
     };
 
     public EncodingStandard() {
-        super("StandardEncoding", GlyphList.standardSourceGlyphLists,
+        super("StandardEncoding", GlyphList.standardSourceGlyphLists(),
                 EncodingStandard.codePoints,
                 EncodingStandard.codePointIndexes);
     }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java	2006-09-06 00:07:11 UTC (rev 7927)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java	2006-09-06 00:13:44 UTC (rev 7928)
@@ -819,7 +819,7 @@
     };
 
     public EncodingSymbol() {
-        super("SymbolEncoding", GlyphList.standardSourceGlyphLists,
+        super("SymbolEncoding", GlyphList.standardSourceGlyphLists(),
                 EncodingSymbol.codePoints,
                 EncodingSymbol.codePointIndexes);
     }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java	2006-09-06 00:07:11 UTC (rev 7927)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java	2006-09-06 00:13:44 UTC (rev 7928)
@@ -919,7 +919,7 @@
     };
 
     public EncodingWinAnsi() {
-        super("WinAnsiEncoding", GlyphList.standardSourceGlyphLists,
+        super("WinAnsiEncoding", GlyphList.standardSourceGlyphLists(),
                 EncodingWinAnsi.codePoints,
                 EncodingWinAnsi.codePointIndexes);
     }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java	2006-09-06 00:07:11 UTC (rev 7927)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java	2006-09-06 00:13:44 UTC (rev 7928)
@@ -38,15 +38,15 @@
  */
 public class GlyphList {
 
-    public static final GlyphList[] standardSourceGlyphLists = {
-        GlyphList.getGlyphList("AGL")
-    };
-
     /** Map of GlyphList instances that have already been registered. The key
      * is a String with the GlyphList name, and the value is the GlyphList
      * instance. */
     private static HashMap glyphListMap = new HashMap();
 
+    private static final GlyphList[] standardSourceGlyphLists = {
+        GlyphList.getGlyphList("AGL")
+    };
+
     /** A unique, descriptive name for this GlyphList. */
     private String name;
 
@@ -249,4 +249,11 @@
         return Encoding.INVALID_UNICODE_CHAR;
     }
 
+    /**
+     * @return Returns the standardSourceGlyphLists.
+     */
+    public static GlyphList[] standardSourceGlyphLists() {
+        return standardSourceGlyphLists;
+    }
+
 }


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