summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-20 15:32:38 +0200
committerNoel Grandin <noel@peralex.com>2014-10-07 13:20:02 +0200
commitf9be44340a1fbabb67c7a33d8c9b4766a56c1fde (patch)
treebc4ca4eccbe7deefbf42a27862fcdb4440a18c32
parentdc53e3027bb1a278164f15d0a31f20c15608d10e (diff)
java: use equals() to compare Strings, not ==
Change-Id: Ia41a4899fb82df7b580a020765404c4ef0cddfa2
-rw-r--r--odk/examples/java/Storage/Test01.java2
-rw-r--r--odk/examples/java/Storage/Test04.java2
-rw-r--r--odk/examples/java/Storage/Test05.java2
-rw-r--r--odk/examples/java/Storage/Test07.java2
-rw-r--r--odk/examples/java/Storage/Test08.java2
-rw-r--r--odk/examples/java/Storage/Test09.java2
-rw-r--r--qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java2
-rw-r--r--qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java2
-rw-r--r--qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java2
9 files changed, 9 insertions, 9 deletions
diff --git a/odk/examples/java/Storage/Test01.java b/odk/examples/java/Storage/Test01.java
index b2e94b36ac44..ed2d1e9546aa 100644
--- a/odk/examples/java/Storage/Test01.java
+++ b/odk/examples/java/Storage/Test01.java
@@ -40,7 +40,7 @@ public class Test01 implements StorageTest {
try
{
String sTempFileURL = m_aTestHelper.CreateTempFile( m_xMSF );
- if ( sTempFileURL == null || sTempFileURL == "" )
+ if ( sTempFileURL == null || sTempFileURL.equals("") )
{
m_aTestHelper.Error( "No valid temporary file was created!" );
return false;
diff --git a/odk/examples/java/Storage/Test04.java b/odk/examples/java/Storage/Test04.java
index 79a55dcb25a4..2390a9140992 100644
--- a/odk/examples/java/Storage/Test04.java
+++ b/odk/examples/java/Storage/Test04.java
@@ -41,7 +41,7 @@ public class Test04 implements StorageTest {
try
{
String sTempFileURL = m_aTestHelper.CreateTempFile( m_xMSF );
- if ( sTempFileURL == null || sTempFileURL == "" )
+ if ( sTempFileURL == null || sTempFileURL.equals("") )
{
m_aTestHelper.Error( "No valid temporary file was created!" );
return false;
diff --git a/odk/examples/java/Storage/Test05.java b/odk/examples/java/Storage/Test05.java
index b0c84ae11b9f..571251bb276d 100644
--- a/odk/examples/java/Storage/Test05.java
+++ b/odk/examples/java/Storage/Test05.java
@@ -42,7 +42,7 @@ public class Test05 implements StorageTest {
try
{
String sTempFileURL = m_aTestHelper.CreateTempFile( m_xMSF );
- if ( sTempFileURL == null || sTempFileURL == "" )
+ if ( sTempFileURL == null || sTempFileURL.equals("") )
{
m_aTestHelper.Error( "No valid temporary file was created!" );
return false;
diff --git a/odk/examples/java/Storage/Test07.java b/odk/examples/java/Storage/Test07.java
index 7ae850fab32c..c89268817a21 100644
--- a/odk/examples/java/Storage/Test07.java
+++ b/odk/examples/java/Storage/Test07.java
@@ -40,7 +40,7 @@ public class Test07 implements StorageTest {
try
{
String sTempFileURL = m_aTestHelper.CreateTempFile( m_xMSF );
- if ( sTempFileURL == null || sTempFileURL == "" )
+ if ( sTempFileURL == null || sTempFileURL.equals("") )
{
m_aTestHelper.Error( "No valid temporary file was created!" );
return false;
diff --git a/odk/examples/java/Storage/Test08.java b/odk/examples/java/Storage/Test08.java
index adc911ccb95f..43e9423781e2 100644
--- a/odk/examples/java/Storage/Test08.java
+++ b/odk/examples/java/Storage/Test08.java
@@ -119,7 +119,7 @@ public class Test08 implements StorageTest {
// create temporary file
String sTempFileURL = m_aTestHelper.CreateTempFile( m_xMSF );
- if ( sTempFileURL == null || sTempFileURL == "" )
+ if ( sTempFileURL == null || sTempFileURL.equals("") )
{
m_aTestHelper.Error( "No valid temporary file was created!" );
return false;
diff --git a/odk/examples/java/Storage/Test09.java b/odk/examples/java/Storage/Test09.java
index 171ce6f25627..5e59562c6eb0 100644
--- a/odk/examples/java/Storage/Test09.java
+++ b/odk/examples/java/Storage/Test09.java
@@ -61,7 +61,7 @@ public class Test09 implements StorageTest {
// create temporary file
String sTempFileURL = m_aTestHelper.CreateTempFile( m_xMSF );
- if ( sTempFileURL == null || sTempFileURL == "" )
+ if ( sTempFileURL == null || sTempFileURL.equals( "" ) )
{
m_aTestHelper.Error( "No valid temporary file was created!" );
return false;
diff --git a/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java b/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java
index fc21d22263c5..5b946e75697b 100644
--- a/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java
+++ b/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java
@@ -98,7 +98,7 @@ public class _TableAutoFormatField extends MultiPropertyTest {
testProperty("CharLocale", new PropertyTester() {
@Override
protected Object getNewValue(String p, Object old) {
- return old == null || ((Locale)old).Language == "de" ?
+ return old == null || ((Locale)old).Language.equals( "de" ) ?
new Locale("es", "ES", "") : new Locale("de", "DE", "") ;
}
}) ;
diff --git a/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java b/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java
index 9f5202a3fd75..480c0e3bd7a8 100644
--- a/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java
+++ b/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java
@@ -88,7 +88,7 @@ public class DLLComponentLoader extends TestCase {
tEnv.addObjRelation("ImplementationLoader",
"com.sun.star.loader.SharedLibrary") ;
String os = (String) Param.get("OS");
- if (os == null || os == "")
+ if (os == null || os.equals(""))
throw new StatusException(
"Couldn't determine operating system for naming convention.",
new NullPointerException());
diff --git a/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java b/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java
index 6bf6ba473751..dd7df76c9138 100644
--- a/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java
+++ b/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java
@@ -87,7 +87,7 @@ public class DLLComponentLoader extends TestCase {
tEnv.addObjRelation("ImplementationLoader",
"com.sun.star.loader.SharedLibrary") ;
String os = (String) Param.get("OS");
- if (os == null || os == "")
+ if (os == null || os.equals(""))
throw new StatusException(
"Couldn't determine operating system for naming convention.",
new NullPointerException());