Allow spotbugs to pass

2 files changed, 3 insertions, 4 deletions

diff --git a/fop-core/src/main/java/org/apache/fop/fo/properties/StringProperty.java b/fop-core/src/main/java/org/apache/fop/fo/properties/StringProperty.java
index d9718564f..e6ab54f9d 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/properties/StringProperty.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/properties/StringProperty.java
@@ -125,8 +125,7 @@ public final class StringProperty extends Property {
         }
         if (obj instanceof StringProperty) {
             StringProperty sp = (StringProperty)obj;
-            return (sp.str == this.str
-                    || sp.str.equals(this.str));
+            return sp.str.equals(this.str);
         }
         return false;
     }
diff --git a/fop-core/src/main/java/org/apache/fop/render/rtf/FoUnitsConverter.java b/fop-core/src/main/java/org/apache/fop/render/rtf/FoUnitsConverter.java
index 154bee0c0..0e0741855 100644
--- a/fop-core/src/main/java/org/apache/fop/render/rtf/FoUnitsConverter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/rtf/FoUnitsConverter.java
@@ -101,7 +101,7 @@ final class FoUnitsConverter {
         // convert number to integer
         try {
             if (number != null && number.trim().length() > 0) {
-                result = Float.valueOf(number);
+                result = Float.parseFloat(number);
             }
         } catch (Exception e) {
             throw new FOPException("number format error: cannot convert '"
@@ -132,7 +132,7 @@ final class FoUnitsConverter {
         float result = 0;
         size = size.substring(0, size.length() - sFONTSUFFIX.length());
         try {
-            result = (Float.valueOf(size));
+            result = Float.parseFloat(size);
         } catch (Exception e) {
             throw new FOPException("Invalid font size value '" + size + "'");
         }