Author: alex.guizar(a)jboss.com Date: 2009-05-27 05:14:59 -0400 (Wed, 27 May 2009) New Revision: 4909 Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/deployer/HTTP.java jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/XmlUtil.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageUtil.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/JuelScriptEngine.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/JuelScriptEngineFactory.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Type.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DOMWriter.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/cron/CronExpression.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/variables/VariableBasicTypesTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java Log: RESOLVED - issue JBPM-2148: StringBuffer use in jBPM 4 https://jira.jboss.org/jira/browse/JBPM-2148 Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/deployer/HTTP.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/deployer/HTTP.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/deployer/HTTP.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -35,31 +35,19 @@ public static String post(String urlString, InputStream inputStream, String[] credentials) throws Exception { - HttpURLConnection conn = null; - BufferedReader br = null; DataOutputStream dos = null; - DataInputStream inStream = null; - InputStream is = null; - OutputStream os = null; - boolean ret = false; - String StrMessage = ""; - - String lineEnd = "\r\n"; String twoHyphens = "--"; String boundary = "*****"; - int bytesRead, bytesAvailable, bufferSize; byte[] buffer; int maxBufferSize = 1*1024*1024; - String responseFromServer = ""; - try { //------------------ CLIENT REQUEST @@ -125,13 +113,11 @@ inputStream.close(); dos.flush(); dos.close(); - } catch (MalformedURLException ex) { throw ex; } - catch (IOException ioe) { throw ioe; @@ -140,28 +126,25 @@ //------------------ read the SERVER RESPONSE - StringBuffer sb = new StringBuffer(); + StringBuilder response = new StringBuilder(); try { - inStream = new DataInputStream ( conn.getInputStream() ); + BufferedReader reader = new BufferedReader( new InputStreamReader ( conn.getInputStream() ) ); String str; - while (( str = inStream.readLine()) != null) + while (( str = reader.readLine()) != null) { - sb.append(str).append(""); + response.append(str).append(""); } - inStream.close(); - + reader.close(); } catch (IOException ioex) { System.out.println("From (ServerResponse): "+ioex); - } + return response.toString(); - return sb.toString(); - } private static void applyCredentials(String[] credentials, HttpURLConnection conn) @@ -173,7 +156,7 @@ public static String get(String urlString, String[] credentials) { - StringBuffer sb = new StringBuffer(); + StringBuilder response = new StringBuilder(); try { URL url = new URL(urlString); @@ -187,7 +170,7 @@ while ((str = in.readLine()) != null) { - sb.append(str); + response.append(str); } in.close(); @@ -201,7 +184,7 @@ throw new RuntimeException(e); } - return sb.toString(); + return response.toString(); } } Modified: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java =================================================================== --- jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -63,17 +63,17 @@ public URL getDispatchUrl(long taskId) { - StringBuffer sb = new StringBuffer(); - sb.append("http://"); - sb.append(getServerConfig().getWebServiceHost()); - sb.append(":").append(getServerConfig().getWebServicePort()); - sb.append("/gwt-console-server/rs/task/"); - sb.append( taskId ); - sb.append("/render"); + StringBuilder spec = new StringBuilder(); + spec.append("http://"); + spec.append(getServerConfig().getWebServiceHost()); + spec.append(":").append(getServerConfig().getWebServicePort()); + spec.append("/gwt-console-server/rs/task/"); + spec.append( taskId ); + spec.append("/render"); try { - return new URL(sb.toString()); + return new URL(spec.toString()); } catch (MalformedURLException e) { @@ -131,19 +131,19 @@ // plugin context - StringBuffer sb = new StringBuffer(); - sb.append("http://"); - sb.append(getServerConfig().getWebServiceHost()); - sb.append(":").append(getServerConfig().getWebServicePort()); - sb.append("/gwt-console-server/rs/task/"); - sb.append( taskId ); - sb.append("/process"); + StringBuilder action = new StringBuilder(); + action.append("http://"); + action.append(getServerConfig().getWebServiceHost()); + action.append(":").append(getServerConfig().getWebServicePort()); + action.append("/gwt-console-server/rs/task/"); + action.append( taskId ); + action.append("/process"); Map<String, Object> renderContext = new HashMap<String,Object>(); // form directive FormDirective formDirective = new FormDirective(); - formDirective.setAction( sb.toString() ); + formDirective.setAction( action.toString() ); renderContext.put("form", formDirective); // outcome directive Modified: jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/XmlUtil.java =================================================================== --- jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/XmlUtil.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/XmlUtil.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -167,15 +167,13 @@ } public static String getContentText(Element element) { - StringBuffer buffer = new StringBuffer(); - NodeList nodeList = element.getChildNodes(); - for (int i=0; i<nodeList.getLength(); i++) { - Node node = nodeList.item(i); - if (node instanceof CharacterData) { - CharacterData characterData = (CharacterData) node; - buffer.append(characterData.getData()); - } - } - return buffer.toString(); + StringBuilder text = new StringBuilder(); + for (Node child = element.getFirstChild(); child != null; child = child.getNextSibling()) { + if (child instanceof CharacterData) { + CharacterData characterData = (CharacterData) child; + text.append(characterData.getData()); + } + } + return text.toString(); } } \ No newline at end of file Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -47,7 +47,7 @@ } public List<Participation> execute(Environment environment) throws Exception { - StringBuffer hql = new StringBuffer(); + StringBuilder hql = new StringBuilder(); hql.append("select role from "); hql.append(ParticipationImpl.class.getName()); hql.append(" as role where "); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageUtil.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageUtil.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/JmsMessageUtil.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -39,27 +39,26 @@ private static final Log log = Log.getLog(JmsMessageUtil.class.getName()); public static String dump(Message message) { + StringBuilder dump = new StringBuilder(); - StringBuffer sb = new StringBuffer(); + dump.append("JMS MessageImpl Dump\n").append("MessageImpl type is " + message.getClass().getName() + "\n"); - sb.append("JMS MessageImpl Dump\n").append("MessageImpl type is " + message.getClass().getName() + "\n"); - try { if (message instanceof ObjectMessage) { - sb.append("MessageImpl object type is " + ((ObjectMessage) message).getObject().getClass().getName() + "\n"); + dump.append("MessageImpl object type is " + ((ObjectMessage) message).getObject().getClass().getName() + "\n"); } - sb.append("Reply to " + getDestinationName(message.getJMSReplyTo()) + "\n"); - Enumeration e = message.getPropertyNames(); + dump.append("Reply to " + getDestinationName(message.getJMSReplyTo()) + "\n"); + Enumeration<?> e = message.getPropertyNames(); while (e.hasMoreElements()) { String propertyName = (String) e.nextElement(); Object property = message.getObjectProperty(propertyName); - sb.append("Property " + propertyName + " value " + property.toString() + "\n"); + dump.append("Property " + propertyName + " value " + property.toString() + "\n"); } } catch (JMSException j) { log.error("JMS exception while dumping message", j); } - return sb.toString(); + return dump.toString(); } public static String getDestinationName(Destination d) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -153,23 +153,23 @@ } public String toString() { - StringBuffer buffer = new StringBuffer(); - buffer.append("timer["); - buffer.append(dbid); + StringBuilder text = new StringBuilder(); + text.append("timer["); + text.append(dbid); if (dueDate!=null) { - buffer.append("|"); - buffer.append(formatDueDate(dueDate)); + text.append("|"); + text.append(formatDueDate(dueDate)); } if (signalName!=null) { - buffer.append("|"); - buffer.append(signalName); + text.append("|"); + text.append(signalName); } if (eventName!=null) { - buffer.append("|"); - buffer.append(eventName); + text.append("|"); + text.append(eventName); } - buffer.append("]"); - return buffer.toString(); + text.append("]"); + return text.toString(); } public static String formatDueDate(Date date) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -96,7 +96,7 @@ return query.list(); } - protected void appendWhereClause(String whereClause, StringBuffer hql) { + protected void appendWhereClause(String whereClause, StringBuilder hql) { if (isWhereAdded) { hql.append(" and "); } else { @@ -106,7 +106,7 @@ hql.append(whereClause); } - protected void appendOrderByClause(StringBuffer hql) { + protected void appendOrderByClause(StringBuilder hql) { if (orderByClause!=null) { hql.append("order by "); hql.append(orderByClause); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -52,7 +52,7 @@ } public String hql() { - StringBuffer hql = new StringBuffer(); + StringBuilder hql = new StringBuilder(); hql.append("select hai "); hql.append("from "); hql.append(HistoryActivityInstanceImpl.class.getName()); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -24,13 +24,11 @@ import java.util.List; import org.hibernate.Query; -import org.jbpm.api.JbpmException; import org.jbpm.api.cmd.CommandService; import org.jbpm.api.history.HistoryProcessInstance; import org.jbpm.api.history.HistoryProcessInstanceQuery; import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl; - /** * @author Tom Baeyens */ @@ -47,7 +45,7 @@ } public String hql() { - StringBuffer hql = new StringBuffer(); + StringBuilder hql = new StringBuilder(); hql.append("select hpi "); hql.append("from "); hql.append(HistoryProcessInstanceImpl.class.getName()); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -49,7 +49,7 @@ } public String hql() { - StringBuffer hql = new StringBuffer(); + StringBuilder hql = new StringBuilder(); hql.append("select j "); hql.append("from "); if (messagesOnly) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -85,7 +85,7 @@ } public String hql() { - StringBuffer hql = new StringBuffer(); + StringBuilder hql = new StringBuilder(); hql.append("select new map( idProperty.objectName as objectName, " + "idProperty.deployment.dbid as deploymentDbid ) "); hql.append("from "); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -24,13 +24,11 @@ import java.util.List; import org.hibernate.Query; -import org.jbpm.api.Execution; import org.jbpm.api.ProcessInstance; import org.jbpm.api.ProcessInstanceQuery; import org.jbpm.api.cmd.CommandService; import org.jbpm.pvm.internal.model.ExecutionImpl; - /** * @author Tom Baeyens */ @@ -55,7 +53,7 @@ } public String hql() { - StringBuffer hql = new StringBuffer(); + StringBuilder hql = new StringBuilder(); hql.append("select processInstance "); hql.append("from "); hql.append(ExecutionImpl.class.getName()); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/JuelScriptEngine.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/JuelScriptEngine.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/JuelScriptEngine.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -187,12 +187,12 @@ int numChars; char[] arr = new char[8192]; - StringBuilder buf = new StringBuilder(); + StringBuilder text = new StringBuilder(); try { while ((numChars = reader.read(arr, 0, arr.length)) > 0) { - buf.append(arr, 0, numChars); + text.append(arr, 0, numChars); } } @@ -201,7 +201,7 @@ throw new ScriptException(exp); } - return buf.toString(); + return text.toString(); } private static Method getPrintMethod() Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/JuelScriptEngineFactory.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/JuelScriptEngineFactory.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/JuelScriptEngineFactory.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -99,9 +99,9 @@ public String getOutputStatement(String toDisplay) { - StringBuilder buf = new StringBuilder(); + StringBuilder statement = new StringBuilder(); - buf.append("out:print(\""); + statement.append("out:print(\""); int len = toDisplay.length(); @@ -112,22 +112,22 @@ switch (ch) { case '"': - buf.append("\\\""); + statement.append("\\\""); break; case '\\': - buf.append("\\\\"); + statement.append("\\\\"); break; default: - buf.append(ch); + statement.append(ch); } } - buf.append("\")"); + statement.append("\")"); - return buf.toString(); + return statement.toString(); } public String getParameter(String key) @@ -162,22 +162,22 @@ public String getProgram(String[] statements) { - StringBuilder buf = new StringBuilder(); + StringBuilder program = new StringBuilder(); if (statements.length != 0) { for (int i = 0; i < statements.length; ++i) { - buf.append("${"); + program.append("${"); - buf.append(statements[i]); + program.append(statements[i]); - buf.append("} "); + program.append("} "); } } - return buf.toString(); + return program.toString(); } public ScriptEngine getScriptEngine() Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -26,7 +26,6 @@ import org.hibernate.Query; import org.jbpm.api.JbpmException; -import org.jbpm.api.ProcessDefinition; import org.jbpm.api.TaskQuery; import org.jbpm.api.cmd.CommandService; import org.jbpm.api.env.Environment; @@ -114,7 +113,7 @@ } public String hql() { - StringBuffer hql = new StringBuffer(); + StringBuilder hql = new StringBuilder(); hql.append("select distinct task "); hql.append("from "); hql.append(TaskImpl.class.getName()); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Type.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Type.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Type.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -41,17 +41,17 @@ if (name!=null) { return name; } - StringBuffer buffer = new StringBuffer(); + StringBuilder text = new StringBuilder(); if (converter!=null) { - buffer.append(converter.toString()); - buffer.append("-->"); + text.append(converter.toString()); + text.append("-->"); } if (variableClass!=null) { - buffer.append(ReflectUtil.getUnqualifiedClassName(variableClass)); + text.append(ReflectUtil.getUnqualifiedClassName(variableClass)); } else { - buffer.append("undefined"); + text.append("undefined"); } - return buffer.toString(); + return text.toString(); } public Converter getConverter() { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DOMWriter.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DOMWriter.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/DOMWriter.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -578,7 +578,7 @@ /** Normalizes the given string. */ public static String normalize(String s, boolean canonical) { - StringBuffer str = new StringBuffer(); + StringBuilder normal = new StringBuilder(); int len = (s != null) ? s.length() : 0; for (int i = 0; i < len; i++) @@ -588,27 +588,27 @@ { case '<': { - str.append("&lt;"); + normal.append("&lt;"); break; } case '>': { - str.append("&gt;"); + normal.append("&gt;"); break; } case '&': { - str.append("&amp;"); + normal.append("&amp;"); break; } case '"': { - str.append("&quot;"); + normal.append("&quot;"); break; } case '\'': { - str.append("&apos;"); + normal.append("&apos;"); break; } case '\r': @@ -616,19 +616,19 @@ { if (canonical) { - str.append("&#"); - str.append(Integer.toString(ch)); - str.append(';'); + normal.append("&#"); + normal.append(Integer.toString(ch)); + normal.append(';'); break; } // else, default append char } default: { - str.append(ch); + normal.append(ch); } } } - return (str.toString()); + return (normal.toString()); } } \ No newline at end of file Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -178,15 +178,15 @@ private static String getParameterTypesText(Class<?>[] parameterTypes) { if (parameterTypes==null) return ""; - StringBuffer parametersTypeText = new StringBuffer(); + StringBuilder parameterTypesText = new StringBuilder(); for (int i=0; i<parameterTypes.length; i++) { Class<?> parameterType = parameterTypes[i]; - parametersTypeText.append(parameterType.getName()); + parameterTypesText.append(parameterType.getName()); if (i!=parameterTypes.length-1) { - parametersTypeText.append(", "); + parameterTypesText.append(", "); } } - return parametersTypeText.toString(); + return parameterTypesText.toString(); } public static <T> T newInstance(Class<T> clazz) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -98,7 +98,7 @@ } public String toString() { - StringBuffer text = new StringBuffer(); + StringBuilder text = new StringBuilder(); text.append(type); text.append(": "); text.append(msg); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -149,7 +149,7 @@ Throwable cause = null; - StringBuffer errorMsg = new StringBuffer(); + StringBuilder errorMsg = new StringBuilder(); if (problems!=null) { if (message!=null) { errorMsg.append(message); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/cron/CronExpression.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/cron/CronExpression.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/cron/CronExpression.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -749,43 +749,43 @@ } public String getExpressionSummary() { - StringBuffer buf = new StringBuffer(); + StringBuilder summary = new StringBuilder(); - buf.append("seconds: "); - buf.append(getExpressionSetSummary(seconds)); - buf.append("\n"); - buf.append("minutes: "); - buf.append(getExpressionSetSummary(minutes)); - buf.append("\n"); - buf.append("hours: "); - buf.append(getExpressionSetSummary(hours)); - buf.append("\n"); - buf.append("daysOfMonth: "); - buf.append(getExpressionSetSummary(daysOfMonth)); - buf.append("\n"); - buf.append("months: "); - buf.append(getExpressionSetSummary(months)); - buf.append("\n"); - buf.append("daysOfWeek: "); - buf.append(getExpressionSetSummary(daysOfWeek)); - buf.append("\n"); - buf.append("lastdayOfWeek: "); - buf.append(lastdayOfWeek); - buf.append("\n"); - buf.append("nearestWeekday: "); - buf.append(nearestWeekday); - buf.append("\n"); - buf.append("NthDayOfWeek: "); - buf.append(nthdayOfWeek); - buf.append("\n"); - buf.append("lastdayOfMonth: "); - buf.append(lastdayOfMonth); - buf.append("\n"); - buf.append("years: "); - buf.append(getExpressionSetSummary(years)); - buf.append("\n"); + summary.append("seconds: "); + summary.append(getExpressionSetSummary(seconds)); + summary.append("\n"); + summary.append("minutes: "); + summary.append(getExpressionSetSummary(minutes)); + summary.append("\n"); + summary.append("hours: "); + summary.append(getExpressionSetSummary(hours)); + summary.append("\n"); + summary.append("daysOfMonth: "); + summary.append(getExpressionSetSummary(daysOfMonth)); + summary.append("\n"); + summary.append("months: "); + summary.append(getExpressionSetSummary(months)); + summary.append("\n"); + summary.append("daysOfWeek: "); + summary.append(getExpressionSetSummary(daysOfWeek)); + summary.append("\n"); + summary.append("lastdayOfWeek: "); + summary.append(lastdayOfWeek); + summary.append("\n"); + summary.append("nearestWeekday: "); + summary.append(nearestWeekday); + summary.append("\n"); + summary.append("NthDayOfWeek: "); + summary.append(nthdayOfWeek); + summary.append("\n"); + summary.append("lastdayOfMonth: "); + summary.append(lastdayOfMonth); + summary.append("\n"); + summary.append("years: "); + summary.append(getExpressionSetSummary(years)); + summary.append("\n"); - return buf.toString(); + return summary.toString(); } protected String getExpressionSetSummary(java.util.Set set) { @@ -797,7 +797,7 @@ return "*"; } - StringBuffer buf = new StringBuffer(); + StringBuilder summary = new StringBuilder(); Iterator itr = set.iterator(); boolean first = true; @@ -805,16 +805,16 @@ Integer iVal = (Integer) itr.next(); String val = iVal.toString(); if (!first) { - buf.append(","); + summary.append(","); } - buf.append(val); + summary.append(val); first = false; } - return buf.toString(); + return summary.toString(); } - protected String getExpressionSetSummary(java.util.ArrayList list) { + protected String getExpressionSetSummary(java.util.List list) { if (list.contains(NO_SPEC)) { return "?"; @@ -823,7 +823,7 @@ return "*"; } - StringBuffer buf = new StringBuffer(); + StringBuilder summary = new StringBuilder(); Iterator itr = list.iterator(); boolean first = true; @@ -831,13 +831,13 @@ Integer iVal = (Integer) itr.next(); String val = iVal.toString(); if (!first) { - buf.append(","); + summary.append(","); } - buf.append(val); + summary.append(val); first = false; } - return buf.toString(); + return summary.toString(); } protected int skipWhiteSpace(int i, String s) { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -275,12 +275,11 @@ } String generateString(String base, int multiplier) { - StringBuffer buffer = new StringBuffer(); + StringBuilder text = new StringBuilder(); for (int i=0; i<multiplier; i++) { - buffer.append(base); + text.append(base); } - String string = buffer.toString(); - return string; + return text.toString(); } byte[] generateBytes(String base, int multiplier) { Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -85,12 +85,11 @@ } protected String generateString(String base, int multiplier) { - StringBuffer buffer = new StringBuffer(); + StringBuilder text = new StringBuilder(); for (int i=0; i<multiplier; i++) { - buffer.append(base); + text.append(base); } - String string = buffer.toString(); - return string; + return text.toString(); } public static byte[] readBytes(InputStream inputStream) { Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/variables/VariableBasicTypesTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/variables/VariableBasicTypesTest.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/variables/VariableBasicTypesTest.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -128,11 +128,10 @@ } protected String generateString(String base, int multiplier) { - StringBuffer buffer = new StringBuffer(); + StringBuilder text = new StringBuilder(); for (int i=0; i<multiplier; i++) { - buffer.append(base); + text.append(base); } - String string = buffer.toString(); - return string; + return text.toString(); } } Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -163,18 +163,18 @@ long seconds = diff / SECOND; - StringBuffer text = new StringBuffer(); + StringBuilder duration = new StringBuilder(); if (hours!=0) { - text.append(hours+"h"); + duration.append(hours+"h"); } - text.append(minutes); - text.append("'"); - text.append(seconds); - text.append("\""); + duration.append(minutes); + duration.append("'"); + duration.append(seconds); + duration.append("\""); // long millis = diff - (seconds * SECOND); // text.append(","+millis); - return text.toString(); + return duration.toString(); } } Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java 2009-05-27 08:22:48 UTC (rev 4908) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java 2009-05-27 09:14:59 UTC (rev 4909) @@ -56,11 +56,11 @@ } public Object execute(Environment environment) throws Exception { - StringBuilder stringBuilder = new StringBuilder(); - while (stringBuilder.length() < length) { - stringBuilder.append("This is a long test message. "); + StringBuilder message = new StringBuilder(); + while (message.length() < length) { + message.append("This is a long test message. "); } - throw new RuntimeException(stringBuilder.toString()); + throw new RuntimeException(message.toString()); } }