From efd4bfa818e262d7dc219ac3ceb85526fedc732c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 9 Jun 2015 13:30:49 +0200 Subject: 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 Tested-by: Noel Grandin --- javaunohelper/com/sun/star/comp/helper/Bootstrap.java | 16 ++++++++-------- javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'javaunohelper/com/sun') 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 context_entries ) + public static XComponentContext createInitialComponentContext( Hashtable context_entries ) throws Exception { return createInitialComponentContext((Map) context_entries); @@ -104,7 +104,7 @@ public class Bootstrap { context entries (type class ComponentContextEntry). @return a new context. */ - static public XComponentContext createInitialComponentContext( Map context_entries ) + public static XComponentContext createInitialComponentContext( Map 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) null ).getServiceManager() ); @@ -154,7 +154,7 @@ public class Bootstrap { See also cppuhelper/defaultBootstrap_InitialComponentContext(). */ - static public final XComponentContext defaultBootstrap_InitialComponentContext() + public static final XComponentContext defaultBootstrap_InitialComponentContext() throws Exception { return defaultBootstrap_InitialComponentContext( (String) null, (Map) 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 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 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 partParameters; -- cgit