Flag to control if keyword terms are allowed

[cql-java-moved-to-github.git] / src / main / java / org / z3950 / zing / cql / Modifier.java

diff --git a/src/main/java/org/z3950/zing/cql/Modifier.java b/src/main/java/org/z3950/zing/cql/Modifier.java
index 4992b25..71232e9 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/Modifier.java
+++ b/src/main/java/org/z3950/zing/cql/Modifier.java
@@ -1,8 +1,5 @@
-// $Id: Modifier.java,v 1.4 2007-07-03 13:29:34 mike Exp $
 
 package org.z3950.zing.cql;
-import java.util.Vector;
-import java.lang.StringBuffer;
 
 /**
  * Represents a single modifier, consisting of three elements: a type,
@@ -12,7 +9,6 @@ import java.lang.StringBuffer;
  * <P>
  * This class is used only by ModifierSet.
  *
- * @version $Id: Modifier.java,v 1.4 2007-07-03 13:29:34 mike Exp $
  */
 public class Modifier {
     String type;
@@ -60,28 +56,23 @@ public class Modifier {
        return value;
     }
 
-    public String toXCQL(int level, String relationElement) {
-       StringBuffer buf = new StringBuffer();
-
-       buf.append(Utils.indent(level) + "<modifier>\n");
-       buf.append(Utils.indent(level+1) +
-                  "<type>" + Utils.xq(type) + "</type>\n");
+    void toXCQLInternal(XCQLBuilder b, int level, String relationElement) {
+       b.indent(level).append("<modifier>\n");
+        b.indent(level + 1).append("<type>");
+        b.xq(type).append("</type>\n");
        if (value != null) {
-           buf.append(Utils.indent(level+1) + "<" + relationElement + ">" +
-                      Utils.xq(comparison) + "</" + relationElement + ">\n");
-           buf.append(Utils.indent(level+1) +
-                      "<value>" + Utils.xq(value) + "</value>\n");
+            b.indent(level + 1).append("<").append(relationElement).append(">");
+            b.xq(comparison).append("</").append(relationElement).append(">\n");
+            b.indent(level + 1).append("<value>");
+            b.xq(value).append("</value>\n");
        }
-       
-       buf.append(Utils.indent(level) + "</modifier>\n");
-       return buf.toString();
+       b.indent(level).append("</modifier>\n");
     }
 
     public String toCQL() {
-       StringBuffer buf = new StringBuffer(type);
+       StringBuilder buf = new StringBuilder(type);
        if (value != null)
-           buf.append(" " + comparison + " " + value);
-
+           buf.append(" ").append(comparison).append(" ").append(value);
        return buf.toString();
     }
 }