... to prevent my IDE from complaining. In various places the patch
- removes "new String"
- replaces "new Character", "new Integer", "new Long" with
"Character.valueOf" etc
- fixed endless loop in
org/apache/poi/hssf/usermodel/EscherGraphics2d.drawString
Patch against trunk:
Index: src/java/org/apache/poi/poifs/dev/POIFSHeaderDumper.java
===================================================================
--- src/java/org/apache/poi/poifs/dev/POIFSHeaderDumper.java (revision
1043185)
+++ src/java/org/apache/poi/poifs/dev/POIFSHeaderDumper.java (working copy)
@@ -123,7 +123,7 @@
gbm.setAccessible(true);
for(int i=0; i<Math.min(16, data_blocks.blockCount()); i++) {
- ListManagedBlock block = (ListManagedBlock)gbm.invoke(data_blocks,
new Integer(i));
+ ListManagedBlock block = (ListManagedBlock)gbm.invoke(data_blocks,
Integer.valueOf(i));
byte[] data = new byte[Math.min(48, block.getData().length)];
System.arraycopy(block.getData(), 0, data, 0, data.length);
Index: src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
===================================================================
--- src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
(revision 1043185)
+++ src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
(working copy)
@@ -308,7 +308,7 @@
public void drawString(AttributedCharacterIterator
attributedcharacteriterator, int x, int y)
{
- drawString(attributedcharacteriterator, x, y);
+ getEscherGraphics().drawString(attributedcharacteriterator, x, y);
}
public void fill(Shape shape)
Index: src/java/org/apache/poi/hssf/usermodel/FontDetails.java
===================================================================
--- src/java/org/apache/poi/hssf/usermodel/FontDetails.java (revision
1043185)
+++ src/java/org/apache/poi/hssf/usermodel/FontDetails.java (working copy)
@@ -57,7 +57,7 @@
public void addChar( char c, int width )
{
- charWidths.put(new Character(c), Integer.valueOf(width));
+ charWidths.put(Character.valueOf(c), Integer.valueOf(width));
}
/**
@@ -67,7 +67,7 @@
*/
public int getCharWidth( char c )
{
- Integer widthInteger = charWidths.get(new Character(c));
+ Integer widthInteger = charWidths.get(Character.valueOf(c));
if (widthInteger == null && c != 'W') {
return getCharWidth('W');
}
@@ -78,7 +78,7 @@
{
for ( int i = 0; i < characters.length; i++ )
{
- charWidths.put( new Character(characters[i]),
Integer.valueOf(widths[i]));
+ charWidths.put( Character.valueOf(characters[i]),
Integer.valueOf(widths[i]));
}
}
Index: src/java/org/apache/poi/hssf/record/SSTSerializer.java
===================================================================
--- src/java/org/apache/poi/hssf/record/SSTSerializer.java (revision
1043185)
+++ src/java/org/apache/poi/hssf/record/SSTSerializer.java (working copy)
@@ -38,7 +38,6 @@
private final int[] bucketAbsoluteOffsets;
/** Offsets relative the start of the current SST or continue record */
private final int[] bucketRelativeOffsets;
- int startOfSST, startOfRecord;
public SSTSerializer( IntMapper<UnicodeString> strings, int numStrings,
int numUniqueStrings )
{
Index: src/java/org/apache/poi/hssf/record/common/UnicodeString.java
===================================================================
--- src/java/org/apache/poi/hssf/record/common/UnicodeString.java
(revision 1043185)
+++ src/java/org/apache/poi/hssf/record/common/UnicodeString.java
(working copy)
@@ -266,7 +266,7 @@
ext.formattingFontIndex = formattingFontIndex;
ext.formattingOptions = formattingOptions;
ext.numberOfRuns = numberOfRuns;
- ext.phoneticText = new String(phoneticText);
+ ext.phoneticText = phoneticText;
ext.phRuns = new PhRun[phRuns.length];
for(int i=0; i<ext.phRuns.length; i++) {
ext.phRuns[i] = new PhRun(
Index: src/java/org/apache/poi/util/POILogger.java
===================================================================
--- src/java/org/apache/poi/util/POILogger.java (revision 1043185)
+++ src/java/org/apache/poi/util/POILogger.java (working copy)
@@ -610,7 +610,7 @@
for (int j = 0; j < array.length; j++)
{
- results.add(new Character(array[ j ]));
+ results.add(Character.valueOf(array[ j ]));
}
}
else if (object instanceof short [])
Index: src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
===================================================================
--- src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
(revision 1043185)
+++ src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
(working copy)
@@ -383,7 +383,7 @@
j += 33;
// System.out.println(j);
sb.append(">");
- sb.append(new Character(j));
+ sb.append(Character.valueOf(j));
sb.append("=");
sb.append(umlaute[rand.nextInt(umlaute.length)]);
sb.append("<");
@@ -509,7 +509,7 @@
j += 33;
// System.out.println(j);
sb.append(">");
- sb.append(new Character(j));
+ sb.append(Character.valueOf(j));
sb.append("=");
sb.append(umlaute[rand.nextInt(umlaute.length)]);
sb.append("<");
Index:
src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
===================================================================
---
src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
(revision 1043185)
+++
src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
(working copy)
@@ -63,7 +63,7 @@
public void addTestRow(long rawBits, String
expectedExcelRendering) {
writeDataRow(_sheet, _rowIndex++, rawBits,
expectedExcelRendering);
if(Double.isNaN(Double.longBitsToDouble(rawBits))) {
- _replacementNaNs.add(new Long(rawBits));
+ _replacementNaNs.add(Long.valueOf(rawBits));
}
}
Index: src/testcases/org/apache/poi/util/DummyPOILogger.java
===================================================================
--- src/testcases/org/apache/poi/util/DummyPOILogger.java (revision
1043185)
+++ src/testcases/org/apache/poi/util/DummyPOILogger.java (working copy)
@@ -37,10 +37,10 @@
public void initialize(String cat) {}
public void log(int level, Object obj1) {
- logged.add(new String(level + " - " + obj1));
+ logged.add(level + " - " + obj1);
}
public void log(int level, Object obj1, Throwable exception) {
- logged.add(new String(level + " - " + obj1 + " - " +
exception));
+ logged.add(level + " - " + obj1 + " - " + exception);
}
}
Cheers,
Marcel
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
