[exo-jcr-commits] exo-jcr SVN: r5383 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access and 25 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Dec 29 05:29:56 EST 2011
Author: andrew.plotnikov
Date: 2011-12-29 05:29:54 -0500 (Thu, 29 Dec 2011)
New Revision: 5383
Modified:
jcr/trunk/applications/exo.jcr.cluster.testclient/src/main/java/org/exoplatform/services/jcr/cluster/JCRWebdavConnection.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestore.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataValidator.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MoreLikeThis.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryContainerImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OracleConnectionFactory.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OraclePoolConnectionFactory.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleConnectionFactory.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OraclePoolConnectionFactory.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/BaseXmlExporter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewContentExporter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewStreamExporter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/FileNameProducer.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/ReplicationService.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/recovery/FileNameFactory.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/bandwidth/BandwidthAllocationTestCase.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyResourceLoader.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPasv.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPort.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPwd.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/lnkproducer/LinkGenerator.java
jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetPropertiesCommand.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNlst.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/FtpCommandImpl.java
Log:
EXOJCR-1687: Fixed new sonar violations in project
Modified: jcr/trunk/applications/exo.jcr.cluster.testclient/src/main/java/org/exoplatform/services/jcr/cluster/JCRWebdavConnection.java
===================================================================
--- jcr/trunk/applications/exo.jcr.cluster.testclient/src/main/java/org/exoplatform/services/jcr/cluster/JCRWebdavConnection.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/applications/exo.jcr.cluster.testclient/src/main/java/org/exoplatform/services/jcr/cluster/JCRWebdavConnection.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -88,13 +88,13 @@
public HTTPResponse addNode(String name, String[] mixinTypes, byte[] data) throws IOException, ModuleException
{
// construct string containing mixins in comma separated format
- String mixins = mixinTypes.length > 0 ? mixinTypes[0] : "";
+ StringBuilder mixins = new StringBuilder(mixinTypes.length > 0 ? mixinTypes[0] : "");
for (int i = 1; i < mixinTypes.length; i++)
{
- mixins = mixins + ", " + mixinTypes[i];
+ mixins.append(", ").append(mixinTypes[i]);
}
NVPair[] headers = new NVPair[2];
- headers[0] = new NVPair(ExtHttpHeaders.CONTENT_MIXINTYPES, mixins);
+ headers[0] = new NVPair(ExtHttpHeaders.CONTENT_MIXINTYPES, mixins.toString());
headers[1] = new NVPair(HttpHeaders.CONTENT_TYPE, "text/plain");
HTTPResponse response = Put(workspacePath + name, data, headers);
response.getStatusCode();
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -223,19 +223,19 @@
public String dump()
{
- String res = "OWNER: " + (owner != null ? owner : "null") + "\n";
+ StringBuilder res = new StringBuilder("OWNER: ").append(owner != null ? owner : "null").append("\n");
if (accessList != null)
{
for (AccessControlEntry a : accessList)
{
- res += a.getAsString() + "\n";
+ res.append(a.getAsString()).append("\n");
}
}
else
{
- res += "null";
+ res.append("null");
}
- return res;
+ return res.toString();
}
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -213,17 +213,18 @@
public String dump()
{
- String str = "ChangesLog: \n";
+ StringBuilder str = new StringBuilder("ChangesLog: \n");
for (int i = 0; i < items.size(); i++)
{
- str +=
- " " + ItemState.nameFromValue(items.get(i).getState()) + "\t" + items.get(i).getData().getIdentifier()
- + "\t" + "isPersisted=" + items.get(i).isPersisted() + "\t" + "isEventFire="
- + items.get(i).isEventFire() + "\t" + "isInternallyCreated=" + items.get(i).isInternallyCreated() + "\t"
- + items.get(i).getData().getQPath().getAsString() + "\n";
+ str.append(" ").append(ItemState.nameFromValue(items.get(i).getState())).append("\t")
+ .append(items.get(i).getData().getIdentifier());
+ str.append("\t").append("isPersisted=").append(items.get(i).isPersisted()).append("\t").append("isEventFire=");
+ str.append(items.get(i).isEventFire()).append("\t").append("isInternallyCreated=")
+ .append(items.get(i).isInternallyCreated()).append("\t");
+ str.append(items.get(i).getData().getQPath().getAsString()).append("\n");
}
- return str;
+ return str.toString();
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -173,12 +173,12 @@
public String dump()
{
- String str = "ChangesLog: size" + changesLogs.size() + "\n ";
+ StringBuilder str = new StringBuilder("ChangesLog: size").append(changesLogs.size()).append("\n ");
for (PlainChangesLog cLog : changesLogs)
{
- str += cLog.dump() + "\n";
+ str.append(cLog.dump()).append("\n");
}
- return str;
+ return str.toString();
}
// Need for Externalizable
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -270,12 +270,12 @@
if (stringName == null)
{
- String str = "";
+ StringBuilder str = new StringBuilder();
for (int i = 0; i < getLength(); i++)
{
- str += names[i].getAsString(true);
+ str.append(names[i].getAsString(true));
}
- stringName = str;
+ stringName = str.toString();
}
return stringName;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestore.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestore.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestore.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -334,16 +334,16 @@
}
// construct statement
- String names = "";
- String parameters = "";
+ StringBuilder names = new StringBuilder();
+ StringBuilder parameters = new StringBuilder();
for (int i = 0; i < targetColumnCount; i++)
{
if (restoreRule.getSkipColumnIndex() != null && restoreRule.getSkipColumnIndex() == i)
{
continue;
}
- names += columnName.get(i) + (i == targetColumnCount - 1 ? "" : ",");
- parameters += "?" + (i == targetColumnCount - 1 ? "" : ",");
+ names.append(columnName.get(i)).append(i == targetColumnCount - 1 ? "" : ",");
+ parameters.append("?").append(i == targetColumnCount - 1 ? "" : ",");
}
int batchSize = 0;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -576,20 +576,20 @@
*/
public String dump()
{
- String vals = "Property ";
+ StringBuilder vals = new StringBuilder("Property ");
try
{
- vals = getPath() + " values: ";
+ vals = new StringBuilder(getPath()).append(" values: ");
for (int i = 0; i < getValueArray().length; i++)
{
- vals += new String(((BaseValue)getValueArray()[i]).getInternalData().getAsByteArray()) + ";";
+ vals.append(new String(((BaseValue)getValueArray()[i]).getInternalData().getAsByteArray())).append(";");
}
}
catch (Exception e)
{
LOG.error(e.getLocalizedMessage(), e);
}
- return vals;
+ return vals.toString();
}
// ----------------------- Object -----------------------
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -862,14 +862,12 @@
final Set<InternalQName> descendantNt = this.nodeTypeRepository.getSubtypes(nodeTypeName);
if (descendantNt.size() > 0)
{
- String message =
- "Can not remove " + nodeTypeName.getAsString()
- + "nodetype, because the following node types depend on it: ";
+ StringBuilder message = new StringBuilder("Can not remove ").append(nodeTypeName.getAsString()).append("nodetype, because the following node types depend on it: ");
for (final InternalQName internalQName : descendantNt)
{
- message += internalQName.getAsString() + " ";
+ message.append(internalQName.getAsString()).append(" ");
}
- throw new RepositoryException(message);
+ throw new RepositoryException(message.toString());
}
final Set<String> nodes = this.indexSearcherHolder.getNodesByNodeType(nodeTypeName);
if (nodes.size() > 0)
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataValidator.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataValidator.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataValidator.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -166,19 +166,19 @@
}
if (unresolvedDependecies.size() > 0)
{
- String msg = "Fail. Unresolved cyclic dependecy for :";
+ StringBuilder msg = new StringBuilder("Fail. Unresolved cyclic dependecy for :");
for (InternalQName internalQName : resolvedDependecies)
{
- msg += " " + internalQName.getAsString();
+ msg.append(" ").append(internalQName.getAsString());
}
- msg += " Unresolved ";
+ msg.append(" Unresolved ");
for (InternalQName internalQName : unresolvedDependecies)
{
- msg += " " + internalQName.getAsString();
+ msg.append(" ").append(internalQName.getAsString());
}
- throw new RepositoryException(msg);
+ throw new RepositoryException(msg.toString());
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -189,16 +189,17 @@
getNodes(nodesData, new InternalQName[]{}, new InternalQName[]{recipientDefinitionData.getName()});
if (mandatoryNodes.size() > 0)
{
- String message =
- "Can not change " + recipientDefinitionData.getName().getAsString()
- + " property definition from mandatory=false to mandatory = true , because " + " the following nodes ";
+ StringBuilder message =
+ new StringBuilder("Can not change ").append(recipientDefinitionData.getName().getAsString()).append(
+ " property definition from mandatory=false to mandatory = true , because ").append(" the following nodes ");
+
for (NodeData nodeData : mandatoryNodes)
{
- message += nodeData.getQPath().getAsString() + " ";
+ message.append(nodeData.getQPath().getAsString()).append(" ");
}
- message += " doesn't have these properties ";
+ message.append(" doesn't have these properties ");
- throw new ConstraintViolationException(message);
+ throw new ConstraintViolationException(message.toString());
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MoreLikeThis.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MoreLikeThis.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MoreLikeThis.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -613,9 +613,10 @@
// go through all the fields and find the largest document frequency
String topField = fieldNames[0];
int docFreq = 0;
- for (int i = 0; i < fieldNames.length; i++) {
+ for (int i = 0; i < fieldNames.length; i++)
+ {
int freq = ir.docFreq(new Term(fieldNames[i], word));
- topField = (freq > docFreq) ? fieldNames[i] : topField;
+ topField = (freq > docFreq) ? fieldNames[i] : topField; //NOSONAR
docFreq = (freq > docFreq) ? freq : docFreq;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -87,27 +87,28 @@
public String dump()
{
- String str = "SessionEventMatcher: " + eventTypes + "\n";
+ StringBuilder str = new StringBuilder("SessionEventMatcher: ").append(eventTypes).append("\n");
if (paths != null)
{
- str += "Paths (isDeep=" + isDeep + "):\n";
+ str.append("Paths (isDeep=").append(isDeep).append("):\n");
+
for (QPath p : paths)
{
- str += p.getAsString() + "\n";
+ str.append(p.getAsString()).append("\n");
}
}
if (nodeTypeNames != null)
{
- str += "Node Types:\n";
+ str.append("Node Types:\n");
for (InternalQName n : nodeTypeNames)
{
- str += n.getAsString() + "\n";
+ str.append(n.getAsString()).append("\n");
}
}
- return str;
+ return str.toString();
}
public final boolean match(Condition conditions)
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryContainerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryContainerImpl.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryContainerImpl.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -61,9 +61,9 @@
*/
public String getInfo()
{
- String str = "Info: Inmemory (for testing only) based container \n";
- str += "Name: " + name + "\n";
- return str;
+ StringBuilder str = new StringBuilder("Info: Inmemory (for testing only) based container \n");
+ str.append("Name: ").append(name).append("\n");
+ return str.toString();
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -274,14 +274,14 @@
public String dump()
{
- String str = "Inmemory WorkspaceContainer Data: \n";
+ StringBuilder str = new StringBuilder("Inmemory WorkspaceContainer Data: \n");
Iterator i = items.keySet().iterator();
while (i.hasNext())
{
MapKey d = (MapKey)i.next();
- str += d.getQPath().getAsString() + '\t' + d.getItemType().toString() + "\n";
+ str.append(d.getQPath().getAsString()).append('\t').append(d.getItemType().toString()).append("\n");
}
- return str;
+ return str.toString();
}
public void rename(NodeData destData) throws RepositoryException, UnsupportedOperationException,
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OracleConnectionFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OracleConnectionFactory.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OracleConnectionFactory.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -152,12 +152,12 @@
catch (Throwable e)
{
cds = null;
- String err = "Oracle OCI connection cache is unavailable due to error " + e;
+ StringBuilder err = new StringBuilder("Oracle OCI connection cache is unavailable due to error ").append(e);
if (e.getCause() != null)
{
- err += " (" + e.getCause() + ")";
+ err.append(" (").append(e.getCause()).append(")");
}
- err += ". Standard JDBC DriverManager will be used for connections opening.";
+ err.append(". Standard JDBC DriverManager will be used for connections opening.");
if (log.isDebugEnabled())
log.warn(err, e);
else
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OraclePoolConnectionFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OraclePoolConnectionFactory.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OraclePoolConnectionFactory.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -124,12 +124,12 @@
catch (Throwable e)
{
cpool = null;
- String err = "Oracle OCI connection pool is unavailable due to error " + e;
+ StringBuilder err = new StringBuilder("Oracle OCI connection pool is unavailable due to error ").append(e);
if (e.getCause() != null)
{
- err += " (" + e.getCause() + ")";
+ err.append(" (").append(e.getCause()).append(")");
}
- err += ". Standard JDBC DriverManager will be used for connections opening.";
+ err.append(". Standard JDBC DriverManager will be used for connections opening.");
if (log.isDebugEnabled())
log.warn(err, e);
else
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleConnectionFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleConnectionFactory.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleConnectionFactory.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -154,12 +154,12 @@
catch (Throwable e)
{
cds = null;
- String err = "Oracle OCI connection cache is unavailable due to error " + e;
+ StringBuilder err = new StringBuilder("Oracle OCI connection cache is unavailable due to error ").append(e);
if (e.getCause() != null)
{
- err += " (" + e.getCause() + ")";
+ err.append(" (").append(e.getCause()).append(")");
}
- err += ". Standard JDBC DriverManager will be used for connections opening.";
+ err.append(". Standard JDBC DriverManager will be used for connections opening.");
if (log.isDebugEnabled())
log.warn(err, e);
else
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OraclePoolConnectionFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OraclePoolConnectionFactory.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OraclePoolConnectionFactory.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -124,12 +124,12 @@
catch (Throwable e)
{
cpool = null;
- String err = "Oracle OCI connection pool is unavailable due to error " + e;
+ StringBuilder err = new StringBuilder("Oracle OCI connection pool is unavailable due to error ").append(e);
if (e.getCause() != null)
{
- err += " (" + e.getCause() + ")";
+ err.append(" (").append(e.getCause()).append(")");
}
- err += ". Standard JDBC DriverManager will be used for connections opening.";
+ err.append(". Standard JDBC DriverManager will be used for connections opening.");
if (log.isDebugEnabled())
log.warn(err, e);
else
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/BaseXmlExporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/BaseXmlExporter.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/BaseXmlExporter.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -227,11 +227,11 @@
nodeName = prefix.length() == 0 ? "" : prefix + ":";
if ("".equals(itemPath.getName().getName()) && itemPath.isDescendantOf(Constants.EXO_NAMESPACES_PATH))
{
- nodeName += DEFAULT_EMPTY_NAMESPACE_PREFIX;
+ nodeName += DEFAULT_EMPTY_NAMESPACE_PREFIX; //NOSONAR
}
else
{
- nodeName += internalNodeName.getName();
+ nodeName += internalNodeName.getName(); //NOSONAR
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewContentExporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewContentExporter.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewContentExporter.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -114,7 +114,7 @@
continue;
}
- strValue +=
+ strValue += //NOSONAR
MULTI_VALUE_DELIMITER
+ (property.getType() == PropertyType.BINARY ? strVal : StringConverter.normalizeString(strVal,
true));
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewStreamExporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewStreamExporter.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewStreamExporter.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -117,7 +117,7 @@
{
continue;
}
- strValue +=
+ strValue += //NOSONAR
MULTI_VALUE_DELIMITER
+ (property.getType() == PropertyType.BINARY ? strVal : StringConverter.normalizeString(strVal,
true));
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -155,15 +155,16 @@
if (log.isDebugEnabled())
{
- String str = "";
+ StringBuilder str = new StringBuilder();
for (int i = 0; i < changesLog.getAllStates().size(); i++)
- str +=
- " " + ItemState.nameFromValue(changesLog.getAllStates().get(i).getState()) + "\t\t"
- + changesLog.getAllStates().get(i).getData().getIdentifier() + "\t" + "isPersisted="
- + changesLog.getAllStates().get(i).isPersisted() + "\t" + "isEventFire="
- + changesLog.getAllStates().get(i).isEventFire() + "\t" + "isInternallyCreated="
- + changesLog.getAllStates().get(i).isInternallyCreated() + "\t"
- + changesLog.getAllStates().get(i).getData().getQPath().getAsString() + "\n";
+ {
+ str.append(" ").append(ItemState.nameFromValue(changesLog.getAllStates().get(i).getState())).append("\t\t");
+ str.append(changesLog.getAllStates().get(i).getData().getIdentifier()).append("\t").append("isPersisted=");
+ str.append(changesLog.getAllStates().get(i).isPersisted()).append("\t").append("isEventFire=");
+ str.append(changesLog.getAllStates().get(i).isEventFire()).append("\t").append("isInternallyCreated=");
+ str.append(changesLog.getAllStates().get(i).isInternallyCreated()).append("\t");
+ str.append(changesLog.getAllStates().get(i).getData().getQPath().getAsString()).append("\n");
+ }
log.debug(str);
}
if (isNeedReloadAncestorToSave)
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/FileNameProducer.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/FileNameProducer.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/FileNameProducer.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -207,18 +207,18 @@
String sDate = getStrDate(date);
String sTime = getStrTime(date);
- String fileName = backupSetName + "-" + sDate + "_" + sTime + ".";
+ StringBuilder fileName = new StringBuilder(backupSetName).append("-").append(sDate).append("_").append(sTime).append(".");
if (isFullBackup)
{
- fileName += "0";
+ fileName.append("0");
}
else
{
- fileName += getNextSufix();
+ fileName.append(getNextSufix());
}
- return fileName;
+ return fileName.toString();
}
private String getNextSufix()
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/ReplicationService.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/ReplicationService.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/ReplicationService.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -532,13 +532,13 @@
Element root = doc.createElement(SERVICE_NAME);
doc.appendChild(root);
- String reps = "";
+ StringBuilder reps = new StringBuilder();
for (String rep : repoNamesList)
{
- reps += rep + ";";
+ reps.append(rep).append(";");
}
Element element = doc.createElement("repositories");
- setAttributeSmart(element, "repositories", reps);
+ setAttributeSmart(element, "repositories", reps.toString());
root.appendChild(element);
element = doc.createElement("replication-properties");
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/recovery/FileNameFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/recovery/FileNameFactory.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/recovery/FileNameFactory.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -117,19 +117,23 @@
*/
public String getRandomSubPath()
{
- String subPath = new String();
+ StringBuilder subPath = new StringBuilder();
for (int i = 0; i < SUB_PATH_LENGTH; i++)
{
int index = (int)(Math.random() * PATTERN_1000) % pathCharSequence.length();
if (i != SUB_PATH_LENGTH - 1)
- subPath += (pathCharSequence.charAt(index) + File.separator);
+ {
+ subPath.append(pathCharSequence.charAt(index)).append(File.separator);
+ }
else
- subPath += pathCharSequence.charAt(index);
+ {
+ subPath.append(pathCharSequence.charAt(index));
+ }
}
- return subPath;
+ return subPath.toString();
}
/**
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/bandwidth/BandwidthAllocationTestCase.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/bandwidth/BandwidthAllocationTestCase.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/bandwidth/BandwidthAllocationTestCase.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -159,13 +159,13 @@
try
{
// create random value
- String sValue = "";
+ StringBuilder value = new StringBuilder();
for (int i = 0; i < size; i++)
{
int sIndex = (int)(Math.random() * RANDOM_VALUE) % ALPHABET.length();
- sValue += ALPHABET.substring(sIndex, sIndex + 1);
+ value.append(ALPHABET.substring(sIndex, sIndex + 1));
}
-
+ String sValue = value.toString();
for (int i = 0; i < iterations; i++)
{
String normalizePath = getNormalizePath(repoPath);
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyResourceLoader.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyResourceLoader.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyResourceLoader.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -49,7 +49,7 @@
}
else if (ref.charAt(ref.length() - 1) != '/')
{
- ref = ref + "/";
+ ref = ref + "/"; //NOSONAR
}
res[i] = new URL(src[i], "#" + ref);
}
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -36,30 +36,30 @@
{
try
{
- String datka = "";
+ StringBuilder datka = new StringBuilder();
for (int i = 0; i < reqLen; i++)
{
if (i >= strVal.length())
{
- datka += " ";
+ datka.append(" ");
}
else
{
- datka += strVal.charAt(i);
+ datka.append(strVal.charAt(i));
}
}
- return datka;
+ return datka.toString();
}
catch (Exception exc)
{
log.info("Unhandled exception. " + exc.getMessage(), exc);
}
- String resStr = "";
+ StringBuilder resStr = new StringBuilder();
for (int i = 0; i < reqLen; i++)
{
- resStr += " ";
+ resStr.append(" ");
}
- return resStr;
+ return resStr.toString();
}
public static String getStrachedAtStart(String strVal, int reqLen)
@@ -67,7 +67,7 @@
String result = strVal;
while (result.length() < reqLen)
{
- result = " " + result;
+ result = " " + result; //NOSONAR
}
return result;
}
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -93,11 +93,11 @@
{
if ("".equals(comms[i]))
{
- comms[1] += " ";
+ comms[1] += " "; //NOSONAR
}
else
{
- comms[1] += " " + comms[i];
+ comms[1] += " " + comms[i]; //NOSONAR
}
}
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -315,16 +315,16 @@
public String getRepoPath(ArrayList<String> repoPath)
{
- String curPath = "/";
+ StringBuilder curPath = new StringBuilder("/");
for (int i = 1; i < repoPath.size(); i++)
{
- curPath += repoPath.get(i);
+ curPath.append(repoPath.get(i));
if (i < (repoPath.size() - 1))
{
- curPath += "/";
+ curPath.append("/");
}
}
- return curPath;
+ return curPath.toString();
}
public Session getSession(String workspaceName) throws Exception
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPasv.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPasv.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPasv.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -49,15 +49,13 @@
}
clientSession().setDataTransiver(transiver);
- String serverLocation = clientSession().getServerIp();
- serverLocation = serverLocation.replace('.', ',');
-
+ StringBuilder serverLocation = new StringBuilder(clientSession().getServerIp().replace('.', ','));
int dataPort = transiver.getDataPort();
int high = dataPort / 256;
int low = dataPort % 256;
- serverLocation += String.format(",%s,%s", high, low);
- reply(String.format(FtpConst.Replyes.REPLY_227, serverLocation));
+ serverLocation.append(String.format(",%s,%s", high, low));
+ reply(String.format(FtpConst.Replyes.REPLY_227, serverLocation.toString()));
}
}
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPort.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPort.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPort.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -50,7 +50,7 @@
return;
}
- String host = "";
+ StringBuilder host = new StringBuilder();
int port = 0;
try
@@ -58,9 +58,9 @@
String[] ports = params[1].split(",");
for (int i = 0; i < 3; i++)
{
- host += ports[i] + ".";
+ host.append(ports[i]).append(".");
}
- host += ports[3];
+ host.append(ports[3]);
port = new Integer(ports[4]) * 256 + new Integer(ports[5]);
}
catch (Exception exc)
@@ -72,7 +72,8 @@
try
{
FtpDataTransiver dataTransiver =
- new FtpDataTransiverImpl(host, port, clientSession().getFtpServer().getConfiguration(), clientSession());
+ new FtpDataTransiverImpl(host.toString(), port, clientSession().getFtpServer().getConfiguration(),
+ clientSession());
clientSession().setDataTransiver(dataTransiver);
reply(String.format(FtpConst.Replyes.REPLY_200, "Port command success"));
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPwd.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPwd.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPwd.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -41,17 +41,17 @@
{
ArrayList<String> curPath = clientSession().getPath();
- String path = "/";
+ StringBuilder path = new StringBuilder("/");
for (int i = 0; i < curPath.size(); i++)
{
- path += curPath.get(i);
+ path.append(curPath.get(i));
if (i != (curPath.size() - 1))
{
- path += "/";
+ path.append("/");
}
}
- reply(String.format(FtpConst.Replyes.REPLY_257, path));
+ reply(String.format(FtpConst.Replyes.REPLY_257, path.toString()));
}
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -133,7 +133,7 @@
LockRequestEntity requestEntity = new LockRequestEntity(body);
- lockToken = WebDavConst.Lock.OPAQUE_LOCK_TOKEN + ":" + lockToken;
+ lockToken = WebDavConst.Lock.OPAQUE_LOCK_TOKEN + ":" + lockToken; //NOSONAR
if (bodyIsEmpty)
{
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/lnkproducer/LinkGenerator.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/lnkproducer/LinkGenerator.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/lnkproducer/LinkGenerator.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -157,7 +157,7 @@
writeBytes(rootItem, outStream);
pathes = targetPath.split("/");
- String curHref = servletPath;
+ StringBuilder curHref = new StringBuilder(servletPath);
for (int i = 0; i < pathes.length; i++)
{
@@ -166,17 +166,17 @@
continue;
}
String curName = pathes[i];
- curHref += "/" + curName;
+ curHref.append("/").append(curName);
if (i < pathes.length - 1)
{
- byte[] linkItem = getHreffedFolder(curName, curHref);
+ byte[] linkItem = getHreffedFolder(curName, curHref.toString());
writeInt(linkItem.length + 2, outStream);
writeBytes(linkItem, outStream);
}
else
{
- byte[] linkFile = getHreffedFile(curName, curHref);
+ byte[] linkFile = getHreffedFile(curName, curHref.toString());
writeInt(linkFile.length + 2, outStream);
writeBytes(linkFile, outStream);
}
Modified: jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetPropertiesCommand.java
===================================================================
--- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetPropertiesCommand.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetPropertiesCommand.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -35,23 +35,23 @@
@Override
public boolean perform(CliAppContext ctx)
{
- String output = "";
+ StringBuilder output;
try
{
Node currentNode = (Node)ctx.getCurrentItem();
PropertyIterator propertyIterator = currentNode.getProperties();
- output = "Properties:\n";
+ output = new StringBuilder("Properties:\n");
while (propertyIterator.hasNext())
{
Property property = propertyIterator.nextProperty();
- output += property.getName() + "\n";
+ output.append(property.getName()).append("\n");
}
}
catch (Exception e)
{
- output = "Can't execute command - " + e.getMessage() + "\n";
+ output = new StringBuilder("Can't execute command - ").append(e.getMessage()).append("\n");
}
- ctx.setOutput(output);
+ ctx.setOutput(output.toString());
return false;
}
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNlst.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNlst.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNlst.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -87,13 +87,13 @@
byte[] data = dataTransiver.receive();
dataTransiver.close();
- String dd = "";
+ StringBuilder dd = new StringBuilder();
for (int i = 0; i < data.length; i++)
{
- dd += (char)data[i];
+ dd.append((char)data[i]);
}
- String[] lines = dd.split("\r\n");
+ String[] lines = dd.toString().split("\r\n");
for (int i = 0; i < lines.length; i++)
{
names.add(lines[i]);
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/FtpCommandImpl.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/FtpCommandImpl.java 2011-12-29 08:37:37 UTC (rev 5382)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/FtpCommandImpl.java 2011-12-29 10:29:54 UTC (rev 5383)
@@ -18,7 +18,6 @@
*/
package org.exoplatform.frameworks.ftpclient.commands;
-import org.exoplatform.frameworks.ftpclient.FtpConst;
import org.exoplatform.frameworks.ftpclient.FtpUtils;
import org.exoplatform.frameworks.ftpclient.client.FtpClientSession;
import org.exoplatform.services.log.ExoLogger;
@@ -100,7 +99,7 @@
public int getReply() throws Exception
{
log.info("try get reply..........");
- String reply = "";
+ StringBuilder reply = new StringBuilder();
String curReply = "";
while (true)
@@ -109,24 +108,24 @@
if ("".equals(curReply))
{
- reply += "\r\n";
+ reply.append("\r\n");
}
else
{
- reply += curReply;
+ reply.append(curReply);
if (isReplyString(curReply))
{
break;
}
else
{
- reply += "\r\n";
+ reply.append("\r\n");
}
}
}
- descript = reply;
+ descript = reply.toString();
replyCode = FtpUtils.getReplyCode(curReply);
log.info("<<< " + descript);
@@ -163,12 +162,12 @@
if (prevByte == '\r' && received == '\n')
{
- String resultLine = "";
+ StringBuilder resultLine = new StringBuilder();
for (int i = 0; i < bufPos - 2; i++)
{
- resultLine += (char)buffer[i];
+ resultLine.append((char)buffer[i]);
}
- return resultLine;
+ return resultLine.toString();
}
prevByte = (byte)received;
More information about the exo-jcr-commits
mailing list