summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-12 15:27:21 +0200
committerNoel Grandin <noel@peralex.com>2014-08-19 14:57:18 +0200
commit4b4bff34027cca49fd13e82d33d1b399848838fa (patch)
tree361bde1ae9cf88160694bec9d5f3c1893d398f66 /xmerge
parentc552aac9f889b094caaa35c3fd9d12fe7c3fc73c (diff)
java: no need to instantiate String objects directly
Change-Id: I7610774c94bf673ed3b574ffce04c4ee6ca93c03
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java2
6 files changed, 9 insertions, 9 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
index 9c79c9898c9f..83efc31d4660 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
@@ -588,7 +588,7 @@ public class TextStyle extends Style implements Cloneable {
v[0] = c.getRed();
v[1] = c.getGreen();
v[2] = c.getBlue();
- String colorString = new String("#");
+ String colorString = "#";
for (int i = 0; i <= 2; i++) {
String xx = Integer.toHexString(v[i]);
if (xx.length() < 2)
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
index 20f1a790dcce..fd47549359a1 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
@@ -38,7 +38,7 @@ public class BookSettings implements OfficeConstants {
private org.w3c.dom.Document settings = null;
private boolean hasColumnRowHeaders = true;
- private String activeSheet = new String();
+ private String activeSheet = "";
private ArrayList<SheetSettings> worksheetSettings = new ArrayList<SheetSettings>();
/**
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
index 1bde03f48da2..e437e18764d6 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
@@ -457,7 +457,7 @@ public class CellStyle extends Style implements Cloneable {
v[0] = c.getRed();
v[1] = c.getGreen();
v[2] = c.getBlue();
- String colorString = new String("#");
+ String colorString = "#";
for (int i = 0; i <= 2; i++) {
String xx = Integer.toHexString(v[i]);
if (xx.length() < 2)
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
index 3bf1dc70c2ec..8be897c47e9e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
@@ -369,7 +369,7 @@ public class Format implements Cloneable {
*/
@Override
public String toString() {
- return new String("Value : " + getValue() + " Category : " + getCategory());
+ return "Value : " + getValue() + " Category : " + getCategory();
}
/**
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
index c79abc3a1406..ba060cbf3e4b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
@@ -365,7 +365,7 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
repeatedRows = Integer.parseInt(repeatStr);
}
- String styleName = new String("");
+ String styleName = "";
if ( rowStyle != null) {
styleName = rowStyle.getNodeValue();
@@ -481,7 +481,7 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
col.setRepeated(repeatedColumns);
}
- String cellStyleName = new String("");
+ String cellStyleName = "";
if(tableDefaultCellStyle!=null) {
cellStyleName = tableDefaultCellStyle.getNodeValue();
@@ -502,7 +502,7 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
col.setFormat(defaultFmt);
}
- String styleName = new String("");
+ String styleName = "";
if(tableStyleNode!=null) {
styleName = tableStyleNode.getNodeValue();
@@ -568,7 +568,7 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
Node tableStyleNode =
cellAtt.getNamedItem(ATTRIBUTE_TABLE_STYLE_NAME);
- String styleName = new String("");
+ String styleName = "";
if(tableStyleNode!=null) {
styleName = tableStyleNode.getNodeValue();
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
index ce942134ef5c..f71dbe5bc80a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
@@ -66,7 +66,7 @@ public class ConverterInfoList {
bis.close();
int i = 1;
- String jarFileName = new String();
+ String jarFileName = "";
jars = new ArrayList<String>();
while ((jarFileName = props.getProperty("jarname" + i)) != null) {