summaryrefslogtreecommitdiff
path: root/javaunohelper/com/sun/star
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-06-09 13:30:49 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-06-11 09:34:00 +0000
commitefd4bfa818e262d7dc219ac3ceb85526fedc732c (patch)
tree932b54f6c3689d3c087f4f3911f66695c8817229 /javaunohelper/com/sun/star
parenta6f4fde8baf3eeb36820d18ffad84192e995145f (diff)
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>
Diffstat (limited to 'javaunohelper/com/sun/star')
-rw-r--r--javaunohelper/com/sun/star/comp/helper/Bootstrap.java16
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java2
2 files changed, 9 insertions, 9 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;