From 0e1aa757507ef11b612d12247bac9a38495f492d Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Thu, 13 Aug 2015 00:38:04 +0000 Subject: [PATCH] findbugs - DM_NUMBER_CTOR git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1695635 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/hssf/record/aggregates/SharedValueManager.java | 2 +- .../java/org/apache/poi/xssf/streaming/SXSSFSheet.java | 8 ++++---- .../java/org/apache/poi/xwpf/usermodel/BreakClear.java | 4 ++-- .../java/org/apache/poi/xwpf/usermodel/BreakType.java | 4 ++-- .../org/apache/poi/xwpf/usermodel/LineSpacingRule.java | 4 ++-- .../org/apache/poi/xwpf/usermodel/ParagraphAlignment.java | 4 ++-- .../java/org/apache/poi/xwpf/usermodel/TextAlignment.java | 4 ++-- .../org/apache/poi/xwpf/usermodel/UnderlinePatterns.java | 4 ++-- .../java/org/apache/poi/xwpf/usermodel/VerticalAlign.java | 4 ++-- .../poi/hslf/model/textproperties/TextPFException9.java | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java b/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java index 7f6e4022d7..f2ccc71e45 100644 --- a/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java +++ b/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java @@ -178,7 +178,7 @@ public final class SharedValueManager { private Integer getKeyForCache(final CellReference cellRef) { // The HSSF has a max of 2^16 rows and 2^8 cols - return new Integer((cellRef.getCol()+1)<<16 | cellRef.getRow()); + return ((cellRef.getCol()+1)<<16 | cellRef.getRow()); } /** diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java index 283b829c2a..0094976530 100644 --- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java +++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java @@ -135,7 +135,7 @@ public class SXSSFSheet implements Sheet, Cloneable if(initialAllocationSize<=0) initialAllocationSize=10; SXSSFRow newRow=new SXSSFRow(this,initialAllocationSize); - _rows.put(new Integer(rownum),newRow); + _rows.put(rownum,newRow); allFlushed = false; if(_randomAccessWindowSize>=0&&_rows.size()>_randomAccessWindowSize) { @@ -182,7 +182,7 @@ public class SXSSFSheet implements Sheet, Cloneable */ public SXSSFRow getRow(int rownum) { - return _rows.get(new Integer(rownum)); + return _rows.get(rownum); } /** @@ -1165,7 +1165,7 @@ public class SXSSFSheet implements Sheet, Cloneable */ public void setRowOutlineLevel(int rownum, int level) { - SXSSFRow row = _rows.get(new Integer(rownum)); + SXSSFRow row = _rows.get(rownum); row.setOutlineLevel(level); if(level > 0 && level > outlineLevelRow) { outlineLevelRow = level; @@ -1513,7 +1513,7 @@ public class SXSSFSheet implements Sheet, Cloneable { removeRow(row); - _rows.put(new Integer(newRowNum),row); + _rows.put(newRowNum,row); } public int getRowNum(SXSSFRow row) diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakClear.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakClear.java index 4fbef1d20f..e44bb3b0f4 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakClear.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakClear.java @@ -87,7 +87,7 @@ public enum BreakClear { static { for (BreakClear p : values()) { - imap.put(new Integer(p.getValue()), p); + imap.put(p.getValue(), p); } } @@ -98,7 +98,7 @@ public enum BreakClear { } public static BreakClear valueOf(int type) { - BreakClear bType = imap.get(new Integer(type)); + BreakClear bType = imap.get(type); if (bType == null) throw new IllegalArgumentException("Unknown break clear type: " + type); diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakType.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakType.java index 94cddab502..30fc939cb0 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakType.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakType.java @@ -60,7 +60,7 @@ public enum BreakType { static { for (BreakType p : values()) { - imap.put(new Integer(p.getValue()), p); + imap.put(p.getValue(), p); } } @@ -71,7 +71,7 @@ public enum BreakType { } public static BreakType valueOf(int type) { - BreakType bType = imap.get(new Integer(type)); + BreakType bType = imap.get(type); if (bType == null) throw new IllegalArgumentException("Unknown break type: " + type); diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java index b46c53206c..b52d2c34f9 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java @@ -53,7 +53,7 @@ public enum LineSpacingRule { static { for (LineSpacingRule p : values()) { - imap.put(new Integer(p.getValue()), p); + imap.put(p.getValue(), p); } } @@ -64,7 +64,7 @@ public enum LineSpacingRule { } public static LineSpacingRule valueOf(int type) { - LineSpacingRule lineType = imap.get(new Integer(type)); + LineSpacingRule lineType = imap.get(type); if (lineType == null) throw new IllegalArgumentException("Unknown line type: " + type); return lineType; diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java index 226d4095ae..7cffb30a58 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java @@ -44,7 +44,7 @@ public enum ParagraphAlignment { static { for (ParagraphAlignment p : values()) { - imap.put(new Integer(p.getValue()), p); + imap.put(p.getValue(), p); } } @@ -55,7 +55,7 @@ public enum ParagraphAlignment { } public static ParagraphAlignment valueOf(int type) { - ParagraphAlignment err = imap.get(new Integer(type)); + ParagraphAlignment err = imap.get(type); if (err == null) throw new IllegalArgumentException("Unknown paragraph alignment: " + type); return err; } diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextAlignment.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextAlignment.java index 7c1187df60..1cc6434c91 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextAlignment.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextAlignment.java @@ -56,7 +56,7 @@ public enum TextAlignment { static { for (TextAlignment p : values()) { - imap.put(new Integer(p.getValue()), p); + imap.put(p.getValue(), p); } } @@ -67,7 +67,7 @@ public enum TextAlignment { } public static TextAlignment valueOf(int type) { - TextAlignment align = imap.get(new Integer(type)); + TextAlignment align = imap.get(type); if (align == null) throw new IllegalArgumentException("Unknown text alignment: " + type); return align; } diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java index 9272ac0600..c99b17bd7a 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java @@ -139,7 +139,7 @@ public enum UnderlinePatterns { static { for (UnderlinePatterns p : values()) { - imap.put(new Integer(p.getValue()), p); + imap.put(p.getValue(), p); } } @@ -150,7 +150,7 @@ public enum UnderlinePatterns { } public static UnderlinePatterns valueOf(int type) { - UnderlinePatterns align = imap.get(new Integer(type)); + UnderlinePatterns align = imap.get(type); if (align == null) throw new IllegalArgumentException("Unknown underline pattern: " + type); diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java index 4114c11009..7b7538d192 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java @@ -51,7 +51,7 @@ public enum VerticalAlign { static { for (VerticalAlign p : values()) { - imap.put(new Integer(p.getValue()), p); + imap.put(p.getValue(), p); } } @@ -62,7 +62,7 @@ public enum VerticalAlign { } public static VerticalAlign valueOf(int type) { - VerticalAlign align = imap.get(new Integer(type)); + VerticalAlign align = imap.get(type); if (align == null) throw new IllegalArgumentException("Unknown vertical alignment: " + type); diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java index 271b2591f9..262a845f51 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java @@ -44,7 +44,7 @@ public class TextPFException9 { private final AutoNumberingScheme autoNumberScheme; private final static AutoNumberingScheme DEFAULT_AUTONUMBER_SHEME = AutoNumberingScheme.arabicPeriod; private final Short autoNumberStartNumber; - private final static Short DEFAULT_START_NUMBER = new Short((short)1); + private final static Short DEFAULT_START_NUMBER = 1; private final int recordLength; public TextPFException9(final byte[] source, final int startIndex) { //this.mask1 = source[startIndex]; -- 2.39.5