commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bay...@apache.org
Subject svn commit: r635447 - in /commons/proper/lang/trunk/src/java/org/apache/commons/lang: StringUtils.java text/ExtendedMessageFormat.java
Date Mon, 10 Mar 2008 06:27:11 GMT
Author: bayard
Date: Sun Mar  9 23:27:09 2008
New Revision: 635447

URL: http://svn.apache.org/viewvc?rev=635447&view=rev
Log:
Dealing with some of the >120 length lines as per checkstyle. A few still need reducing.


Modified:
    commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java
    commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/ExtendedMessageFormat.java

Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java?rev=635447&r1=635446&r2=635447&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java (original)
+++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java Sun Mar  9
23:27:09 2008
@@ -2334,7 +2334,9 @@
      * @return an array of parsed Strings, <code>null</code> if null String input
      * @since 2.4
      */
-    private static String[] splitByWholeSeparatorWorker(String str, String separator, int
max, boolean preserveAllTokens) {
+    private static String[] splitByWholeSeparatorWorker(String str, String separator, int
max, 
+                                                        boolean preserveAllTokens) 
+    {
         if (str == null) {
             return null;
         }
@@ -3566,20 +3568,20 @@
      * </p>
      * 
      * <pre>
-     *  StringUtils.replaceEach(null, *, *, *)        = null
-     *  StringUtils.replaceEach("", *, *, *)          = ""
+     *  StringUtils.replaceEach(null, *, *, *) = null
+     *  StringUtils.replaceEach("", *, *, *) = ""
      *  StringUtils.replaceEach("aba", null, null, *) = "aba"
      *  StringUtils.replaceEach("aba", new String[0], null, *) = "aba"
      *  StringUtils.replaceEach("aba", null, new String[0], *) = "aba"
-     *  StringUtils.replaceEach("aba", new String[]{"a"}, null, *)  = "aba"
-     *  StringUtils.replaceEach("aba", new String[]{"a"}, new String[]{""}, *)  = "b"
-     *  StringUtils.replaceEach("aba", new String[]{null}, new String[]{"a"}, *)  = "aba"
-     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"w", "t"},
*)  = "wcte"
+     *  StringUtils.replaceEach("aba", new String[]{"a"}, null, *) = "aba"
+     *  StringUtils.replaceEach("aba", new String[]{"a"}, new String[]{""}, *) = "b"
+     *  StringUtils.replaceEach("aba", new String[]{null}, new String[]{"a"}, *) = "aba"
+     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"w", "t"},
*) = "wcte"
      *  (example of how it repeats)
-     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "t"},
false)  = "dcte"
-     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "t"},
true)  = "tcte"
-     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "ab"},
true)  = IllegalArgumentException
-     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "ab"},
false)  = "dcabe"
+     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "t"},
false) = "dcte"
+     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "t"},
true) = "tcte"
+     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "ab"},
true) = IllegalArgumentException
+     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "ab"},
false) = "dcabe"
      * </pre>
      * 
      * @param text
@@ -3617,19 +3619,19 @@
      * </p>
      * 
      * <pre>
-     *  StringUtils.replaceEach(null, *, *, *)        = null
-     *  StringUtils.replaceEach("", *, *, *)          = ""
+     *  StringUtils.replaceEach(null, *, *, *) = null
+     *  StringUtils.replaceEach("", *, *, *) = ""
      *  StringUtils.replaceEach("aba", null, null, *) = "aba"
      *  StringUtils.replaceEach("aba", new String[0], null, *) = "aba"
      *  StringUtils.replaceEach("aba", null, new String[0], *) = "aba"
-     *  StringUtils.replaceEach("aba", new String[]{"a"}, null, *)  = "aba"
-     *  StringUtils.replaceEach("aba", new String[]{"a"}, new String[]{""}, *)  = "b"
-     *  StringUtils.replaceEach("aba", new String[]{null}, new String[]{"a"}, *)  = "aba"
-     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"w", "t"},
*)  = "wcte"
+     *  StringUtils.replaceEach("aba", new String[]{"a"}, null, *) = "aba"
+     *  StringUtils.replaceEach("aba", new String[]{"a"}, new String[]{""}, *) = "b"
+     *  StringUtils.replaceEach("aba", new String[]{null}, new String[]{"a"}, *) = "aba"
+     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"w", "t"},
*) = "wcte"
      *  (example of how it repeats)
