From b07c9ebbcf1956dc21df4fb7737439e369e30e83 Mon Sep 17 00:00:00 2001
From: Jakub Skoczen <jakub@indexdata.dk>
Date: Fri, 22 Jul 2011 14:47:43 +0200
Subject: [PATCH] Use StringBuilder instead of StringBuffer, optimize

---
 src/main/java/org/z3950/zing/cql/CQLSortNode.java |    4 +--
 src/main/java/org/z3950/zing/cql/Modifier.java    |   27 ++++++++++-----------
 src/main/java/org/z3950/zing/cql/ModifierSet.java |   22 ++++++++---------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/z3950/zing/cql/CQLSortNode.java b/src/main/java/org/z3950/zing/cql/CQLSortNode.java
index 1c3aa14..55e69d5 100644
--- a/src/main/java/org/z3950/zing/cql/CQLSortNode.java
+++ b/src/main/java/org/z3950/zing/cql/CQLSortNode.java
@@ -52,13 +52,13 @@ public class CQLSortNode extends CQLNode {
 
     @Override
     public String toCQL() {
-	StringBuffer buf = new StringBuffer(subtree.toCQL());
+	StringBuilder buf = new StringBuilder(subtree.toCQL());
 
 	if (keys != null) {
 	    buf.append(" sortby");
 	    for (int i = 0; i < keys.size(); i++) {
 		ModifierSet key = keys.get(i);
-		buf.append(" " + key.toCQL());
+		buf.append(" ").append(key.toCQL());
 	    }
 	}
 
diff --git a/src/main/java/org/z3950/zing/cql/Modifier.java b/src/main/java/org/z3950/zing/cql/Modifier.java
index 7b9fbbe..9057dee 100644
--- a/src/main/java/org/z3950/zing/cql/Modifier.java
+++ b/src/main/java/org/z3950/zing/cql/Modifier.java
@@ -1,7 +1,6 @@
 // $Id: Modifier.java,v 1.4 2007-07-03 13:29:34 mike Exp $
 
 package org.z3950.zing.cql;
-import java.lang.StringBuffer;
 
 /**
  * Represents a single modifier, consisting of three elements: a type,
@@ -60,27 +59,27 @@ public class Modifier {
     }
 
     public String toXCQL(int level, String relationElement) {
-	StringBuffer buf = new StringBuffer();
+	StringBuilder buf = new StringBuilder();
 
-	buf.append(Utils.indent(level) + "<modifier>\n");
-	buf.append(Utils.indent(level+1) +
-		   "<type>" + Utils.xq(type) + "</type>\n");
+	buf.append(Utils.indent(level)).append("<modifier>\n").
+            append(Utils.indent(level + 1)).append("<type>").
+            append(Utils.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");
+	    buf.append(Utils.indent(level + 1)).append("<").
+              append(relationElement).append(">").
+              append(Utils.xq(comparison)).append("</").
+              append(relationElement).append(">\n").
+              append(Utils.indent(level + 1)).append("<value>").
+              append(Utils.xq(value)).append("</value>\n");
 	}
-	
-	buf.append(Utils.indent(level) + "</modifier>\n");
+	buf.append(Utils.indent(level)).append("</modifier>\n");
 	return buf.toString();
     }
 
     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();
     }
 }
diff --git a/src/main/java/org/z3950/zing/cql/ModifierSet.java b/src/main/java/org/z3950/zing/cql/ModifierSet.java
index 31fdad1..ce5915c 100644
--- a/src/main/java/org/z3950/zing/cql/ModifierSet.java
+++ b/src/main/java/org/z3950/zing/cql/ModifierSet.java
@@ -1,7 +1,6 @@
 // $Id: ModifierSet.java,v 1.13 2007-07-03 13:30:18 mike Exp $
 
 package org.z3950.zing.cql;
-import java.lang.StringBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -88,26 +87,27 @@ public class ModifierSet {
 
     private String underlyingToXCQL(int level, String topLevelElement,
 				    String valueElement) {
-	StringBuffer buf = new StringBuffer();
-	buf.append(Utils.indent(level) + "<" + topLevelElement + ">\n");
-	buf.append(Utils.indent(level+1) +
-		   "<" + valueElement + ">" + Utils.xq(base) +
-		   "</" + valueElement + ">\n");
+	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("</").
+            append(valueElement).append(">\n");
 	if (modifiers.size() > 0) {
-	    buf.append(Utils.indent(level+1) + "<modifiers>\n");
+	    buf.append(Utils.indent(level + 1)).append("<modifiers>\n");
 	    for (int i = 0; i < modifiers.size(); i++) {
 		buf.append(modifiers.get(i).toXCQL(level+2, "comparison"));
 	    }
-	    buf.append(Utils.indent(level+1) + "</modifiers>\n");
+	    buf.append(Utils.indent(level + 1)).append("</modifiers>\n");
 	}
-	buf.append(Utils.indent(level) + "</" + topLevelElement + ">\n");
+	buf.append(Utils.indent(level)).append("</").append(topLevelElement).
+            append(">\n");
 	return buf.toString();
     }
 
     public String toCQL() {
-	StringBuffer buf = new StringBuffer(base);
+	StringBuilder buf = new StringBuilder(base);
 	for (int i = 0; i < modifiers.size(); i++) {
-	    buf.append("/" + modifiers.get(i).toCQL());
+	    buf.append("/").append(modifiers.get(i).toCQL());
 	}
 
 	return buf.toString();
-- 
1.7.10.4