java:regulatize the order of 'final' and public/private

Make the order be 'public static' or 'private static'
Just makes the code nicer to read.

Change-Id: I182424bda45a2d68642e5d04c6091d268ace1fe2
Reviewed-on: https://gerrit.libreoffice.org/16202
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

4 files changed, 18 insertions, 18 deletions

diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index 537959b98e24..70328ce5ec8c 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -93,7 +93,7 @@ public class Bootstrap {
     /**
      * backwards compatibility stub.
      */
-    static public XComponentContext createInitialComponentContext( Hashtable<String, Object> context_entries )
+    public static XComponentContext createInitialComponentContext( Hashtable<String, Object> context_entries )
             throws Exception
     {
         return createInitialComponentContext((Map<String, Object>) context_entries);
@@ -104,7 +104,7 @@ public class Bootstrap {
         context entries (type class ComponentContextEntry).
         @return a new context.
     */
-    static public XComponentContext createInitialComponentContext( Map<String, Object> context_entries )
+    public static XComponentContext createInitialComponentContext( Map<String, Object> context_entries )
         throws Exception
     {
         ServiceManager xSMgr = new ServiceManager();
@@ -142,7 +142,7 @@ public class Bootstrap {
      *
      * @return     a freshly boostrapped service manager
      */
-    static public XMultiServiceFactory createSimpleServiceManager() throws Exception
+    public static XMultiServiceFactory createSimpleServiceManager() throws Exception
     {
         return UnoRuntime.queryInterface(
             XMultiServiceFactory.class, createInitialComponentContext( (Map<String, Object>) null ).getServiceManager() );
@@ -154,7 +154,7 @@ public class Bootstrap {
         See also
         <code>cppuhelper/defaultBootstrap_InitialComponentContext()</code>.
     */
-    static public final XComponentContext defaultBootstrap_InitialComponentContext()
+    public static final XComponentContext defaultBootstrap_InitialComponentContext()
         throws Exception
     {
         return defaultBootstrap_InitialComponentContext( (String) null, (Map<String,String>) null );
@@ -162,7 +162,7 @@ public class Bootstrap {
     /**
      * Backwards compatibility stub.
      */
-    static public final XComponentContext defaultBootstrap_InitialComponentContext(
+    public static final XComponentContext defaultBootstrap_InitialComponentContext(
             String ini_file, Hashtable<String,String> bootstrap_parameters )
             throws Exception
     {
@@ -179,7 +179,7 @@ public class Bootstrap {
         @param bootstrap_parameters
                bootstrap parameters (maybe null)
     */
-    static public final XComponentContext defaultBootstrap_InitialComponentContext(
+    public static final XComponentContext defaultBootstrap_InitialComponentContext(
         String ini_file, Map<String,String> bootstrap_parameters )
         throws Exception
     {
@@ -232,8 +232,8 @@ public class Bootstrap {
                 ini_file, pairs, Bootstrap.class.getClassLoader() ) );
     }
 
-    static private boolean m_loaded_juh = false;
-    static private native Object cppuhelper_bootstrap(
+    private static boolean m_loaded_juh = false;
+    private static native Object cppuhelper_bootstrap(
         String ini_file, String bootstrap_parameters [], ClassLoader loader )
         throws Exception;
 
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java b/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
index ca5e7a0aadd2..b0c31353971f 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
@@ -61,7 +61,7 @@ public class UnoUrl {
     private final UnoUrlPart protocol;
     private final String rootOid;
 
-    static private class UnoUrlPart {
+    private static class UnoUrlPart {
 
         private final String partTypeName;
         private final HashMap<String,String> partParameters;
diff --git a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
index 184515d47d8b..ce85cb78fc91 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
@@ -33,7 +33,7 @@ public class Bootstrap_Test {
 
     private static final Logger logger = Logger.getLogger(Bootstrap_Test.class.getName());
 
-    static public boolean test( String ini_file, Map<String,String> bootstrap_parameters )
+    public static boolean test( String ini_file, Map<String,String> bootstrap_parameters )
         throws java.lang.Exception
     {
         boolean passed = false;
@@ -85,7 +85,7 @@ public class Bootstrap_Test {
         System.exit( -1 );
     }
 
-    static public void main(String args[]) throws java.lang.Exception {
+    public static void main(String args[]) throws java.lang.Exception {
         if ( args.length == 0 )
             usage();
 
diff --git a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
index 3df517eec804..550a497018dc 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
@@ -39,7 +39,7 @@ public class SharedLibraryLoader_Test {
     private static XImplementationLoader    sharedLibraryLoader         = null;
     private static XSimpleRegistry          simpleRegistry              = null;
 
-    static public boolean test_getSharedLibraryLoaderFactory()
+    public static boolean test_getSharedLibraryLoaderFactory()
             throws java.lang.Exception
     {
         sharedLibraryLoaderFactory = null;
@@ -55,7 +55,7 @@ public class SharedLibraryLoader_Test {
         return sharedLibraryLoaderFactory != null;
     }
 
-    static public boolean test_instantiateSharedLibraryLoader()
+    public static boolean test_instantiateSharedLibraryLoader()
             throws java.lang.Exception
     {
         sharedLibraryLoader = null;
@@ -76,7 +76,7 @@ public class SharedLibraryLoader_Test {
         return sharedLibraryLoader != null;
     }
 
-    static public boolean test_loadNativeServiceManager()
+    public static boolean test_loadNativeServiceManager()
             throws java.lang.Exception
     {
         nativeServiceManager = null;
@@ -103,7 +103,7 @@ public class SharedLibraryLoader_Test {
         return nativeServiceManager != null;
     }
 
-    static public boolean test_loadNativeSimpleRegistry()
+    public static boolean test_loadNativeSimpleRegistry()
             throws java.lang.Exception
     {
         System.out.println("*******************************************************************");
@@ -127,7 +127,7 @@ public class SharedLibraryLoader_Test {
         return true;
     }
 
-    static public boolean test_registerSharedLibraryLoader()
+    public static boolean test_registerSharedLibraryLoader()
             throws java.lang.Exception
     {
         boolean result = true;
@@ -148,7 +148,7 @@ public class SharedLibraryLoader_Test {
         return result;
     }
 
-    static public boolean test() throws java.lang.Exception {
+    public static boolean test() throws java.lang.Exception {
         boolean passed = true;
 
         System.err.println("SharedLibraryLoader - doing tests...");
@@ -162,7 +162,7 @@ public class SharedLibraryLoader_Test {
         return passed;
     }
 
-    static public void main(String args[]) throws java.lang.Exception {
+    public static void main(String args[]) throws java.lang.Exception {
         System.exit( test() ? 0: -1 );
     }
 }