svn commit: r1471325 - in /sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/iso: AbstractInternationalString.java ResourceInternationalString.java

[desruisseaux]

Author: desruisseaux
Date: Wed Apr 24 09:36:00 2013
New Revision: 1471325

URL: http://svn.apache.org/r1471325
Log:
Corrections from FindBugs report.

Modified:
    
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractInternationalString.java
    
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java

Modified: 
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractInternationalString.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractInternationalString.java?rev=1471325&r1=1471324&r2=1471325&view=diff
==============================================================================
--- 
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractInternationalString.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractInternationalString.java
 [UTF-8] Wed Apr 24 09:36:00 2013
@@ -100,14 +100,7 @@ public abstract class AbstractInternatio
      */
     @Override
     public CharSequence subSequence(final int start, final int end) {
-        final String text = toString();
-        if (text == null) {
-            if (start == 0 && end == 0) {
-                return "";
-            }
-            throw new StringIndexOutOfBoundsException();
-        }
-        return text.substring(start, end);
+        return toString().substring(start, end);
     }
 
     /**

Modified: 
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java?rev=1471325&r1=1471324&r2=1471325&view=diff
==============================================================================
--- 
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
 [UTF-8] Wed Apr 24 09:36:00 2013
@@ -173,7 +173,7 @@ public class ResourceInternationalString
     public boolean equals(final Object object) {
         if (object != null && object.getClass() == getClass()) {
             final ResourceInternationalString that = 
(ResourceInternationalString) object;
-            return key.equals(that.key) && resources.equals(resources);
+            return key.equals(that.key) && resources.equals(that.resources);
         }
         return false;
     }