X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fz3950%2Fzing%2Fcql%2FModifierSet.java;h=da94b8c9b8c148fa78e106c8c332b12aeb5600c1;hb=b76b718c1994b348b66a994dcf15c819c4e94617;hp=213f1992bd4f71dfe70c6a17f9c5c0cf34b1c3a4;hpb=7cff92fa0b727aa844456f130744ec2fe263ba48;p=cql-java-moved-to-github.git

diff --git a/src/main/java/org/z3950/zing/cql/ModifierSet.java b/src/main/java/org/z3950/zing/cql/ModifierSet.java
index 213f199..da94b8c 100644
--- a/src/main/java/org/z3950/zing/cql/ModifierSet.java
+++ b/src/main/java/org/z3950/zing/cql/ModifierSet.java
@@ -1,11 +1,8 @@
-// $Id: ModifierSet.java,v 1.13 2007-07-03 13:30:18 mike Exp $
 
 package org.z3950.zing.cql;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.z3950.zing.cql.Utils.*;
-
 /**
  * Represents a base String and a set of Modifiers.
  * <P>
@@ -17,7 +14,6 @@ import static org.z3950.zing.cql.Utils.*;
  * zero or more <I>type</I> <I>comparison</I> <I>value</I> pairs,
  * where type, comparison and value are all strings.
  *
- * @version $Id: ModifierSet.java,v 1.13 2007-07-03 13:30:18 mike Exp $
  */
 public class ModifierSet {
     private String base;
@@ -79,31 +75,20 @@ public class ModifierSet {
 	return modifiers;
     }
 
-    public String toXCQL(int level, String topLevelElement) {
-	return underlyingToXCQL(level, topLevelElement, "value");
-    }
-
-    public String sortKeyToXCQL(int level) {
-	return underlyingToXCQL(level, "key", "index");
-    }
-
-    private String underlyingToXCQL(int level, String topLevelElement,
-				    String valueElement) {
-	StringBuilder buf = new StringBuilder();
-	buf.append(indent(level)).append("<").append(topLevelElement).
-            append(">\n").append(indent(level + 1)).append("<").
-            append(valueElement).append(">").append(xq(base)).append("</").
+    void toXCQLInternal(XCQLBuilder b, int level,
+        String topLevelElement, String valueElement) {
+	b.indent(level).append("<").append(topLevelElement).
+            append(">\n").indent(level + 1).append("<").
+            append(valueElement).append(">").xq(base).append("</").
             append(valueElement).append(">\n");
 	if (modifiers.size() > 0) {
-	    buf.append(indent(level + 1)).append("<modifiers>\n");
+	    b.indent(level + 1).append("<modifiers>\n");
 	    for (int i = 0; i < modifiers.size(); i++) {
-		buf.append(modifiers.get(i).toXCQL(level+2, "comparison"));
+              modifiers.get(i).toXCQLInternal(b, level+2, "comparison");
 	    }
-	    buf.append(indent(level + 1)).append("</modifiers>\n");
+	    b.indent(level + 1).append("</modifiers>\n");
 	}
-	buf.append(indent(level)).append("</").append(topLevelElement).
-            append(">\n");
-	return buf.toString();
+	b.indent(level).append("</").append(topLevelElement).append(">\n");
     }
 
     public String toCQL() {