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>

12 files changed, 51 insertions, 51 deletions

diff --git a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
index d84b7397e3ed..50c82c91bb37 100644
--- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
+++ b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
@@ -46,7 +46,7 @@ import com.sun.star.uno.UnoRuntime;
  * @since       UDK1.0
  */
 public class BridgeFactory implements XBridgeFactory/*, XEventListener*/ {
-    static private final boolean DEBUG = false;
+    private static final boolean DEBUG = false;
 
     /**
      * The name of the service, the <code>JavaLoader</code> accesses this through
diff --git a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java b/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
index 8204ef16bff6..a5e7284a23d4 100644
--- a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
+++ b/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
@@ -42,13 +42,13 @@ public class ConstantInstanceProvider implements XInstanceProvider {
     /**
      * When set to true, enables various debugging output.
      */
-    static public final boolean DEBUG = false;
+    public static final boolean DEBUG = false;
 
     /**
      * The name of the service, the <code>JavaLoader</code> accesses this through
      * reflection.
      */
-    static private final String __serviceName = "com.sun.star.comp.connection.InstanceProvider";
+    private static final String __serviceName = "com.sun.star.comp.connection.InstanceProvider";
 
     /**
      * Gives a factory for creating the service.
diff --git a/jurt/com/sun/star/comp/connections/PipedConnection.java b/jurt/com/sun/star/comp/connections/PipedConnection.java
index 91541508b65b..3cfe6078e71c 100644
--- a/jurt/com/sun/star/comp/connections/PipedConnection.java
+++ b/jurt/com/sun/star/comp/connections/PipedConnection.java
@@ -44,7 +44,7 @@ public class PipedConnection implements XConnection {
      * The name of the service, the <code>JavaLoader</code> accesses this through
      * reflection.
      */
-    static private final String __serviceName = "com.sun.star.connection.PipedConnection";
+    private static final String __serviceName = "com.sun.star.connection.PipedConnection";
 
     /**
      * Gives a factory for creating the service.
diff --git a/jurt/com/sun/star/comp/loader/FactoryHelper.java b/jurt/com/sun/star/comp/loader/FactoryHelper.java
index 3fdbac487180..584b9dadab5b 100644
--- a/jurt/com/sun/star/comp/loader/FactoryHelper.java
+++ b/jurt/com/sun/star/comp/loader/FactoryHelper.java
@@ -50,7 +50,7 @@ public class FactoryHelper {
 
     private static final boolean DEBUG = false;
     // the factory
-    static protected class Factory
+    protected static class Factory
         implements XSingleServiceFactory, XSingleComponentFactory, XServiceInfo,
         XTypeProvider {
 
@@ -384,7 +384,7 @@ public class FactoryHelper {
      * @see     com.sun.star.lang.XServiceInfo
      * @deprecated as of UDK 1.0
      */
-    static public XSingleServiceFactory getServiceFactory(Class<?> implClass,
+    public static XSingleServiceFactory getServiceFactory(Class<?> implClass,
                                                           XMultiServiceFactory multiFactory,
                                                           XRegistryKey regKey)
     {
@@ -420,7 +420,7 @@ public class FactoryHelper {
      * @return  returns a factory.
      * @see     com.sun.star.lang.XServiceInfo
      */
-    static public XSingleServiceFactory getServiceFactory(Class<?> implClass,
+    public static XSingleServiceFactory getServiceFactory(Class<?> implClass,
                                                           String serviceName,
                                                           XMultiServiceFactory multiFactory,
                                                           XRegistryKey regKey)
@@ -434,7 +434,7 @@ public class FactoryHelper {
      * @param  implClass the implementing class.
      * @return returns a factory object.
      */
-    static public Object createComponentFactory( Class<?> implClass, String serviceName )
+    public static Object createComponentFactory( Class<?> implClass, String serviceName )
     {
         return new Factory( implClass, serviceName, null, null );
     }
@@ -449,7 +449,7 @@ public class FactoryHelper {
      *
      * @see     com.sun.star.lang.XServiceInfo
      */
-    static public boolean writeRegistryServiceInfo(String implName, String serviceName, XRegistryKey regKey) {
+    public static boolean writeRegistryServiceInfo(String implName, String serviceName, XRegistryKey regKey) {
         boolean result = false;
 
           try {
diff --git a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
index 76058e95a6b4..c080ae88b504 100644
--- a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
+++ b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
@@ -47,8 +47,8 @@ import com.sun.star.uno.UnoRuntime;
  * @since       UDK1.0
  */
 public class UrlResolver {
-    static public class _UrlResolver implements XUnoUrlResolver {
-        static private final String __serviceName = "com.sun.star.bridge.UnoUrlResolver";
+    public static class _UrlResolver implements XUnoUrlResolver {
+        private static final String __serviceName = "com.sun.star.bridge.UnoUrlResolver";
 
         private final XMultiServiceFactory _xMultiServiceFactory;
 
diff --git a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
index 44016075b42b..d589fa515c52 100644
--- a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
+++ b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
@@ -40,7 +40,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
     /**
      * When set to true, enables various debugging output.
      */
-    static public final boolean DEBUG = false;
+    public static final boolean DEBUG = false;
 
     static {
         // load shared library for JNI code
diff --git a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
index c0a94d62e735..4bef73b5590a 100644
--- a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
+++ b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
@@ -48,7 +48,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster {
     /**
      * When set to true, enables various debugging output.
      */
-    static public final boolean DEBUG = false;
+    public static final boolean DEBUG = false;
 
     protected String       _description;
     protected Socket       _socket;
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
index 7f65c3ba9c95..c09b7366f1c5 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
@@ -26,7 +26,7 @@ import com.sun.star.connection.XConnection;
 
 
 class XConnectionInputStream_Adapter extends InputStream {
-    static private final boolean DEBUG = false;
+    private static final boolean DEBUG = false;
 
     protected XConnection _xConnection;
     protected byte        _bytes[][] = new byte[1][];
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
index fe9707492335..7db36affb2c2 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
@@ -26,7 +26,7 @@ import com.sun.star.connection.XConnection;
 
 
 class XConnectionOutputStream_Adapter extends OutputStream {
-    static private final boolean DEBUG = false;
+    private static final boolean DEBUG = false;
 
     protected XConnection _xConnection;
     protected byte _bytes[] = new byte[1];
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index 1a48b53c17ec..0dcc75d91bd2 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
@@ -71,7 +71,7 @@ public class java_remote_bridge
     /**
      * When set to true, enables various debugging output.
      */
-    static private final boolean DEBUG = false;
+    private static final boolean DEBUG = false;
 
     private final class MessageDispatcher extends Thread {
         public MessageDispatcher() {
diff --git a/jurt/com/sun/star/uno/AnyConverter.java b/jurt/com/sun/star/uno/AnyConverter.java
index efe46250198c..d6761c8a3969 100644
--- a/jurt/com/sun/star/uno/AnyConverter.java
+++ b/jurt/com/sun/star/uno/AnyConverter.java
@@ -37,7 +37,7 @@ public class AnyConverter
      * @param object any object.
      * @return type object.
      */
-    static public Type getType( Object object )
+    public static Type getType( Object object )
     {
         Type t;
         if (null == object)
@@ -64,7 +64,7 @@ public class AnyConverter
      * @param object the object to check.
      * @return true when the any is void, false otherwise.
      */
-    static public boolean isVoid(Object object){
+    public static boolean isVoid(Object object){
         return containsType(TypeClass.VOID, object);
     }
 
@@ -74,7 +74,7 @@ public class AnyConverter
      * @param object the object to check.
      * @return true when the any contains a char, false otherwise.
      */
-    static public boolean isChar(Object object){
+    public static boolean isChar(Object object){
         return containsType(TypeClass.CHAR, object);
     }
 
@@ -84,7 +84,7 @@ public class AnyConverter
      * @param object the object to check.
      * @return true when the any contains a boolean, false otherwise.
      */
-    static public boolean isBoolean(Object object){
+    public static boolean isBoolean(Object object){
         return containsType(TypeClass.BOOLEAN, object);
     }
 
@@ -94,7 +94,7 @@ public class AnyConverter
      * @param object the object to check.
      * @return true when the any contains a byte, false otherwise.
      */
-    static public boolean isByte(Object object){
+    public static boolean isByte(Object object){
         return containsType(TypeClass.BYTE, object);
     }
 
@@ -104,7 +104,7 @@ public class AnyConverter
      * @param object the object to check.
      * @return true when the any contains a short, false otherwise.
      */
-    static public boolean isShort(Object object){
+    public static boolean isShort(Object object){
         return containsType(TypeClass.SHORT, object);
     }
 
@@ -115,7 +115,7 @@ public class AnyConverter
      * @param object the object to check.
      * @return true when the any contains a int, false otherwise.
      */
-    static public boolean isInt(Object object){
+    public static boolean isInt(Object object){
         return containsType(TypeClass.LONG, object);
     }
 
@@ -126,7 +126,7 @@ public class AnyConverter
      * @param object the object to check.
      * @return true when the any contains a long, false otherwise.
      */
-    static public boolean isLong(Object object){
+    public static boolean isLong(Object object){
         return containsType(TypeClass.HYPER, object);
     }
 
@@ -136,7 +136,7 @@ public class AnyConverter
      * @param object the object to check.
      * @return true when the any contains a float, false otherwise.
      */
-    static public boolean isFloat(Object object){
+    public static boolean isFloat(Object object){
         return containsType(TypeClass.FLOAT, object);
     }
 
@@ -146,7 +146,7 @@ public class AnyConverter
      * @param object the object to check.
      * @return true when the any contains a double, false otherwise.
      */
-    static public boolean isDouble(Object object){
+    public static boolean isDouble(Object object){
         return containsType(TypeClass.DOUBLE, object);
     }
 
@@ -156,7 +156,7 @@ public class AnyConverter
      * @param object the object to check.
      * @return true when the any contains a string, false otherwise.
      */
-    static public boolean isString(Object object){
+    public static boolean isString(Object object){
         return containsType(TypeClass.STRING, object);
     }
 
@@ -166,7 +166,7 @@ public class AnyConverter
      * @param object the object to check.
      * @return true if the any contains an enum, false otherwise.
      */
-    static public boolean isEnum(Object object)
+    public static boolean isEnum(Object object)
     {
         return containsType(TypeClass.ENUM, object);
     }
@@ -177,7 +177,7 @@ public class AnyConverter
      * @param object the object to check.
      * @return true when the any contains a type, false otherwise.
      */
-    static public boolean isType(Object object){
+    public static boolean isType(Object object){
         return containsType(TypeClass.TYPE, object);
     }
 
@@ -191,7 +191,7 @@ public class AnyConverter
      * @param object the object to check.
      * @return true if the any contains an object.
      */
-    static public boolean isObject(Object object)
+    public static boolean isObject(Object object)
     {
         int tc = getType(object).getTypeClass().getValue();
         return (TypeClass.INTERFACE_value == tc ||
@@ -209,7 +209,7 @@ public class AnyConverter
      * @return true when the any contains an object which implements interfaces,
      * false otherwise.
      */
-    static public boolean isArray(Object object){
+    public static boolean isArray(Object object){
         return containsType(TypeClass.SEQUENCE, object);
     }
 
@@ -224,7 +224,7 @@ public class AnyConverter
      *
      * @see #isChar
      */
-    static public char toChar(Object object) throws  com.sun.star.lang.IllegalArgumentException{
+    public static char toChar(Object object) throws  com.sun.star.lang.IllegalArgumentException{
         Character ret= (Character)convertSimple(TypeClass.CHAR, null, object);
         return ret.charValue();
     }
@@ -240,7 +240,7 @@ public class AnyConverter
      *
      * @see #isBoolean
     */
-    static public boolean toBoolean(Object object) throws  com.sun.star.lang.IllegalArgumentException{
+    public static boolean toBoolean(Object object) throws  com.sun.star.lang.IllegalArgumentException{
         Boolean ret= (Boolean)convertSimple(TypeClass.BOOLEAN, null, object);
         return ret.booleanValue();
     }
@@ -256,7 +256,7 @@ public class AnyConverter
      *
      * @see #isBoolean
      */
-    static public byte toByte(Object object) throws   com.sun.star.lang.IllegalArgumentException{
+    public static byte toByte(Object object) throws   com.sun.star.lang.IllegalArgumentException{
         Byte ret= (Byte)convertSimple(TypeClass.BYTE, null, object);
         return ret.byteValue();
     }
@@ -272,7 +272,7 @@ public class AnyConverter
      *
      * @return the short contained within the object.
      */
-    static public short toShort(Object object) throws   com.sun.star.lang.IllegalArgumentException{
+    public static short toShort(Object object) throws   com.sun.star.lang.IllegalArgumentException{
         Short ret= (Short)convertSimple(TypeClass.SHORT, null, object);
         return ret.shortValue();
     }
@@ -288,7 +288,7 @@ public class AnyConverter
      *
      * @return an (unsigned) short.
      */
-    static public short toUnsignedShort(Object object)
+    public static short toUnsignedShort(Object object)
         throws com.sun.star.lang.IllegalArgumentException
     {
         Short ret= (Short)convertSimple(TypeClass.UNSIGNED_SHORT, null, object);
@@ -307,7 +307,7 @@ public class AnyConverter
      *
      * @return the int contained within the object.
      */
-    static public int toInt(Object object) throws  com.sun.star.lang.IllegalArgumentException{
+    public static int toInt(Object object) throws  com.sun.star.lang.IllegalArgumentException{
         Integer ret= (Integer) convertSimple( TypeClass.LONG, null, object);
         return ret.intValue();
     }
@@ -324,7 +324,7 @@ public class AnyConverter
      *
      * @return an (unsigned) int.
      */
-    static public int toUnsignedInt(Object object)
+    public static int toUnsignedInt(Object object)
         throws  com.sun.star.lang.IllegalArgumentException
     {
         Integer ret = (Integer)convertSimple(TypeClass.UNSIGNED_LONG, null, object);
@@ -343,7 +343,7 @@ public class AnyConverter
      *
      * @return the long contained within the object.
      */
-    static public long toLong(Object object) throws   com.sun.star.lang.IllegalArgumentException{
+    public static long toLong(Object object) throws   com.sun.star.lang.IllegalArgumentException{
         Long ret= (Long) convertSimple( TypeClass.HYPER, null, object);
         return ret.longValue();
     }
@@ -360,7 +360,7 @@ public class AnyConverter
      *
      * @return an (unsigned) long.
      */
-    static public long toUnsignedLong(Object object)
+    public static long toUnsignedLong(Object object)
         throws com.sun.star.lang.IllegalArgumentException
     {
         Long ret = (Long)convertSimple(TypeClass.UNSIGNED_HYPER, null, object);
@@ -379,7 +379,7 @@ public class AnyConverter
      *
      * @return the float contained within the object.
      */
-    static public float toFloat(Object object) throws com.sun.star.lang.IllegalArgumentException{
+    public static float toFloat(Object object) throws com.sun.star.lang.IllegalArgumentException{
         Float ret= (Float) convertSimple( TypeClass.FLOAT,null, object);
         return ret.floatValue();
     }
@@ -396,7 +396,7 @@ public class AnyConverter
      *
      * @return the double contained within the object.
      */
-    static public double toDouble(Object object) throws com.sun.star.lang.IllegalArgumentException {
+    public static double toDouble(Object object) throws com.sun.star.lang.IllegalArgumentException {
         Double ret= (Double) convertSimple( TypeClass.DOUBLE, null, object);
         return ret.doubleValue();
     }
@@ -410,7 +410,7 @@ public class AnyConverter
      *
      * @return the string contained within the object.
      */
-    static public String toString(Object object) throws com.sun.star.lang.IllegalArgumentException {
+    public static String toString(Object object) throws com.sun.star.lang.IllegalArgumentException {
         return (String) convertSimple( TypeClass.STRING, null, object);
     }
 
@@ -423,7 +423,7 @@ public class AnyConverter
      *
      * @return the type contained within the object.
      */
-    static public Type toType(Object object) throws com.sun.star.lang.IllegalArgumentException {
+    public static Type toType(Object object) throws com.sun.star.lang.IllegalArgumentException {
         return (Type) convertSimple( TypeClass.TYPE, null, object);
     }
 
@@ -445,7 +445,7 @@ public class AnyConverter
      *
      * @return destination object.
      */
-    static public Object toObject(Type type, Object object)
+    public static Object toObject(Type type, Object object)
         throws com.sun.star.lang.IllegalArgumentException
     {
         return convertSimple( type.getTypeClass(), type, object );
@@ -467,7 +467,7 @@ public class AnyConverter
      *
      * @return destination object.
      */
-    static public Object toObject(Class<?> clazz, Object object)
+    public static Object toObject(Class<?> clazz, Object object)
         throws com.sun.star.lang.IllegalArgumentException
     {
         return toObject( new Type( clazz ), object );
@@ -482,7 +482,7 @@ public class AnyConverter
      *
      * @return the array contained within the object.
      */
-    static public Object toArray( Object object) throws com.sun.star.lang.IllegalArgumentException {
+    public static Object toArray( Object object) throws com.sun.star.lang.IllegalArgumentException {
         return convertSimple( TypeClass.SEQUENCE, null, object);
     }
 
@@ -493,13 +493,13 @@ public class AnyConverter
      * <p><em>object</em> is either matched directly against the type or if it is
      * an any then the contained object is matched against the type.</p>
      */
-    static private boolean containsType( TypeClass what, Object object){
+    private static boolean containsType( TypeClass what, Object object){
         return (getType(object).getTypeClass().getValue() == what.getValue());
     }
 
-    static private final Type m_XInterface_type = new Type( XInterface.class );
+    private static final Type m_XInterface_type = new Type( XInterface.class );
 
-    static private Object convertSimple( TypeClass destTClass, Type destType, Object object_ )
+    private static Object convertSimple( TypeClass destTClass, Type destType, Object object_ )
         throws com.sun.star.lang.IllegalArgumentException
     {
         Object object;
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java b/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java
index 8525105d09dc..49d6b499e931 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java
+++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java
@@ -28,7 +28,7 @@ import com.sun.star.uno.Type;
 
 
 class TestBridge implements IBridge {
-    static private final boolean DEBUG = false;
+    private static final boolean DEBUG = false;
 
     private final HashMap<String,Object> _hashtable = new HashMap<String,Object>();