[FOray-commit] SF.net SVN: foray:[12519] trunk/foray/foray-common/src/main/java/org/foray /common/sequence

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

Revision: 12519
          http://sourceforge.net/p/foray/code/12519
Author:   victormote
Date:     2022-02-01 01:04:57 +0000 (Tue, 01 Feb 2022)
Log Message:
-----------
Conform to aXSL changes: Add methods to append other sequences and subsets of sequences to sequences.

Modified Paths:
--------------
    trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteArrayBuilder.java
    trunk/foray/foray-common/src/main/java/org/foray/common/sequence/CharArrayBuilder.java
    trunk/foray/foray-common/src/main/java/org/foray/common/sequence/IntArrayBuilder.java
    trunk/foray/foray-common/src/main/java/org/foray/common/sequence/LongArrayBuilder.java
    trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ShortArrayBuilder.java

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteArrayBuilder.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteArrayBuilder.java	2022-02-01 00:20:44 UTC (rev 12518)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteArrayBuilder.java	2022-02-01 01:04:57 UTC (rev 12519)
@@ -35,8 +35,8 @@
 
 import org.foray.common.MarkedIndexOutOfBoundsException;
 
+import org.axsl.utility.sequence.ByteSequence;
 import org.axsl.utility.sequence.ByteSequenceMutable;
-import org.axsl.utility.sequence.ByteSequencePlus;
 
 import org.apache.commons.io.IOUtils;
 
@@ -134,6 +134,22 @@
         return this;
     }
 
+    @Override
+    public ByteArrayBuilder append(final ByteSequence sequence) {
+        ensureCapacity(length() + sequence.length());
+        return append(sequence, 0, sequence.length());
+    }
+
+    @Override
+    public ByteArrayBuilder append(final ByteSequence sequence, final int start, final int end) {
+        ensureCapacity(length() + end - start);
+        for (int index = start; index < end; index ++) {
+            this.backingArray[this.length] = sequence.byteAt(index);
+            this.length ++;
+        }
+        return this;
+    }
+
     /**
      * Adds the content of an input stream.
      * @param stream The input stream whose content should be added to this array.
@@ -188,12 +204,6 @@
         return append(theChar, charset);
     }
 
-    public ByteArrayBuilder append(final ByteSequencePlus byteSequence) {
-        final byte[] bytes = byteSequence.toArray();
-        append(bytes);
-        return this;
-    }
-
     public ByteArrayBuilder append(final long theLong) {
         append(Long.toString(theLong));
         return this;

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/CharArrayBuilder.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/CharArrayBuilder.java	2022-02-01 00:20:44 UTC (rev 12518)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/CharArrayBuilder.java	2022-02-01 01:04:57 UTC (rev 12519)
@@ -302,16 +302,17 @@
         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.
-     */
-    public CharArrayBuilder append(final CharSequence newContent) {
-        ensureCapacity(length() + newContent.length());
-        final int startingLength = this.length;
-        for (int index = 0; index < newContent.length(); index ++) {
-            this.backingArray[startingLength + index] = newContent.charAt(index);
+    @Override
+    public CharArrayBuilder append(final CharSequence sequence) {
+        ensureCapacity(length() + sequence.length());
+        return append(sequence, 0, sequence.length());
+    }
+
+    @Override
+    public CharArrayBuilder append(final CharSequence sequence, final int start, final int end) {
+        ensureCapacity(length() + end - start);
+        for (int index = start; index < end; index ++) {
+            this.backingArray[this.length] = sequence.charAt(index);
             this.length ++;
         }
         return this;

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	2022-02-01 00:20:44 UTC (rev 12518)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/IntArrayBuilder.java	2022-02-01 01:04:57 UTC (rev 12519)
@@ -232,6 +232,22 @@
         return this;
     }
 
+    @Override
+    public IntArrayBuilder append(final IntSequence sequence) {
+        ensureCapacity(length() + sequence.length());
+        return append(sequence, 0, sequence.length());
+    }
+
+    @Override
+    public IntArrayBuilder append(final IntSequence sequence, final int start, final int end) {
+        ensureCapacity(length() + end - start);
+        for (int index = start; index < end; index ++) {
+            this.backingArray[this.length] = sequence.intAt(index);
+            this.length ++;
+        }
+        return this;
+    }
+
     /**
      * Append a varargs or char[] to this structure.
      * @param intToAppend The int to append.
@@ -247,21 +263,6 @@
     }
 
     /**
-     * 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.
-     */
-    public IntArrayBuilder append(final IntSequence newContent) {
-        this.ensureCapacity(this.length + newContent.length());
-        final int startingLength = this.length;
-        for (int index = 0; index < newContent.length(); index ++) {
-            this.backingArray[startingLength + index] = newContent.intAt(index);
-            this.length ++;
-        }
-        return this;
-    }
-
-    /**
      * Removes the value at a given index.
      * @param index The index whose value should be deleted.
      * @return This object.

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/LongArrayBuilder.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/LongArrayBuilder.java	2022-02-01 00:20:44 UTC (rev 12518)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/LongArrayBuilder.java	2022-02-01 01:04:57 UTC (rev 12519)
@@ -199,16 +199,18 @@
         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.
-     */
-    public LongArrayBuilder append(final LongSequence newContent) {
-        this.ensureCapacity(length() + newContent.length());
-        for (int index = 0; index < newContent.length(); index ++) {
-            this.backingArray[this.length + index] = newContent.longAt(index);
-            length ++;
+    @Override
+    public LongArrayBuilder append(final LongSequence sequence) {
+        ensureCapacity(length() + sequence.length());
+        return append(sequence, 0, sequence.length());
+    }
+
+    @Override
+    public LongArrayBuilder append(final LongSequence sequence, final int start, final int end) {
+        ensureCapacity(length() + end - start);
+        for (int index = start; index < end; index ++) {
+            this.backingArray[this.length] = sequence.longAt(index);
+            this.length ++;
         }
         return this;
     }

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ShortArrayBuilder.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ShortArrayBuilder.java	2022-02-01 00:20:44 UTC (rev 12518)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ShortArrayBuilder.java	2022-02-01 01:04:57 UTC (rev 12519)
@@ -180,16 +180,18 @@
         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.
-     */
-    public ShortArrayBuilder append(final ShortSequence newContent) {
-        this.ensureCapacity(length() + newContent.length());
-        for (int index = 0; index < newContent.length(); index ++) {
-            this.backingArray[this.length + index] = newContent.shortAt(index);
-            length ++;
+    @Override
+    public ShortArrayBuilder append(final ShortSequence sequence) {
+        ensureCapacity(length() + sequence.length());
+        return append(sequence, 0, sequence.length());
+    }
+
+    @Override
+    public ShortArrayBuilder append(final ShortSequence sequence, final int start, final int end) {
+        ensureCapacity(length() + end - start);
+        for (int index = start; index < end; index ++) {
+            this.backingArray[this.length] = sequence.shortAt(index);
+            this.length ++;
         }
         return this;
     }

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