diff options
66 files changed, 194 insertions, 194 deletions
diff --git a/android/source/src/java/org/libreoffice/ui/FileUtilities.java b/android/source/src/java/org/libreoffice/ui/FileUtilities.java index b8bb7e922111..e2df3f0021d9 100644 --- a/android/source/src/java/org/libreoffice/ui/FileUtilities.java +++ b/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; diff --git a/bean/test/applet/oooapplet/OOoViewer.java b/bean/test/applet/oooapplet/OOoViewer.java index a58e72874f3a..d437611187f9 100644 --- a/bean/test/applet/oooapplet/OOoViewer.java +++ b/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; diff --git a/dbaccess/qa/complex/dbaccess/FileHelper.java b/dbaccess/qa/complex/dbaccess/FileHelper.java index 0a4d022aba5f..cae67af0083f 100644 --- a/dbaccess/qa/complex/dbaccess/FileHelper.java +++ b/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 ) ) diff --git a/desktop/test/deployment/locationtest/LocationTest.java b/desktop/test/deployment/locationtest/LocationTest.java index 3155cdd7b025..14a0e7d922a9 100644 --- a/desktop/test/deployment/locationtest/LocationTest.java +++ b/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 diff --git a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java index 8e7d4cb79c08..2dd230b7da00 100644 --- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java +++ b/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; diff --git a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java index b8e213b5c96e..f147270d58bb 100644 --- a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java +++ b/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 diff --git a/forms/qa/integration/forms/dbfTools.java b/forms/qa/integration/forms/dbfTools.java index 0d9a61e0881a..fe61c6ef4814 100644 --- a/forms/qa/integration/forms/dbfTools.java +++ b/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 ); } 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; diff --git a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java index 184515d47d8b..ce85cb78fc91 100644 --- a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java +++ b/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(); diff --git a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java index 3df517eec804..550a497018dc 100644 --- a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java +++ b/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 ); } } 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>(); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java index 081a3622ca9b..c20e02ab6709 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java +++ b/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 { diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java index 6b4fd614330c..a21e912cf129 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java +++ b/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) diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java index a969253bc9c4..08633ee67bc3 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java +++ b/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. */ diff --git a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java index 02ca5d9c02b0..5839875b4e86 100644 --- a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java +++ b/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. diff --git a/odk/examples/DevelopersGuide/Drawing/Helper.java b/odk/examples/DevelopersGuide/Drawing/Helper.java index a232e9418be4..a904675d9a95 100644 --- a/odk/examples/DevelopersGuide/Drawing/Helper.java +++ b/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 ) diff --git a/odk/examples/DevelopersGuide/Drawing/PageHelper.java b/odk/examples/DevelopersGuide/Drawing/PageHelper.java index cbf8d9cdcfd3..02e46d7bc8f0 100644 --- a/odk/examples/DevelopersGuide/Drawing/PageHelper.java +++ b/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( diff --git a/odk/examples/DevelopersGuide/Forms/DocumentHelper.java b/odk/examples/DevelopersGuide/Forms/DocumentHelper.java index 3bae7b154847..173433499e28 100644 --- a/odk/examples/DevelopersGuide/Forms/DocumentHelper.java +++ b/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; diff --git a/odk/examples/DevelopersGuide/Forms/FLTools.java b/odk/examples/DevelopersGuide/Forms/FLTools.java index cef9e4e1f32d..4e1aa9a8d710 100644 --- a/odk/examples/DevelopersGuide/Forms/FLTools.java +++ b/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>"; diff --git a/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java b/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java index 406cdcb69866..89bf023eadde 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java +++ b/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", diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java index d999bd2df718..19e307ffa761 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java +++ b/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" }; diff --git a/odk/examples/DevelopersGuide/OfficeDev/MenuElement.java b/odk/examples/DevelopersGuide/OfficeDev/MenuElement.java index fa351f1c7f5e..40b483b8f350 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/MenuElement.java +++ b/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 ); diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java index e6d6830a48ed..5c9a2b2f5611 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java +++ b/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; diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java index bea38f1ef896..5fab2ab13c7f 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java +++ b/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 = { + public static final int nDimensionCount = 6; + public static final int nValueDimension = 4; + public static final int nDataDimension = 5; + public static final String [] aDimensionNames = { "ones", "tens", "hundreds", "thousands", "value", "" }; - static public final String getMemberName( int nMember ) + public static final String getMemberName( int nMember ) { return String.valueOf( nMember ); } @@ -752,7 +752,7 @@ public class ExampleDataPilotSource { // implementation of com.sun.star.sheet.DataPilotSource - static public class _ExampleDataPilotSource implements + public static class _ExampleDataPilotSource implements com.sun.star.sheet.XDimensionsSupplier, com.sun.star.sheet.XDataPilotResults, com.sun.star.util.XRefreshable, @@ -760,8 +760,8 @@ public class ExampleDataPilotSource com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo { - static private final String aServiceName = "com.sun.star.sheet.DataPilotSource"; - static private final String aImplName = _ExampleDataPilotSource.class.getName(); + private static final String aServiceName = "com.sun.star.sheet.DataPilotSource"; + private static final String aImplName = _ExampleDataPilotSource.class.getName(); private final ExampleSettings aSettings = new ExampleSettings(); private ExampleDimensions aDimensions; diff --git a/odk/examples/java/Inspector/Inspector.java b/odk/examples/java/Inspector/Inspector.java index a537d9c77941..fe10fac255f7 100644 --- a/odk/examples/java/Inspector/Inspector.java +++ b/odk/examples/java/Inspector/Inspector.java @@ -75,9 +75,9 @@ public class Inspector{ /** This class implements the method of the interface XInstanceInspector. * Also the class implements the interfaces XServiceInfo, and XTypeProvider. */ - static public class _Inspector extends WeakBase implements XInstanceInspector, XServiceInfo{ + public static class _Inspector extends WeakBase implements XInstanceInspector, XServiceInfo{ - static private final String __serviceName = "org.openoffice.InstanceInspector"; + private static final String __serviceName = "org.openoffice.InstanceInspector"; private HashMap<String, String> aApplicationHashMap = new HashMap<String, String>(); private String sTitle = "Object Inspector"; private ArrayList<XComponent> aHiddenDocuments = new ArrayList<XComponent>(); diff --git a/odk/examples/java/Inspector/ProtocolHandlerAddon.java b/odk/examples/java/Inspector/ProtocolHandlerAddon.java index 80e52db58f9a..5492d217d845 100644 --- a/odk/examples/java/Inspector/ProtocolHandlerAddon.java +++ b/odk/examples/java/Inspector/ProtocolHandlerAddon.java @@ -65,7 +65,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. */ diff --git a/odk/examples/java/MinimalComponent/MinimalComponent.java b/odk/examples/java/MinimalComponent/MinimalComponent.java index 30b984c75c46..decc2417ea67 100644 --- a/odk/examples/java/MinimalComponent/MinimalComponent.java +++ b/odk/examples/java/MinimalComponent/MinimalComponent.java @@ -53,7 +53,7 @@ public class MinimalComponent { implements XInitialization, 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.MinimalComponent"; /** The initial component contextr, that gives access to diff --git a/odk/examples/java/Spreadsheet/CalcAddins.java b/odk/examples/java/Spreadsheet/CalcAddins.java index 790a71655a35..81951954e6be 100644 --- a/odk/examples/java/Spreadsheet/CalcAddins.java +++ b/odk/examples/java/Spreadsheet/CalcAddins.java @@ -60,7 +60,7 @@ public class CalcAddins { * of the service description. It implements the needed interfaces. * @implements XCalcAddins, XAddIn, XServiceName, XServiceInfo, XTypeProvider */ - static private class _CalcAddins extends WeakBase implements + private static class _CalcAddins extends WeakBase implements XCalcAddins, XAddIn, XServiceName, @@ -69,9 +69,9 @@ public class CalcAddins { /** The component will be registered under this name. */ - static private final String __serviceName = "org.openoffice.sheet.addin.CalcAddins"; + private static final String __serviceName = "org.openoffice.sheet.addin.CalcAddins"; - static private final String ADDIN_SERVICE = "com.sun.star.sheet.AddIn"; + private static final String ADDIN_SERVICE = "com.sun.star.sheet.AddIn"; private Locale aFuncLoc; diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java index c22ad16ab32f..150dc1d99f10 100644 --- a/odk/examples/java/ToDo/ToDo.java +++ b/odk/examples/java/ToDo/ToDo.java @@ -93,21 +93,21 @@ public class ToDo { private XMultiComponentFactory m_xMCF; // Implementation helper variables - static private final int INT_COLUMN_FEATURE = 0; - static private final int INT_COLUMN_NEEDEDDAYS = 2; - static private final int INT_COLUMN_STARTDATE = 3; - static private final int INT_COLUMN_START_DAY_OF_WEEK = 4; - static private final int INT_COLUMN_ENDDATE = 5; - static private final int INT_COLUMN_END_DAY_OF_WEEK = 6; - static private final int INT_COLUMN_DUEDATE = 7; - static private final int INT_COLUMN_STATUS = 8; + private static final int INT_COLUMN_FEATURE = 0; + private static final int INT_COLUMN_NEEDEDDAYS = 2; + private static final int INT_COLUMN_STARTDATE = 3; + private static final int INT_COLUMN_START_DAY_OF_WEEK = 4; + private static final int INT_COLUMN_ENDDATE = 5; + private static final int INT_COLUMN_END_DAY_OF_WEEK = 6; + private static final int INT_COLUMN_DUEDATE = 7; + private static final int INT_COLUMN_STATUS = 8; - static private final int INT_ROW_FROM = 14; // 8 + private static final int INT_ROW_FROM = 14; // 8 - static private final int INT_ROW_HOLIDAYS_START = 4; - static private final int INT_COLUMN_HOLIDAYS_START = 7; // 10 + private static final int INT_ROW_HOLIDAYS_START = 4; + private static final int INT_COLUMN_HOLIDAYS_START = 7; // 10 - static private final String STRING_SEPARATOR = "/"; + private static final String STRING_SEPARATOR = "/"; /** The constructor of the inner class has a XComponenContext parameter. diff --git a/qadevOOo/runner/complexlib/ShowTargets.java b/qadevOOo/runner/complexlib/ShowTargets.java index 210ad33851fe..f655e1330c1a 100644 --- a/qadevOOo/runner/complexlib/ShowTargets.java +++ b/qadevOOo/runner/complexlib/ShowTargets.java @@ -83,7 +83,7 @@ public class ShowTargets } } - static private String getShortTestDescription( Class<?> _testClass ) + private static String getShortTestDescription( Class<?> _testClass ) { java.lang.reflect.Method getShortDescriptionMethod = null; try { getShortDescriptionMethod = _testClass.getMethod( "getShortTestDescription", new Class[]{} ); } diff --git a/qadevOOo/runner/org/openoffice/RunnerService.java b/qadevOOo/runner/org/openoffice/RunnerService.java index 99f3b1592e7a..9240f6e1320d 100644 --- a/qadevOOo/runner/org/openoffice/RunnerService.java +++ b/qadevOOo/runner/org/openoffice/RunnerService.java @@ -51,9 +51,9 @@ import com.sun.star.uno.XInterface; public class RunnerService implements XJob, XServiceInfo, XTypeProvider, XPropertyAccess { - static public final String __serviceName = "org.openoffice.Runner"; - static public final String __implName = "org.openoffice.RunnerService"; - static private XMultiServiceFactory xMSF = null; + public static final String __serviceName = "org.openoffice.Runner"; + public static final String __implName = "org.openoffice.RunnerService"; + private static XMultiServiceFactory xMSF = null; public Object execute(NamedValue[] args) { // construct valid arguments from the given stuff diff --git a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java index 77e243670cee..7ce7a80b618d 100644 --- a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java +++ b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java @@ -72,11 +72,11 @@ public class MyPersistObject implements XPersistObject, XTypeProvider, } } - static private final boolean verbose = false; + private static final boolean verbose = false; - static public final String __serviceName = + public static final String __serviceName = "com.sun.star.cmp.PersistObject"; - static public final String __implName = + public static final String __implName = "com.sun.star.cmp.MyPersistObject"; // lots of props to write diff --git a/qadevOOo/testdocs/qadevlibs/source/test/Job.java b/qadevOOo/testdocs/qadevlibs/source/test/Job.java index d180d557b19b..40d0c09c3c7a 100644 --- a/qadevOOo/testdocs/qadevlibs/source/test/Job.java +++ b/qadevOOo/testdocs/qadevlibs/source/test/Job.java @@ -30,9 +30,9 @@ import com.sun.star.comp.loader.FactoryHelper; public class Job { - static public class _Implementation implements XServiceInfo, XTypeProvider, + public static class _Implementation implements XServiceInfo, XTypeProvider, XJob, XNamed { - static private final String __serviceName = "test.Job"; + private static final String __serviceName = "test.Job"; Object oDoc = null; String actionType = null; String actionParm = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java b/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java index 643e6fb384d8..17f29a930b66 100644 --- a/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java @@ -62,9 +62,9 @@ import util.FormTools; * @see ifc.sheet._XCellRangeReferrer */ public class ScViewPaneObj extends TestCase { - static private XSpreadsheetDocument xSpreadsheetDoc; - static private SOfficeFactory SOF; - static private XInterface oObj; + private static XSpreadsheetDocument xSpreadsheetDoc; + private static SOfficeFactory SOF; + private static XInterface oObj; /** * Creates Spreadsheet document. diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportData.java b/reportbuilder/java/org/libreoffice/report/SDBCReportData.java index 5656a950a84c..a07006bfeb5f 100644 --- a/reportbuilder/java/org/libreoffice/report/SDBCReportData.java +++ b/reportbuilder/java/org/libreoffice/report/SDBCReportData.java @@ -179,7 +179,7 @@ public class SDBCReportData implements DataSource { } - static private java.sql.Date getDate(final Object obj) + private static java.sql.Date getDate(final Object obj) { final java.sql.Date date; if (obj instanceof com.sun.star.util.Date) @@ -217,7 +217,7 @@ public class SDBCReportData implements DataSource return timeString; } - static private StringBuffer getDateString(final int years, final int months, final int days) + private static StringBuffer getDateString(final int years, final int months, final int days) { final StringBuffer str = new StringBuffer(); str.append(years); @@ -239,7 +239,7 @@ public class SDBCReportData implements DataSource return str; } - static private java.sql.Time getTime(final Object obj) + private static java.sql.Time getTime(final Object obj) { final java.sql.Time time; if (obj instanceof Time) @@ -254,7 +254,7 @@ public class SDBCReportData implements DataSource return time; } - static private Timestamp getTimestamp(final Object obj) + private static Timestamp getTimestamp(final Object obj) { final Timestamp ts; if (obj instanceof DateTime) diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java index 8518bc619325..eef2178934a9 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java @@ -1664,7 +1664,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget } } - static private double[] calcPaintSize(final CSSNumericValue areaWidth, final CSSNumericValue areaHeight, + private static double[] calcPaintSize(final CSSNumericValue areaWidth, final CSSNumericValue areaHeight, final CSSNumericValue imageWidth, final CSSNumericValue imageHeight) { diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java b/ridljar/com/sun/star/uno/UnoRuntime.java index 40403cdc3908..8c822d33b969 100644 --- a/ridljar/com/sun/star/uno/UnoRuntime.java +++ b/ridljar/com/sun/star/uno/UnoRuntime.java @@ -597,7 +597,7 @@ public class UnoRuntime { * @deprecated As of UDK 3.2.0, this method is deprecated, without * offering a replacement. */ - static public boolean reset() { + public static boolean reset() { synchronized (bridges) { for (Iterator<java.lang.ref.WeakReference<IBridge>> i = bridges.values().iterator(); i.hasNext();) { IBridge b = WeakMap.getValue(i.next()); @@ -627,7 +627,7 @@ public class UnoRuntime { /** * @deprecated As of UDK 3.2.0, do not use this internal field. */ - static public final boolean DEBUG = false; + public static final boolean DEBUG = false; private static final class BridgeTurner implements IBridge { public BridgeTurner(IBridge bridge) { 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<Parcel> parcels = new ArrayList<Parcel>(10); - static protected XSimpleFileAccess m_xSFA; + protected static XSimpleFileAccess m_xSFA; protected XComponentContext m_xCtx; private ParcelContainer parent = null; private final Collection<ParcelContainer> 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<URL, ScriptEditorForJavaScript> BEING_EDITED = new diff --git a/smoketest/com/sun/star/comp/smoketest/TestExtension.java b/smoketest/com/sun/star/comp/smoketest/TestExtension.java index 5e4d797fa602..65fdfff75dff 100644 --- a/smoketest/com/sun/star/comp/smoketest/TestExtension.java +++ b/smoketest/com/sun/star/comp/smoketest/TestExtension.java @@ -37,7 +37,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"; /** This method returns an array of all supported service names. diff --git a/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java b/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java index 7cdd64732d19..66444c2d0372 100644 --- a/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java +++ b/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java @@ -30,7 +30,7 @@ import com.sun.star.ucb.XCommandEnvironment; public class SmoketestCommandEnvironment extends WeakBase implements XServiceInfo, XCommandEnvironment { - static private final String __serviceName = + private static final String __serviceName = "com.sun.star.deployment.test.SmoketestCommandEnvironment"; public static String[] getServiceNames() { diff --git a/sw/qa/complex/writer/CheckBookmarks.java b/sw/qa/complex/writer/CheckBookmarks.java index 607064a80d58..a5e1a9ed138b 100644 --- a/sw/qa/complex/writer/CheckBookmarks.java +++ b/sw/qa/complex/writer/CheckBookmarks.java @@ -57,7 +57,7 @@ class BookmarkHashes { assertEquals(aExpectation.m_nMsWordReloadHash, m_nMsWordReloadHash); } - static public java.math.BigInteger getBookmarksHash(XTextDocument xDoc) + public static java.math.BigInteger getBookmarksHash(XTextDocument xDoc) throws com.sun.star.uno.Exception, java.security.NoSuchAlgorithmException { StringBuffer buffer = new StringBuffer(""); diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java index 5900e9aa96cd..b2c618d08f03 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java @@ -677,7 +677,7 @@ public class Helper } } - static private class HTMLParse extends HTMLEditorKit + private static class HTMLParse extends HTMLEditorKit { @Override @@ -687,12 +687,12 @@ public class Helper } } - static protected HTMLEditorKit.Parser GetHTMLParser() + protected static HTMLEditorKit.Parser GetHTMLParser() { return new HTMLParse().getParser(); } - static private boolean LoginReportsError( String sRespond ) + private static boolean LoginReportsError( String sRespond ) { boolean bResult = true; if ( sRespond != null ) @@ -715,7 +715,7 @@ public class Helper return bResult; } - static private String GetLoginToken( String sLoginPage ) + private static String GetLoginToken( String sLoginPage ) { String sResult = ""; if ( sLoginPage != null && sLoginPage.length() > 0 ) @@ -738,7 +738,7 @@ public class Helper return sResult; } - static protected HostConfiguration Login( URI aMainURL, String sWikiUser, String sWikiPass, XComponentContext xContext ) + protected static HostConfiguration Login( URI aMainURL, String sWikiUser, String sWikiPass, XComponentContext xContext ) throws java.io.IOException, WikiCancelException { HostConfiguration aHostConfig = null; diff --git a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java index 70af8831e505..784bc7774e11 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java +++ b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java @@ -36,7 +36,7 @@ public class MainThreadDialogExecutor implements XCallback private boolean m_bCalled = false; private boolean m_bClose = false; - static public boolean Show( XComponentContext xContext, WikiDialog aWikiDialog ) + public static boolean Show( XComponentContext xContext, WikiDialog aWikiDialog ) { MainThreadDialogExecutor aExecutor = new MainThreadDialogExecutor( aWikiDialog ); return GetCallback( xContext, aExecutor ); @@ -44,13 +44,13 @@ public class MainThreadDialogExecutor implements XCallback - static public boolean Execute( XComponentContext xContext, XMessageBox xMessageBox ) + public static boolean Execute( XComponentContext xContext, XMessageBox xMessageBox ) { MainThreadDialogExecutor aExecutor = new MainThreadDialogExecutor( xMessageBox ); return GetCallback( xContext, aExecutor ); } - static public boolean Close( XComponentContext xContext, XDialog xDialog ) + public static boolean Close( XComponentContext xContext, XDialog xDialog ) { MainThreadDialogExecutor aExecutor = new MainThreadDialogExecutor( xDialog ); aExecutor.m_bClose = true; @@ -58,7 +58,7 @@ public class MainThreadDialogExecutor implements XCallback return GetCallback( xContext, aExecutor ); } - static private boolean GetCallback( XComponentContext xContext, MainThreadDialogExecutor aExecutor ) + private static boolean GetCallback( XComponentContext xContext, MainThreadDialogExecutor aExecutor ) { try { diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java index bf1524dd18ca..a6966eb15ec2 100644 --- a/testtools/com/sun/star/comp/bridge/TestComponent.java +++ b/testtools/com/sun/star/comp/bridge/TestComponent.java @@ -62,10 +62,10 @@ import com.sun.star.uno.XInterface; @SuppressWarnings("unchecked") public class TestComponent { - static public final boolean DEBUG = false; + public static final boolean DEBUG = false; - static public class _PerformancTestObject implements XPerformanceTest, XServiceInfo, XTypeProvider { - static private final String __serviceName = "com.sun.star.comp.benchmark.JavaTestObject"; + public static class _PerformancTestObject implements XPerformanceTest, XServiceInfo, XTypeProvider { + private static final String __serviceName = "com.sun.star.comp.benchmark.JavaTestObject"; private int _long; private long _hyper; @@ -289,8 +289,8 @@ public class TestComponent { } } - static public class _TestObject implements XBridgeTest2, XRecursiveCall, XServiceInfo, XTypeProvider { - static private final String __serviceName = "com.sun.star.test.bridge.JavaTestObject"; + public static class _TestObject implements XBridgeTest2, XRecursiveCall, XServiceInfo, XTypeProvider { + private static final String __serviceName = "com.sun.star.test.bridge.JavaTestObject"; private boolean _bool; private char _char; diff --git a/testtools/com/sun/star/comp/bridge/TestComponentMain.java b/testtools/com/sun/star/comp/bridge/TestComponentMain.java index eaeab8d23ebf..c4ea66ce88ae 100644 --- a/testtools/com/sun/star/comp/bridge/TestComponentMain.java +++ b/testtools/com/sun/star/comp/bridge/TestComponentMain.java @@ -63,7 +63,7 @@ public class TestComponentMain } } - static public void main(String args[]) throws Exception, com.sun.star.uno.Exception { + public static void main(String args[]) throws Exception, com.sun.star.uno.Exception { if(args.length != 2) { System.err.println("usage : com.sun.star.comp.bridge.TestComponentMain uno:connection;protocol;objectName singleaccept"); System.exit(-1); diff --git a/toolkit/test/accessibility/Options.java b/toolkit/test/accessibility/Options.java index bbe7d608a7d3..6cf6e48f2a31 100644 --- a/toolkit/test/accessibility/Options.java +++ b/toolkit/test/accessibility/Options.java @@ -27,29 +27,29 @@ import java.util.Properties; class Options extends Properties { - static public Options Instance () + public static Options Instance () { if (saOptions == null) saOptions = new Options (); return saOptions; } - static public void SetBoolean (String sName, boolean bValue) + public static void SetBoolean (String sName, boolean bValue) { Instance().setProperty (sName, Boolean.toString(bValue)); } - static public boolean GetBoolean (String sName) + public static boolean GetBoolean (String sName) { return Boolean.getBoolean(Instance().getProperty (sName)); } - static public void SetInteger (String sName, int nValue) + public static void SetInteger (String sName, int nValue) { Instance().setProperty (sName, Integer.toString(nValue)); } - static public int GetInteger (String sName, int nDefault) + public static int GetInteger (String sName, int nDefault) { String sValue = Instance().getProperty (sName); if (sValue == null) @@ -118,5 +118,5 @@ class Options sBaseName); } - static private Options saOptions = null; + private static Options saOptions = null; } diff --git a/toolkit/test/accessibility/ov/ContextView.java b/toolkit/test/accessibility/ov/ContextView.java index e2667abde907..943c884f158e 100644 --- a/toolkit/test/accessibility/ov/ContextView.java +++ b/toolkit/test/accessibility/ov/ContextView.java @@ -36,7 +36,7 @@ public class ContextView extends ListeningObjectView implements ActionListener { - static public ObjectView Create ( + public static ObjectView Create ( ObjectViewContainer aContainer, XAccessibleContext xContext) { diff --git a/toolkit/test/accessibility/ov/FocusView.java b/toolkit/test/accessibility/ov/FocusView.java index b7a489d896b2..7cb3c8094ba1 100644 --- a/toolkit/test/accessibility/ov/FocusView.java +++ b/toolkit/test/accessibility/ov/FocusView.java @@ -41,7 +41,7 @@ public class FocusView /** Create a FocusView when the given object supports the XAccessibleComponent interface. */ - static public ObjectView Create ( + public static ObjectView Create ( ObjectViewContainer aContainer, XAccessibleContext xContext) { diff --git a/toolkit/test/accessibility/ov/TextView.java b/toolkit/test/accessibility/ov/TextView.java index 3e388637258a..1d40c5f48b98 100644 --- a/toolkit/test/accessibility/ov/TextView.java +++ b/toolkit/test/accessibility/ov/TextView.java @@ -34,7 +34,7 @@ public class TextView /** Create a TextView when the given object supports the XAccessibleText interface. */ - static public ObjectView Create ( + public static ObjectView Create ( ObjectViewContainer aContainer, XAccessibleContext xContext) { diff --git a/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java b/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java index 5f3c91b2b4a1..a3fb7545dd0f 100644 --- a/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java +++ b/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java @@ -39,11 +39,11 @@ import java.io.PrintWriter; public final class GlobalTransfer_Test extends ComplexTestCase { - static private final String fileName + private static final String fileName = "testcase-do-not-remove.sxw"; - static private final String httpSourceDir + private static final String httpSourceDir = "http://so-berlin/~webdav/"; - static private final String fileTargetDir + private static final String fileTargetDir = "file:///d:/temp/"; @Override diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index badd5e55c1b8..7c727dd2b4af 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -38,8 +38,8 @@ public class ReportLayouter private UnoDialog CurUnoDialog; private static final int SOCONTENTLST = 29; - final static public int SOOPTLANDSCAPE = 30; - final static public int SOOPTPORTRAIT = 31; + final public static int SOOPTLANDSCAPE = 30; + final public static int SOOPTPORTRAIT = 31; private static final int SOLAYOUTLST = 32; private XListBox xContentListBox; private XListBox xLayoutListBox; diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java index dab0ecee30ac..fbdea40f0170 100644 --- a/xmerge/source/bridge/java/XMergeBridge.java +++ b/xmerge/source/bridge/java/XMergeBridge.java @@ -82,7 +82,7 @@ public class XMergeBridge { /** This inner class provides the component as a concrete implementation * of the service description. It implements the needed interfaces. */ - static public class _XMergeBridge implements + public static class _XMergeBridge implements XImportFilter, XExportFilter, XServiceName, @@ -92,7 +92,7 @@ public class XMergeBridge { /** The component will be registered under this name. */ - static private final String __serviceName = "com.sun.star.documentconversion.XMergeBridge"; + private static final String __serviceName = "com.sun.star.documentconversion.XMergeBridge"; |