[exo-jcr-commits] exo-jcr SVN: r5384 - in jcr/trunk: exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Dec 29 05:44:14 EST 2011
Author: andrew.plotnikov
Date: 2011-12-29 05:44:13 -0500 (Thu, 29 Dec 2011)
New Revision: 5384
Modified:
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java
jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetNodesCommand.java
jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java
jcr/trunk/exo.jcr.framework.web/src/main/java/org/exoplatform/frameworks/jcr/web/fckeditor/FCKeditor.java
Log:
EXOJCR-1687: Fixed new sonar violations in project
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 10:29:54 UTC (rev 5383)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java 2011-12-29 10:44:13 UTC (rev 5384)
@@ -78,13 +78,10 @@
if (!"".equals(command))
{
- String logStr = "";
String[] comms = command.split(" ");
FtpCommand curCommand = clientSession.getFtpServer().getCommand(comms[0].toUpperCase());
- logStr = comms[0].toUpperCase();
-
if (curCommand != null)
{
if (comms.length > 1)
@@ -100,8 +97,6 @@
comms[1] += " " + comms[i]; //NOSONAR
}
}
-
- logStr += " " + comms[1];
}
FtpContext ftpContext = new FtpContext(clientSession, comms);
Modified: jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetNodesCommand.java
===================================================================
--- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetNodesCommand.java 2011-12-29 10:29:54 UTC (rev 5383)
+++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetNodesCommand.java 2011-12-29 10:44:13 UTC (rev 5384)
@@ -36,37 +36,37 @@
@Override
public boolean perform(CliAppContext ctx)
{
- String output = "";
+ StringBuilder output = new StringBuilder();
try
{
if (ctx.getCurrentItem().isNode())
{
Node currentNode = (Node)ctx.getCurrentItem();
PropertyIterator propertyIterator = currentNode.getProperties();
- output += "Properties list for " + currentNode.getPath() + ":\n";
+ output.append("Properties list for ").append(currentNode.getPath()).append(":\n");
while (propertyIterator.hasNext())
{
Property property = propertyIterator.nextProperty();
- output += property.getName() + "\n";
+ output.append(property.getName()).append("\n");
}
NodeIterator nodeIterator = currentNode.getNodes();
- output += "Nodes list for " + currentNode.getPath() + ":\n";
+ output.append("Nodes list for ").append(currentNode.getPath()).append(":\n");
while (nodeIterator.hasNext())
{
Node node = nodeIterator.nextNode();
- output += node.getPath() + "\n";
+ output.append(node.getPath()).append("\n");
}
}
else
{
- output += "Current item is property: " + ((Property)ctx.getCurrentItem()).getName() + "\n";
+ output.append("Current item is property: ").append(((Property)ctx.getCurrentItem()).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.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java
===================================================================
--- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java 2011-12-29 10:29:54 UTC (rev 5383)
+++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java 2011-12-29 10:44:13 UTC (rev 5384)
@@ -69,7 +69,7 @@
@Override
public boolean perform(CliAppContext ctx)
{
- String output = "";
+ StringBuilder output = new StringBuilder();
try
{
String findHelpCommand = null;
@@ -92,24 +92,25 @@
if (findHelpCommand.equals(currentHelpCommand))
{
// begin format output string (adding spaces)
- String findHelpCommandFormatted = currentHelpCommand;
+ StringBuilder findHelpCommandFormatted = new StringBuilder(currentHelpCommand);
+
int commandLength = currentHelpCommand.length();
if (commandLength < WORD_LENGTH)
{
for (int i = currentHelpCommand.length(); i < WORD_LENGTH; i++)
{
- findHelpCommandFormatted += " ";
+ findHelpCommandFormatted.append(" ");
}
}
// end format
- output += findHelpCommandFormatted + " - " + map.get(findHelpCommand) + "\n";
+ output.append(findHelpCommandFormatted).append(" - ").append(map.get(findHelpCommand)).append("\n");
found = true;
break;
}
}
if (found == false)
{
- output += "Can't find help for the: " + findHelpCommand + " command\n";
+ output.append("Can't find help for the: ").append(findHelpCommand).append(" command\n");
}
}
else
@@ -120,25 +121,26 @@
{
String currentHelpCommand = (String)(iterator.next());
// begin format output string (adding spaces)
- String currentHelpCommandFormatted = currentHelpCommand;
+ StringBuilder currentHelpCommandFormatted = new StringBuilder(currentHelpCommand);
int commandLength = currentHelpCommand.length();
if (commandLength < WORD_LENGTH)
{
for (int i = currentHelpCommand.length(); i < WORD_LENGTH; i++)
{
- currentHelpCommandFormatted += " ";
+ currentHelpCommandFormatted.append(" ");
}
}
// end format
- output += currentHelpCommandFormatted + " - " + map.get(currentHelpCommand) + "\n";
+ output.append(currentHelpCommandFormatted).append(" - ").append(map.get(currentHelpCommand))
+ .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.web/src/main/java/org/exoplatform/frameworks/jcr/web/fckeditor/FCKeditor.java
===================================================================
--- jcr/trunk/exo.jcr.framework.web/src/main/java/org/exoplatform/frameworks/jcr/web/fckeditor/FCKeditor.java 2011-12-29 10:29:54 UTC (rev 5383)
+++ jcr/trunk/exo.jcr.framework.web/src/main/java/org/exoplatform/frameworks/jcr/web/fckeditor/FCKeditor.java 2011-12-29 10:44:13 UTC (rev 5384)
@@ -369,14 +369,16 @@
private String createIFrameHTML()
{
- String sLink = basePath + "editor/fckeditor.html?InstanceName=" + instanceName;
+ StringBuilder sLink =
+ new StringBuilder(basePath).append("editor/fckeditor.html?InstanceName=").append(instanceName);
if (!toolbarSet.equals(""))
- sLink += "&Toolbar=" + toolbarSet;
+ {
+ sLink.append("&Toolbar=").append(toolbarSet);
+ }
- return "<iframe id=\"" + instanceName + "___Frame\" src=\"" + sLink + "\" width=\"" + width + "\" height=\""
- + height + "\" frameborder=\"no\" scrolling=\"no\"></iframe>";
-
+ return "<iframe id=\"" + instanceName + "___Frame\" src=\"" + sLink.toString() + "\" width=\"" + width
+ + "\" height=\"" + height + "\" frameborder=\"no\" scrolling=\"no\"></iframe>";
}
/**
More information about the exo-jcr-commits
mailing list