svn commit: r1553567 - in /jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators: CollatorComparator.java HumanComparator.java JavaNaturalComparator.java

[juanpablo]

Author: juanpablo
Date: Thu Dec 26 19:59:32 2013
New Revision: 1553567

URL: http://svn.apache.org/r1553567
Log:
use of StringUtils.equals( str1, str2 ) instead of == to compare str1 and str2

Modified:
    
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java
    
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
    
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java

Modified: 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java?rev=1553567&r1=1553566&r2=1553567&view=diff
==============================================================================
--- 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java
 (original)
+++ 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java
 Thu Dec 26 19:59:32 2013
@@ -22,6 +22,8 @@ package org.apache.wiki.util.comparators
 import java.text.Collator;
 import java.util.Comparator;
 
+import org.apache.commons.lang.StringUtils;
+
 /**
  * A comparator that sorts Strings using a Collator. This class is needed
  * because, even though Collator implements
@@ -61,12 +63,15 @@ public class CollatorComparator implemen
      */
     public int compare( String str1, String str2 )
     {
-        if( str1 == str2 )
-            return 0; // the same object
-        if( str1 == null )
-            return -1; // str1 is null and str2 isn't so str1 is smaller
-        if( str2 == null )
-            return 1; // str2 is null and str1 isn't so str1 is bigger
+        if( StringUtils.equals( str1, str2 ) ) {
+               return 0; // the same object
+        }
+        if( str1 == null ) {
+               return -1; // str1 is null and str2 isn't so str1 is smaller
+        }
+        if( str2 == null ) {
+               return 1; // str2 is null and str1 isn't so str1 is bigger
+        }
         return m_collator.compare( str1, str2 );
     }
 

Modified: 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java?rev=1553567&r1=1553566&r2=1553567&view=diff
==============================================================================
--- 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
 (original)
+++ 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
 Thu Dec 26 19:59:32 2013
@@ -21,6 +21,8 @@ package org.apache.wiki.util.comparators
 
 import java.util.Comparator;
 
+import org.apache.commons.lang.StringUtils;
+
 /**
  * A comparator that sorts Strings using "human" ordering, including decimal
  * ordering. Only works for languages where every character is lexigraphically
@@ -79,16 +81,13 @@ public class HumanComparator implements 
     public int compare( String str1, String str2 )
     {
         // Some quick and easy checks
-        if( str1 == str2 )
-        {
+        if( StringUtils.equals( str1, str2 ) ) {
             // they're identical, possibly both null
             return 0;
-        } else if ( str1 == null )
-        {
+        } else if ( str1 == null ) {
             // str1 is null and str2 isn't so str1 is smaller
             return -1;
-        } else if ( str2 == null )
-        {
+        } else if ( str2 == null ) {
             // str2 is null and str1 isn't so str1 is bigger
             return 1;
         }

Modified: 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java?rev=1553567&r1=1553566&r2=1553567&view=diff
==============================================================================
--- 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java
 (original)
+++ 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java
 Thu Dec 26 19:59:32 2013
@@ -21,6 +21,8 @@ package org.apache.wiki.util.comparators
 
 import java.util.Comparator;
 
+import org.apache.commons.lang.StringUtils;
+
 /**
  * A comparator that sorts Strings using Java's "natural" order.
  * 
@@ -34,14 +36,16 @@ public class JavaNaturalComparator imple
      * (non-Javadoc)
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
-    public int compare( String str1, String str2 )
-    {
-        if ( str1 == str2 )
-            return 0; // the same object
-        if( str1 == null )
-            return -1; // str1 is null and str2 isn't so str1 is smaller
-        if( str2 == null )
-            return 1; // str2 is null and str1 isn't so str1 is bigger
+    public int compare( String str1, String str2 ) {
+        if (StringUtils.equals( str1, str2 ) ) {
+               return 0; // the same object
+        }
+        if( str1 == null ) {
+               return -1; // str1 is null and str2 isn't so str1 is smaller
+        }
+        if( str2 == null ) {
+               return 1; // str2 is null and str1 isn't so str1 is bigger
+        }
         return str1.compareTo( str2 );
     }
 }