X-Git-Url: http://git.indexdata.com/?p=cql-java-moved-to-github.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fz3950%2Fzing%2Fcql%2FModifierSet.java;h=213f1992bd4f71dfe70c6a17f9c5c0cf34b1c3a4;hp=ce5915cccfc3a87212598b0a84e3d932c4b37110;hb=7cff92fa0b727aa844456f130744ec2fe263ba48;hpb=f079ba53623fc80782044f8f06488d19a3948b27 diff --git a/src/main/java/org/z3950/zing/cql/ModifierSet.java b/src/main/java/org/z3950/zing/cql/ModifierSet.java index ce5915c..213f199 100644 --- a/src/main/java/org/z3950/zing/cql/ModifierSet.java +++ b/src/main/java/org/z3950/zing/cql/ModifierSet.java @@ -4,6 +4,8 @@ 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. *

@@ -88,18 +90,18 @@ public class ModifierSet { private String underlyingToXCQL(int level, String topLevelElement, String valueElement) { StringBuilder buf = new StringBuilder(); - buf.append(Utils.indent(level)).append("<").append(topLevelElement). - append(">\n").append(Utils.indent(level + 1)).append("<"). - append(valueElement).append(">").append(Utils.xq(base)).append("\n").append(indent(level + 1)).append("<"). + append(valueElement).append(">").append(xq(base)).append("\n"); if (modifiers.size() > 0) { - buf.append(Utils.indent(level + 1)).append("\n"); + buf.append(indent(level + 1)).append("\n"); for (int i = 0; i < modifiers.size(); i++) { buf.append(modifiers.get(i).toXCQL(level+2, "comparison")); } - buf.append(Utils.indent(level + 1)).append("\n"); + buf.append(indent(level + 1)).append("\n"); } - buf.append(Utils.indent(level)).append("\n"); return buf.toString(); }