-     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "t"},
false)  = "dcte"
-     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "t"},
true)  = "tcte"
-     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "ab"},
*)  = IllegalArgumentException
+     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "t"},
false) = "dcte"
+     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "t"},
true) = "tcte"
+     *  StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new String[]{"d", "ab"},
*) = IllegalArgumentException
      * </pre>
      * 
      * @param text
@@ -3653,12 +3655,16 @@
      *             and/or size 0)
      * @since 2.4
      */
-    private static String replaceEach(String text, String[] searchList, String[] replacementList,
boolean repeat, int timeToLive) {
+    private static String replaceEach(String text, String[] searchList, String[] replacementList,

+                                      boolean repeat, int timeToLive) 
+    {
 
         // mchyzer Performance note: This creates very few new objects (one major goal)
         // let me know if there are performance requests, we can create a harness to measure
 
-        if (text == null || text.length() == 0 || searchList == null || searchList.length
== 0 || replacementList == null || replacementList.length == 0) {
+        if (text == null || text.length() == 0 || searchList == null || 
+            searchList.length == 0 || replacementList == null || replacementList.length ==
0) 
+        {
             return text;
         }
 
@@ -3689,7 +3695,9 @@
         // index of replace array that will replace the search string found
         // NOTE: logic duplicated below START
         for (int i = 0; i < searchLength; i++) {
-            if (noMoreMatchesForReplIndex[i] || searchList[i] == null || searchList[i].length()
== 0 || replacementList[i] == null) {
+            if (noMoreMatchesForReplIndex[i] || searchList[i] == null || 
+                searchList[i].length() == 0 || replacementList[i] == null) 
+            {
                 continue;
             }
             tempIndex = text.indexOf(searchList[i]);
@@ -3743,7 +3751,9 @@
             // find the next earliest match
             // NOTE: logic mostly duplicated above START
             for (int i = 0; i < searchLength; i++) {
-                if (noMoreMatchesForReplIndex[i] || searchList[i] == null || searchList[i].length()
== 0 || replacementList[i] == null) {
+                if (noMoreMatchesForReplIndex[i] || searchList[i] == null || 
+                    searchList[i].length() == 0 || replacementList[i] == null) 
+                {
                     continue;
                 }
                 tempIndex = text.indexOf(searchList[i], start);

Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/ExtendedMessageFormat.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/ExtendedMessageFormat.java?rev=635447&r1=635446&r2=635447&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/ExtendedMessageFormat.java
(original)
+++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/ExtendedMessageFormat.java
Sun Mar  9 23:27:09 2008
@@ -36,7 +36,7 @@
  * and the formats supported by <code>java.text.MessageFormat</code> can be overridden
  * at the format and/or format style level (see MessageFormat).  A "format element"
  * embedded in the message pattern is specified (<b>()?</b> signifies optionality):<br
/>
- * <code>{</code<i>argument-number</i><b>(</b><code>,</code><i>format-name</i><b>(</b><code>,</code><i>format-style</i><b>)?</b><b>)?</b><code>}</code>
+ * <code>{</code><i>argument-number</i><b>(</b><code>,</code><i>format-name</i><b>(</b><code>,</code><i>format-style</i><b>)?)?</b><code>}</code>
  *
  * <p>
  * <i>format-name</i> and <i>format-style</i> values are trimmed
of surrounding whitespace
@@ -192,7 +192,8 @@
         toPattern = insertFormats(super.toPattern(), foundDescriptions);
         if (containsElements(foundFormats)) {
             Format[] origFormats = getFormats();
-            //only loop over what we know we have, as MessageFormat on Java 1.3 seems to
provide an extra format element:
+            // only loop over what we know we have, as MessageFormat on Java 1.3 
+            // seems to provide an extra format element:
             int i = 0;
             for (Iterator it = foundFormats.iterator(); it.hasNext(); i++) {
                 Format f = (Format) it.next();



Mime
View raw message