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 --- .../java/com/sun/star/script/framework/container/ParcelContainer.java | 2 +- scripting/java/com/sun/star/script/framework/io/XStorageHelper.java | 4 ++-- .../framework/provider/javascript/ScriptEditorForJavaScript.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scripting') diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java index f6d9d71ac767..2988e5e85a63 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java @@ -61,7 +61,7 @@ public class ParcelContainer implements XNameAccess { protected String language; protected String containerUrl; private Collection parcels = new ArrayList(10); - static protected XSimpleFileAccess m_xSFA; + protected static XSimpleFileAccess m_xSFA; protected XComponentContext m_xCtx; private ParcelContainer parent = null; private final Collection childContainers = new diff --git a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java index 7123ca5c8973..2d05d4dbb0db 100644 --- a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java +++ b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java @@ -220,7 +220,7 @@ public class XStorageHelper implements XEventListener { } - static public void disposeObject(XInterface xInterface) { + public static void disposeObject(XInterface xInterface) { if (xInterface == null) { return; } @@ -235,7 +235,7 @@ public class XStorageHelper implements XEventListener { xComponent.dispose(); } - static public void commit(XInterface xInterface) { + public static void commit(XInterface xInterface) { XTransactedObject xTrans = UnoRuntime.queryInterface(XTransactedObject.class, xInterface); diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java index 63023ea61caa..0f83d3f70d0a 100644 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java @@ -48,7 +48,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor { // template for JavaScript scripts private static String JSTEMPLATE; - static private Main rhinoWindow; + private static Main rhinoWindow; private URL scriptURL; // global list of ScriptEditors, key is URL of file being edited private static Map BEING_EDITED = new -- cgit