misc. cleanup.

2 files changed, 16 insertions, 30 deletions

diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 58ede7bb6f10..bbffc8c3983f 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -98,25 +98,17 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         }
     }
 
-    //Only do something if the sunjavaplugin created this JavaInfo
-    rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc."));
-    rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("Oracle Corporation"));
-    rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation"));
-    rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team"));
-    rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Inc."));
-    rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc."));
-    rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
-    rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
-    rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
-    if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
-            || sVendor2.equals(pInfo->sVendor) == sal_True
-            || sVendor9.equals(pInfo->sVendor) == sal_True
-            || sVendor3.equals(pInfo->sVendor) == sal_True
-            || sVendor4.equals(pInfo->sVendor) == sal_True
-            || sVendor5.equals(pInfo->sVendor) == sal_True
-            || sVendor6.equals(pInfo->sVendor) == sal_True
-            || sVendor7.equals(pInfo->sVendor) == sal_True
-            || sVendor8.equals(pInfo->sVendor) == sal_True))
+    rtl::OUString aVendor( pInfo->sVendor );
+    // Only do something if the sunjavaplugin created this JavaInfo
+    if ( aVendor != "Sun Microsystems Inc." &&
+         aVendor != "Oracle Corporation" &&
+         aVendor != "IBM Corporation" &&
+         aVendor != "Blackdown Java-Linux Team" &&
+         aVendor != "Apple Inc." &&
+         aVendor != "Apple Computer, Inc." &&
+         aVendor != "BEA Systems, Inc." &&
+         aVendor != "Free Software Foundation, Inc." &&
+         aVendor != "The FreeBSD Foundation" )
         return 0;
 
     rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 9e40e8a37d3b..6c2bc0f6d82d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -25,14 +25,11 @@
 
 using namespace std;
 
-using ::rtl::OUString;
-using ::rtl::Reference;
-
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 namespace jfw_plugin
 {
 
-Reference<VendorBase> SunInfo::createInstance()
+rtl::Reference<VendorBase> SunInfo::createInstance()
 {
     return new SunInfo;
 }
@@ -50,7 +47,7 @@ char const* const* SunInfo::getJavaExePaths(int * size)
         "jre/bin/java"
 #endif
     };
-        *size = SAL_N_ELEMENTS(ar);
+    *size = SAL_N_ELEMENTS(ar);
     return ar;
 }
 
@@ -68,7 +65,6 @@ char const* const* SunInfo::getRuntimePaths(int * size)
         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
 #endif
-
     };
     *size = SAL_N_ELEMENTS(ar);
     return ar;
@@ -78,12 +74,10 @@ char const* const* SunInfo::getLibraryPaths(int* size)
 {
 #ifdef UNX
     static char const * ar[] = {
-
         "/lib/" JFW_PLUGIN_ARCH "/client",
         "/lib/" JFW_PLUGIN_ARCH "/server",
         "/lib/" JFW_PLUGIN_ARCH "/native_threads",
         "/lib/" JFW_PLUGIN_ARCH
-
     };
     *size = SAL_N_ELEMENTS(ar);
     return ar;
@@ -95,7 +89,7 @@ char const* const* SunInfo::getLibraryPaths(int* size)
 
 int SunInfo::compareVersions(const rtl::OUString& sSecond) const
 {
-    OUString sFirst = getVersion();
+    rtl::OUString sFirst = getVersion();
 
     SunVersion version1(sFirst);
     JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION
@@ -105,9 +99,9 @@ int SunInfo::compareVersions(const rtl::OUString& sSecond) const
     if ( ! version2)
         throw MalformedVersionException();
 
-    if(version1 == version2)
+    if (version1 == version2)
         return 0;
-    if(version1 > version2)
+    if (version1 > version2)
         return 1;
     else
         return -1;