[MIN] SeqBuilder (minor)

Author: ChristianGruen

basex-core/src/main/java/org/basex/query/value/seq/SeqBuilder.java

@@ -18,15 +18,25 @@ public abstract class SeqBuilder {
    * @param item item to append
    * @return reference to this builder for convenience
    */
-  public abstract SeqBuilder add(Item item);
+  protected abstract SeqBuilder add(Item item);
 
   /**
    * Appends items.
    * @param value items to append
    * @param job interruptible job
    * @return this builder for convenience
    */
-  public SeqBuilder add(final Value value, final Job job) {
+  public final SeqBuilder add(final Value value, final Job job) {
+    return value.size() == 1 ? add((Item) value) : addSequence(value, job);
+  }
+
+  /**
+   * Appends a sequence.
+   * @param value items to append
+   * @param job interruptible job
+   * @return this builder for convenience
+   */
+  protected SeqBuilder addSequence(final Value value, final Job job) {
     SeqBuilder sb = this;
     for(final Item item : value) {
       job.checkStop();
@@ -48,7 +58,7 @@ public SeqBuilder add(final Value value, final Job job) {
    * @param job interruptible job
    * @return tree sequence builder
    */
-  protected final TreeSeqBuilder tree(final Item item, final Job job) {
+  protected final SeqBuilder tree(final Item item, final Job job) {
     return new TreeSeqBuilder().add(value(null), job).add(item);
   }
 }

basex-core/src/main/java/org/basex/query/value/seq/tree/TreeSeqBuilder.java

@@ -1,7 +1,6 @@
 package org.basex.query.value.seq.tree;
 
 import org.basex.core.jobs.*;
-import org.basex.query.iter.*;
 import org.basex.query.util.fingertree.*;
 import org.basex.query.value.*;
 import org.basex.query.value.item.*;
@@ -69,7 +68,7 @@ public TreeSeqBuilder prepend(final Item item) {
   }
 
   @Override
-  public TreeSeqBuilder add(final Item item) {
+  protected TreeSeqBuilder add(final Item item) {
     if(inRight < TreeSeq.MAX_DIGIT) {
       // just insert the item
       items[(mid + inRight) % CAP] = item;
@@ -96,13 +95,9 @@ public TreeSeqBuilder add(final Item item) {
   }
 
   @Override
-  public TreeSeqBuilder add(final Value value, final Job job) {
-    // shortcut for adding single items
-    if(value.size() == 1) return add((Item) value);
-
+  protected SeqBuilder addSequence(final Value value, final Job job) {
     if(!(value instanceof final BigSeq big)) {
-      final BasicIter<?> iter = value.iter();
-      for(Item item; (item = iter.next()) != null;) {
+      for(final Item item : value) {
         job.checkStop();
         add(item);
       }