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

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

Revision: 11805
          http://sourceforge.net/p/foray/code/11805
Author:   victormote
Date:     2021-01-17 00:00:51 +0000 (Sun, 17 Jan 2021)
Log Message:
-----------
Conform to aXSL changes: Leave only the IntSequence method for creating a CharSet.

Modified Paths:
--------------
    trunk/foray/foray-common/src/main/java/org/foray/common/sequence/IntArrayBuilder.java
    trunk/foray/foray-ps/src/main/java/org/foray/ps/PsServer4a.java
    trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CharSet4a.java
    trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CharSetExtendedRoman.java
    trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CharSetWindowsAnsi.java

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/IntArrayBuilder.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/IntArrayBuilder.java	2021-01-16 23:33:26 UTC (rev 11804)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/IntArrayBuilder.java	2021-01-17 00:00:51 UTC (rev 11805)
@@ -216,6 +216,20 @@
     }
 
     /**
+     * Append a varargs or char[] to this structure.
+     * @param intToAppend The int to append.
+     * @return This object.
+     */
+    public IntArrayBuilder append(final char... intToAppend) {
+        ensureCapacity(this.length + intToAppend.length);
+        for (int index = 0; index < intToAppend.length; index ++) {
+            this.array[this.length] = intToAppend[index];
+            this.length ++;
+        }
+        return this;
+    }
+
+    /**
      * Append the content of an existing sequence to this one.
      * @param newContent The existing sequence whose content should be appended to this one.
      * @return This object.

Modified: trunk/foray/foray-ps/src/main/java/org/foray/ps/PsServer4a.java
===================================================================
--- trunk/foray/foray-ps/src/main/java/org/foray/ps/PsServer4a.java	2021-01-16 23:33:26 UTC (rev 11804)
+++ trunk/foray/foray-ps/src/main/java/org/foray/ps/PsServer4a.java	2021-01-17 00:00:51 UTC (rev 11805)
@@ -28,6 +28,7 @@
 
 package org.foray.ps;
 
+import org.foray.common.sequence.IntArrayBuilder;
 import org.foray.ps.encode.CharSet4a;
 import org.foray.ps.encode.CharSetParser;
 import org.foray.ps.encode.Cmap4a04;
@@ -67,10 +68,8 @@
 import org.foray.ps.pdf.PdfSystemDict;
 import org.foray.ps.readonly.ReadOnlySystemDict;
 
-import org.axsl.common.sequence.CharSequencePlus;
-import org.axsl.common.sequence.CharSequenceUtility;
 import org.axsl.common.sequence.IntSequence;
-import org.axsl.common.sequence.IntSequencePlus;
+import org.axsl.common.sequence.IntSequenceMutable;
 import org.axsl.ps.CharSet;
 import org.axsl.ps.Cmap04;
 import org.axsl.ps.Cmap12;
@@ -274,21 +273,15 @@
 
     @Override
     public CharSet makeCharSet(final String name, final IntSequence characterSet) {
-        final IntSequencePlus plus = characterSet.asPlus();
-        return new CharSet4a(name, plus.toArray());
+        final IntSequenceMutable mutable = IntArrayBuilder.fromIntSequence(characterSet);
+        return new CharSet4a(name, mutable);
     }
 
     @Override
-    public CharSet makeCharSet(final String name, final CharSequence characterSet) {
-        final CharSequencePlus plus = CharSequenceUtility.asPlus(characterSet);
-        return new CharSet4a(name, plus.toArray());
-    }
-
-    @Override
     public CharSet parseCharSet(final String name, final InputStream inputStream) throws IOException, PsException {
         final CharSetParser parser = new CharSetParser(inputStream);
         parser.parseList();
-        final CharSet4a charSet = new CharSet4a(name, parser.getCharacterSet());
+        final CharSet4a charSet = new CharSet4a(name, new IntArrayBuilder().append(parser.getCharacterSet()));
         return charSet;
     }
 

Modified: trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CharSet4a.java
===================================================================
--- trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CharSet4a.java	2021-01-16 23:33:26 UTC (rev 11804)
+++ trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CharSet4a.java	2021-01-17 00:00:51 UTC (rev 11805)
@@ -28,6 +28,7 @@
 
 package org.foray.ps.encode;
 
+import org.axsl.common.sequence.IntSequenceMutable;
 import org.axsl.ps.CharSet;
 
 import java.io.IOException;
@@ -65,33 +66,13 @@
     private transient int[] characterSet32;
 
     /**
-     * Constructor suitable for character sets that contain only 16-bit
-     * characters. If there are any 32-bit code points in the character set,
-     * use {@link #CharSet4a(String, int[])} instead.
+     * Constructor.
      * @param name The name of this character set.
-     * @param characterSet The array containing the code points in this
-     * character set.
+     * @param mutable The array containing the code points in this character set.
      */
-    public CharSet4a(final String name, final char[] characterSet) {
-        this.name = name;
-        if (characterSet == null) {
-            return;
-        }
-        /* Make sure the input array is sorted. */
-        Arrays.sort(characterSet);
-        this.characterSet16 = characterSet;
-    }
+    public CharSet4a(final String name, final IntSequenceMutable mutable) {
+        final int[] characterSet = mutable.toArray();
 
-    /**
-     * General constructor suitable for character sets containing 16-bit
-     * codePoints, 32-bit code points, or both.
-     * If all code points in the character set are 16-bit (less than or equal to
-     * 0xFFFF), then {@link #CharSet4a(String, char[])} may also be used.
-     * @param name The name of this character set.
-     * @param characterSet The array containing the code points in this
-     * character set.
-     */
-    public CharSet4a(final String name, final int[] characterSet) {
         this.name = name;
         if (characterSet == null) {
             return;

Modified: trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CharSetExtendedRoman.java
===================================================================
--- trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CharSetExtendedRoman.java	2021-01-16 23:33:26 UTC (rev 11804)
+++ trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CharSetExtendedRoman.java	2021-01-17 00:00:51 UTC (rev 11805)
@@ -28,6 +28,8 @@
 
 package org.foray.ps.encode;
 
+import org.foray.common.sequence.IntArrayBuilder;
+
 /**
  * Class containing hard-coded values that represent the ExtendedRoman
  * character set.
@@ -372,7 +374,7 @@
      * Constructor.
      */
     private CharSetExtendedRoman() {
-        super("ExtendedRoman", CharSetExtendedRoman.CHARACTER_SET);
+        super("ExtendedRoman", new IntArrayBuilder().append(CharSetExtendedRoman.CHARACTER_SET));
     }
 
     /**

Modified: trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CharSetWindowsAnsi.java
===================================================================
--- trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CharSetWindowsAnsi.java	2021-01-16 23:33:26 UTC (rev 11804)
+++ trunk/foray/foray-ps/src/main/java/org/foray/ps/encode/CharSetWindowsAnsi.java	2021-01-17 00:00:51 UTC (rev 11805)
@@ -28,6 +28,7 @@
 
 package org.foray.ps.encode;
 
+import org.foray.common.sequence.IntArrayBuilder;
 
 /**
  * Class containing hard-coded values that represent the "Windows ANSI"
@@ -46,7 +47,7 @@
      * Constructor.
      */
     private CharSetWindowsAnsi() {
-        super("WindowsANSI", EncodingWinAnsi.getCodePoints());
+        super("WindowsANSI", new IntArrayBuilder().append(EncodingWinAnsi.getCodePoints()));
     }
 
     /**

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