Merge some string literals

Author: garydgregory

src/main/java/org/apache/commons/net/examples/Main.java

@@ -56,13 +56,13 @@ public static void main(final String[] args) throws Throwable {
         if (args.length == 0) {
             if (Thread.currentThread().getStackTrace().length > 2) { // called by Maven
                 System.out.println(
-                        "Usage: mvn -q exec:java  -Dexec.arguments=<alias or" + " exampleClass>,<exampleClass parameters> (comma-separated, no spaces)");
-                System.out.println("Or   : mvn -q exec:java  -Dexec.args=\"<alias" + " or exampleClass> <exampleClass parameters>\" (space separated)");
+                        "Usage: mvn -q exec:java  -Dexec.arguments=<alias or exampleClass>,<exampleClass parameters> (comma-separated, no spaces)");
+                System.out.println("Or   : mvn -q exec:java  -Dexec.args=\"<alias or exampleClass> <exampleClass parameters>\" (space separated)");
             } else if (fromJar()) {
                 System.out.println("Usage: java -jar commons-net-examples-m.n.jar <alias or exampleClass> <exampleClass parameters>");
             } else {
                 System.out
-                        .println("Usage: java -cp target/classes org.apache.commons.net.examples.Main" + " <alias or exampleClass> <exampleClass parameters>");
+                        .println("Usage: java -cp target/classes org.apache.commons.net.examples.Main <alias or exampleClass> <exampleClass parameters>");
             }
             @SuppressWarnings("unchecked") // property names are Strings
             final List<String> l = (List<String>) Collections.list(fp.propertyNames());

src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java

@@ -79,7 +79,7 @@ public final class FTPClientExample {
             + "\t-U - save unparseable responses\n"
             + "\t-w msec - wait time for keep-alive reply (setControlKeepAliveReplyTimeout)\n"
             + "\t-T  all|valid|none - use one of the built-in TrustManager implementations (none = JVM default)\n"
-            + "\t-y format - set default date format string\n" 
+            + "\t-y format - set default date format string\n"
             + "\t-Y format - set recent date format string\n"
             + "\t-Z timezone - set the server time zone for parsing LIST responses\n"
             + "\t-z timezone - set the time zone for displaying MDTM, LIST, MLSD, MLST responses\n"

src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java

@@ -42,11 +42,11 @@
  */
 public final class TFTPExample {
     // @formatter:off
-    static final String USAGE = "Usage: TFTPExample [options] hostname localfile remotefile\n\n" 
+    static final String USAGE = "Usage: TFTPExample [options] hostname localfile remotefile\n\n"
             + "hostname   - The name of the remote host [:port]\n"
-            + "localfile  - The name of the local file to send or the name to use for\n" 
+            + "localfile  - The name of the local file to send or the name to use for\n"
             + "\tthe received file\n"
-            + "remotefile - The name of the remote file to receive or the name for\n" 
+            + "remotefile - The name of the remote file to receive or the name for\n"
             + "\tthe remote server to use to name the local file being sent.\n\n"
             + "options: (The default is to assume -r -b)\n"
             + "\t-t timeout in seconds (default 60s)\n"

src/main/java/org/apache/commons/net/examples/mail/IMAPImportMbox.java

@@ -85,7 +85,7 @@ public static void main(final String[] args) throws IOException {
         if (args.length < 2) {
             System.err.println("Usage: IMAPImportMbox imap[s]://user:password@host[:port]/folder/path <mboxfile> [selectors]");
             System.err
-                    .println("\tWhere: a selector is a list of numbers/number ranges - 1,2,3-10" + " - or a list of strings to match in the initial From line");
+                    .println("\tWhere: a selector is a list of numbers/number ranges - 1,2,3-10 - or a list of strings to match in the initial From line");
             System.exit(1);
         }
 

src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java

@@ -101,7 +101,7 @@ public static void processResponse(final TimeInfo info) {
         System.out.println(" mode: " + message.getModeName() + " (" + message.getMode() + ")");
         final int poll = message.getPoll();
         // poll value typically btwn MINPOLL (4) and MAXPOLL (14)
-        System.out.println(" poll: " + (poll <= 0 ? 1 : (int) Math.pow(2, poll)) + " seconds" + " (2 ** " + poll + ")");
+        System.out.println(" poll: " + (poll <= 0 ? 1 : (int) Math.pow(2, poll)) + " seconds (2 ** " + poll + ")");
         final double disp = message.getRootDispersionInMillisDouble();
         System.out.println(" rootdelay=" + numberFormat.format(message.getRootDelayInMillisDouble()) + ", rootdispersion(ms): " + numberFormat.format(disp));
 

src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java

@@ -45,8 +45,10 @@ public class EnterpriseUnixFTPEntryParser extends RegexFTPFileEntryParserImpl {
     /**
      * this is the regular expression used by this parser.
      */
+    // @formatter:off
     private static final String REGEX = "(([\\-]|[A-Z])([\\-]|[A-Z])([\\-]|[A-Z])([\\-]|[A-Z])([\\-]|[A-Z])"
-            + "([\\-]|[A-Z])([\\-]|[A-Z])([\\-]|[A-Z])([\\-]|[A-Z])([\\-]|[A-Z]))" + "(\\S*)\\s*" // 12
+            + "([\\-]|[A-Z])([\\-]|[A-Z])([\\-]|[A-Z])([\\-]|[A-Z])([\\-]|[A-Z]))"
+            + "(\\S*)\\s*" // 12
             + "(\\S+)\\s*" // 13
             + "(\\S*)\\s*" // 14 user
             + "(\\d*)\\s*" // 15 group
@@ -60,6 +62,7 @@ public class EnterpriseUnixFTPEntryParser extends RegexFTPFileEntryParserImpl {
             // 21 [01]\d or 2[0123] hour + ':'
             // 22 [012345]\d = minute
             + "(\\S*)(\\s*.*)"; // 23 name
+    // @formatter:on
 
     /**
      * The sole constructor for a EnterpriseUnixFTPEntryParser object.

src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java

@@ -589,7 +589,7 @@ public void setVersion(final int version) {
      */
     @Override
     public String toString() {
-        return "[" + "version:" + getVersion() + ", mode:" + getMode() + ", poll:" + getPoll() + ", precision:" + getPrecision() + ", delay:" + getRootDelay()
+        return "[version:" + getVersion() + ", mode:" + getMode() + ", poll:" + getPoll() + ", precision:" + getPrecision() + ", delay:" + getRootDelay()
                 + ", dispersion(ms):" + getRootDispersionInMillisDouble() + ", id:" + getReferenceIdString() + ", xmitTime:"
                 + getTransmitTimeStamp().toDateString() + " ]";
     }