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/16202Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

android/source/src/java/org/libreoffice/ui/FileUtilities.java

@@ -157,7 +157,7 @@ public class FileUtilities {
     }
 
     // Filter by mode, and/or in future by filename/wildcard
-    static private boolean doAccept(String filename, int byMode, String byFilename) {
+    private static boolean doAccept(String filename, int byMode, String byFilename) {
         Log.d(LOGTAG, "doAccept : " + filename + " mode " + byMode + " byFilename " + byFilename);
         if (filename == null)
             return false;

bean/test/applet/oooapplet/OOoViewer.java

@@ -28,7 +28,7 @@ import java.util.*;
 
 public class OOoViewer extends Applet {
 
-    static private CustomURLClassLoader m_loader;
+    private static CustomURLClassLoader m_loader;
 
     Object  m_objBean;
 

dbaccess/qa/complex/dbaccess/FileHelper.java

@@ -21,7 +21,7 @@ package complex.dbaccess;
 public class FileHelper
 {
     private FileHelper(){}
-    static public String getOOoCompatibleFileURL( String _javaFileURL )
+    public static String getOOoCompatibleFileURL( String _javaFileURL )
     {
         String returnURL = _javaFileURL;
         if ( ( returnURL.indexOf( "file:/" ) == 0 ) && ( returnURL.indexOf( "file:///" ) == -1 ) )

desktop/test/deployment/locationtest/LocationTest.java

@@ -42,7 +42,7 @@ public class LocationTest {
         implements XServiceInfo {
         /** The service name, that must be used to get an instance of this service.
          */
-        static private final String __serviceName =
+        private static final String __serviceName =
         "com.sun.star.comp.smoketest.LocationTest";
 
         /** The initial component contextr, that gives access to

desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java

@@ -46,7 +46,7 @@ public class OptionsEventHandler {
     public static class _OptionsEventHandler extends WeakBase
         implements XServiceInfo, XContainerWindowEventHandler {
 
-        static private final String __serviceName =
+        private static final String __serviceName =
         "com.sun.star.comp.extensionoptions.OptionsEventHandler";
 
         private final XComponentContext m_cmpCtx;

desktop/test/deployment/update/updateinfocreation/build/TestExtension.java

@@ -42,7 +42,7 @@ public class TestExtension {
         implements XServiceInfo {
         /** The service name, that must be used to get an instance of this service.
          */
-        static private final String __serviceName =
+        private static final String __serviceName =
         "com.sun.star.comp.smoketest.TestExtension";
 
         /** The initial component contextr, that gives access to

forms/qa/integration/forms/dbfTools.java

@@ -30,7 +30,7 @@ class dbfTools
     /* ------------------------------------------------------------------ */
     /** disposes the component given
     */
-    static public void disposeComponent( Object xComp ) throws java.lang.RuntimeException
+    public static void disposeComponent( Object xComp ) throws java.lang.RuntimeException
     {
         XComponent xComponent = queryComponent( xComp );
         if ( null != xComponent )
@@ -40,7 +40,7 @@ class dbfTools
     /* ------------------------------------------------------------------ */
     /** queries an object for the XPropertySet interface
     */
-    static public XPropertySet queryPropertySet( Object aComp )
+    public static XPropertySet queryPropertySet( Object aComp )
     {
         return UnoRuntime.queryInterface( XPropertySet.class, aComp );
     }
@@ -48,7 +48,7 @@ class dbfTools
     /* ------------------------------------------------------------------ */
     /** queries an object for the XIndexContainer interface
     */
-    static public XIndexContainer queryIndexContainer( Object aComp )
+    public static XIndexContainer queryIndexContainer( Object aComp )
     {
         return UnoRuntime.queryInterface( XIndexContainer.class, aComp );
     }
@@ -56,7 +56,7 @@ class dbfTools
     /* ------------------------------------------------------------------ */
     /** queries an object for the XComponent interface
     */
-    static public XComponent queryComponent( Object aComp )
+    public static XComponent queryComponent( Object aComp )
     {
         return UnoRuntime.queryInterface( XComponent.class, aComp );
     }

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;
 

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;

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();
 

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 );
     }
 }

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

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.

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.

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 {

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;
 

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

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;

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][];

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];

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() {

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>();
 

jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java

@@ -31,7 +31,7 @@ import java.util.*;
 */
 public class JREProperties
 {
-    static public void main(String[] args)
+    public static void main(String[] args)
     {
          try
         {

nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java

@@ -56,7 +56,7 @@ public class ACRComparator implements IGoodnessCompareEngine, IUpdateCycleEngine
     epsilon_t = lib.getExtremalVcon(true);
   }
 
-  static private int compare(double data1, double data2) {
+  private static int compare(double data1, double data2) {
     if (data1 < data2)
       return LESS_THAN;
     else if (data1 > data2)

odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java

@@ -64,7 +64,7 @@ public class ProtocolHandlerAddon {
 
         /** The service name, that must be used to get an instance of this service.
          */
-        static private final String[] m_serviceNames = { "com.sun.star.frame.ProtocolHandler" };
+        private static final String[] m_serviceNames = { "com.sun.star.frame.ProtocolHandler" };
 
         /** The component context, that gives access to the service manager and all registered services.
          */

odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java

@@ -50,7 +50,7 @@ public class LicenseTest {
         implements XServiceInfo {
         /** The service name, that must be used to get an instance of this service.
          */
-        static private final String __serviceName =
+        private static final String __serviceName =
         "org.openoffice.LicenseTest";
 
         /** This method returns an array of all supported service names.

odk/examples/DevelopersGuide/Drawing/Helper.java

@@ -47,7 +47,7 @@ public class Helper
      * A new connection is established and the service manger from the running
      * offic eis returned.
      */
-    static public XComponentContext connect()
+    public static XComponentContext connect()
         throws Exception
     {
         // get the remote office component context
@@ -62,7 +62,7 @@ public class Helper
 
     /** creates and instantiates new document
     */
-    static public com.sun.star.lang.XComponent createDocument(
+    public static com.sun.star.lang.XComponent createDocument(
         com.sun.star.uno.XComponentContext xOfficeContext,
         String sURL, String sTargetFrame, int nSearchFlags,
         com.sun.star.beans.PropertyValue[] aArgs )

odk/examples/DevelopersGuide/Drawing/PageHelper.java

@@ -60,7 +60,7 @@ public class PageHelper
 
     /** get the page count for standard pages
     */
-    static public int getDrawPageCount( XComponent xComponent )
+    public static int getDrawPageCount( XComponent xComponent )
     {
         XDrawPagesSupplier xDrawPagesSupplier =
             UnoRuntime.queryInterface(
@@ -71,7 +71,7 @@ public class PageHelper
 
     /** get draw page by index
     */
-    static public XDrawPage getDrawPageByIndex( XComponent xComponent, int nIndex )
+    public static XDrawPage getDrawPageByIndex( XComponent xComponent, int nIndex )
         throws com.sun.star.lang.IndexOutOfBoundsException,
             com.sun.star.lang.WrappedTargetException
     {
@@ -85,7 +85,7 @@ public class PageHelper
     /** creates and inserts a draw page into the giving position,
         the method returns the new created page
     */
-    static public XDrawPage insertNewDrawPageByIndex( XComponent xComponent, int nIndex )
+    public static XDrawPage insertNewDrawPageByIndex( XComponent xComponent, int nIndex )
         throws Exception
     {
         XDrawPagesSupplier xDrawPagesSupplier =
@@ -99,7 +99,7 @@ public class PageHelper
 
     /** get size of the given page
     */
-    static public Size getPageSize( XDrawPage xDrawPage )
+    public static Size getPageSize( XDrawPage xDrawPage )
         throws com.sun.star.beans.UnknownPropertyException,
             com.sun.star.lang.WrappedTargetException
     {
@@ -113,7 +113,7 @@ public class PageHelper
 
     /** get the page count for master pages
     */
-    static public int getMasterPageCount( XComponent xComponent )
+    public static int getMasterPageCount( XComponent xComponent )
     {
         XMasterPagesSupplier xMasterPagesSupplier =
             UnoRuntime.queryInterface(
@@ -124,7 +124,7 @@ public class PageHelper
 
     /** get master page by index
     */
-    static public XDrawPage getMasterPageByIndex( XComponent xComponent, int nIndex )
+    public static XDrawPage getMasterPageByIndex( XComponent xComponent, int nIndex )
         throws com.sun.star.lang.IndexOutOfBoundsException,
             com.sun.star.lang.WrappedTargetException
     {
@@ -138,7 +138,7 @@ public class PageHelper
     /** creates and inserts a new master page into the giving position,
         the method returns the new created page
     */
-    static public XDrawPage insertNewMasterPageByIndex( XComponent xComponent, int nIndex )
+    public static XDrawPage insertNewMasterPageByIndex( XComponent xComponent, int nIndex )
     {
         XMasterPagesSupplier xMasterPagesSupplier =
             UnoRuntime.queryInterface(
@@ -153,7 +153,7 @@ public class PageHelper
 
     /** sets given masterpage at the drawpage
     */
-    static public void setMasterPage( XDrawPage xDrawPage, XDrawPage xMasterPage )
+    public static void setMasterPage( XDrawPage xDrawPage, XDrawPage xMasterPage )
     {
         XMasterPageTarget xMasterPageTarget =
             UnoRuntime.queryInterface(
@@ -167,7 +167,7 @@ public class PageHelper
         This is important, because only presentation documents
         have notes and handout pages
     */
-    static public boolean isImpressDocument( XComponent xComponent )
+    public static boolean isImpressDocument( XComponent xComponent )
     {
         XServiceInfo xInfo = UnoRuntime.queryInterface(
                 XServiceInfo.class, xComponent );
@@ -176,7 +176,7 @@ public class PageHelper
 
     /** in impress documents each normal draw page has a corresponding notes page
     */
-    static public XDrawPage getNotesPage( XDrawPage xDrawPage )
+    public static XDrawPage getNotesPage( XDrawPage xDrawPage )
     {
         XPresentationPage aPresentationPage =
             UnoRuntime.queryInterface(
@@ -186,7 +186,7 @@ public class PageHelper
 
     /** in impress each documents has one handout page
     */
-    static public XDrawPage getHandoutMasterPage( XComponent xComponent )
+    public static XDrawPage getHandoutMasterPage( XComponent xComponent )
     {
         XHandoutMasterSupplier aHandoutMasterSupplier =
             UnoRuntime.queryInterface(

odk/examples/DevelopersGuide/Forms/DocumentHelper.java

@@ -175,7 +175,7 @@ public class DocumentHelper
     /* ------------------------------------------------------------------ */
     /** retrieves the document model which a given form component belongs to
     */
-    static public DocumentHelper getDocumentForComponent( Object aFormComponent, XComponentContext xCtx )
+    public static DocumentHelper getDocumentForComponent( Object aFormComponent, XComponentContext xCtx )
     {
         XChild xChild = UnoRuntime.queryInterface( XChild.class, aFormComponent );
         XModel xModel = null;

odk/examples/DevelopersGuide/Forms/FLTools.java

@@ -120,7 +120,7 @@ public class FLTools
     /* ------------------------------------------------------------------ */
     /** disposes the component given
     */
-    static public void disposeComponent( Object xComp ) throws java.lang.RuntimeException
+    public static void disposeComponent( Object xComp ) throws java.lang.RuntimeException
     {
         XComponent xComponent = UnoRuntime.queryInterface( XComponent.class,
             xComp );
@@ -131,7 +131,7 @@ public class FLTools
     /* ------------------------------------------------------------------ */
     /** get's the XControlModel for a control
     */
-    static public <T> T getModel( Object aControl, Class<T> aInterfaceClass )
+    public static <T> T getModel( Object aControl, Class<T> aInterfaceClass )
     {
         XControl xControl = UnoRuntime.queryInterface(
             XControl.class, aControl );
@@ -149,7 +149,7 @@ public class FLTools
         forms container; and it is able to classify grid columns (which are no form components)
         as well.</p>
     */
-    static public String classifyFormComponentType( XPropertySet xComponent ) throws com.sun.star.uno.Exception
+    public static String classifyFormComponentType( XPropertySet xComponent ) throws com.sun.star.uno.Exception
     {
         String sType = "<unknown component>";
 

odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java

@@ -50,7 +50,7 @@ public class DisableCommandsTest {
     /*
      * A list of command names
      */
-    final static private String[] aCommandURLTestSet =
+    final private static String[] aCommandURLTestSet =
     {
         "Open",
         "About",

odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java

@@ -59,9 +59,9 @@ public class FlatXml implements XImportFilter, XExportFilter, XServiceName,
     private XExtendedDocumentHandler m_xHandler;
     private static final boolean m_bPrettyPrint = true;
 
-    static private final String __serviceName = "devguide.officedev.samples.filter.FlatXmlJava";
-    static private final String __implName = "FlatXml";
-    static private final String[] __supportedServiceNames = {
+    private static final String __serviceName = "devguide.officedev.samples.filter.FlatXmlJava";
+    private static final String __implName = "FlatXml";
+    private static final String[] __supportedServiceNames = {
         "devguide.officedev.samples.filter.FlatXmlJava"
     };
 

odk/examples/DevelopersGuide/OfficeDev/MenuElement.java

@@ -37,7 +37,7 @@ import com.sun.star.uno.UnoRuntime;
 // A helper class to determine the menu element type
 public class MenuElement
 {
-    static public boolean IsMenuEntry( com.sun.star.beans.XPropertySet xMenuElement ) {
+    public static boolean IsMenuEntry( com.sun.star.beans.XPropertySet xMenuElement ) {
         com.sun.star.lang.XServiceInfo xServiceInfo =
             UnoRuntime.queryInterface(
             com.sun.star.lang.XServiceInfo.class, xMenuElement );
@@ -45,7 +45,7 @@ public class MenuElement
         return xServiceInfo.supportsService( "com.sun.star.ui.ActionTrigger" );
     }
 
-    static public boolean IsMenuSeparator( com.sun.star.beans.XPropertySet xMenuElement ) {
+    public static boolean IsMenuSeparator( com.sun.star.beans.XPropertySet xMenuElement ) {
         com.sun.star.lang.XServiceInfo xServiceInfo =
             UnoRuntime.queryInterface(
             com.sun.star.lang.XServiceInfo.class, xMenuElement );

odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java

@@ -108,15 +108,15 @@ class ExampleAddInThread extends Thread
 
 public class ExampleAddIn
 {
-    static public class _ExampleAddIn extends com.sun.star.lib.uno.helper.WeakBase
+    public static class _ExampleAddIn extends com.sun.star.lib.uno.helper.WeakBase
            implements org.openoffice.sheet.addin.XExampleAddIn,
                       com.sun.star.sheet.XAddIn,
                       com.sun.star.lang.XServiceName,
                       com.sun.star.lang.XServiceInfo
     {
-        static private final String aExampleService = "org.openoffice.sheet.addin.ExampleAddIn";
-        static private final String aAddInService = "com.sun.star.sheet.AddIn";
-        static private final String aImplName = _ExampleAddIn.class.getName();
+        private static final String aExampleService = "org.openoffice.sheet.addin.ExampleAddIn";
+        private static final String aAddInService = "com.sun.star.sheet.AddIn";
+        private static final String aImplName = _ExampleAddIn.class.getName();
 
         private static final short FUNCTION_INVALID   = -1;
 

odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java

@@ -40,13 +40,13 @@ import com.sun.star.sheet.DataPilotFieldFilter;
 
 class ExampleSettings
 {
-    static public final int nDimensionCount = 6;
-    static public final int nValueDimension = 4;
-    static public final int nDataDimension = 5;
-    static public final String [] aDimensionNames = {
+