Bugzilla 47962 - Fixed some potential NPEs. Avoided unnecessary creation of box instances. Applied patch with mods

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@823348 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 6 insertions, 6 deletions

diff --git a/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java b/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
index fdb5c99b49..e9eebaff41 100644
--- a/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
+++ b/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
@@ -67,9 +67,9 @@ import java.util.Map;
  * <p/>
  *
  * @author Yegor Kozlov
- *  
- * Modified 6/17/09 by Stanislav Shor - positive formats don't need starting '(' 
- *  
+ *
+ * Modified 6/17/09 by Stanislav Shor - positive formats don't need starting '('
+ *
  */
 public final class BuiltinFormats {
 	/**
@@ -142,7 +142,7 @@ public final class BuiltinFormats {
 	public static Map<Integer, String> getBuiltinFormats() {
 		Map<Integer, String> result = new LinkedHashMap<Integer, String>();
 		for (int i=0; i<_formats.length; i++) {
-			result.put(new Integer(i), _formats[i]);
+			result.put(Integer.valueOf(i), _formats[i]);
 		}
 		return result;
 	}
diff --git a/src/java/org/apache/poi/ss/usermodel/DataFormatter.java b/src/java/org/apache/poi/ss/usermodel/DataFormatter.java
index f402a0cfab..bb7ef000e4 100644
--- a/src/java/org/apache/poi/ss/usermodel/DataFormatter.java
+++ b/src/java/org/apache/poi/ss/usermodel/DataFormatter.java
@@ -147,7 +147,7 @@ public class DataFormatter {
         if (format != null) {
             return format;
         }
-        if (formatStr.equals("General") || formatStr.equals("@")) {
+        if ("General".equals(formatStr) || "@".equals(formatStr)) {
             if (DataFormatter.isWholeNumber(cellValue)) {
                 return generalWholeNumFormat;
             }
@@ -257,7 +257,7 @@ public class DataFormatter {
                 if(mIsMonth) {
                     sb.append('M');
                     ms.add(
-                            new Integer(sb.length() -1)
+                            Integer.valueOf(sb.length() -1)
                     );
                 } else {
                     sb.append('m');