summaryrefslogtreecommitdiff
path: root/qadevOOo/tests/java
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-11-24 20:58:56 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-11-24 20:58:56 +0100
commit718de51eb9f567fa433ac216114f5e6f16236209 (patch)
tree01793173eb9c16050f17638d5df0caaf65f7ac22 /qadevOOo/tests/java
parent224e9c81d87de598c00cd7025dfe43febcc08477 (diff)
Some Java String clean-up
Change-Id: I6728720a13f4b66edc6c5cd0b7a9bcb036e86ff2
Diffstat (limited to 'qadevOOo/tests/java')
-rw-r--r--qadevOOo/tests/java/ifc/presentation/_Presentation.java4
-rw-r--r--qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java2
-rw-r--r--qadevOOo/tests/java/ifc/style/_CharacterProperties.java2
-rw-r--r--qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java2
-rw-r--r--qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/ODatabaseForm.java2
-rw-r--r--qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java4
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java8
8 files changed, 12 insertions, 14 deletions
diff --git a/qadevOOo/tests/java/ifc/presentation/_Presentation.java b/qadevOOo/tests/java/ifc/presentation/_Presentation.java
index 0096abff8c66..3ac26dc41561 100644
--- a/qadevOOo/tests/java/ifc/presentation/_Presentation.java
+++ b/qadevOOo/tests/java/ifc/presentation/_Presentation.java
@@ -67,9 +67,9 @@ public class _Presentation extends MultiPropertyTest {
protected Object getNewValue(String propName, Object oldValue)
throws java.lang.IllegalArgumentException {
if ( ((String)oldValue).equals("SecondPresentation") ) {
- return new String("FirstPresentation");
+ return "FirstPresentation";
} else {
- return new String("SecondPresentation");
+ return "SecondPresentation";
}
}
};
diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java
index 1aeb2064d5d4..18d8ca0f981a 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java
@@ -66,7 +66,7 @@ public class _XCellRangeData extends MultiMethodTest {
Object[][] emptyData = new Object[newData.length][newData[0].length];
for (int i=0; i<emptyData.length; i++) {
for (int j=0; j<emptyData[i].length; j++) {
- emptyData[i][j] = new String();
+ emptyData[i][j] = "";
}
}
oObj.setDataArray(emptyData);
diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
index c03626e43824..b5f9234657d5 100644
--- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
+++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
@@ -262,7 +262,7 @@ public class _CharacterProperties extends MultiPropertyTest {
protected Object getNewValue(String propName, Object oldValue)
throws java.lang.IllegalArgumentException {
if (utils.isVoid(oldValue)) {
- return new String("RubyText");
+ return "RubyText";
} else {
return ValueChanger.changePValue(oldValue);
}
diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
index a955158aa156..c958adaf97ba 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
@@ -112,7 +112,7 @@ public class OQueryDesign extends TestCase {
log.println("check XMultiServiceFactory");
try {
- xConn = xDS.getConnection(new String(), new String());
+ xConn = xDS.getConnection("", "");
} catch (SQLException ex) {
ex.printStackTrace( log );
throw new StatusException( "Could not get XConnection", ex );
diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java
index 7cf1ee9c3a50..5e632d0e8251 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java
@@ -179,7 +179,7 @@ public class OSingleSelectQueryComposer extends TestCase {
log.println("check XMultiServiceFactory");
XMultiServiceFactory xConn = UnoRuntime.queryInterface(XMultiServiceFactory.class,
- xDS.getConnection(new String(),new String()));
+ xDS.getConnection("", ""));
log.println("check getAvailableServiceNames");
String[] sServiceNames = xConn.getAvailableServiceNames();
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index 9c884d95720c..464c00d50b1c 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -623,7 +623,7 @@ public class ODatabaseForm extends TestCase {
/***** statement parameter types and their initial
values must be added here as relation. */
- params.add(new String("SAU99")) ;
+ params.add("SAU99") ;
params.add(new Boolean(false)) ;
params.add(new Byte((byte) 123)) ;
params.add(new Short((short) 234)) ;
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java
index 03760b4de45b..370a439c9086 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java
@@ -88,7 +88,7 @@ public class AccessibleEditableTextPara extends TestCase {
new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() {
public void fireEvent() {
try {
- int l = new String("AccessibleEditablePara").length();
+ int l = "AccessibleEditablePara".length();
edText.deleteText(0, l);
edText.setText("Event");
edText.setText("AccessibleEditablePara");
@@ -147,4 +147,4 @@ public class AccessibleEditableTextPara extends TestCase {
}
}
-} \ No newline at end of file
+}
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java
index 3087387ce11a..8c2fc3182c38 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java
@@ -90,9 +90,7 @@ public class UnoControlDialogModel extends TestCase {
xPSetDialog.setPropertyValue("PositionY", new Integer(100));
xPSetDialog.setPropertyValue("Width", new Integer(150));
xPSetDialog.setPropertyValue("Height", new Integer(100));
- xPSetDialog.setPropertyValue("Title",
- new String("Runtime Dialog Demo"));
-
+ xPSetDialog.setPropertyValue("Title", "Runtime Dialog Demo");
// get the service manager from the dialog model
xMultiServiceFactory = UnoRuntime.queryInterface(
@@ -110,7 +108,7 @@ public class UnoControlDialogModel extends TestCase {
xPSetButton.setPropertyValue("Height", new Integer(14));
xPSetButton.setPropertyValue("Name", _buttonName);
xPSetButton.setPropertyValue("TabIndex", new Short((short) 0));
- xPSetButton.setPropertyValue("Label", new String("Click Me"));
+ xPSetButton.setPropertyValue("Label", "Click Me");
// create the label model and set the properties
Object labelModel = xMultiServiceFactory.createInstance(
@@ -177,4 +175,4 @@ public class UnoControlDialogModel extends TestCase {
return tEnv;
} // finish method getTestEnvironment
-} \ No newline at end of file
+}