diff options
219 files changed, 917 insertions, 917 deletions
diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java index 141f63d0ddc9..22c5fb4d901d 100644 --- a/bean/qa/complex/bean/OOoBeanTest.java +++ b/bean/qa/complex/bean/OOoBeanTest.java @@ -651,9 +651,9 @@ public class OOoBeanTest } } - class BeanPanel extends Panel + private class BeanPanel extends Panel { - public BeanPanel(OOoBean b) + private BeanPanel(OOoBean b) { setLayout(new BorderLayout()); add(b, BorderLayout.CENTER); diff --git a/bean/qa/complex/bean/WriterFrame.java b/bean/qa/complex/bean/WriterFrame.java index 9c0eb7d6c98d..77f1959c98f0 100644 --- a/bean/qa/complex/bean/WriterFrame.java +++ b/bean/qa/complex/bean/WriterFrame.java @@ -146,7 +146,7 @@ class WriterFrame extends java.awt.Frame return rc; } - public Rectangle getUnoFramePosition() throws Exception + private Rectangle getUnoFramePosition() throws Exception { com.sun.star.awt.XWindow win = m_bean.getFrame().getContainerWindow(); com.sun.star.awt.Rectangle rect = win.getPosSize(); diff --git a/bridges/test/java_uno/any/TestAny.java b/bridges/test/java_uno/any/TestAny.java index 1e7cf2ec1e4d..752f2c303d3c 100644 --- a/bridges/test/java_uno/any/TestAny.java +++ b/bridges/test/java_uno/any/TestAny.java @@ -2177,7 +2177,7 @@ final class TestAny { private final Class clazz; } - public static class Enum1 extends Enum { + private static class Enum1 extends Enum { public Enum1() { super(0); } @@ -2192,31 +2192,31 @@ final class TestAny { } } - public static class Enum2 extends Enum1 { + private static class Enum2 extends Enum1 { @Override public boolean equals(Object obj) { return obj != null && obj.getClass() == Enum2.class; } } - public static class BaseStruct { + private static class BaseStruct { @Override public boolean equals(Object obj) { return obj != null && obj.getClass() == BaseStruct.class; } } - public static class DerivedStruct extends BaseStruct { + private static class DerivedStruct extends BaseStruct { @Override public boolean equals(Object obj) { return obj != null && obj.getClass() == DerivedStruct.class; } } - public static class BaseException extends com.sun.star.uno.Exception { + private static class BaseException extends com.sun.star.uno.Exception { public BaseException() {} - public BaseException(String message) { + private BaseException(String message) { super(message); } @@ -2226,7 +2226,7 @@ final class TestAny { } } - public static class DerivedException extends BaseException { + private static class DerivedException extends BaseException { public DerivedException() {} public DerivedException(String message) { @@ -2239,12 +2239,12 @@ final class TestAny { } } - public static class BaseRuntimeException + private static class BaseRuntimeException extends com.sun.star.uno.RuntimeException { public BaseRuntimeException() {} - public BaseRuntimeException(String message) { + private BaseRuntimeException(String message) { super(message); } @@ -2255,7 +2255,7 @@ final class TestAny { } } - public static class DerivedRuntimeException extends BaseRuntimeException + private static class DerivedRuntimeException extends BaseRuntimeException { public DerivedRuntimeException() {} diff --git a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java index 40c2714cc940..9167b097c776 100644 --- a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java +++ b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java @@ -37,7 +37,7 @@ import static org.junit.Assert.*; class TestHelper { - String m_sTestPrefix; + private String m_sTestPrefix; /** Creates a new instance of TestHelper */ diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java index ecca4fd9868e..66c65e119945 100644 --- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java +++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java @@ -68,54 +68,54 @@ import com.sun.star.sdbc.*; public class TestCacheSize { // program can edit the *.properties file to set cache_size - protected boolean filedb = true; + private boolean filedb = true; // shutdown performed mid operation - not for mem: or hsql: URL's - protected boolean shutdown = true; + private boolean shutdown = true; // fixed - protected String url = "sdbc:embedded:hsqldb"; + private String url = "sdbc:embedded:hsqldb"; // frequent reporting of progress - boolean reportProgress = false; + private boolean reportProgress = false; - XMultiServiceFactory servicefactory = null; + private XMultiServiceFactory servicefactory = null; // type of the big table {MEMORY | CACHED | TEXT} - String tableType = "CACHED"; - int cacheScale = 17; + private String tableType = "CACHED"; + private int cacheScale = 17; int cacheSizeScale = 8; // script format {TEXT, BINARY, COMPRESSED} - String logType = "TEXT"; - int writeDelay = 60; - boolean indexZip = true; - boolean indexLastName = false; - boolean addForeignKey = false; - boolean refIntegrity = true; + private String logType = "TEXT"; + private int writeDelay = 60; + private boolean indexZip = true; + private boolean indexLastName = false; + private boolean addForeignKey = false; + private boolean refIntegrity = true; // speeds up inserts when tableType=="CACHED" - boolean createTempTable = false; + private boolean createTempTable = false; // introduces fragmentation to the .data file during insert - boolean deleteWhileInsert = false; - int deleteWhileInsertInterval = 10000; + private boolean deleteWhileInsert = false; + private int deleteWhileInsertInterval = 10000; // size of the tables used in test int bigrows = 10000; int smallrows = 0xfff; // if the extra table needs to be created and filled up - boolean multikeytable = false; + private boolean multikeytable = false; - String user; - String password; - XStatement sStatement; - XConnection cConnection; + private String user; + private String password; + private XStatement sStatement; + private XConnection cConnection; XDataSource ds; - XDriver drv; - com.sun.star.beans.PropertyValue[] info; + private XDriver drv; + private com.sun.star.beans.PropertyValue[] info; public TestCacheSize(XMultiServiceFactory _xmulti,com.sun.star.beans.PropertyValue[] _info,XDriver _drv){ servicefactory = _xmulti; diff --git a/connectivity/qa/connectivity/tools/CRMDatabase.java b/connectivity/qa/connectivity/tools/CRMDatabase.java index 3caf024f1a3d..3d33926280c3 100644 --- a/connectivity/qa/connectivity/tools/CRMDatabase.java +++ b/connectivity/qa/connectivity/tools/CRMDatabase.java @@ -112,7 +112,7 @@ public class CRMDatabase } - public XDatabaseDocumentUI getDocumentUI() + private XDatabaseDocumentUI getDocumentUI() { XModel docModel = UnoRuntime.queryInterface( XModel.class, m_database.getDatabaseDocument() ); return UnoRuntime.queryInterface( XDatabaseDocumentUI.class, docModel.getCurrentController() ); diff --git a/connectivity/qa/connectivity/tools/DataSource.java b/connectivity/qa/connectivity/tools/DataSource.java index 748ee61cdefe..5b42e343dd0a 100644 --- a/connectivity/qa/connectivity/tools/DataSource.java +++ b/connectivity/qa/connectivity/tools/DataSource.java @@ -109,7 +109,7 @@ public class DataSource /** provides the container of query definitions of the data source */ - public XNameAccess getQueryDefinitions() + private XNameAccess getQueryDefinitions() { final XQueryDefinitionsSupplier suppQueries = UnoRuntime.queryInterface( XQueryDefinitionsSupplier.class, m_dataSource); diff --git a/dbaccess/qa/complex/dbaccess/TestCase.java b/dbaccess/qa/complex/dbaccess/TestCase.java index 4a9fa8aa2b3b..a9768e7b47a2 100644 --- a/dbaccess/qa/complex/dbaccess/TestCase.java +++ b/dbaccess/qa/complex/dbaccess/TestCase.java @@ -116,7 +116,7 @@ public abstract class TestCase * is the class of the exception to be caught. If this is null, * it means that <em>no</em> exception must be throw by invoking the method. */ - protected void assureException( final String _message, final Object _object, final String _methodName, + private void assureException( final String _message, final Object _object, final String _methodName, final Class[] _argClasses, final Object[] _methodArgs, final Class _expectedExceptionClass ) { Class objectClass = _object.getClass(); @@ -152,7 +152,7 @@ public abstract class TestCase * @param _expectedExceptionClass is the class of the exception to be caught. If this is null, * it means that <em>no</em> exception must be throw by invoking the method. */ - protected void assureException( final String _message, final Object _object, final String _methodName, + private void assureException( final String _message, final Object _object, final String _methodName, final Object[] _methodArgs, final Class _expectedExceptionClass ) { Class[] argClasses = new Class[ _methodArgs.length ]; @@ -169,7 +169,7 @@ public abstract class TestCase * @param _expectedExceptionClass is the class of the exception to be caught. If this is null, * it means that <em>no</em> exception must be throw by invoking the method. */ - protected void assureException( final Object _object, final String _methodName, final Object[] _methodArgs, + private void assureException( final Object _object, final String _methodName, final Object[] _methodArgs, final Class _expectedExceptionClass ) { assureException( 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 7cd3688176c4..abd49d5857a8 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 @@ -43,7 +43,7 @@ import com.sun.star.util.XChangesBatch; */ public class OptionsEventHandler { - public static class _OptionsEventHandler extends WeakBase + private static class _OptionsEventHandler extends WeakBase implements XServiceInfo, XContainerWindowEventHandler { static private final String __serviceName = @@ -106,7 +106,7 @@ public class OptionsEventHandler { * static component initialisation functions as well as in * getSupportedServiceNames. */ - public static String[] getServiceNames() { + private static String[] getServiceNames() { String[] sSupportedServiceNames = { __serviceName }; return sSupportedServiceNames; } diff --git a/forms/qa/integration/forms/TestCase.java b/forms/qa/integration/forms/TestCase.java index c2c18d2889df..cc1e6ec623f3 100644 --- a/forms/qa/integration/forms/TestCase.java +++ b/forms/qa/integration/forms/TestCase.java @@ -25,7 +25,7 @@ import com.sun.star.util.XModifiable; public abstract class TestCase extends complexlib.ComplexTestCase implements com.sun.star.lang.XEventListener { protected XMultiServiceFactory m_orb; /// our service factory - protected DocumentType m_documentType; /// the type of our document + private DocumentType m_documentType; /// the type of our document protected DocumentHelper m_document; /// our current test document protected FormLayer m_formLayer; diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java index 2479b3203aee..9737bbe7cc8a 100644 --- a/framework/qa/complex/XUserInputInterception/EventTest.java +++ b/framework/qa/complex/XUserInputInterception/EventTest.java @@ -327,7 +327,7 @@ public class EventTest { * Listener which added and its method must be called * on <code>keyPressed</code> and <code>keyReleased</code> call. */ - public class MyKeyHandler implements XKeyHandler { + private class MyKeyHandler implements XKeyHandler { /** * This event sets the member <code>m_keyPressed</coed> to * <code>true</code> @@ -363,7 +363,7 @@ public class EventTest { * Listener which added and its method must be called * on <code>mousePressed</code> and <code>mouseReleased</code> call. */ - public class MyMouseClickHandler implements XMouseClickHandler { + private class MyMouseClickHandler implements XMouseClickHandler { /** * This event sets the member <code>m_mousePressed</coed> to * <code>true</code> diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java index b476ab09580e..e918055fbfe9 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTools.java +++ b/framework/qa/complex/framework/recovery/RecoveryTools.java @@ -162,7 +162,7 @@ public class RecoveryTools { } } - public HashMap<String, String> getRecoveryFiles() + private HashMap<String, String> getRecoveryFiles() throws com.sun.star.io.IOException { try{ diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java index 9a67b2049f5c..28a277994bac 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java @@ -27,7 +27,7 @@ import com.sun.star.lib.uno.environments.java.java_environment; public class ProxyProvider { - static java_environment env= new java_environment(null); + private static java_environment env= new java_environment(null); /** returns Holder proxy objects for the specified interface. If the method is called * several times with the same arguments then each time a new HolderProxy is returned. @@ -61,7 +61,7 @@ public class ProxyProvider class Proxy implements IQueryInterface, XEventListener { - String oid; + private String oid; Type type; Proxy(String oid, Type t) { this.oid = oid; diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java b/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java index f907a3c1cb08..638427fe82ce 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java +++ b/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java @@ -34,10 +34,10 @@ class TestWorkAt implements TestIWorkAt { int _sync_counter; int _async_counter; - Thread _sync_thread; - Thread _async_thread; + private Thread _sync_thread; + private Thread _async_thread; - boolean _passedAync = true; + private boolean _passedAync = true; boolean _notified = false; public synchronized void syncCall() throws Throwable { diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java index aff5def10cb8..e3ac682fe697 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java +++ b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java @@ -232,7 +232,7 @@ public class ThreadPool_Test { } abstract class Stress extends Thread { - public Stress(int count) { + private Stress(int count) { this.count = count; } 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 88f6aeefea00..e84bd2a5f497 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,14 +28,14 @@ import com.sun.star.uno.Type; class TestBridge implements IBridge { - static public final boolean DEBUG = false; + static private final boolean DEBUG = false; - final HashMap<String,Object> _hashtable = new HashMap<String,Object>(); + private final HashMap<String,Object> _hashtable = new HashMap<String,Object>(); - IEnvironment _source ;//= new com.sun.star.lib.uno.environments.java.java_environment(null); + private IEnvironment _source ;//= new com.sun.star.lib.uno.environments.java.java_environment(null); - class MyEnv implements IEnvironment { + private class MyEnv implements IEnvironment { public Object getContext() { return null; } diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java index 84db9685d6a3..36fdd4d55ac2 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java @@ -71,7 +71,7 @@ public abstract class BaseDialog extends BaseControl { return xMSF; } - public XFrame getCurrentFrame() { + private XFrame getCurrentFrame() { try { Object oDesktop = xMCF.createInstanceWithContext("com.sun.star.frame.Desktop", context); XDesktop xDesktop = UnoRuntime.queryInterface(XDesktop.class, oDesktop); @@ -84,7 +84,7 @@ public abstract class BaseDialog extends BaseControl { } } - public Rectangle getWorkspaceDimensions() { + private Rectangle getWorkspaceDimensions() { return getCurrentFrame().getComponentWindow().getPosSize(); } diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/runner/complexlib/Assurance.java index 53d287e9dc48..0cbc1e0aaf20 100644 --- a/qadevOOo/runner/complexlib/Assurance.java +++ b/qadevOOo/runner/complexlib/Assurance.java @@ -170,7 +170,7 @@ public class Assurance public class AssureException extends RuntimeException { - public AssureException(String msg) { + private AssureException(String msg) { super(msg); } public AssureException(Throwable cause) { diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index 2d35b9669eed..669083bd0778 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -329,7 +329,7 @@ public class GraphicalTestArguments } // set methods - public void setReferenceType(String _sType) + private void setReferenceType(String _sType) { // special casse, null is not allowed, set to default. if (_sType == null) @@ -342,10 +342,10 @@ public class GraphicalTestArguments } } public void setTargetFrameName(String _sTargetFrameName) {m_sTargetFrameName = _sTargetFrameName;} - public void setPrinterName(String _sName) {m_sPrinterName = _sName;} + private void setPrinterName(String _sName) {m_sPrinterName = _sName;} private void setHidden() { m_bHidden = true;} private void setViewable() {m_bHidden = false;} - public void setDefaultXMLFormatApp(String _sNameOfApp) {m_sDefaultXMLFormatApplication = _sNameOfApp;} + private void setDefaultXMLFormatApp(String _sNameOfApp) {m_sDefaultXMLFormatApplication = _sNameOfApp;} // get methods public XMultiServiceFactory getMultiServiceFactory() diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java index 9ed3b4b60727..e6235bed9716 100644 --- a/qadevOOo/runner/convwatch/MSOfficePrint.java +++ b/qadevOOo/runner/convwatch/MSOfficePrint.java @@ -42,7 +42,7 @@ public class MSOfficePrint { private String m_sPrinterName; // within Windows the tools need a printer name; - public void setPrinterName(String _s) {m_sPrinterName = _s;} + private void setPrinterName(String _s) {m_sPrinterName = _s;} private static boolean isWordDocument(String _sSuffix) diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java b/qadevOOo/runner/convwatch/PerformanceContainer.java index 0590ef37fc23..2f32bdeaeb06 100644 --- a/qadevOOo/runner/convwatch/PerformanceContainer.java +++ b/qadevOOo/runner/convwatch/PerformanceContainer.java @@ -26,7 +26,7 @@ public class PerformanceContainer { /* simple helper functions to start/stop a timer, to know how long a process need in milliseconds */ - public long getStartTime() + private long getStartTime() { return System.currentTimeMillis(); } diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java index ba9a7ba25c64..a909651bc5f0 100644 --- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java @@ -36,7 +36,7 @@ public class MSOfficePostscriptCreator implements IOffice { private String m_sPrinterName; // within Windows the tools need a printer name; - public void setPrinterName(String _s) + private void setPrinterName(String _s) { m_sPrinterName = _s; } diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java index dfbdfd8a648c..efba9a86cfe8 100644 --- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java @@ -622,7 +622,7 @@ public class OpenOfficePostscriptCreator implements IOffice - public boolean isStoreAllowed() + private boolean isStoreAllowed() { return false; } diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java b/qadevOOo/runner/graphical/PerformanceContainer.java index 5812f59d7f71..0ebda690f5c5 100644 --- a/qadevOOo/runner/graphical/PerformanceContainer.java +++ b/qadevOOo/runner/graphical/PerformanceContainer.java @@ -27,7 +27,7 @@ public class PerformanceContainer { /* simple helper functions to start/stop a timer, to know how long a process need in milliseconds */ - public long getStartTime() + private long getStartTime() { return System.currentTimeMillis(); } diff --git a/qadevOOo/runner/helper/ComplexDescGetter.java b/qadevOOo/runner/helper/ComplexDescGetter.java index 1c2099cce8d9..e92cce05d77c 100644 --- a/qadevOOo/runner/helper/ComplexDescGetter.java +++ b/qadevOOo/runner/helper/ComplexDescGetter.java @@ -33,7 +33,7 @@ import complexlib.ComplexTestCase; public class ComplexDescGetter extends DescGetter { - ComplexTest testClass; + private ComplexTest testClass; /** Creates new ComplexDescGetter */ public ComplexDescGetter() diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index 332eb52f5a83..9e0b352e55eb 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -729,7 +729,7 @@ public class ProcessHandler * @return <code>true</code> if the external command was * found and successfully started. */ - public boolean isStarted() + private boolean isStarted() { return isStarted; } @@ -741,7 +741,7 @@ public class ProcessHandler * @return <code>true</code> if the command correctly starts, * exits and was not interrupted due to timeout. */ - public boolean isFinished() + private boolean isFinished() { return isFinished; } diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java index c1f0b308f07b..aabd919054e3 100644 --- a/qadevOOo/runner/lib/MultiMethodTest.java +++ b/qadevOOo/runner/lib/MultiMethodTest.java @@ -290,7 +290,7 @@ public class MultiMethodTest * @param methName the method name to set status * @param methStatus the status to set to the method */ - protected void setStatus(String methName, Status methStatus) + private void setStatus(String methName, Status methStatus) { tRes.tested(methName, methStatus); } @@ -298,7 +298,7 @@ public class MultiMethodTest /** * sets the substates */ - protected void setSubStates(String msg) + private void setSubStates(String msg) { for (int k = 0; k < entry.SubEntryCount; k++) { @@ -332,7 +332,7 @@ public class MultiMethodTest /** * Checks if the <code>method</code> test has been already called. */ - protected boolean isCalled(String method) + private boolean isCalled(String method) { return methCalled.contains(method); } @@ -373,7 +373,7 @@ public class MultiMethodTest /** * Just calls the <code>method</code> test. */ - protected void callMethod(String method) + private void callMethod(String method) { methCalled.add(method); invokeTestMethod(getMethodFor(method), method); @@ -440,7 +440,7 @@ public class MultiMethodTest * * @return the testing method, if found, <tt>null</tt> otherwise */ - protected Method getMethodFor(String method) + private Method getMethodFor(String method) { String mName = "_" + method; diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java index 1ca6a5c5b638..57501c140c06 100644 --- a/qadevOOo/runner/lib/TestParameters.java +++ b/qadevOOo/runner/lib/TestParameters.java @@ -199,7 +199,7 @@ public class TestParameters extends HashMap<String,Object> { * to OOo rules. * @return A valid OS name, or "" if the name is not known. */ - String getSOCompatibleOSName() { + private String getSOCompatibleOSName() { String osname = System.getProperty ("os.name").toLowerCase (); String osarch = System.getProperty ("os.arch"); String operatingSystem = ""; diff --git a/qadevOOo/runner/lib/TestResult.java b/qadevOOo/runner/lib/TestResult.java index a6c964f258ee..eb7a469cdc99 100644 --- a/qadevOOo/runner/lib/TestResult.java +++ b/qadevOOo/runner/lib/TestResult.java @@ -27,7 +27,7 @@ public class TestResult { /** * Contains methods having been tested and their results. */ - protected HashMap<String, Status> testedMethods = new HashMap<String, Status>(); + private HashMap<String, Status> testedMethods = new HashMap<String, Status>(); /** * The method makes method tested with the result, i.e. it adds to its diff --git a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java index 91aa80848c6b..ab739aeb3595 100644 --- a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java +++ b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java @@ -198,7 +198,7 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider, public void removeEventListener(com.sun.star.lang.XEventListener xEventListener) { } - protected class CommonLayer implements XLayer, XTimeStamped { + private class CommonLayer implements XLayer, XTimeStamped { public void readData(XLayerHandler xLayerHandler) throws com.sun.star.lang.NullPointerException, com.sun.star.lang.WrappedTargetException, diff --git a/qadevOOo/testdocs/qadevlibs/source/test/Job.java b/qadevOOo/testdocs/qadevlibs/source/test/Job.java index 950eee89cfbc..c2aae762bddd 100644 --- a/qadevOOo/testdocs/qadevlibs/source/test/Job.java +++ b/qadevOOo/testdocs/qadevlibs/source/test/Job.java @@ -31,13 +31,13 @@ import com.sun.star.comp.loader.FactoryHelper; public class Job { - static public class _Implementation implements XServiceInfo, XTypeProvider, + static private class _Implementation implements XServiceInfo, XTypeProvider, XJob, XNamed { static private final String __serviceName = "test.Job"; Object oDoc = null; String actionType = null; String actionParm = null; - XMultiServiceFactory oMSF = null; + private XMultiServiceFactory oMSF = null; public _Implementation(XMultiServiceFactory xMSF) { @@ -57,7 +57,7 @@ public class Job { return new String[] {__serviceName}; } - public static int executed = 0; + private static int executed = 0; public Object execute(NamedValue[] args) { executed++; diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java index 5a6d42c972b5..fe3b94bc3a41 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java @@ -567,7 +567,7 @@ public class ORowSet extends TestCase { * for the XCompletedExecution test * @see ifc.sdb._XCompletedExecution */ - public class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler { + private class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler { private boolean handlerWasUsed = false; private PrintWriter log = new PrintWriter(System.out); diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java index ed7ba409d2ed..0a0f7b3c4233 100644 --- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java +++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java @@ -493,12 +493,12 @@ public class GenericModelTest extends TestCase { } // finish method getTestEnvironment - static class Checker implements ifc.form._XUpdateBroadcaster.UpdateChecker { + private static class Checker implements ifc.form._XUpdateBroadcaster.UpdateChecker { private Object lastValue = null; - XLoadable formLoaderF = null; - XPropertySet ps = null; - XInterface ctrl = null; - String ChangePropertyName = null; + private XLoadable formLoaderF = null; + private XPropertySet ps = null; + private XInterface ctrl = null; + private String ChangePropertyName = null; Object ChangePropertyValue = null; public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) { diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index 8a1b43c88f56..72755f0cc449 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -783,9 +783,9 @@ public class ODatabaseForm extends TestCase { * for the XDatabaseParameterBroadcaster test * @see ifc.form._XDatabaseParameterBroadcaster */ - public class ParameterListenerImpl implements _XDatabaseParameterBroadcaster.CheckParameterListener { - boolean listenerWasCalled = false; - PrintWriter log = new PrintWriter(System.out); + private class ParameterListenerImpl implements _XDatabaseParameterBroadcaster.CheckParameterListener { + private boolean listenerWasCalled = false; + private PrintWriter log = new PrintWriter(System.out); /** * Return true, if the listener was called, false otherwise. @@ -845,7 +845,7 @@ public class ODatabaseForm extends TestCase { * for the XCompletedExecution test * @see ifc.sdb._XCompletedExecution */ - public class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler { + private class InteractionHandlerImpl implements _XCompletedExecution.CheckInteractionHandler { private boolean handlerWasUsed = false; private PrintWriter log = new PrintWriter(System.out); diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java index c5d61c79f4ad..69db57197b1e 100644 --- a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java @@ -183,12 +183,12 @@ public class OListBoxModel extends GenericModelTest { return tEnv; } - static class Checker implements UpdateChecker { + private static class Checker implements UpdateChecker { private short lastItem = (short) 0; - XLoadable formLoaderF = null; - XPropertySet ps = null; - XInterface ctrl = null; - String ChangePropertyName = null; + private XLoadable formLoaderF = null; + private XPropertySet ps = null; + private XInterface ctrl = null; + private String ChangePropertyName = null; Object ChangePropertyValue = null; public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) { diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java index e2caa810892c..4e1525bed3fd 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java @@ -176,11 +176,11 @@ public class OTimeModel extends GenericModelTest { return tEnv; } - static class Checker implements UpdateChecker { - XLoadable formLoaderF = null; - XPropertySet ps = null; - XInterface ctrl = null; - String ChangePropertyName = null; + private static class Checker implements UpdateChecker { + private XLoadable formLoaderF = null; + private XPropertySet ps = null; + private XInterface ctrl = null; + private String ChangePropertyName = null; Object ChangePropertyValue = null; public Checker(XLoadable xl, XPropertySet ps, XInterface ctrl, String ChangePropertyName, Object ChangePropertyValue) { diff --git a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java index 8cf372db98c2..8816fe136ea6 100644 --- a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java +++ b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java @@ -273,8 +273,8 @@ class Job implements } } - public static final String __serviceName = "test.Job"; - static Impl impl = new Impl(); + private static final String __serviceName = "test.Job"; + private static Impl impl = new Impl(); public Object createInstanceWithArguments(Object[] args) { return impl; diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java index e572e3dfa953..13dd31170d42 100644 --- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java @@ -122,13 +122,13 @@ public class ModuleUIConfigurationManager extends TestCase { * interface to trigger the event for a listener call. * @see ifc.ui._XUIConfiguration */ - public static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl { + private static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl { private boolean triggered = false; private final PrintWriter log; private final XUIConfigurationManager xUIManager; private final XMultiServiceFactory xMSF; - public ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) { + private ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) { log = _log; this.xUIManager = xUIManager; this.xMSF = xMSF; diff --git a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java index 75d78cdc71be..d32fb8d237d8 100644 --- a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java @@ -114,14 +114,14 @@ public class UIConfigurationManager extends TestCase { * interface to trigger the event for a listener call. * @see ifc.ui._XUIConfiguration */ - public static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl { + private static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl { private boolean triggered = false; private final PrintWriter log; private final XUIConfigurationManager xUIManager; private final XMultiServiceFactory xMSF; private static int iUniqueCounter; - public ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) { + private ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) { log = _log; this.xUIManager = xUIManager; this.xMSF = xMSF; diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java index 7c132745cd9d..d23af9a14174 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java @@ -80,7 +80,7 @@ public class various extends TestCase { * * @see com.sun.star.bridge.XInstanceProvider */ - protected class MyInstanceProvider implements XInstanceProvider { + private class MyInstanceProvider implements XInstanceProvider { /** * a MultiServiceFactory for creating instances * @@ -93,7 +93,7 @@ public class various extends TestCase { * * @see com.sun.star.lang.MultiServiceFactory */ - public MyInstanceProvider(XMultiServiceFactory xMSF) { + private MyInstanceProvider(XMultiServiceFactory xMSF) { this.xMSF = xMSF; } @@ -118,25 +118,25 @@ public class various extends TestCase { * Then stores exception thrown by call if it occurred, or * return value. */ - protected class AcceptorThread extends Thread { + private class AcceptorThread extends Thread { /** * If exception occurred during method call it is * stored in this field. */ - public Exception ex = null ; + private Exception ex = null ; private final XAcceptor acc; private final XInstanceProvider xInstProv; private final XBridgeFactory xBrdgFctr; /** * If method call returns some value it stores in this field. */ - public XConnection acceptedCall = null ; + private XConnection acceptedCall = null ; /** * Creates object which can call <code>accept</code> method * of the Acceptor object specified. */ - public AcceptorThread(XAcceptor acc, XInstanceProvider xInstProv, + private AcceptorThread(XAcceptor acc, XInstanceProvider xInstProv, XBridgeFactory xBrdgFctr) { this.acc = acc ; this.xInstProv = xInstProv; diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java index 0bd2b95e7107..a00f98f16582 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/various.java @@ -81,7 +81,7 @@ public class various extends TestCase { * * @see com.sun.star.bridge.XInstanceProvider */ - protected class MyInstanceProvider implements XInstanceProvider { + private class MyInstanceProvider implements XInstanceProvider { /** * a MultiServiceFactory for creating instances * @@ -94,7 +94,7 @@ public class various extends TestCase { * * @see com.sun.star.lang.MultiServiceFactory */ - public MyInstanceProvider(XMultiServiceFactory xMSF) { + private MyInstanceProvider(XMultiServiceFactory xMSF) { this.xMSF = xMSF; } @@ -119,23 +119,23 @@ public class various extends TestCase { * Then stores exception thrown by call if it occurred, or * return value. */ - protected class AcceptorThread extends Thread { + private class AcceptorThread extends Thread { /** * If exception occurred during method call it is * stored in this field. */ - public Exception ex = null ; + private Exception ex = null ; private final XAcceptor acc; /** * If method call returns some value it stores in this field. */ - public XConnection acceptedCall = null ; + private XConnection acceptedCall = null ; /** * Creates object which can call <code>accept</code> method * of the Acceptor object specified. */ - public AcceptorThread(XAcceptor acc) { + private AcceptorThread(XAcceptor acc) { this.acc = acc ; } diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java index 97efd9ed1a2c..01a80ea65460 100644 --- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java +++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java @@ -167,11 +167,11 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase { /** * Thread for opening modal dialog 'Print Settings'. */ - public class DiagThread extends Thread { - public XComponent xCalcDoc = null; - public XMultiServiceFactory msf = null; + private class DiagThread extends Thread { + private XComponent xCalcDoc = null; + private XMultiServiceFactory msf = null; - public DiagThread(XComponent xCalcDoc, XMultiServiceFactory msf) { + private DiagThread(XComponent xCalcDoc, XMultiServiceFactory msf) { this.xCalcDoc = xCalcDoc; this.msf = msf; } diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java index 13f53b277378..bd525d7f0961 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java @@ -168,13 +168,13 @@ public class ScAccessibleCsvCell extends TestCase { } } - public class loadThread extends Thread { + private class loadThread extends Thread { private final SOfficeFactory SOF; private final PropertyValue[] args; public XComponent xSpreadSheedDoc = null; - public loadThread(SOfficeFactory SOF, PropertyValue[] Args) { + private loadThread(SOfficeFactory SOF, PropertyValue[] Args) { this.SOF = SOF; this.args = Args; } diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java index 1237e9817f11..8d6687cf01dd 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java @@ -154,13 +154,13 @@ public class ScAccessibleCsvGrid extends TestCase { } } - public class loadThread extends Thread { + private class loadThread extends Thread { private final SOfficeFactory SOF; private final PropertyValue[] args; public XComponent xSpreadSheedDoc = null; - public loadThread(SOfficeFactory SOF, PropertyValue[] Args) { + private loadThread(SOfficeFactory SOF, PropertyValue[] Args) { this.SOF = SOF; this.args = Args; } diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java index 45c3f9e4e16e..549c8cb4985c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java @@ -189,13 +189,13 @@ public class ScAccessibleCsvRuler extends TestCase { } } - public class loadThread extends Thread { + private class loadThread extends Thread { private final SOfficeFactory SOF; private final PropertyValue[] args; public XComponent xSpreadSheedDoc = null; - public loadThread(SOfficeFactory SOF, PropertyValue[] Args) { + private loadThread(SOfficeFactory SOF, PropertyValue[] Args) { this.SOF = SOF; this.args = Args; } diff --git a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java index 5d2979d2a8d6..aed4929d9233 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java @@ -182,14 +182,14 @@ public class XMLContentExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class ContentFilterChecker extends XMLTools.XMLTagsChecker + private class ContentFilterChecker extends XMLTools.XMLTagsChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public ContentFilterChecker(PrintWriter log) { + private ContentFilterChecker(PrintWriter log) { super(log) ; } diff --git a/qadevOOo/tests/java/mod/_sc/XMLExporter.java b/qadevOOo/tests/java/mod/_sc/XMLExporter.java index d8b9b329e21f..cfc85e4e0719 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLExporter.java @@ -190,14 +190,14 @@ public class XMLExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, false) ; } /** diff --git a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java index f2e9e88a6176..6446afde67d0 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java @@ -172,14 +172,14 @@ public class XMLMetaExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log,false) ; } /** diff --git a/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java index f2b80392ed16..287049d7e3bb 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java @@ -173,14 +173,14 @@ public class XMLSettingsExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class SettingsFilterChecker extends XMLTools.XMLChecker + private class SettingsFilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public SettingsFilterChecker(PrintWriter log) { + private SettingsFilterChecker(PrintWriter log) { super(log, false) ; } /** diff --git a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java index d105a475fa4b..24c2dcde9cba 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java @@ -177,14 +177,14 @@ public class XMLStylesExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log,false) ; } /** diff --git a/qadevOOo/tests/java/mod/_sm/XMLExporter.java b/qadevOOo/tests/java/mod/_sm/XMLExporter.java index d44f26f57906..05a406dcd920 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLExporter.java @@ -165,14 +165,14 @@ public class XMLExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, true) ; } /** diff --git a/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java index 0a2e7d431f6d..7f360330fe90 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java @@ -168,14 +168,14 @@ public class XMLMetaExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, true) ; } /** diff --git a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java index 501e2b82d873..f18762960b72 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java @@ -166,14 +166,14 @@ public class XMLSettingsExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, true) ; } /** diff --git a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java index 901249737d1c..3ada74f5fe89 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java @@ -164,14 +164,14 @@ public class XMLContentExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class ContentFilterChecker extends XMLTools.XMLTagsChecker + private class ContentFilterChecker extends XMLTools.XMLTagsChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public ContentFilterChecker(PrintWriter log) { + private ContentFilterChecker(PrintWriter log) { super(log) ; } diff --git a/qadevOOo/tests/java/mod/_sw/XMLExporter.java b/qadevOOo/tests/java/mod/_sw/XMLExporter.java index 967389feaa71..f3c8d43c2101 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLExporter.java @@ -168,14 +168,14 @@ public class XMLExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLTagsChecker + private class FilterChecker extends XMLTools.XMLTagsChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log) ; } /** diff --git a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java index 3bc515977f49..c8553ab72bfb 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java @@ -165,14 +165,14 @@ public class XMLMetaExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class MetaFilterChecker extends XMLTools.XMLTagsChecker + private class MetaFilterChecker extends XMLTools.XMLTagsChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public MetaFilterChecker(PrintWriter log) { + private MetaFilterChecker(PrintWriter log) { super(log) ; } diff --git a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java index d0943ae08160..7b408a5276a7 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java @@ -176,14 +176,14 @@ public class XMLSettingsExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class SettingsFilterChecker extends XMLTools.XMLChecker + private class SettingsFilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public SettingsFilterChecker(PrintWriter log) { + private SettingsFilterChecker(PrintWriter log) { super(log, false) ; } diff --git a/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java index 9196d13e026c..7fb992152743 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java @@ -170,14 +170,14 @@ public class XMLStylesExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log,false) ; } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java index 07340ad82f3c..2a0e703a1498 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java @@ -192,11 +192,11 @@ public class AccessibleButton extends lib.TestCase { /** * Thread for opening modal dialog 'Print Settings'. */ - public class DiagThread extends Thread { - public XTextDocument xTextDoc = null; - public XMultiServiceFactory msf = null; + private class DiagThread extends Thread { + private XTextDocument xTextDoc = null; + private XMultiServiceFactory msf = null; - public DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) { + private DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) { this.xTextDoc = xTextDoc; this.msf = msf; } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java index 6c90c96f0c93..25fa9a7798d3 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java @@ -208,11 +208,11 @@ public class AccessibleCheckBox extends TestCase { /** * Thread for opening modal dialog 'Insert Table'. */ - public class DiagThread extends Thread { - public XTextDocument xTextDoc = null; - public XMultiServiceFactory msf = null; + private class DiagThread extends Thread { + private XTextDocument xTextDoc = null; + private XMultiServiceFactory msf = null; - public DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) { + private DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) { this.xTextDoc = xTextDoc; this.msf = msf; } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java index 527770386fe2..0174c0094b1d 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java @@ -193,11 +193,11 @@ public class AccessibleComboBox extends TestCase { /** * Thread for opening modal dialog 'Character style'. */ - public class DiagThread extends Thread { - public XTextDocument xTextDoc = null; - public XMultiServiceFactory msf = null; + private class DiagThread extends Thread { + private XTextDocument xTextDoc = null; + private XMultiServiceFactory msf = null; - public DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) { + private DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) { this.xTextDoc = xTextDoc; this.msf = msf; } diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java index aaa9f987a781..5a403d252550 100644 --- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java @@ -80,7 +80,7 @@ public class MutableTreeDataModel extends TestCase { return tEnv; } // finish method getTestEnvironment - public class XTreeDataModelListenerEvent implements ifc.awt.tree._XTreeDataModel.XTreeDataModelListenerEvent{ + private class XTreeDataModelListenerEvent implements ifc.awt.tree._XTreeDataModel.XTreeDataModelListenerEvent{ public void fireEvent(){ diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java index 08511618e68d..cb90ae98eee4 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java @@ -170,14 +170,14 @@ public class XMLContentExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, true) ; } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java index 4ec04319ca6b..18047d2591d8 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java @@ -172,14 +172,14 @@ public class XMLExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, true) ; } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java index f5247f3cb182..c672f1467011 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java @@ -160,14 +160,14 @@ public class XMLStylesExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, true) ; } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java index a2009b40ffcc..2e6bd3bfca2e 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java @@ -176,14 +176,14 @@ public class XMLContentExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log,true) ; } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java index 022a2f6132fe..30542b4a0442 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java @@ -178,14 +178,14 @@ public class XMLExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log,true) ; } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java index a4edaa81c105..56c82e97af04 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java @@ -171,14 +171,14 @@ public class XMLMetaExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, true) ; } diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java index 29c2c3b398e1..34a162fe067d 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java @@ -177,14 +177,14 @@ public class XMLSettingsExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, false) ; } diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java index 59b3aded3543..8ecbb470895d 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java @@ -179,14 +179,14 @@ public class XMLStylesExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, false) ; } diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java index ae7572eb0d4b..aca41f9f42af 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java @@ -175,14 +175,14 @@ public class XMLContentExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, true) ; } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java index 28c277af29c2..61b1898760ce 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java @@ -177,14 +177,14 @@ public class XMLExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, true) ; } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java index 0d59606af15f..a9894f5f6068 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java @@ -173,14 +173,14 @@ public class XMLMetaExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, true); } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java index 22769601cc5f..b3a5205e9000 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java @@ -176,14 +176,14 @@ public class XMLSettingsExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log,false) ; } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java index 2567b7b2230c..23f8cefed8f7 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java @@ -175,14 +175,14 @@ public class XMLStylesExporter extends TestCase { * to log specified. * @see ifc.document._XFilter */ - protected class FilterChecker extends XMLTools.XMLChecker + private class FilterChecker extends XMLTools.XMLChecker implements ifc.document._XFilter.FilterChecker { /** * Creates a class which will write information * into log specified. */ - public FilterChecker(PrintWriter log) { + private FilterChecker(PrintWriter log) { super(log, false) ; } /** diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java index 903726c1da6c..9caf5ec8bb3a 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java @@ -200,7 +200,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget } } - protected static class GroupContext + public static class GroupContext { private final GroupContext parent; @@ -222,7 +222,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget return iterationCount; } - public void setIterationCount(final int iterationCount) + private void setIterationCount(final int iterationCount) { this.iterationCount = iterationCount; } @@ -232,7 +232,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget return groupWithRepeatingSection; } - public void setGroupWithRepeatingSection(final boolean groupWithRepeatingSection) + private void setGroupWithRepeatingSection(final boolean groupWithRepeatingSection) { this.groupWithRepeatingSection = groupWithRepeatingSection; } diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java index 1baa24080774..180635bc6dd8 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java @@ -96,12 +96,12 @@ public class PageContext return footer; } - public CSSNumericValue getHeaderHeight() + private CSSNumericValue getHeaderHeight() { return headerHeight; } - public CSSNumericValue getFooterHeight() + private CSSNumericValue getFooterHeight() { return footerHeight; } diff --git a/sc/qa/complex/dataPilot/_XPropertySet.java b/sc/qa/complex/dataPilot/_XPropertySet.java index 7573ffcb1b6f..70875a950314 100644 --- a/sc/qa/complex/dataPilot/_XPropertySet.java +++ b/sc/qa/complex/dataPilot/_XPropertySet.java @@ -116,9 +116,9 @@ public class _XPropertySet { * Structure that collects three properties of each type to test : * Constrained, Bound and Normal. */ - public class PropsToTest { - String constrained = null; - String bound = null; + private class PropsToTest { + private String constrained = null; + private String bound = null; String normal = null; } @@ -474,7 +474,7 @@ public class _XPropertySet { * Gets the properties being tested. Searches and stores by one * property of each kind (Bound, Vetoable, Normal). */ - public PropsToTest getPropsToTest(XPropertySetInfo xPSI) { + private PropsToTest getPropsToTest(XPropertySetInfo xPSI) { Property[] properties = xPSI.getProperties(); String bound = ""; diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java index 303bb1a5b1d2..b0f8658fa6e2 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java @@ -31,7 +31,7 @@ public class ScriptEntry implements Cloneable { private Map<String, String> languagedepprops; - public ScriptEntry(String language, String languagename, + private ScriptEntry(String language, String languagename, String location) { this.language = language; @@ -105,7 +105,7 @@ public class ScriptEntry implements Cloneable { return language; } - public String getLocation() { + private String getLocation() { return location; } diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index 95f91d566fed..fd3c1080dfdc 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -62,7 +62,7 @@ public class ScriptMetaData extends ScriptEntry { return (source != null && hasSource) ? source : null; } - public byte[] getSourceBytes() { + private byte[] getSourceBytes() { return (source != null && hasSource) ? source.getBytes() : null; } @@ -126,7 +126,7 @@ public class ScriptMetaData extends ScriptEntry { return result; } - public String getLocationPlaceHolder() { + private String getLocationPlaceHolder() { String placeHolder = "Unknown"; String pathToParcel = parent.getPathToParcel(); diff --git a/sot/qa/complex/olesimplestorage/Test01.java b/sot/qa/complex/olesimplestorage/Test01.java index c07eb2283803..18d220e05488 100644 --- a/sot/qa/complex/olesimplestorage/Test01.java +++ b/sot/qa/complex/olesimplestorage/Test01.java @@ -28,10 +28,10 @@ import java.util.Random; public class Test01 implements OLESimpleStorageTest { - XMultiServiceFactory m_xMSF = null; - TestHelper m_aTestHelper = null; - static final int pStreamCnt = 5; - static final int pBytesCnt = 10; + private XMultiServiceFactory m_xMSF = null; + private TestHelper m_aTestHelper = null; + private static final int pStreamCnt = 5; + private static final int pBytesCnt = 10; public Test01 ( XMultiServiceFactory xMSF ) { diff --git a/sot/qa/complex/olesimplestorage/TestHelper.java b/sot/qa/complex/olesimplestorage/TestHelper.java index eadef8375eb0..651ee9218363 100644 --- a/sot/qa/complex/olesimplestorage/TestHelper.java +++ b/sot/qa/complex/olesimplestorage/TestHelper.java @@ -21,7 +21,7 @@ package complex.olesimplestorage; public class TestHelper { - String m_sTestPrefix; + private String m_sTestPrefix; public TestHelper ( String sTestPrefix ) { diff --git a/svl/qa/complex/passwordcontainer/Test01.java b/svl/qa/complex/passwordcontainer/Test01.java index fb6b8537b020..d0e9dcc09e9e 100644 --- a/svl/qa/complex/passwordcontainer/Test01.java +++ b/svl/qa/complex/passwordcontainer/Test01.java @@ -27,9 +27,9 @@ import com.sun.star.uno.UnoRuntime; public class Test01 implements PasswordContainerTest { - XMultiServiceFactory m_xMSF = null; + private XMultiServiceFactory m_xMSF = null; XPasswordContainer m_xPasswordContainer = null; - TestHelper m_aTestHelper = null; + private TestHelper m_aTestHelper = null; public Test01 ( XMultiServiceFactory xMSF ) { diff --git a/svl/qa/complex/passwordcontainer/Test02.java b/svl/qa/complex/passwordcontainer/Test02.java index aca3183b2569..1296d77af678 100644 --- a/svl/qa/complex/passwordcontainer/Test02.java +++ b/svl/qa/complex/passwordcontainer/Test02.java @@ -29,9 +29,9 @@ import com.sun.star.uno.UnoRuntime; public class Test02 implements PasswordContainerTest { - XMultiServiceFactory m_xMSF = null; + private XMultiServiceFactory m_xMSF = null; XPasswordContainer m_xPasswordContainer = null; - TestHelper m_aTestHelper = null; + private TestHelper m_aTestHelper = null; public Test02 ( XMultiServiceFactory xMSF ) { diff --git a/svl/qa/complex/passwordcontainer/Test03.java b/svl/qa/complex/passwordcontainer/Test03.java index 93df47ad62c1..d9b3e3588b3e 100644 --- a/svl/qa/complex/passwordcontainer/Test03.java +++ b/svl/qa/complex/passwordcontainer/Test03.java @@ -30,9 +30,9 @@ import com.sun.star.uno.UnoRuntime; public class Test03 implements PasswordContainerTest { - XMultiServiceFactory m_xMSF = null; + private XMultiServiceFactory m_xMSF = null; XPasswordContainer m_xPasswordContainer = null; - TestHelper m_aTestHelper = null; + private TestHelper m_aTestHelper = null; public Test03 ( XMultiServiceFactory xMSF ) { diff --git a/svl/qa/complex/passwordcontainer/TestHelper.java b/svl/qa/complex/passwordcontainer/TestHelper.java index 10574019ebcc..b6f1f08425e6 100644 --- a/svl/qa/complex/passwordcontainer/TestHelper.java +++ b/svl/qa/complex/passwordcontainer/TestHelper.java @@ -22,7 +22,7 @@ import com.sun.star.task.UserRecord; public class TestHelper { - String m_sTestPrefix; + private String m_sTestPrefix; public TestHelper( String sTestPrefix ) { m_sTestPrefix = sTestPrefix; @@ -32,7 +32,7 @@ public class TestHelper { System.out.println( m_sTestPrefix + "Error: " + sError ); } - public void Message( String sMessage ) { + private void Message( String sMessage ) { System.out.println( m_sTestPrefix + sMessage ); } diff --git a/sw/qa/complex/writer/LoadSaveTest.java b/sw/qa/complex/writer/LoadSaveTest.java index f617a93d8b42..e2ae7ab21b48 100644 --- a/sw/qa/complex/writer/LoadSaveTest.java +++ b/sw/qa/complex/writer/LoadSaveTest.java @@ -148,10 +148,10 @@ public class LoadSaveTest } } - class EventListener implements XDocumentEventListener + private class EventListener implements XDocumentEventListener { - boolean m_isLayoutFinished = false; - boolean IsLayoutFinished() { return m_isLayoutFinished; } + private boolean m_isLayoutFinished = false; + private boolean IsLayoutFinished() { return m_isLayoutFinished; } public void documentEventOccured(DocumentEvent Event) { if ("OnLayoutFinished".equals(Event.EventName)) diff --git a/sw/qa/complex/writer/TextPortionEnumerationTest.java b/sw/qa/complex/writer/TextPortionEnumerationTest.java index ed5885b0a51a..db99d695d35f 100644 --- a/sw/qa/complex/writer/TextPortionEnumerationTest.java +++ b/sw/qa/complex/writer/TextPortionEnumerationTest.java @@ -3365,7 +3365,7 @@ public class TextPortionEnumerationTest assertEquals("gotoEndOfWord(): wrong string", "Text", string); } - abstract class AttachHelper + private abstract class AttachHelper { abstract boolean isAttribute(); abstract TreeNode mkTreeNode(); diff --git a/testtools/com/sun/star/comp/bridge/TestComponentMain.java b/testtools/com/sun/star/comp/bridge/TestComponentMain.java index bcb5d8f58e53..eaeab8d23ebf 100644 --- a/testtools/com/sun/star/comp/bridge/TestComponentMain.java +++ b/testtools/com/sun/star/comp/bridge/TestComponentMain.java @@ -38,8 +38,8 @@ import com.sun.star.uno.UnoRuntime; public class TestComponentMain { - static class InstanceProvider implements XInstanceProvider { - XComponentContext ctx; + private static class InstanceProvider implements XInstanceProvider { + private XComponentContext ctx; public InstanceProvider( XComponentContext ctx ) { diff --git a/testtools/qa/cli/CLITest.java b/testtools/qa/cli/CLITest.java index 29ba7a235b0b..13755dc8a3ee 100644 --- a/testtools/qa/cli/CLITest.java +++ b/testtools/qa/cli/CLITest.java @@ -78,7 +78,7 @@ public class CLITest extends ComplexTestCase */ class Reader extends Thread { - InputStream is; + private InputStream is; public Reader(InputStream stream) { is = stream; diff --git a/testtools/qa/cliversioning/VersionTestCase.java b/testtools/qa/cliversioning/VersionTestCase.java index 3a3d666e0f8a..c430443d8164 100644 --- a/testtools/qa/cliversioning/VersionTestCase.java +++ b/testtools/qa/cliversioning/VersionTestCase.java @@ -76,7 +76,7 @@ public class VersionTestCase extends ComplexTestCase */ class Reader extends Thread { - java.io.InputStream is; + private java.io.InputStream is; public Reader(java.io.InputStream stream) { is = stream; diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java index 73fa129ceaea..f728d8536869 100644 --- a/toolkit/test/accessibility/AccTreeNode.java +++ b/toolkit/test/accessibility/AccTreeNode.java @@ -38,15 +38,15 @@ import com.sun.star.uno.UnoRuntime; class AccTreeNode extends AccessibleTreeNode { - class HandlerDescriptor + private class HandlerDescriptor { - public HandlerDescriptor (NodeHandler aHandler) + private HandlerDescriptor (NodeHandler aHandler) { maHandler = aHandler; mnChildCount = -1; } - public NodeHandler maHandler; - public int mnChildCount; + private NodeHandler maHandler; + private int mnChildCount; } /// NodeHandlers for this node private ArrayList<HandlerDescriptor> maHandlers; @@ -158,7 +158,7 @@ class AccTreeNode /** iterate over handlers and return child sum */ - protected HandlerDescriptor getHandlerDescriptor (int i) + private HandlerDescriptor getHandlerDescriptor (int i) { HandlerDescriptor aDescriptor = maHandlers.get(i); if (aDescriptor.mnChildCount < 0) diff --git a/toolkit/test/accessibility/AccessibilityTree.java b/toolkit/test/accessibility/AccessibilityTree.java index 844065d3e3b6..f1210afee26e 100644 --- a/toolkit/test/accessibility/AccessibilityTree.java +++ b/toolkit/test/accessibility/AccessibilityTree.java @@ -113,7 +113,7 @@ public class AccessibilityTree /** Expand the nodes in the subtree rooted in aNode according to the specified expander. The tree is locked during the expansion. */ - protected void expandTree (AccessibleTreeNode aNode, Expander aExpander) + private void expandTree (AccessibleTreeNode aNode, Expander aExpander) { if (mnExpandLevel == 0) { @@ -189,7 +189,7 @@ public class AccessibilityTree { expandShapes ((AccessibleTreeNode)maTree.getModel().getRoot()); } - public void expandShapes (AccessibleTreeNode aNode) + private void expandShapes (AccessibleTreeNode aNode) { expandTree (aNode, new ShapeExpander()); } @@ -199,7 +199,7 @@ public class AccessibilityTree { expandAll ((AccessibleTreeNode)maTree.getModel().getRoot()); } - public void expandAll (AccessibleTreeNode aNode) + private void expandAll (AccessibleTreeNode aNode) { expandTree (aNode, new AllExpander()); } @@ -222,7 +222,7 @@ public class AccessibilityTree } */ - class MouseListener extends MouseAdapter + private class MouseListener extends MouseAdapter { public MouseListener (AccessibilityTree aTree) { @@ -239,7 +239,7 @@ public class AccessibilityTree @Override public void mouseReleased(MouseEvent e) { popupTrigger(e); } - public boolean popupTrigger( MouseEvent e ) + private boolean popupTrigger( MouseEvent e ) { boolean bIsPopup = e.isPopupTrigger(); if( !bIsPopup ) @@ -296,12 +296,12 @@ public class AccessibilityTree private final AccessibilityTree maTree; } - class NodeAction extends AbstractAction + private class NodeAction extends AbstractAction { private final int mnIndex; private final AccessibleTreeNode maNode; - public NodeAction( String aName, AccessibleTreeNode aNode, int nIndex ) + private NodeAction( String aName, AccessibleTreeNode aNode, int nIndex ) { super( aName ); maNode = aNode; @@ -315,7 +315,7 @@ public class AccessibilityTree } // This action expands all shapes in the subtree rooted in the specified node. - class ShapeExpandAction extends AbstractAction + private class ShapeExpandAction extends AbstractAction { private final AccessibilityTree maTree; private final AccTreeNode maNode; @@ -332,7 +332,7 @@ public class AccessibilityTree } // This action expands all nodes in the subtree rooted in the specified node. - class SubtreeExpandAction extends AbstractAction + private class SubtreeExpandAction extends AbstractAction { private final AccessibilityTree maTree; private final AccTreeNode maNode; @@ -350,20 +350,20 @@ public class AccessibilityTree /** Predicate class to determine whether a node should be expanded * For use with expandTree method */ - abstract class Expander + private abstract class Expander { abstract public boolean expand (Object aObject); } /** expand all nodes */ - class AllExpander extends Expander + private class AllExpander extends Expander { @Override public boolean expand(Object aObject) { return true; } } /** expand all nodes with accessibility roles > 100 */ - class ShapeExpander extends Expander + private class ShapeExpander extends Expander { @Override public boolean expand (Object aObject) @@ -382,7 +382,7 @@ public class AccessibilityTree - protected AccessibleTreeCellRenderer maCellRenderer; + private AccessibleTreeCellRenderer maCellRenderer; private final JTree maTree; private int mnExpandLevel; } diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java index cee0f86842b6..4bf258ce7f55 100644 --- a/toolkit/test/accessibility/AccessibilityTreeModel.java +++ b/toolkit/test/accessibility/AccessibilityTreeModel.java @@ -30,7 +30,7 @@ import com.sun.star.uno.UnoRuntime; public class AccessibilityTreeModel extends AccessibilityTreeModelBase { - public boolean mbVerbose = false; + private boolean mbVerbose = false; public AccessibilityTreeModel (AccessibleTreeNode aRoot) { @@ -147,7 +147,7 @@ public class AccessibilityTreeModel /** Remove a node (and all children) from the tree model. */ - protected boolean removeChild (AccessibleTreeNode aNode) + private boolean removeChild (AccessibleTreeNode aNode) { try { @@ -206,7 +206,7 @@ public class AccessibilityTreeModel Returns the new or existing representation of the specified accessible object. */ - protected AccessibleTreeNode addChild (AccTreeNode aParentNode, XAccessible xNewChild) + private AccessibleTreeNode addChild (AccTreeNode aParentNode, XAccessible xNewChild) { AccessibleTreeNode aChildNode = null; try @@ -258,7 +258,7 @@ public class AccessibilityTreeModel @param aNode The node to insert into the internal tree structure. */ - protected boolean addNode (AccessibleTreeNode aNode) + private boolean addNode (AccessibleTreeNode aNode) { boolean bRet = false; try @@ -293,7 +293,7 @@ public class AccessibilityTreeModel /** create path to node, suitable for TreeModelEvent constructor * @see javax.swing.event.TreeModelEvent#TreeModelEvent */ - protected Object[] createPath (AccessibleTreeNode aNode) + private Object[] createPath (AccessibleTreeNode aNode) { ArrayList<AccessibleTreeNode> aPath = new ArrayList<AccessibleTreeNode>(); aNode.createPath (aPath); @@ -307,7 +307,7 @@ public class AccessibilityTreeModel // tree cache, and we should get removed as soon as they are out. - protected void fireTreeNodesChanged(TreeModelEvent e) + private void fireTreeNodesChanged(TreeModelEvent e) { for(int i = 0; i < maTMListeners.size(); i++) { @@ -323,7 +323,7 @@ public class AccessibilityTreeModel } } - protected void fireTreeNodesRemoved(final TreeModelEvent e) + private void fireTreeNodesRemoved(final TreeModelEvent e) { for(int i = 0; i < maTMListeners.size(); i++) { @@ -331,7 +331,7 @@ public class AccessibilityTreeModel } } - protected void fireTreeStructureChanged(final TreeModelEvent e) + private void fireTreeStructureChanged(final TreeModelEvent e) { for(int i = 0; i < maTMListeners.size(); i++) { @@ -348,13 +348,13 @@ public class AccessibilityTreeModel /** Create a TreeModelEvent object that informs listeners that one child has been removed from or inserted into its parent. */ - public TreeModelEvent createChildUpdateEvent (XAccessibleContext xParent) + private TreeModelEvent createChildUpdateEvent (XAccessibleContext xParent) { AccessibleTreeNode aParentNode = maNodeMap.GetNode (xParent); return createEvent (aParentNode, xParent); } - public TreeModelEvent createEvent (AccessibleTreeNode aParentNode, XAccessibleContext xChild) + private TreeModelEvent createEvent (AccessibleTreeNode aParentNode, XAccessibleContext xChild) { AccessibleTreeNode aChildNode = null; if (xChild != null) @@ -394,7 +394,7 @@ public class AccessibilityTreeModel /** Create a TreeModelEvent that indicates changes at those children of the specified node with the specified indices. */ - protected TreeModelEvent createChangeEvent (AccTreeNode aNode, java.util.List<Integer> aChildIndices) + private TreeModelEvent createChangeEvent (AccTreeNode aNode, java.util.List<Integer> aChildIndices) { // Build a list of child objects that are indicated by the given indices. int nCount = aChildIndices.size(); @@ -415,7 +415,7 @@ public class AccessibilityTreeModel - protected XAccessibleEventBroadcaster getBroadcaster (Object aObject) + private XAccessibleEventBroadcaster getBroadcaster (Object aObject) { if (aObject instanceof AccTreeNode) return UnoRuntime.queryInterface ( @@ -424,7 +424,7 @@ public class AccessibilityTreeModel return null; } - protected void registerAccListener( Object aObject ) + private void registerAccListener( Object aObject ) { // register this as listener for XAccessibleEventBroadcaster // implementations @@ -435,7 +435,7 @@ public class AccessibilityTreeModel } } - protected void removeAccListener( Object aObject ) + private void removeAccListener( Object aObject ) { XAccessibleEventBroadcaster xBroadcaster = getBroadcaster( aObject ); if (xBroadcaster != null) diff --git a/toolkit/test/accessibility/AccessibilityWorkBench.java b/toolkit/test/accessibility/AccessibilityWorkBench.java index a069c97b266d..4e29d6744942 100644 --- a/toolkit/test/accessibility/AccessibilityWorkBench.java +++ b/toolkit/test/accessibility/AccessibilityWorkBench.java @@ -43,8 +43,8 @@ public class AccessibilityWorkBench implements ActionListener, XTerminateListener, TreeSelectionListener { - public static final String msVersion = "v1.7.2"; - public String msOptionsFileName = ".AWBrc"; + private static final String msVersion = "v1.7.2"; + private String msOptionsFileName = ".AWBrc"; public static void main (String args[]) { @@ -116,7 +116,7 @@ public class AccessibilityWorkBench /** Create and arrange the widgets of the GUI. */ - public void Layout () + private void Layout () { setSize (new Dimension (8000,600)); @@ -209,7 +209,7 @@ public class AccessibilityWorkBench /** Shortcut method for adding an object to a GridBagLayout. */ - void addGridElement (JComponent object, + private void addGridElement (JComponent object, int x, int y, int width, int height, int weightx, int weighty, int anchor, int fill) { @@ -231,7 +231,7 @@ public class AccessibilityWorkBench /** Create a new button and place at the right most position into the button bar. */ - public JButton createButton (String title, String command) + private JButton createButton (String title, String command) { JButton aButton = new JButton (title); aButton.setEnabled (false); @@ -250,7 +250,7 @@ public class AccessibilityWorkBench Returns the new menu bar. The returned reference is also remembered in the data member <member>maMenuBar</member>. */ - JMenuBar CreateMenuBar () + private JMenuBar CreateMenuBar () { // Menu bar. JMenuBar aMenuBar = new JMenuBar (); @@ -342,7 +342,7 @@ public class AccessibilityWorkBench actions will be carried out every time. The main purpose of a second call is that of a re-initialization after a reconnect. */ - protected void initialize () + private void initialize () { maCanvas.clear(); @@ -385,7 +385,7 @@ public class AccessibilityWorkBench /** Update the states of the buttons according to the internal state of the AWB. */ - protected void UpdateButtonStates () + private void UpdateButtonStates () { aConnectButton.setEnabled (mbInitialized); aQuitButton.setEnabled (mbInitialized); @@ -566,9 +566,9 @@ public class AccessibilityWorkBench private static AccessibilityWorkBench saWorkBench = null; - protected SimpleOffice + private SimpleOffice office; - protected InformationWriter + private InformationWriter info; private JPanel diff --git a/toolkit/test/accessibility/AccessibleActionHandler.java b/toolkit/test/accessibility/AccessibleActionHandler.java index 4abfb09ccaac..868ea1105cfb 100644 --- a/toolkit/test/accessibility/AccessibleActionHandler.java +++ b/toolkit/test/accessibility/AccessibleActionHandler.java @@ -40,7 +40,7 @@ class AccessibleActionHandler { } - public AccessibleActionHandler (XAccessibleAction xAction) + private AccessibleActionHandler (XAccessibleAction xAction) { if (xAction != null) maChildList.setSize (1 + xAction.getAccessibleActionCount()); diff --git a/toolkit/test/accessibility/AccessibleCellHandler.java b/toolkit/test/accessibility/AccessibleCellHandler.java index d99fdbfe4cb4..c52532d8555c 100644 --- a/toolkit/test/accessibility/AccessibleCellHandler.java +++ b/toolkit/test/accessibility/AccessibleCellHandler.java @@ -47,7 +47,7 @@ class AccessibleCellHandler extends NodeHandler { } - public AccessibleCellHandler (XAccessibleTable xTable) + private AccessibleCellHandler (XAccessibleTable xTable) { if (xTable != null) maChildList.setSize (8); diff --git a/toolkit/test/accessibility/AccessibleComponentHandler.java b/toolkit/test/accessibility/AccessibleComponentHandler.java index 01a86c83fb21..7420a00daf51 100644 --- a/toolkit/test/accessibility/AccessibleComponentHandler.java +++ b/toolkit/test/accessibility/AccessibleComponentHandler.java @@ -42,7 +42,7 @@ class AccessibleComponentHandler { } - public AccessibleComponentHandler (XAccessibleComponent xComponent) + private AccessibleComponentHandler (XAccessibleComponent xComponent) { if (xComponent != null) maChildList.setSize (6); diff --git a/toolkit/test/accessibility/AccessibleContextHandler.java b/toolkit/test/accessibility/AccessibleContextHandler.java index 8409a9a7da88..9483c5c79b9a 100644 --- a/toolkit/test/accessibility/AccessibleContextHandler.java +++ b/toolkit/test/accessibility/AccessibleContextHandler.java @@ -40,7 +40,7 @@ class AccessibleContextHandler super (); } - public AccessibleContextHandler (XAccessibleContext xContext) + private AccessibleContextHandler (XAccessibleContext xContext) { super(); if (xContext != null) diff --git a/toolkit/test/accessibility/AccessibleEditableTextHandler.java b/toolkit/test/accessibility/AccessibleEditableTextHandler.java index fa9b0d521217..a31073b22af5 100644 --- a/toolkit/test/accessibility/AccessibleEditableTextHandler.java +++ b/toolkit/test/accessibility/AccessibleEditableTextHandler.java @@ -39,7 +39,7 @@ class AccessibleEditableTextHandler extends NodeHandler { } - public AccessibleEditableTextHandler (XAccessibleEditableText xText) + private AccessibleEditableTextHandler (XAccessibleEditableText xText) { if (xText != null) maChildList.setSize (1); diff --git a/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java b/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java index 3cdf1d405017..f34ed1b5fc60 100644 --- a/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java +++ b/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java @@ -40,7 +40,7 @@ class AccessibleExtendedComponentHandler { } - public AccessibleExtendedComponentHandler (XAccessibleExtendedComponent xEComponent) + private AccessibleExtendedComponentHandler (XAccessibleExtendedComponent xEComponent) { if (xEComponent != null) maChildList.setSize (0); diff --git a/toolkit/test/accessibility/AccessibleHyperlinkHandler.java b/toolkit/test/accessibility/AccessibleHyperlinkHandler.java index d46288e529cd..9af7390e9749 100644 --- a/toolkit/test/accessibility/AccessibleHyperlinkHandler.java +++ b/toolkit/test/accessibility/AccessibleHyperlinkHandler.java @@ -39,7 +39,7 @@ class AccessibleHyperlinkHandler extends AccessibleTreeHandler { } - public AccessibleHyperlinkHandler (XAccessibleHyperlink xLink) + private AccessibleHyperlinkHandler (XAccessibleHyperlink xLink) { if (xLink != null) maChildList.setSize (1); diff --git a/toolkit/test/accessibility/AccessibleHypertextHandler.java b/toolkit/test/accessibility/AccessibleHypertextHandler.java index cba62589d201..7021c2abc77e 100644 --- a/toolkit/test/accessibility/AccessibleHypertextHandler.java +++ b/toolkit/test/accessibility/AccessibleHypertextHandler.java @@ -39,7 +39,7 @@ class AccessibleHypertextHandler extends AccessibleTreeHandler { } - public AccessibleHypertextHandler (XAccessibleHypertext xText) + private AccessibleHypertextHandler (XAccessibleHypertext xText) { if (xText != null) maChildList.setSize (1); diff --git a/toolkit/test/accessibility/AccessibleImageHandler.java b/toolkit/test/accessibility/AccessibleImageHandler.java index cec93c55e97f..a02077b7d2d2 100644 --- a/toolkit/test/accessibility/AccessibleImageHandler.java +++ b/toolkit/test/accessibility/AccessibleImageHandler.java @@ -39,13 +39,13 @@ class AccessibleImageHandler extends NodeHandler { } - public AccessibleImageHandler (XAccessibleImage xImage) + private AccessibleImageHandler (XAccessibleImage xImage) { if (xImage != null) maChildList.setSize (1); } - protected static XAccessibleImage getImage (AccTreeNode aNode) + private static XAccessibleImage getImage (AccTreeNode aNode) { return UnoRuntime.queryInterface ( XAccessibleImage.class, aNode.getContext()); diff --git a/toolkit/test/accessibility/AccessibleRelationHandler.java b/toolkit/test/accessibility/AccessibleRelationHandler.java index 884f0493c7cd..1f7eebada20f 100644 --- a/toolkit/test/accessibility/AccessibleRelationHandler.java +++ b/toolkit/test/accessibility/AccessibleRelationHandler.java @@ -45,7 +45,7 @@ class AccessibleRelationHandler { } - public AccessibleRelationHandler( XAccessibleContext xContext ) + private AccessibleRelationHandler( XAccessibleContext xContext ) { XAccessibleRelationSet xRelation = xContext.getAccessibleRelationSet(); if (xRelation != null) diff --git a/toolkit/test/accessibility/AccessibleSelectionHandler.java b/toolkit/test/accessibility/AccessibleSelectionHandler.java index ece8153b67e5..4a8cd24ba9c9 100644 --- a/toolkit/test/accessibility/AccessibleSelectionHandler.java +++ b/toolkit/test/accessibility/AccessibleSelectionHandler.java @@ -41,7 +41,7 @@ class AccessibleSelectionHandler { } - public AccessibleSelectionHandler( XAccessibleSelection xSelection ) + private AccessibleSelectionHandler( XAccessibleSelection xSelection ) { if (xSelection != null) maChildList.setSize( 2 ); diff --git a/toolkit/test/accessibility/AccessibleTableHandler.java b/toolkit/test/accessibility/AccessibleTableHandler.java index 9ec6ccb2de7d..8697a52a0232 100644 --- a/toolkit/test/accessibility/AccessibleTableHandler.java +++ b/toolkit/test/accessibility/AccessibleTableHandler.java @@ -39,7 +39,7 @@ class AccessibleTableHandler extends NodeHandler { } - public AccessibleTableHandler (XAccessibleTable xTable) + private AccessibleTableHandler (XAccessibleTable xTable) { if (xTable != null) maChildList.setSize (4); diff --git a/toolkit/test/accessibility/AccessibleTextHandler.java b/toolkit/test/accessibility/AccessibleTextHandler.java index dfecd974803c..714bcb591021 100644 --- a/toolkit/test/accessibility/AccessibleTextHandler.java +++ b/toolkit/test/accessibility/AccessibleTextHandler.java @@ -67,7 +67,7 @@ class AccessibleTextHandler extends NodeHandler { } - public AccessibleTextHandler (XAccessibleText xText) + private AccessibleTextHandler (XAccessibleText xText) { if (xText != null) maChildList.setSize (8); @@ -379,9 +379,9 @@ class AccessibleTextHandler extends NodeHandler } - static String[] aTextActions = + private static String[] aTextActions = new String[] { "select...", "copy..." }; - static String[] aEditableTextActions = + private static String[] aEditableTextActions = new String[] { "select...", "copy...", "cut...", "paste...", "edit...", "format..." }; @@ -491,10 +491,10 @@ class AccessibleTextHandler extends NodeHandler abstract class TextActionDialog extends JDialog implements ActionListener { - AccTreeNode aNode; + private AccTreeNode aNode; JTextArea aText; - String sName; - JCheckBox aIndexToggle; + private String sName; + private JCheckBox aIndexToggle; public TextActionDialog( AccTreeNode aNd, String sExplanation, @@ -548,13 +548,13 @@ abstract class TextActionDialog extends JDialog aContent.add( aButtons, BorderLayout.SOUTH ); } - void cancel() + private void cancel() { setVisible(false); dispose(); } - void action() + private void action() { String sError = null; try @@ -589,7 +589,7 @@ abstract class TextActionDialog extends JDialog int getSelectionStart() { return getSelection(true); } int getSelectionEnd() { return getSelection(false); } - int getSelection(boolean bStart) + private int getSelection(boolean bStart) { return ( bStart ^ aIndexToggle.isSelected() ) ? aText.getSelectionStart() : aText.getSelectionEnd(); @@ -634,7 +634,7 @@ class TextEditDialog extends TextActionDialog /** update the text */ - boolean updateText( XAccessibleEditableText xEdit, String sNew ) + private boolean updateText( XAccessibleEditableText xEdit, String sNew ) { String sOld = xEdit.getText(); @@ -757,11 +757,11 @@ class TextAttributeDialog extends TextActionDialog } - class ColorIcon implements Icon + private class ColorIcon implements Icon { - boolean bForeground; - static final int nHeight = 16; - static final int nWidth = 16; + private boolean bForeground; + private static final int nHeight = 16; + private static final int nWidth = 16; public ColorIcon(boolean bWhich) { bForeground = bWhich; } public int getIconHeight() { return nHeight; } diff --git a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java index cd032b9aa17e..3a1f7150b5e6 100644 --- a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java +++ b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java @@ -29,10 +29,10 @@ import javax.swing.tree.TreePath; public class AccessibleTreeCellRenderer extends DefaultTreeCellRenderer { - public Color + private Color maDefaultColor, maChangedColor; - protected ArrayList<Boolean> + private ArrayList<Boolean> maChangedLines; @@ -77,7 +77,7 @@ public class AccessibleTreeCellRenderer /** Inform the cell renderer of a new changed line which to paint highlighted when asked to paint it the next time. */ - public void addChangedLine (int nRow) + private void addChangedLine (int nRow) { while (maChangedLines.size() <= nRow) { maChangedLines.add(null); diff --git a/toolkit/test/accessibility/AccessibleTreeHandler.java b/toolkit/test/accessibility/AccessibleTreeHandler.java index 5f9830f6574c..e022dbae8d6b 100644 --- a/toolkit/test/accessibility/AccessibleTreeHandler.java +++ b/toolkit/test/accessibility/AccessibleTreeHandler.java @@ -28,7 +28,7 @@ import com.sun.star.lang.IndexOutOfBoundsException; class AccessibleTreeHandler extends NodeHandler { - protected XAccessibleContext mxContext; + private XAccessibleContext mxContext; @Override public NodeHandler createHandler (XAccessibleContext xContext) @@ -45,7 +45,7 @@ class AccessibleTreeHandler mxContext = null; } - public AccessibleTreeHandler (XAccessibleContext xContext) + private AccessibleTreeHandler (XAccessibleContext xContext) { super(); mxContext = xContext; diff --git a/toolkit/test/accessibility/AccessibleTreeNode.java b/toolkit/test/accessibility/AccessibleTreeNode.java index a127402bd30d..17b90b9dbcbd 100644 --- a/toolkit/test/accessibility/AccessibleTreeNode.java +++ b/toolkit/test/accessibility/AccessibleTreeNode.java @@ -26,7 +26,7 @@ import com.sun.star.lang.IndexOutOfBoundsException; class AccessibleTreeNode { /// The parent node. It is null for the root node. - protected AccessibleTreeNode maParent; + private AccessibleTreeNode maParent; /// The object to be displayed. private final Object maDisplayObject; diff --git a/toolkit/test/accessibility/Canvas.java b/toolkit/test/accessibility/Canvas.java index 0aeec9c24ea6..e2e1fabf0810 100644 --- a/toolkit/test/accessibility/Canvas.java +++ b/toolkit/test/accessibility/Canvas.java @@ -190,7 +190,7 @@ class Canvas return Options.GetBoolean ("ShowText"); } - public void setShowText (boolean bNewValue) + private void setShowText (boolean bNewValue) { Options.SetBoolean ("ShowText", bNewValue); repaint (); @@ -202,7 +202,7 @@ class Canvas repaint (); } - public int getZoomMode () + private int getZoomMode () { return Options.GetInteger ("ZoomMode", WHOLE_SCREEN); } @@ -388,7 +388,7 @@ class Canvas highlightObject (FindCanvasShapeUnderMouse (e)); } - protected CanvasShape FindCanvasShapeUnderMouse (MouseEvent e) + private CanvasShape FindCanvasShapeUnderMouse (MouseEvent e) { CanvasShape aObjectUnderMouse = null; int nCount = maObjectList.size(); @@ -405,7 +405,7 @@ class Canvas return aObjectUnderMouse; } - protected boolean highlightObject (CanvasShape aNewActiveObject) + private boolean highlightObject (CanvasShape aNewActiveObject) { if (aNewActiveObject != maActiveObject) { diff --git a/toolkit/test/accessibility/CanvasShape.java b/toolkit/test/accessibility/CanvasShape.java index b0767e619a0b..aa1e47be4420 100644 --- a/toolkit/test/accessibility/CanvasShape.java +++ b/toolkit/test/accessibility/CanvasShape.java @@ -28,9 +28,9 @@ import com.sun.star.accessibility.AccessibleStateType; class CanvasShape { - public final Color maHighlightColor = Color.red; - public final Color maSelectionColor = Color.green; - public final Color maFocusColor = Color.blue; + private final Color maHighlightColor = Color.red; + private final Color maSelectionColor = Color.green; + private final Color maFocusColor = Color.blue; public CanvasShape (AccTreeNode aNode) { diff --git a/toolkit/test/accessibility/EventListener.java b/toolkit/test/accessibility/EventListener.java index 43a53774a910..5d9141953d60 100644 --- a/toolkit/test/accessibility/EventListener.java +++ b/toolkit/test/accessibility/EventListener.java @@ -23,7 +23,7 @@ import com.sun.star.accessibility.*; */ public class EventListener { - public boolean mbVerbose = false; + private boolean mbVerbose = false; public EventListener (AccessibilityTreeModel aTreeModel) { diff --git a/toolkit/test/accessibility/EventQueue.java b/toolkit/test/accessibility/EventQueue.java index 5658ce2414d6..8449c6416ebc 100644 --- a/toolkit/test/accessibility/EventQueue.java +++ b/toolkit/test/accessibility/EventQueue.java @@ -27,8 +27,8 @@ import java.util.LinkedList; class EventQueue implements Runnable { - public boolean mbVerbose = false; - public boolean mbHandleDisposingEventsSynchronous = true; + private boolean mbVerbose = false; + private boolean mbHandleDisposingEventsSynchronous = true; public synchronized static EventQueue Instance () { diff --git a/toolkit/test/accessibility/HelpWindow.java b/toolkit/test/accessibility/HelpWindow.java index 13d2beb0a315..171931eee6d8 100644 --- a/toolkit/test/accessibility/HelpWindow.java +++ b/toolkit/test/accessibility/HelpWindow.java @@ -69,7 +69,7 @@ class HelpWindow - public void loadURL (URL aURL) + private void loadURL (URL aURL) { maHistory.addLast (aURL); selectHistoryPage (maHistory.size()-1); diff --git a/toolkit/test/accessibility/InformationWriter.java b/toolkit/test/accessibility/InformationWriter.java index 27950c24f579..6642a8fb9981 100644 --- a/toolkit/test/accessibility/InformationWriter.java +++ b/toolkit/test/accessibility/InformationWriter.java @@ -60,7 +60,7 @@ public class InformationWriter } } - public void printProperty (XInterface xObject, String prefix, String name) + private void printProperty (XInterface xObject, String prefix, String name) { try { @@ -216,7 +216,7 @@ public class InformationWriter /** @descr Print information concerning the accessibility of the given object. */ - public boolean showAccessibility (XInterface xObject, int depth) + private boolean showAccessibility (XInterface xObject, int depth) { try { @@ -320,7 +320,7 @@ public class InformationWriter /** @descr Print information about the given accessible component. */ - public void showAccessibleComponent (XInterface xObject, String sIndent) + private void showAccessibleComponent (XInterface xObject, String sIndent) { try { diff --git a/toolkit/test/accessibility/MessageArea.java b/toolkit/test/accessibility/MessageArea.java index 1b83d567c77c..8ee0b98e6ccc 100644 --- a/toolkit/test/accessibility/MessageArea.java +++ b/toolkit/test/accessibility/MessageArea.java @@ -74,7 +74,7 @@ public class MessageArea /** Show the given string at the end of the message area and scroll to make it visible. Indent the string as requested. */ - public static synchronized void print (int nIndentation, String aMessage) + private static synchronized void print (int nIndentation, String aMessage) { while (nIndentation-- > 0) { aMessage = " " + aMessage; @@ -99,7 +99,7 @@ public class MessageArea /** Show the given string at the end of the message area and scroll to make it visible. */ - public static void println (int nIndentation, String aMessage) + private static void println (int nIndentation, String aMessage) { print (nIndentation, aMessage+"\n"); } diff --git a/toolkit/test/accessibility/SelectionDialog.java b/toolkit/test/accessibility/SelectionDialog.java index 6f08532cce8e..2f0c6d543446 100644 --- a/toolkit/test/accessibility/SelectionDialog.java +++ b/toolkit/test/accessibility/SelectionDialog.java @@ -53,7 +53,7 @@ class SelectionDialog extends JDialog } /** build dialog */ - protected void Layout () + private void Layout () { setTitle( "Select" ); @@ -132,13 +132,13 @@ class SelectionDialog extends JDialog } - void close () + private void close () { setVisible(false); dispose(); } - void select() + private void select() { try { @@ -153,7 +153,7 @@ class SelectionDialog extends JDialog } } - void deselect() + private void deselect() { try { @@ -169,12 +169,12 @@ class SelectionDialog extends JDialog } } - void selectAll() + private void selectAll() { mxSelection.selectAllAccessibleChildren(); } - void clearSelection() + private void clearSelection() { mxSelection.clearAccessibleSelection(); } diff --git a/toolkit/test/accessibility/SimpleOffice.java b/toolkit/test/accessibility/SimpleOffice.java index 134e0d29fa5b..dcb0b671c01d 100644 --- a/toolkit/test/accessibility/SimpleOffice.java +++ b/toolkit/test/accessibility/SimpleOffice.java @@ -48,8 +48,8 @@ import com.sun.star.awt.XExtendedToolkit; */ public class SimpleOffice { - XDesktop mxDesktop = null; - OfficeConnection aConnection; + private XDesktop mxDesktop = null; + private OfficeConnection aConnection; int mnPortNumber; public SimpleOffice (int nPortNumber) @@ -260,7 +260,7 @@ public class SimpleOffice - public XWindow getCurrentWindow (XModel xModel) + private XWindow getCurrentWindow (XModel xModel) { XWindow xWindow = null; try @@ -297,7 +297,7 @@ public class SimpleOffice - public XDrawPage getCurrentDrawPage (XDrawView xView) + private XDrawPage getCurrentDrawPage (XDrawView xView) { XDrawPage xPage = null; try @@ -320,12 +320,12 @@ public class SimpleOffice /** @descr Return the current view of the given desktop. */ - public XDrawView getCurrentView () + private XDrawView getCurrentView () { return getCurrentView (getDesktop()); } - public XDrawView getCurrentView (XDesktop xDesktop) + private XDrawView getCurrentView (XDesktop xDesktop) { if (xDesktop == null) MessageArea.println ("can't get desktop to retrieve current view"); diff --git a/toolkit/test/accessibility/ov/ContextView.java b/toolkit/test/accessibility/ov/ContextView.java index 0751ef86e030..e2667abde907 100644 --- a/toolkit/test/accessibility/ov/ContextView.java +++ b/toolkit/test/accessibility/ov/ContextView.java @@ -47,7 +47,7 @@ public class ContextView return null; } - public ContextView (ObjectViewContainer aContainer) + private ContextView (ObjectViewContainer aContainer) { super (aContainer); JLabel aNameLabel = new JLabel ("Name: "); diff --git a/toolkit/test/accessibility/ov/FocusView.java b/toolkit/test/accessibility/ov/FocusView.java index 8ae028841c4e..b7a489d896b2 100644 --- a/toolkit/test/accessibility/ov/FocusView.java +++ b/toolkit/test/accessibility/ov/FocusView.java @@ -53,7 +53,7 @@ public class FocusView return null; } - public FocusView (ObjectViewContainer aContainer) + private FocusView (ObjectViewContainer aContainer) { super (aContainer); diff --git a/toolkit/test/accessibility/ov/ObjectViewContainer.java b/toolkit/test/accessibility/ov/ObjectViewContainer.java index e0b5cc08252e..7d9e5cb9b1f6 100644 --- a/toolkit/test/accessibility/ov/ObjectViewContainer.java +++ b/toolkit/test/accessibility/ov/ObjectViewContainer.java @@ -103,7 +103,7 @@ public class ObjectViewContainer /** Add the given class to the list of classes which will be instantiated the next time an accessible object is set. */ - public void RegisterView (Class aObjectViewClass) + private void RegisterView (Class aObjectViewClass) { System.out.println ("registering " + aObjectViewClass); maViewTemplates.add(aObjectViewClass); diff --git a/toolkit/test/accessibility/ov/StateSetView.java b/toolkit/test/accessibility/ov/StateSetView.java index f967f71d18cb..f3e4ddfd9307 100644 --- a/toolkit/test/accessibility/ov/StateSetView.java +++ b/toolkit/test/accessibility/ov/StateSetView.java @@ -60,7 +60,7 @@ public class StateSetView return aView; } - public StateSetView (ObjectViewContainer aContainer) + private StateSetView (ObjectViewContainer aContainer) { super (aContainer); @@ -124,7 +124,7 @@ public class StateSetView -public static class StateSetAllView +private static class StateSetAllView extends StateSetView { /** Create a FocusView when the given object supports the @@ -140,7 +140,7 @@ public static class StateSetAllView return null; } - public StateSetAllView (ObjectViewContainer aContainer) + private StateSetAllView (ObjectViewContainer aContainer) { super (aContainer); @@ -217,7 +217,7 @@ public static class StateSetAllView } -public static class StateSetSetView +private static class StateSetSetView extends StateSetView { static public ObjectView Create ( @@ -230,7 +230,7 @@ public static class StateSetSetView return null; } - public StateSetSetView (ObjectViewContainer aContainer) + private StateSetSetView (ObjectViewContainer aContainer) { super (aContainer); diff --git a/toolkit/test/accessibility/ov/TextView.java b/toolkit/test/accessibility/ov/TextView.java index 9962645b5180..7edb8c0109aa 100644 --- a/toolkit/test/accessibility/ov/TextView.java +++ b/toolkit/test/accessibility/ov/TextView.java @@ -47,7 +47,7 @@ public class TextView } - public TextView (ObjectViewContainer aContainer) + private TextView (ObjectViewContainer aContainer) { super (aContainer); diff --git a/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java b/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java index 4d5630824e90..fe3035fcefa1 100644 --- a/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java +++ b/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java @@ -61,7 +61,7 @@ public class OfficeDocument } /* ------------------------------------------------------------------ */ - protected static XComponent implLoadAsComponent( XMultiServiceFactory orb, String documentOrFactoryURL, final PropertyValue[] i_args ) throws com.sun.star.uno.Exception + private static XComponent implLoadAsComponent( XMultiServiceFactory orb, String documentOrFactoryURL, final PropertyValue[] i_args ) throws com.sun.star.uno.Exception { XComponentLoader aLoader = UnoRuntime.queryInterface( XComponentLoader.class, orb.createInstance( "com.sun.star.frame.Desktop" ) ); @@ -147,7 +147,7 @@ public class OfficeDocument } /* ------------------------------------------------------------------ */ - public <T> T query( Class<T> aInterfaceClass ) + private <T> T query( Class<T> aInterfaceClass ) { return UnoRuntime.queryInterface( aInterfaceClass, m_documentComponent ); } @@ -207,7 +207,7 @@ public class OfficeDocument /* ------------------------------------------------------------------ */ /** returns a URL which can be used to create a document of a certain type */ - public static String getDocumentFactoryURL( DocumentType eType ) + private static String getDocumentFactoryURL( DocumentType eType ) { if ( eType == DocumentType.WRITER ) return "private:factory/swriter"; @@ -227,7 +227,7 @@ public class OfficeDocument /* ------------------------------------------------------------------ */ /** classifies a document */ - public DocumentType classify( ) + private DocumentType classify( ) { XServiceInfo xSI = UnoRuntime.queryInterface( XServiceInfo.class, m_documentComponent ); diff --git a/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java b/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java index e309504a42c0..fee1da989688 100644 --- a/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java +++ b/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java @@ -68,7 +68,7 @@ public class OfficeDocumentView @return the dispatcher for the URL in question */ - public XDispatch getDispatcher( URL[] aURL ) throws com.sun.star.uno.Exception + private XDispatch getDispatcher( URL[] aURL ) throws com.sun.star.uno.Exception { XDispatch xReturn = null; @@ -109,7 +109,7 @@ public class OfficeDocumentView } /* ------------------------------------------------------------------ */ - public boolean dispatch( final String i_url, final PropertyValue[] i_arguments ) throws com.sun.star.uno.Exception + private boolean dispatch( final String i_url, final PropertyValue[] i_arguments ) throws com.sun.star.uno.Exception { URL[] completeURL = new URL[] { new URL() }; completeURL[0].Complete = i_url; diff --git a/unotest/source/java/org/openoffice/test/tools/SpreadsheetDocument.java b/unotest/source/java/org/openoffice/test/tools/SpreadsheetDocument.java index 13a82db8ecfb..7db4291034b4 100644 --- a/unotest/source/java/org/openoffice/test/tools/SpreadsheetDocument.java +++ b/unotest/source/java/org/openoffice/test/tools/SpreadsheetDocument.java @@ -44,7 +44,7 @@ public class SpreadsheetDocument extends OfficeDocument /* ------------------------------------------------------------------ */ /** returns the sheets collection */ - public XSpreadsheets getSheets() + private XSpreadsheets getSheets() { XSpreadsheetDocument spreadsheetDoc = UnoRuntime.queryInterface( XSpreadsheetDocument.class, getDocument() ); return spreadsheetDoc.getSheets(); diff --git a/unotools/qa/complex/tempfile/Test01.java b/unotools/qa/complex/tempfile/Test01.java index b64c3e22039f..2b64195d3752 100644 --- a/unotools/qa/complex/tempfile/Test01.java +++ b/unotools/qa/complex/tempfile/Test01.java @@ -27,9 +27,9 @@ import share.LogWriter; public class Test01 { LogWriter m_aLogWriter; - XMultiServiceFactory m_xMSF = null; - XSimpleFileAccess m_xSFA = null; - TestHelper m_aTestHelper = null; + private XMultiServiceFactory m_xMSF = null; + private XSimpleFileAccess m_xSFA = null; + private TestHelper m_aTestHelper = null; public Test01(XMultiServiceFactory xMSF, XSimpleFileAccess xSFA) { m_xMSF = xMSF; diff --git a/unotools/qa/complex/tempfile/Test02.java b/unotools/qa/complex/tempfile/Test02.java index 29855d428b05..afef403fbfe4 100644 --- a/unotools/qa/complex/tempfile/Test02.java +++ b/unotools/qa/complex/tempfile/Test02.java @@ -27,9 +27,9 @@ import java.util.Random; public class Test02 { - XMultiServiceFactory m_xMSF; - XSimpleFileAccess m_xSFA; - TestHelper m_aTestHelper; + private XMultiServiceFactory m_xMSF; + private XSimpleFileAccess m_xSFA; + private TestHelper m_aTestHelper; public Test02(XMultiServiceFactory xMSF, XSimpleFileAccess xSFA) { m_xMSF = xMSF; diff --git a/unotools/qa/complex/tempfile/TestHelper.java b/unotools/qa/complex/tempfile/TestHelper.java index 9f21438365b1..e17075419ddd 100644 --- a/unotools/qa/complex/tempfile/TestHelper.java +++ b/unotools/qa/complex/tempfile/TestHelper.java @@ -27,7 +27,7 @@ import com.sun.star.ucb.XSimpleFileAccess; public class TestHelper { - String m_sTestPrefix; + private String m_sTestPrefix; public TestHelper( String sTestPrefix ) { diff --git a/unoxml/qa/complex/unoxml/DOMTest.java b/unoxml/qa/complex/unoxml/DOMTest.java index 47671659326a..e6048efb0093 100644 --- a/unoxml/qa/complex/unoxml/DOMTest.java +++ b/unoxml/qa/complex/unoxml/DOMTest.java @@ -2728,7 +2728,7 @@ public class DOMTest serializable.serialize(xHandler, new StringPair[0]); } - class DummyDocumentHandler implements XDocumentHandler + private class DummyDocumentHandler implements XDocumentHandler { public void startDocument() throws SAXException {} public void endDocument() throws SAXException {} @@ -2741,7 +2741,7 @@ public class DOMTest } // just for importNode... - abstract class MockNode implements XNode + private abstract class MockNode implements XNode { MockDoc m_document; MockNode m_parent; @@ -3010,7 +3010,7 @@ public class DOMTest } class MockAttr extends MockNode implements XAttr { - String m_value; + private String m_value; MockAttr(String name, String value) { m_localname = name; m_value = value; diff --git a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java index e47d5d3b6e80..754c21b6e388 100644 --- a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java +++ b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java @@ -587,7 +587,7 @@ public class RDFRepositoryTest return c.toArray(new XNode[c.size()][]); } - static class BindingComp implements java.util.Comparator<XNode[]> + private static class BindingComp implements java.util.Comparator<XNode[]> { public int compare(XNode[] left, XNode[] right) { @@ -604,7 +604,7 @@ public class RDFRepositoryTest } } - static class StmtComp implements java.util.Comparator<Statement> + private static class StmtComp implements java.util.Comparator<Statement> { public int compare(Statement left, Statement right) { @@ -628,7 +628,7 @@ public class RDFRepositoryTest return 0; } - public int cmp(XNode i_Left, XNode i_Right) + private int cmp(XNode i_Left, XNode i_Right) { if (isBlank(i_Left)) { return isBlank(i_Right) ? 0 : 1; @@ -791,9 +791,9 @@ public class RDFRepositoryTest } } - class TestRange implements XTextRange, XMetadatable, XServiceInfo + private class TestRange implements XTextRange, XMetadatable, XServiceInfo { - String m_Stream; + private String m_Stream; String m_XmlId; String m_Text; TestRange(String i_Str) { m_Text = i_Str; } diff --git a/vcl/qa/complex/memCheck/TestDocument.java b/vcl/qa/complex/memCheck/TestDocument.java index b416d349b706..ab942e0083ae 100644 --- a/vcl/qa/complex/memCheck/TestDocument.java +++ b/vcl/qa/complex/memCheck/TestDocument.java @@ -23,7 +23,7 @@ import org.openoffice.test.OfficeFileUrl; final class TestDocument { - final static String sPathname = "testdocuments"; + private final static String sPathname = "testdocuments"; public static String getUrl(String name) { return OfficeFileUrl.getAbsolute(new File(sPathname, name)); diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java index 3a48692e3adb..c69d029e7cc5 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.java +++ b/wizards/com/sun/star/wizards/common/Configuration.java @@ -83,7 +83,7 @@ public abstract class Configuration } } - public static String getLocaleString(XMultiServiceFactory xMSF, String root, String key) + private static String getLocaleString(XMultiServiceFactory xMSF, String root, String key) { String sLocale = PropertyNames.EMPTY_STRING; try @@ -102,7 +102,7 @@ public abstract class Configuration return sLocale; } - public static Locale getLocale(XMultiServiceFactory xMSF, String root, String key) + private static Locale getLocale(XMultiServiceFactory xMSF, String root, String key) { Locale aLocLocale = new Locale(); String sLocale = getLocaleString(xMSF, root, key); diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java index 3093e8a74415..14c3a7a77561 100644 --- a/wizards/com/sun/star/wizards/common/Desktop.java +++ b/wizards/com/sun/star/wizards/common/Desktop.java @@ -66,7 +66,7 @@ public class Desktop return xFrameSuppl.getActiveFrame(); } - public static XDispatch getDispatcher(XFrame xFrame, String _stargetframe, com.sun.star.util.URL oURL) + private static XDispatch getDispatcher(XFrame xFrame, String _stargetframe, com.sun.star.util.URL oURL) { try { @@ -82,7 +82,7 @@ public class Desktop return null; } - public static com.sun.star.util.URL getDispatchURL(XMultiServiceFactory xMSF, String _sURL) + private static com.sun.star.util.URL getDispatchURL(XMultiServiceFactory xMSF, String _sURL) { try { @@ -101,7 +101,7 @@ public class Desktop return null; } - public static void dispatchURL(XMultiServiceFactory xMSF, String sURL, XFrame xFrame, String _stargetframe) + private static void dispatchURL(XMultiServiceFactory xMSF, String sURL, XFrame xFrame, String _stargetframe) { com.sun.star.util.URL oURL = getDispatchURL(xMSF, sURL); XDispatch xDispatch = getDispatcher(xFrame, _stargetframe, oURL); @@ -113,13 +113,13 @@ public class Desktop dispatchURL(xMSF, sURL, xFrame, PropertyNames.EMPTY_STRING); } - public static void dispatchURL(XDispatch _xDispatch, com.sun.star.util.URL oURL) + private static void dispatchURL(XDispatch _xDispatch, com.sun.star.util.URL oURL) { PropertyValue[] oArg = new PropertyValue[0]; _xDispatch.dispatch(oURL, oArg); } - public static XMultiComponentFactory getMultiComponentFactory() throws com.sun.star.uno.Exception, RuntimeException, java.lang.Exception + private static XMultiComponentFactory getMultiComponentFactory() throws com.sun.star.uno.Exception, RuntimeException, java.lang.Exception { XComponentContext xcomponentcontext = Bootstrap.createInitialComponentContext(null); // initial serviceManager @@ -156,7 +156,7 @@ public class Desktop return sIncSuffix; } - public static String getIncrementSuffix(XHierarchicalNameAccess xElementContainer, String ElementName) + private static String getIncrementSuffix(XHierarchicalNameAccess xElementContainer, String ElementName) { boolean bElementexists = true; int i = 1; @@ -178,7 +178,7 @@ public class Desktop return sIncSuffix; } - public static int checkforfirstSpecialCharacter(XMultiServiceFactory _xMSF, String _sString, Locale _aLocale) + private static int checkforfirstSpecialCharacter(XMultiServiceFactory _xMSF, String _sString, Locale _aLocale) { try { @@ -267,7 +267,7 @@ public class Desktop - public static String getTemplatePath(XMultiServiceFactory _xMSF) + private static String getTemplatePath(XMultiServiceFactory _xMSF) { try { diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java index 63a531874625..14f77ed4d312 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.java +++ b/wizards/com/sun/star/wizards/common/FileAccess.java @@ -49,7 +49,7 @@ import com.sun.star.document.XDocumentProperties; public class FileAccess { - public static String deleteLastSlashfromUrl(String _sPath) + private static String deleteLastSlashfromUrl(String _sPath) { if (_sPath.endsWith("/")) { @@ -338,7 +338,7 @@ public class FileAccess /** * We search in all given path for a given file */ - public static String addPath(String _sPath, String _sPath2) + private static String addPath(String _sPath, String _sPath2) { String sNewPath; if (!_sPath.endsWith("/")) @@ -481,7 +481,7 @@ public class FileAccess return LocLayoutFiles; } - public XSimpleFileAccess2 fileAccess; + private XSimpleFileAccess2 fileAccess; public FileAccess(XMultiServiceFactory xmsf) throws com.sun.star.uno.Exception { @@ -496,7 +496,7 @@ public class FileAccess /** * @return the extension of the given filename. */ - public static String getExtension(String filename) + private static String getExtension(String filename) { int p = filename.indexOf('.'); if (p == -1) @@ -540,7 +540,7 @@ public class FileAccess return getFilename(path, "/"); } - public static String getFilename(String path, String pathSeparator) + private static String getFilename(String path, String pathSeparator) { String[] s = JavaTools.ArrayoutofString(path, pathSeparator); return s[s.length - 1]; diff --git a/wizards/com/sun/star/wizards/common/Helper.java b/wizards/com/sun/star/wizards/common/Helper.java index 58f83cdda243..efb0a970a997 100644 --- a/wizards/com/sun/star/wizards/common/Helper.java +++ b/wizards/com/sun/star/wizards/common/Helper.java @@ -199,7 +199,7 @@ public class Helper * @param oValue the parameter that has to represent an object * @return a null reference if the array is empty */ - public static Object getArrayValue(Object oValue) + private static Object getArrayValue(Object oValue) { try { diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java b/wizards/com/sun/star/wizards/common/JavaTools.java index df7bfe11152e..2c0d28c90846 100644 --- a/wizards/com/sun/star/wizards/common/JavaTools.java +++ b/wizards/com/sun/star/wizards/common/JavaTools.java @@ -431,7 +431,7 @@ public class JavaTools return -1; } - public static boolean isEqual(PropertyValue firstPropValue, PropertyValue secPropValue) + private static boolean isEqual(PropertyValue firstPropValue, PropertyValue secPropValue) { if (!firstPropValue.Name.equals(secPropValue.Name)) { diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java index 52651bba0269..dfbd742aef8e 100644 --- a/wizards/com/sun/star/wizards/common/NumberFormatter.java +++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java @@ -36,17 +36,17 @@ import com.sun.star.util.XNumberFormatter; public class NumberFormatter { - public int iDateFormatKey = -1; - public int iDateTimeFormatKey = -1; - public int iNumberFormatKey = -1; - public int iTextFormatKey = -1; - public int iTimeFormatKey = -1; - public int iLogicalFormatKey = -1; - public long lDateCorrection; - public XNumberFormatter xNumberFormatter; - public XNumberFormats xNumberFormats; - public XNumberFormatTypes xNumberFormatTypes; - public XPropertySet xNumberFormatSettings; + private int iDateFormatKey = -1; + private int iDateTimeFormatKey = -1; + private int iNumberFormatKey = -1; + private int iTextFormatKey = -1; + private int iTimeFormatKey = -1; + private int iLogicalFormatKey = -1; + private long lDateCorrection; + private XNumberFormatter xNumberFormatter; + private XNumberFormats xNumberFormats; + private XNumberFormatTypes xNumberFormatTypes; + private XPropertySet xNumberFormatSettings; private final Locale aLocale; @@ -108,7 +108,7 @@ public class NumberFormatter /** * returns a numberformat for a FormatString. */ - public int defineNumberFormat(String _FormatString, Locale _aLocale) + private int defineNumberFormat(String _FormatString, Locale _aLocale) { try { diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index 7505b7b444dc..af74704df4a2 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -33,16 +33,16 @@ import com.sun.star.uno.TypeClass; public class NumericalHelper { - public static final int BYTE_TYPE = 0; - public static final int SHORT_TYPE = 1; - public static final int INT_TYPE = 2; - public static final int LONG_TYPE = 3; - public static final int FLOAT_TYPE = 4; - public static final int DOUBLE_TYPE = 5; - public static final int CHAR_TYPE = 6; - public static final int STRING_TYPE = -1; - public static final int BOOLEAN_TYPE = -2; - public static final int SEQUENCE_TYPE = -3; + private static final int BYTE_TYPE = 0; + private static final int SHORT_TYPE = 1; + private static final int INT_TYPE = 2; + private static final int LONG_TYPE = 3; + private static final int FLOAT_TYPE = 4; + private static final int DOUBLE_TYPE = 5; + private static final int CHAR_TYPE = 6; + private static final int STRING_TYPE = -1; + private static final int BOOLEAN_TYPE = -2; + private static final int SEQUENCE_TYPE = -3; /** * private c'tor to prevent instantiation @@ -272,7 +272,7 @@ public class NumericalHelper * @return * @throws com.sun.star.lang.IllegalArgumentException */ - static int getInt(TypeObject typeObject) + private static int getInt(TypeObject typeObject) throws com.sun.star.lang.IllegalArgumentException { if (typeObject.iType != INT_TYPE) @@ -287,7 +287,7 @@ public class NumericalHelper * get the simple float type * @throws com.sun.star.lang.IllegalArgumentException */ - static float getFloat(TypeObject typeObject) + private static float getFloat(TypeObject typeObject) throws com.sun.star.lang.IllegalArgumentException { if (typeObject.iType != FLOAT_TYPE) diff --git a/wizards/com/sun/star/wizards/common/ParaStyled.java b/wizards/com/sun/star/wizards/common/ParaStyled.java index 0a80f452ad1e..495423bfcb66 100644 --- a/wizards/com/sun/star/wizards/common/ParaStyled.java +++ b/wizards/com/sun/star/wizards/common/ParaStyled.java @@ -24,7 +24,7 @@ import com.sun.star.text.*; class ParaStyled implements TemplateElement { - String paraStyle; + private String paraStyle; ParaStyled(String paraStyle_) { diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java index a7b5d2af9d45..ae517250e65d 100644 --- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java +++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java @@ -26,9 +26,9 @@ import com.sun.star.text.*; public class PlaceholderTextElement extends TextElement { - String hint; + private String hint; String placeHolderText; - XMultiServiceFactory xmsf; + private XMultiServiceFactory xmsf; public PlaceholderTextElement(XTextRange textRange, String placeHolderText_, String hint_, XMultiServiceFactory xmsf_) { @@ -56,7 +56,7 @@ public class PlaceholderTextElement extends TextElement } } - public static XTextContent createPlaceHolder(XMultiServiceFactory xmsf, String ph, String hint) + private static XTextContent createPlaceHolder(XMultiServiceFactory xmsf, String ph, String hint) { Object placeHolder; try diff --git a/wizards/com/sun/star/wizards/common/Properties.java b/wizards/com/sun/star/wizards/common/Properties.java index 59e48e6810ca..372c7c4a3b76 100644 --- a/wizards/com/sun/star/wizards/common/Properties.java +++ b/wizards/com/sun/star/wizards/common/Properties.java @@ -59,7 +59,7 @@ public class Properties extends HashMap<String,Object> return getProperties(this); } - public static PropertyValue[] getProperties(Map<String,Object> map) + private static PropertyValue[] getProperties(Map<String,Object> map) { PropertyValue[] pv = new PropertyValue[map.size()]; @@ -71,7 +71,7 @@ public class Properties extends HashMap<String,Object> return pv; } - public static PropertyValue createProperty(String name, Map<String,Object> map) + private static PropertyValue createProperty(String name, Map<String,Object> map) { return createProperty(name, map.get(name)); } diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.java b/wizards/com/sun/star/wizards/common/PropertySetHelper.java index 15c7f447d062..1def4f063580 100644 --- a/wizards/com/sun/star/wizards/common/PropertySetHelper.java +++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.java @@ -25,7 +25,7 @@ import java.util.HashMap; public class PropertySetHelper { - protected XPropertySet m_xPropertySet; + private XPropertySet m_xPropertySet; private HashMap<String, Object> m_aHashMap; public PropertySetHelper(Object _aObj) @@ -68,7 +68,7 @@ public class PropertySetHelper @param _sName name of the property to set @param _aValue property value as object */ - public void setPropertyValue(String _sName, Object _aValue) throws java.lang.Exception + private void setPropertyValue(String _sName, Object _aValue) throws java.lang.Exception { if (m_xPropertySet != null) { diff --git a/wizards/com/sun/star/wizards/common/Resource.java b/wizards/com/sun/star/wizards/common/Resource.java index 64a1526673f9..f4381906575c 100644 --- a/wizards/com/sun/star/wizards/common/Resource.java +++ b/wizards/com/sun/star/wizards/common/Resource.java @@ -27,10 +27,10 @@ import com.sun.star.uno.UnoRuntime; public class Resource { - XMultiServiceFactory xMSF; - String Module; - XIndexAccess xStringIndexAccess; - XIndexAccess xStringListIndexAccess; + private XMultiServiceFactory xMSF; + private String Module; + private XIndexAccess xStringIndexAccess; + private XIndexAccess xStringListIndexAccess; /** Creates a new instance of Resource */ diff --git a/wizards/com/sun/star/wizards/common/TextElement.java b/wizards/com/sun/star/wizards/common/TextElement.java index 4549a9fc8ee1..08afd2dbe511 100644 --- a/wizards/com/sun/star/wizards/common/TextElement.java +++ b/wizards/com/sun/star/wizards/common/TextElement.java @@ -31,7 +31,7 @@ public class TextElement extends ParaStyled this(range.getString(), (String) Helper.getUnoPropertyValue(range.getStart(), "ParaStyleName")); } - TextElement(String text_, String paraStyle_) + private TextElement(String text_, String paraStyle_) { super(paraStyle_); text = text_; diff --git a/wizards/com/sun/star/wizards/db/BlindtextCreator.java b/wizards/com/sun/star/wizards/db/BlindtextCreator.java index 6f532f188d41..0d79f457d6f4 100644 --- a/wizards/com/sun/star/wizards/db/BlindtextCreator.java +++ b/wizards/com/sun/star/wizards/db/BlindtextCreator.java @@ -23,7 +23,7 @@ import com.sun.star.wizards.common.PropertyNames; public class BlindtextCreator { - public static final String BlindText = + private static final String BlindText = "Ut wisi enim ad minim veniam, quis nostrud exerci tation " + "ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor " + "in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at " + "vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore " + "te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy " + "nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, " + "quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. " + "Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum " + "dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent " + "luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis " + "eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum."; public static String adjustBlindTextlength(String FieldTitle, int FieldWidth, boolean bIsCurLandscape, boolean bIsGroupTable, String[] _RecordFieldNames) diff --git a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java index 3fdbf1228c3b..209d2ffd0522 100644 --- a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java +++ b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java @@ -26,7 +26,7 @@ import com.sun.star.wizards.common.PropertyNames; public class ColumnPropertySet { - TypeInspector oTypeInspector; + private TypeInspector oTypeInspector; public XPropertySet xPropertySet; private int nType; private String sTypeName = PropertyNames.EMPTY_STRING; diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java index 607760fb35bd..a6225b053740 100644 --- a/wizards/com/sun/star/wizards/db/CommandMetaData.java +++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java @@ -60,10 +60,10 @@ public class CommandMetaData extends DBMetaData public String[] NonAggregateFieldNames; private int CommandType; private String Command; - boolean bCatalogAtStart = true; + private boolean bCatalogAtStart = true; String sCatalogSep = PropertyNames.EMPTY_STRING; String sIdentifierQuote = PropertyNames.EMPTY_STRING; - boolean bCommandComposerAttributesalreadyRetrieved = false; + private boolean bCommandComposerAttributesalreadyRetrieved = false; public CommandMetaData(XMultiServiceFactory xMSF) { @@ -332,7 +332,7 @@ public class CommandMetaData extends DBMetaData CommandType = _commandType; } - public boolean isnumeric(FieldColumn _oFieldColumn) + private boolean isnumeric(FieldColumn _oFieldColumn) { try { @@ -523,7 +523,7 @@ public class CommandMetaData extends DBMetaData return RecordFieldNames[i]; } - public void setCommandComposingAttributes() + private void setCommandComposingAttributes() { try { diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java index 804c6475ac52..be65ffd06b1b 100644 --- a/wizards/com/sun/star/wizards/db/CommandName.java +++ b/wizards/com/sun/star/wizards/db/CommandName.java @@ -25,16 +25,16 @@ import com.sun.star.wizards.common.PropertyNames; public class CommandName { - protected CommandMetaData oCommandMetaData; - protected String CatalogName = PropertyNames.EMPTY_STRING; - protected String SchemaName = PropertyNames.EMPTY_STRING; - protected String TableName = PropertyNames.EMPTY_STRING; - protected String DisplayName = PropertyNames.EMPTY_STRING; - protected String ComposedName = PropertyNames.EMPTY_STRING; - protected String AliasName = PropertyNames.EMPTY_STRING; - protected boolean bCatalogAtStart; - protected String sCatalogSep; - protected boolean baddQuotation = true; + private CommandMetaData oCommandMetaData; + private String CatalogName = PropertyNames.EMPTY_STRING; + private String SchemaName = PropertyNames.EMPTY_STRING; + private String TableName = PropertyNames.EMPTY_STRING; + private String DisplayName = PropertyNames.EMPTY_STRING; + private String ComposedName = PropertyNames.EMPTY_STRING; + private String AliasName = PropertyNames.EMPTY_STRING; + private boolean bCatalogAtStart; + private String sCatalogSep; + private boolean baddQuotation = true; public CommandName(CommandMetaData _CommandMetaData, String _DisplayName) { @@ -130,7 +130,7 @@ public class CommandName } } - public void setComposedCommandName() + private void setComposedCommandName() { if (this.setMetaDataAttributes()) { @@ -185,7 +185,7 @@ public class CommandName } } - public String quoteName(String _sName) + private String quoteName(String _sName) { if (baddQuotation) { diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index eaa2d78e1387..f870e96b685b 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -85,13 +85,13 @@ public class DBMetaData private XPropertySet m_dataSourceSettings; private XOfficeDatabaseDocument xModel; private XPropertySet xDataSourcePropertySet; - public java.util.ArrayList<CommandObject> CommandObjects = new ArrayList<CommandObject>(1); - public Locale aLocale; + private java.util.ArrayList<CommandObject> CommandObjects = new ArrayList<CommandObject>(1); + private Locale aLocale; public String DataSourceName; public com.sun.star.sdbc.XConnection DBConnection; private com.sun.star.sdb.tools.XConnectionTools m_connectionTools; public com.sun.star.lang.XMultiServiceFactory xMSF; - public XComponent xConnectionComponent; + private XComponent xConnectionComponent; private XNameAccess xNameAccess; private XInterface xDatabaseContext; @@ -254,7 +254,7 @@ public class DBMetaData private String Name; private int CommandType; - public CommandObject(String _CommandName, int _CommandType) + private CommandObject(String _CommandName, int _CommandType) { try { @@ -310,7 +310,7 @@ public class DBMetaData return bHasEscapeProcessing; } - public XNameAccess getQueryNamesAsNameAccess() + private XNameAccess getQueryNamesAsNameAccess() { XQueriesSupplier xDBQueries = UnoRuntime.queryInterface( XQueriesSupplier.class, DBConnection ); xQueryNames = xDBQueries.getQueries(); @@ -519,7 +519,7 @@ public class DBMetaData } } - public void getDataSourceInterfaces() throws Exception + private void getDataSourceInterfaces() throws Exception { xDataSourcePropertySet = UnoRuntime.queryInterface( XPropertySet.class, getDataSource() ); bPasswordIsRequired = ((Boolean) xDataSourcePropertySet.getPropertyValue("IsPasswordRequired")).booleanValue(); @@ -737,7 +737,7 @@ public class DBMetaData return supportsPrimaryKeys; } - public boolean supportsCoreSQLGrammar() + private boolean supportsCoreSQLGrammar() { try { @@ -856,7 +856,7 @@ public class DBMetaData * the document may not be open * @param i_createTemplate describes the type of the document: "form" or "report" */ - public void addDatabaseDocument(XComponent _xComponent, XHierarchicalNameAccess _xDocNameAccess, boolean i_createTemplate) + private void addDatabaseDocument(XComponent _xComponent, XHierarchicalNameAccess _xDocNameAccess, boolean i_createTemplate) { try { @@ -980,7 +980,7 @@ public class DBMetaData /** * @return Returns the xWindowPeer. */ - public XWindowPeer getWindowPeer() + private XWindowPeer getWindowPeer() { return xWindowPeer; } diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java b/wizards/com/sun/star/wizards/db/FieldColumn.java index aae60495b43e..808c75933739 100644 --- a/wizards/com/sun/star/wizards/db/FieldColumn.java +++ b/wizards/com/sun/star/wizards/db/FieldColumn.java @@ -356,7 +356,7 @@ public class FieldColumn } } - public void initDefaultValue() + private void initDefaultValue() { switch (getFieldType()) { diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java index fb48d02fb7c0..4cb4bcd15c91 100644 --- a/wizards/com/sun/star/wizards/db/QueryMetaData.java +++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java @@ -34,7 +34,7 @@ public class QueryMetaData extends CommandMetaData public PropertyValue[][] GroupByFilterConditions = new PropertyValue[][] { }; - public String[] UniqueAggregateFieldNames = new String[] + private String[] UniqueAggregateFieldNames = new String[] { }; public int Type = QueryType.SODETAILQUERY; diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java index 649434de2da4..b71ae9997262 100644 --- a/wizards/com/sun/star/wizards/db/RecordParser.java +++ b/wizards/com/sun/star/wizards/db/RecordParser.java @@ -38,13 +38,13 @@ import com.sun.star.wizards.common.PropertyNames; public class RecordParser extends QueryMetaData { - XNameAccess xColumns; - com.sun.star.sdbc.XRow xResultSetRow; + private XNameAccess xColumns; + private com.sun.star.sdbc.XRow xResultSetRow; public XResultSet ResultSet; - XInterface xRowSet; - XCompletedExecution xExecute; - XComponent xRowSetComponent; - XInteractionHandler xInteraction; + private XInterface xRowSet; + private XCompletedExecution xExecute; + private XComponent xRowSetComponent; + private XInteractionHandler xInteraction; public FieldColumn[] GroupFieldColumns; public FieldColumn[] RecordFieldColumns; @@ -115,7 +115,7 @@ public class RecordParser extends QueryMetaData return Any.VOID; } - public Object getColumnValue(int ColIndex, int iType) + private Object getColumnValue(int ColIndex, int iType) { Object oAny = Any.VOID; switch (iType) diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java index de387166800a..0a30846ae1c0 100644 --- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java +++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java @@ -38,12 +38,12 @@ import java.util.ArrayList; public class SQLQueryComposer { - QueryMetaData CurDBMetaData; + private QueryMetaData CurDBMetaData; public XSingleSelectQueryAnalyzer m_xQueryAnalyzer; - ArrayList<CommandName> composedCommandNames = new ArrayList<CommandName>(1); + private ArrayList<CommandName> composedCommandNames = new ArrayList<CommandName>(1); private XSingleSelectQueryComposer m_queryComposer; - XMultiServiceFactory xMSF; - boolean bincludeGrouping = true; + private XMultiServiceFactory xMSF; + private boolean bincludeGrouping = true; public SQLQueryComposer(QueryMetaData _CurDBMetaData) { @@ -106,7 +106,7 @@ public class SQLQueryComposer return sSelectClause; } - public String getAliasFieldNameClause(String _FieldName) + private String getAliasFieldNameClause(String _FieldName) { String FieldTitle = CurDBMetaData.getFieldTitle(_FieldName); if (!FieldTitle.equals(_FieldName)) @@ -126,7 +126,7 @@ public class SQLQueryComposer prependSortingCriteria(false); } - public void prependSortingCriteria(boolean _baddAliasFieldNames) throws SQLException + private void prependSortingCriteria(boolean _baddAliasFieldNames) throws SQLException { XIndexAccess xColumnIndexAccess = m_xQueryAnalyzer.getOrderColumns(); m_queryComposer.setOrder(""); @@ -167,7 +167,7 @@ public class SQLQueryComposer m_queryComposer.appendOrderByColumn(xColumn, bascend); } - public void appendSortingcriteria(boolean _baddAliasFieldNames) throws SQLException + private void appendSortingcriteria(boolean _baddAliasFieldNames) throws SQLException { String sOrder = ""; m_queryComposer.setOrder(""); @@ -196,7 +196,7 @@ public class SQLQueryComposer sOrder = m_queryComposer.getOrder(); } - public void appendGroupByColumns(boolean _baddAliasFieldNames) throws SQLException + private void appendGroupByColumns(boolean _baddAliasFieldNames) throws SQLException { for (int i = 0; i < CurDBMetaData.GroupFieldNames.length; i++) { @@ -205,7 +205,7 @@ public class SQLQueryComposer } } - public void setDBMetaData(QueryMetaData _oDBMetaData) + private void setDBMetaData(QueryMetaData _oDBMetaData) { this.CurDBMetaData = _oDBMetaData; updateComposedCommandNames(); @@ -262,12 +262,12 @@ public class SQLQueryComposer return setQueryCommand(_xParentWindow, _bincludeGrouping, _baddAliasFieldNames, true); } - public boolean setQueryCommand(XWindow _xParentWindow, boolean _bincludeGrouping, boolean _baddAliasFieldNames, boolean addQuery) + private boolean setQueryCommand(XWindow _xParentWindow, boolean _bincludeGrouping, boolean _baddAliasFieldNames, boolean addQuery) { return setQueryCommand(_xParentWindow, _bincludeGrouping, _baddAliasFieldNames, addQuery, false); } - public boolean setQueryCommand(XWindow _xParentWindow, boolean _bincludeGrouping, boolean _baddAliasFieldNames, boolean addQuery, boolean prependSortingCriteria) + private boolean setQueryCommand(XWindow _xParentWindow, boolean _bincludeGrouping, boolean _baddAliasFieldNames, boolean addQuery, boolean prependSortingCriteria) { try { @@ -344,7 +344,7 @@ public class SQLQueryComposer return null; } - public CommandName getComposedCommandByDisplayName(String _DisplayName) + private CommandName getComposedCommandByDisplayName(String _DisplayName) { if (composedCommandNames != null) { @@ -359,7 +359,7 @@ public class SQLQueryComposer return null; } - public String getuniqueAliasName(String _TableName) + private String getuniqueAliasName(String _TableName) { int a = 0; String AliasName = ""; @@ -386,7 +386,7 @@ public class SQLQueryComposer return CommandName.quoteName(_sname, CurDBMetaData.getIdentifierQuote()); } - public void displaySQLErrorDialog(Exception _exception, XWindow _xParentWindow) + private void displaySQLErrorDialog(Exception _exception, XWindow _xParentWindow) { try { diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java index e4ff97157b69..f844d59bc3a6 100644 --- a/wizards/com/sun/star/wizards/db/TableDescriptor.java +++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java @@ -52,14 +52,14 @@ import com.sun.star.wizards.common.PropertyNames; public class TableDescriptor extends CommandMetaData implements XContainerListener { - XDataDescriptorFactory xTableDataDescriptorFactory; - XPropertySet xPropTableDataDescriptor; + private XDataDescriptorFactory xTableDataDescriptorFactory; + private XPropertySet xPropTableDataDescriptor; private XNameAccess xNameAccessColumns; private XIndexAccess xIndexAccessKeys; - public XDataDescriptorFactory xColumnDataDescriptorFactory; - XContainer xTableContainer; - XAppend xTableAppend; - XDrop xTableDrop; + private XDataDescriptorFactory xColumnDataDescriptorFactory; + private XContainer xTableContainer; + private XAppend xTableAppend; + private XDrop xTableDrop; private XAppend xKeyAppend; private XDrop xKeyDrop; private String[] sTableFilters = null; @@ -135,7 +135,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen } } - public boolean createPrimaryKeys(String[] _fieldnames, boolean _bAutoincrementation) + private boolean createPrimaryKeys(String[] _fieldnames, boolean _bAutoincrementation) { try { @@ -201,7 +201,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen return false; } - public boolean isColunnNameDuplicate(XNameAccess _xColumns, XPropertySet _xToBeAppendedPropertySet) + private boolean isColunnNameDuplicate(XNameAccess _xColumns, XPropertySet _xToBeAppendedPropertySet) { try { @@ -382,7 +382,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen } } - public boolean modifyColumn(String _sname, String _spropname, Object _oValue) + private boolean modifyColumn(String _sname, String _spropname, Object _oValue) { try { @@ -476,7 +476,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen } } - public String[] getColumnNames() + private String[] getColumnNames() { if (columncontainer.size() > 0) { @@ -640,7 +640,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen - public XPropertySet addPrimaryKeyColumn(String _columnname) + private XPropertySet addPrimaryKeyColumn(String _columnname) { try { @@ -765,7 +765,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen { } - public boolean appendTableNameToFilter(String _scomposedtablename) + private boolean appendTableNameToFilter(String _scomposedtablename) { boolean bhastoinsert = true; for (int i = 0; i < sTableFilters.length; i++) diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java index d930b6724a64..b51a3ff04eee 100644 --- a/wizards/com/sun/star/wizards/db/TypeInspector.java +++ b/wizards/com/sun/star/wizards/db/TypeInspector.java @@ -45,7 +45,7 @@ public class TypeInspector DataType.INTEGER, DataType.FLOAT, DataType.REAL, DataType.DOUBLE, DataType.NUMERIC, DataType.DECIMAL }; static final int INVALID = 999999; - XResultSet xResultSet; + private XResultSet xResultSet; public class TypeInfo { @@ -201,12 +201,12 @@ public class TypeInspector return -1; } - public boolean supportsDataType(int _curDataType) + private boolean supportsDataType(int _curDataType) { return (JavaTools.FieldInIntTable(nDataTypeInfos, _curDataType) > -1); } - public int getLastConversionFallbackDataType() + private int getLastConversionFallbackDataType() { if (supportsDataType(DataType.VARCHAR)) { diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java index fd6241a28998..ae26efe6cce5 100644 --- a/wizards/com/sun/star/wizards/document/Control.java +++ b/wizards/com/sun/star/wizards/document/Control.java @@ -40,14 +40,14 @@ public class Control extends Shape { XControlModel xControlModel; - XControl xControl; + private XControl xControl; public XPropertySet xPropertySet; XWindowPeer xWindowPeer; - String sServiceName; - static final int SOMAXTEXTSIZE = 50; + private String sServiceName; + private static final int SOMAXTEXTSIZE = 50; private int icontroltype; - protected XNameContainer xFormName; - protected static final int IIMGFIELDWIDTH = 3000; + private XNameContainer xFormName; + private static final int IIMGFIELDWIDTH = 3000; public Control() { @@ -71,7 +71,7 @@ public class Control extends Shape createControl(_icontroltype, null, null); } - public void createControl(int _icontroltype, XShapes _xGroupShapes, String _FieldName) + private void createControl(int _icontroltype, XShapes _xGroupShapes, String _FieldName) { try { @@ -105,7 +105,7 @@ public class Control extends Shape } } - public void insertControlInContainer(String _fieldname) + private void insertControlInContainer(String _fieldname) { try { @@ -123,7 +123,7 @@ public class Control extends Shape } } - public String getControlName(String _fieldname) + private String getControlName(String _fieldname) { String controlname = PropertyNames.EMPTY_STRING; switch (getControlType()) @@ -215,7 +215,7 @@ public class Control extends Shape } } - public Size getPreferredSize(String sText) + private Size getPreferredSize(String sText) { try { @@ -251,12 +251,12 @@ public class Control extends Shape /** the peer should be retrieved every time before it is used because it * might be disposed otherwise */ - public XLayoutConstrains getPeer() + private XLayoutConstrains getPeer() { return UnoRuntime.queryInterface(XLayoutConstrains.class, xControl.getPeer()); } - public Size getPeerSize() + private Size getPeerSize() { try { diff --git a/wizards/com/sun/star/wizards/document/DatabaseControl.java b/wizards/com/sun/star/wizards/document/DatabaseControl.java index 14168115520d..a90cc849fb7f 100644 --- a/wizards/com/sun/star/wizards/document/DatabaseControl.java +++ b/wizards/com/sun/star/wizards/document/DatabaseControl.java @@ -52,7 +52,7 @@ public class DatabaseControl extends Control createGridColumn(_oGridControl, _curfieldcolumn, _fieldtype, _columntitle); } - protected int getFieldType() + private int getFieldType() { return m_nFieldType; } @@ -159,7 +159,7 @@ public class DatabaseControl extends Control } } - public void setNumericLimits() + private void setNumericLimits() { try { diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java index 3f9d3702f53a..86243bfcb4e4 100644 --- a/wizards/com/sun/star/wizards/document/FormHandler.java +++ b/wizards/com/sun/star/wizards/document/FormHandler.java @@ -60,7 +60,7 @@ public class FormHandler private static final String TEXTFIELD = "TextField"; private static final String TIMEFIELD = "TimeField"; - public XFormsSupplier xFormsSupplier; + private XFormsSupplier xFormsSupplier; public XMultiServiceFactory xMSFDoc; public XMultiServiceFactory xMSF; public XDrawPage xDrawPage; @@ -76,24 +76,24 @@ public class FormHandler public final static int SOGRIDCONTROL = 6; public final static int SOIMAGECONTROL = 7; public final static int SODATETIMECONTROL = 8; - int iImageControlHeight = 2000; + private int iImageControlHeight = 2000; public static String SOSIZETEXT = "The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog."; - int iXPixelFactor = -1; - int iYPixelFactor = -1; - int iXNirwanaPos = 50000; - int iYNirwanaPos = 50000; - public int nLabelHeight = -1; - public int nDBRefHeight = -1; - public int BasicLabelDiffHeight = -1; - XNameAccess xNamedForms; + private int iXPixelFactor = -1; + private int iYPixelFactor = -1; + private int iXNirwanaPos = 50000; + private int iYNirwanaPos = 50000; + private int nLabelHeight = -1; + private int nDBRefHeight = -1; + private int BasicLabelDiffHeight = -1; + private XNameAccess xNamedForms; XControlAccess xControlAccess; XShapeGrouper xShapeGrouper; - XNameContainer xNamedFormContainer; + private XNameContainer xNamedFormContainer; - public class ControlData + public static class ControlData { int DataType; - int ControlType; + private int ControlType; String GridColumnName; } @@ -154,7 +154,7 @@ public class FormHandler return -1; } - public void initializeBasicControlValues() + private void initializeBasicControlValues() { Control oLabelControl = new Control(this, SOLABEL, new Point(), new Size()); XDevice xDevice = UnoRuntime.queryInterface(XDevice.class, oLabelControl.xWindowPeer); @@ -169,7 +169,7 @@ public class FormHandler xDrawPage.remove(oTextControl.xShape); } - public ControlData createControlData(int _datatype, int _controltype, String _gridcolumnname) + private ControlData createControlData(int _datatype, int _controltype, String _gridcolumnname) { ControlData curControlData = new ControlData(); curControlData.DataType = _datatype; @@ -222,7 +222,7 @@ public class FormHandler } } - public boolean hasFormByName(String _FormName) + private boolean hasFormByName(String _FormName) { xNamedFormContainer = getDocumentForms(); xNamedForms = UnoRuntime.queryInterface(XNameAccess.class, xNamedFormContainer); @@ -264,7 +264,7 @@ public class FormHandler } } - public boolean belongsToForm(Object _oDrawPageElement, String _FormName) + private boolean belongsToForm(Object _oDrawPageElement, String _FormName) { XServiceInfo xServiceInfo = UnoRuntime.queryInterface(XServiceInfo.class, _oDrawPageElement); if (xServiceInfo.supportsService("com.sun.star.drawing.ControlShape")) @@ -313,7 +313,7 @@ public class FormHandler return insertFormbyName(_FormName, getDocumentForms()); } - public XNameContainer getFormByName(String _sname) + private XNameContainer getFormByName(String _sname) { XNameContainer xNamedForm = null; try diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java index 9fd2d54b3225..359b1aa97ad3 100644 --- a/wizards/com/sun/star/wizards/document/GridControl.java +++ b/wizards/com/sun/star/wizards/document/GridControl.java @@ -35,12 +35,12 @@ import com.sun.star.lang.XMultiServiceFactory; public class GridControl extends Shape { - FieldColumn[] fieldcolumns; + private FieldColumn[] fieldcolumns; public XNameContainer xNameContainer; public XGridColumnFactory xGridColumnFactory; public XPropertySet xPropertySet; XNameAccess xNameAccess; - XControlModel xControlModel; + private XControlModel xControlModel; public XComponent xComponent; public GridControl(XMultiServiceFactory _xMSF, String _sname, FormHandler _oFormHandler, XNameContainer _xFormName, FieldColumn[] _fieldcolumns, Point _aPoint, Size _aSize) diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java index b577a04f2afe..7e0202d095c5 100644 --- a/wizards/com/sun/star/wizards/document/OfficeDocument.java +++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java @@ -79,7 +79,7 @@ public class OfficeDocument return createNewFrame(xMSF, listener, "_blank"); } - public static XFrame createNewFrame(XMultiServiceFactory xMSF, XTerminateListener listener, String FrameName) + private static XFrame createNewFrame(XMultiServiceFactory xMSF, XTerminateListener listener, String FrameName) { XFrame xFrame = null; if (FrameName.equalsIgnoreCase("WIZARD_LIVE_PREVIEW")) @@ -102,7 +102,7 @@ public class OfficeDocument return xFrame; } - public static XFrame createNewPreviewFrame(XMultiServiceFactory xMSF, XTerminateListener listener) + private static XFrame createNewPreviewFrame(XMultiServiceFactory xMSF, XTerminateListener listener) { XToolkit xToolkit = null; try diff --git a/wizards/com/sun/star/wizards/document/Shape.java b/wizards/com/sun/star/wizards/document/Shape.java index 93f0606a4207..d6e03f3449b1 100644 --- a/wizards/com/sun/star/wizards/document/Shape.java +++ b/wizards/com/sun/star/wizards/document/Shape.java @@ -41,9 +41,9 @@ public class Shape protected FormHandler oFormHandler; public XServiceInfo xServiceInfo; protected Point aPoint; - protected Size aSize; + private Size aSize; protected XControlShape xControlShape; - public XMultiServiceFactory xMSF; + private XMultiServiceFactory xMSF; public XShapes xShapes; public Shape(FormHandler _oFormHandler, Point _aPoint, Size _aSize) diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java index c00263171a49..ed5a30bf9461 100644 --- a/wizards/com/sun/star/wizards/document/TimeStampControl.java +++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java @@ -34,14 +34,14 @@ import com.sun.star.drawing.XShape; public class TimeStampControl extends DatabaseControl { - DatabaseControl oDateControl; - DatabaseControl oTimeControl; - Resource oResource; - double nreldatewidth; - double nreltimewidth; - int nTimeWidth; - int nDBWidth; - int nDateWidth; + private DatabaseControl oDateControl; + private DatabaseControl oTimeControl; + private Resource oResource; + private double nreldatewidth; + private double nreltimewidth; + private int nTimeWidth; + private int nDBWidth; + private int nDateWidth; XShape xShapeGroup; public TimeStampControl(Resource _oResource, FormHandler _oFormHandler, XNameContainer _xFormName, String _curFieldName, Point _aPoint) diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java index 4f7ffb101722..f5374c142db4 100644 --- a/wizards/com/sun/star/wizards/form/FieldLinker.java +++ b/wizards/com/sun/star/wizards/form/FieldLinker.java @@ -277,7 +277,7 @@ public class FieldLinker extends DBLimitedFieldSelection CurUnoDialog.setStepEnabled(IStep.intValue(), _bdoenable); } - class ItemListenerImpl implements com.sun.star.awt.XItemListener + private class ItemListenerImpl implements com.sun.star.awt.XItemListener { public void itemStateChanged(ItemEvent EventObject) diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java index c1ed3a03db70..557814a431f6 100644 --- a/wizards/com/sun/star/wizards/form/Finalizer.java +++ b/wizards/com/sun/star/wizards/form/Finalizer.java @@ -33,11 +33,11 @@ import com.sun.star.wizards.ui.event.XTextListenerAdapter; public class Finalizer { - WizardDialog CurUnoDialog; - short curtabindex; - XRadioButton optModifyForm; - XTextComponent txtFormName; - FormDocument oFormDocument; + private WizardDialog CurUnoDialog; + private short curtabindex; + private XRadioButton optModifyForm; + private XTextComponent txtFormName; + private FormDocument oFormDocument; public Finalizer(WizardDialog _CurUnoDialog) { diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java index ef46eeb1fc1f..e39f3cfd512f 100644 --- a/wizards/com/sun/star/wizards/form/FormConfiguration.java +++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java @@ -40,17 +40,17 @@ import com.sun.star.wizards.ui.event.XItemListenerAdapter; public class FormConfiguration { - WizardDialog CurUnoDialog; - short curtabindex; - XRadioButton optOnExistingRelation; - XCheckBox chkcreateSubForm; - XRadioButton optSelectManually; - XFixedText lblRelations; - XListBox lstRelations; - String[] sreferencedTables; - CommandFieldSelection CurSubFormFieldSelection; - boolean bsupportsRelations; - RelationController oRelationController = null; + private WizardDialog CurUnoDialog; + private short curtabindex; + private XRadioButton optOnExistingRelation; + private XCheckBox chkcreateSubForm; + private XRadioButton optSelectManually; + private XFixedText lblRelations; + private XListBox lstRelations; + private String[] sreferencedTables; + private CommandFieldSelection CurSubFormFieldSelection; + private boolean bsupportsRelations; + private RelationController oRelationController = null; public FormConfiguration(WizardDialog _CurUnoDialog) { @@ -176,7 +176,7 @@ public class FormConfiguration Helper.setUnoPropertyValue(UnoDialog.getModel(optOnExistingRelation), PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bsupportsRelations && (chkcreateSubForm.getState() == 1))); } - public void toggleSteps() + private void toggleSteps() { if (chkcreateSubForm.getState() == 1) { diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java b/wizards/com/sun/star/wizards/form/FormControlArranger.java index 41c975faceff..92e42997b02d 100644 --- a/wizards/com/sun/star/wizards/form/FormControlArranger.java +++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java @@ -38,7 +38,7 @@ import com.sun.star.wizards.document.TimeStampControl; public class FormControlArranger { - public static final String LABELCONTROL = "LabelControl"; + private static final String LABELCONTROL = "LabelControl"; protected DatabaseControl[] DBControlList = null; private final XNameContainer xFormName; private final XMultiServiceFactory xMSF; diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java index 8ef1936fb883..17698c29f40c 100644 --- a/wizards/com/sun/star/wizards/form/FormDocument.java +++ b/wizards/com/sun/star/wizards/form/FormDocument.java @@ -264,7 +264,7 @@ public class FormDocument extends TextDocument } } - public ControlForm getControlFormByName(String _sname) + private ControlForm getControlFormByName(String _sname) { for (int i = 0; i < oControlForms.size(); i++) { @@ -334,16 +334,16 @@ public class FormDocument extends TextDocument public class ControlForm { - XNameContainer xFormContainer; + private XNameContainer xFormContainer; GridControl oGridControl; - FormControlArranger oFormController; - int curArrangement; - FormDocument oFormDocument; - String Name; - Point aStartPoint; + private FormControlArranger oFormController; + private int curArrangement; + private FormDocument oFormDocument; + private String Name; + private Point aStartPoint; private Size aFormSize; - CommandMetaData oDBMetaData; - XPropertySet xPropertySet; + private CommandMetaData oDBMetaData; + private XPropertySet xPropertySet; public ControlForm(FormDocument _oFormDocument, String _sname, Point _astartPoint, Size _aFormSize) { @@ -432,12 +432,12 @@ public class FormDocument extends TextDocument } } - public Size getFormSize() + private Size getFormSize() { return aFormSize; } - public void setFormSize(Size _aSize) + private void setFormSize(Size _aSize) { aFormSize = _aSize; oFormController.setFormSize(aFormSize); @@ -537,7 +537,7 @@ public class FormDocument extends TextDocument } } - public void finalizeControls() + private void finalizeControls() { Control[] oLabelControls = getLabelControls(); Control[] oDBControls = getDatabaseControls(); diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java index 5c57fe4cde6f..fe1791e6b3ae 100644 --- a/wizards/com/sun/star/wizards/form/FormWizard.java +++ b/wizards/com/sun/star/wizards/form/FormWizard.java @@ -47,7 +47,7 @@ public class FormWizard extends DatabaseObjectWizard private static String slblSelFields; private String sShowBinaryFields = PropertyNames.EMPTY_STRING; private String serrFormNameexists = PropertyNames.EMPTY_STRING; - public static final int SOMAIN_PAGE = 1; + private static final int SOMAIN_PAGE = 1; public static final int SOSUBFORM_PAGE = 2; public static final int SOSUBFORMFIELDS_PAGE = 3; public static final int SOFIELDLINKER_PAGE = 4; @@ -209,7 +209,7 @@ public class FormWizard extends DatabaseObjectWizard } } - public void buildSteps() + private void buildSteps() { curDBCommandFieldSelection = new CommandFieldSelection(this, curFormDocument.oMainFormDBMetaData, 92, slblFields, slblSelFields, slblTables, true, 34411); curDBCommandFieldSelection.addFieldSelectionListener(new FieldSelectionListener()); @@ -308,7 +308,7 @@ public class FormWizard extends DatabaseObjectWizard xDialog.endExecute(); } - public void insertFormRelatedSteps() + private void insertFormRelatedSteps() { addRoadmap(); int i = 0; @@ -370,10 +370,10 @@ public class FormWizard extends DatabaseObjectWizard serrFormNameexists = m_oResource.getResText(UIConsts.RID_FORM + 98); } - public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener + private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener { - protected int ID; + private int ID; // @Override public int getID() diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java index cfb94438e70a..4a171e022fba 100644 --- a/wizards/com/sun/star/wizards/form/StyleApplier.java +++ b/wizards/com/sun/star/wizards/form/StyleApplier.java @@ -375,7 +375,7 @@ public class StyleApplier } } - public void applyDBControlProperties(int[] _iStyleColors) + private void applyDBControlProperties(int[] _iStyleColors) { try { diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java index cd2b37ba2639..9e9e4c2f03bb 100644 --- a/wizards/com/sun/star/wizards/query/QuerySummary.java +++ b/wizards/com/sun/star/wizards/query/QuerySummary.java @@ -29,9 +29,9 @@ import com.sun.star.wizards.ui.FilterComponent; public class QuerySummary extends QueryMetaData { - static final protected int RID_QUERY = 2300; - String sSummary; - Resource oResource; + static final private int RID_QUERY = 2300; + private String sSummary; + private Resource oResource; private final String sSeparator; private final String sReturnChar; private final String sAnd; @@ -148,7 +148,7 @@ public class QuerySummary extends QueryMetaData } // TODO: How can you merge the following two methods to a single one in a smarter way?? - public String combinePartString(int _InitResID, String[] _FieldNames, int _AlternativeResID) + private String combinePartString(int _InitResID, String[] _FieldNames, int _AlternativeResID) { if (_FieldNames != null && _FieldNames.length > 0) { @@ -157,7 +157,7 @@ public class QuerySummary extends QueryMetaData return oResource.getResText(_AlternativeResID); } - protected String ArrayFieldsToString(int _InitResID, String[] _FieldNames) + private String ArrayFieldsToString(int _InitResID, String[] _FieldNames) { String sReturn = oResource.getResText(_InitResID); int FieldCount = _FieldNames.length; @@ -172,7 +172,7 @@ public class QuerySummary extends QueryMetaData return (sReturn); } - public String combinePartString(int _InitResID, String[][] _FieldNames, int _AlternativeResID, int _BaseStringID, String[] _ReplaceTags) + private String combinePartString(int _InitResID, String[][] _FieldNames, int _AlternativeResID, int _BaseStringID, String[] _ReplaceTags) { if (_FieldNames != null && _FieldNames.length > 0) { @@ -181,7 +181,7 @@ public class QuerySummary extends QueryMetaData return oResource.getResText(_AlternativeResID); } - public String ArrayFieldsToString(int _InitResID, String[][] _FieldNames, int _BaseStringID, String[] _ReplaceTags) + private String ArrayFieldsToString(int _InitResID, String[][] _FieldNames, int _BaseStringID, String[] _ReplaceTags) { String CurString = PropertyNames.EMPTY_STRING; String sReturn = oResource.getResText(_InitResID); diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java index 00c39ba84cf2..c058e4dae049 100644 --- a/wizards/com/sun/star/wizards/query/QueryWizard.java +++ b/wizards/com/sun/star/wizards/query/QueryWizard.java @@ -143,7 +143,7 @@ public class QueryWizard extends DatabaseObjectWizard return m_createdQuery; } - public void enableRoadmapItems(boolean _bEnabled) + private void enableRoadmapItems(boolean _bEnabled) { try { @@ -194,7 +194,7 @@ public class QueryWizard extends DatabaseObjectWizard } } - public void insertQueryRelatedSteps() + private void insertQueryRelatedSteps() { try { @@ -225,7 +225,7 @@ public class QueryWizard extends DatabaseObjectWizard } } - public void buildSteps() + private void buildSteps() { try { @@ -394,10 +394,10 @@ public class QueryWizard extends DatabaseObjectWizard enableRoadmapItems(bEnabled); // Note: Performancewise this could be improved } - public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener + private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener { - protected int ID; + private int ID; public int getID() { diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java index 0785ff3de2e3..5ca1f56a8844 100644 --- a/wizards/com/sun/star/wizards/report/DBColumn.java +++ b/wizards/com/sun/star/wizards/report/DBColumn.java @@ -43,25 +43,25 @@ import com.sun.star.wizards.text.TextFieldHandler; public class DBColumn { - public XCell xValCell; - public XTextRange xValTextCell; - public XTextCursor xValCellCursor; + private XCell xValCell; + private XTextRange xValTextCell; + private XTextCursor xValCellCursor; public XCell xNameCell; - public XTextRange xNameTextCell; - public boolean bAlignLeft; - public String CharFontName; - public PropertyState PropertyState; + private XTextRange xNameTextCell; + private boolean bAlignLeft; + private String CharFontName; + private PropertyState PropertyState; public int ValColumn = 1; - public int ValRow = 0; + private int ValRow = 0; public FieldColumn CurDBField; private XTextTable xTextTable; private XTableColumns xTableColumns; private XCellRange xCellRange; public XNamed xTableName; private boolean bIsGroupColumn; - RecordParser CurDBMetaData; - RecordTable CurRecordTable; - TextTableHandler oTextTableHandler; + private RecordParser CurDBMetaData; + private RecordTable CurRecordTable; + private TextTableHandler oTextTableHandler; public DBColumn(RecordTable _CurRecordTable, TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, int i, boolean _bforce) { @@ -230,7 +230,7 @@ public class DBColumn replaceValueCellofTable(_bIsLandscape); } - public void insertUserFieldToTableCell(TextFieldHandler oTextFieldHandler) + private void insertUserFieldToTableCell(TextFieldHandler oTextFieldHandler) { XTextCursor xTextCursor = TextDocument.createTextCursor(xNameCell); xTextCursor.gotoStart(false); @@ -275,7 +275,7 @@ public class DBColumn } } - public void modifyCellContent(Object CurGroupValue) + private void modifyCellContent(Object CurGroupValue) { double dblValue = 0; try @@ -327,7 +327,7 @@ public class DBColumn } } // If the parameter CurGroupValue is null the placeholders are inserted - public void replaceValueCellofTable(boolean _bIsLandscape) + private void replaceValueCellofTable(boolean _bIsLandscape) { try { diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index 92a63d65e836..329dcea92d46 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -34,10 +34,10 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi // ReportTextDocument CurReportDocument; IReportDocument CurReportDocument; - static String sProgressDBConnection; - static String sProgressDataImport; - static String sProgressTitle; - static String sStop; + private static String sProgressDBConnection; + private static String sProgressDataImport; + private static String sProgressTitle; + private static String sStop; public Dataimport(XMultiServiceFactory _xMSF) { @@ -61,7 +61,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi CurReportDocument.StopProcess(); } - public void showProgressDisplay(boolean bgetConnection) + private void showProgressDisplay(boolean bgetConnection) { try { @@ -146,7 +146,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi } } - public void importReportData(final XMultiServiceFactory _xMSF, PropertyValue[] _properties) + private void importReportData(final XMultiServiceFactory _xMSF, PropertyValue[] _properties) { if (CurReportDocument.reconnectToDatabase(_xMSF, _properties)) { diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java index cbadd8205d5a..b0dc12782476 100644 --- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java +++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java @@ -65,7 +65,7 @@ public class GroupFieldHandler extends FieldSelection } } - public boolean isGroupField(String _FieldName) + private boolean isGroupField(String _FieldName) { return (JavaTools.FieldInList(CurDBMetaData.GroupFieldNames, _FieldName) != -1); } @@ -135,7 +135,7 @@ public class GroupFieldHandler extends FieldSelection } - /* protected */ class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener + /* protected */ private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener { public void moveItemDown(String Selitem) diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index c20e9fd488b9..682c958a2f4c 100644 --- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java +++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java @@ -35,12 +35,12 @@ import com.sun.star.wizards.ui.event.XTextListenerAdapter; public class ReportFinalizer { - WizardDialog CurUnoDialog; - XTextComponent xTitleTextBox; - String StoreName; - String DefaultName; - String OldDefaultName; - IReportDocument CurReportDocument; + private WizardDialog CurUnoDialog; + private XTextComponent xTitleTextBox; + private String StoreName; + private String DefaultName; + private String OldDefaultName; + private IReportDocument CurReportDocument; public static final int SOCREATEDOCUMENT = 1; public static final int SOCREATETEMPLATE = 2; public static final int SOUSETEMPLATE = 3; diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index f092b65a1412..1431fc225355 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -36,18 +36,18 @@ import java.util.ArrayList; public class ReportLayouter { - UnoDialog CurUnoDialog; - static final int SOCONTENTLST = 29; + private UnoDialog CurUnoDialog; + private static final int SOCONTENTLST = 29; final static public int SOOPTLANDSCAPE = 30; final static public int SOOPTPORTRAIT = 31; - static final int SOLAYOUTLST = 32; - XListBox xContentListBox; - XListBox xLayoutListBox; + private static final int SOLAYOUTLST = 32; + private XListBox xContentListBox; + private XListBox xLayoutListBox; int iOldContentPos; int iOldLayoutPos; - IReportDocument CurReportDocument; - public String[][] LayoutFiles; - public String[][] ContentFiles; + private IReportDocument CurReportDocument; + private String[][] LayoutFiles; + private String[][] ContentFiles; Object aOrientationImage; private final XMultiServiceFactory m_xMSF; private XTextRange trTitleconst, trAuthorconst, trDateconst, trPageconst; @@ -365,7 +365,7 @@ public class ReportLayouter } } - public void clearConstants() + private void clearConstants() { constRangeList.clear(); trTitleconst = null; @@ -384,7 +384,7 @@ public class ReportLayouter te.write(tr); } - public List<XTextRange> searchFillInItems(int type) + private List<XTextRange> searchFillInItems(int type) { try { diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java index 3484975b985b..e3092bd959c3 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java +++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java @@ -56,14 +56,14 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen private RecordTable CurRecordTable; private String sMsgCommonReportError; private String ContentTemplatePath; - public boolean bIsCurLandscape; + private boolean bIsCurLandscape; public TextTableHandler oTextTableHandler; public TextSectionHandler oTextSectionHandler; public FormHandler oFormHandler; - public TextStyleHandler oTextStyleHandler; + private TextStyleHandler oTextStyleHandler; public TextFieldHandler oTextFieldHandler; public ViewHandler oViewHandler; - public NumberFormatter oNumberFormatter; + private NumberFormatter oNumberFormatter; public static final String TBLRECORDSECTION = "Tbl_RecordSection"; public static final String TBLGROUPSECTION = "Tbl_GroupField"; public static final String RECORDSECTION = "RecordSection"; @@ -185,7 +185,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen oFormHandler.insertHiddenControl(xNameAccess, xNamedForm, "RecordFieldNames", JavaTools.ArraytoString(CurDBMetaData.getRecordFieldNames())); } - public void getReportPageStyles() + private void getReportPageStyles() { try { @@ -228,7 +228,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } } - public boolean loadSectionsfromTemplate(String sTemplateUrl) + private boolean loadSectionsfromTemplate(String sTemplateUrl) { try { @@ -304,7 +304,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } } - public void updateTextSections(String[] SelGroupNames) + private void updateTextSections(String[] SelGroupNames) { String TableName; DBColumn OldDBColumn; @@ -322,7 +322,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } } - public void replaceFieldValueInGroupTable(DBColumn CurDBColumn, int TableIndex) + private void replaceFieldValueInGroupTable(DBColumn CurDBColumn, int TableIndex) { String TableName = TBLGROUPSECTION + (TableIndex + 1); // Note: for some reason the table might lose its name and has to be renamed therefore @@ -335,7 +335,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen CurDBColumn.setCellFont(); } - public void insertColumnstoRecordTable() + private void insertColumnstoRecordTable() { int GroupCount = CurDBMetaData.GroupFieldNames.length; DBColumn CurDBColumn; @@ -420,7 +420,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen DBColumnsVector.remove(iSelItemCount); } - public void removeGroupNamesofRecordTable(int GroupFieldCount) + private void removeGroupNamesofRecordTable(int GroupFieldCount) { int CurFieldCount = DBColumnsVector.size(); if (CurFieldCount > GroupFieldCount) @@ -432,7 +432,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } } - public void showCommonReportErrorBox(Exception exception) + private void showCommonReportErrorBox(Exception exception) { String SystemContentPath = JavaTools.convertfromURLNotation(ContentTemplatePath); String sMsgCurCommonReportError = JavaTools.replaceSubString(sMsgCommonReportError, SystemContentPath, "%PATH"); @@ -529,7 +529,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen return null; } - public static FieldColumn[] removeFieldColumnByFieldName(String _FieldName, FieldColumn[] _FieldColumns) + private static FieldColumn[] removeFieldColumnByFieldName(String _FieldName, FieldColumn[] _FieldColumns) { try { diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java index 3527d7ddd7b8..be202282f3fc 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java +++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java @@ -70,7 +70,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme * We have to remove this!!! * @return */ - ReportTextDocument getDoc() + private ReportTextDocument getDoc() { if (m_aDoc == null) { @@ -125,9 +125,9 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme { return getDoc().xWindowPeer; } - static String sMsgQueryCreationImpossible; - static String sReportFormNotExisting; - static String sMsgEndAutopilot; + private static String sMsgQueryCreationImpossible; + private static String sReportFormNotExisting; + private static String sMsgEndAutopilot; private void initialResources() { @@ -138,7 +138,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme m_resource.getResText(UIConsts.RID_DB_COMMON + 14); } - public void addTextSectionCopies() + private void addTextSectionCopies() { m_aDoc.setLayoutSectionsVisible(false); XTextCursor xTextCursor = ReportTextDocument.createTextCursor(m_aDoc.xTextDocument.getText()); @@ -454,7 +454,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme return m_aDoc.xFrame; } - public XMultiServiceFactory getDocumentServiceFactory() + private XMultiServiceFactory getDocumentServiceFactory() { return m_aDoc.xMSFDoc; } diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java index 5a68433ee2fc..708e43bdc3a6 100644 --- a/wizards/com/sun/star/wizards/report/ReportWizard.java +++ b/wizards/com/sun/star/wizards/report/ReportWizard.java @@ -53,7 +53,7 @@ import java.util.Map; public class ReportWizard extends DatabaseObjectWizard implements XTextListener { - protected FieldSelection CurGroupFieldSelection; + private FieldSelection CurGroupFieldSelection; private SortingComponent CurSortingComponent; private TitlesComponent CurTitlesComponent; private CommandFieldSelection CurDBCommandFieldSelection; @@ -302,7 +302,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener return bQueryCreated; } - public void buildSteps() + private void buildSteps() { // CurReportDocument.getDoc().xProgressBar.setValue(30); CurDBCommandFieldSelection = new CommandFieldSelection(this, m_reportDocument.getRecordParser(), 100, slblFields, slblSelFields, slblTables, true, 34330); @@ -353,7 +353,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener xDialog.endExecute(); } - public void insertQueryRelatedSteps() + private void insertQueryRelatedSteps() { setRMItemLabels(m_oResource, UIConsts.RID_QUERY + 80); addRoadmap(); @@ -523,7 +523,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener m_reportDocument.getRecordParser().dispose(); } - public boolean getReportResources(boolean bgetProgressResourcesOnly) + private boolean getReportResources(boolean bgetProgressResourcesOnly) { sMsgWizardName = super.m_oResource.getResText(UIConsts.RID_REPORT); if (!bgetProgressResourcesOnly) @@ -555,7 +555,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener return sBlindTextNote; } - public void enableRoadmapItems(boolean _bEnabled) + private void enableRoadmapItems(boolean _bEnabled) { try { @@ -637,10 +637,10 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener super.setStepEnabled(SOSORTPAGE, bdoenable); } - public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener + private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener { - protected int m_nID; + private int m_nID; public int getID() { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java index 8b0aef149f67..fc84743e0654 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java @@ -164,7 +164,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter /** * Remove all Groups */ - protected void clearGroups() + private void clearGroups() { final XGroups xGroups = getReportDefinition().getGroups(); while (xGroups.hasElements()) @@ -233,7 +233,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return nIndent; } - int m_nLeftIndent = -1; + private int m_nLeftIndent = -1; /** * Get left page indent. @@ -250,7 +250,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return m_nLeftIndent; } - int m_nRightIndent = -1; + private int m_nRightIndent = -1; /** * Get right page indent. @@ -298,7 +298,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return aUsedStyle; } - protected int getFromPageStyles(String _sStyleName, int _nDefault) + private int getFromPageStyles(String _sStyleName, int _nDefault) { int nValue = _nDefault; final XStyle xStyle = getUsedStyle("PageStyles"); @@ -311,7 +311,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return nValue; } - protected void setToPageStyles(String _sStyleName, Object _aObj) + private void setToPageStyles(String _sStyleName, Object _aObj) { final XStyle xStyle = getUsedStyle("PageStyles"); if (xStyle != null) @@ -321,7 +321,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } - int m_nPageWidth = -1; + private int m_nPageWidth = -1; /** * Get page width. The default is 21000 1/100mm what is 21cm of DIN A4. @@ -382,7 +382,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } - protected int insertGroups() + private int insertGroups() { final XGroups xGroups = getReportDefinition().getGroups(); int lastGroupPosition = -1; @@ -474,7 +474,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } - protected String getTitleFromFieldName(String _sField) + private String getTitleFromFieldName(String _sField) { for (int i = 0; i < m_aFieldNames.length; i++) { @@ -486,7 +486,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return PropertyNames.EMPTY_STRING; } - protected int getTypeFromFieldName(String _sField) + private int getTypeFromFieldName(String _sField) { for (int i = 0; i < m_aFieldNames.length; i++) { @@ -498,7 +498,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return 0; } - protected boolean listContains(String[] _aList, String _aValue) + private boolean listContains(String[] _aList, String _aValue) { for (int i = 0; i < _aList.length; i++) { @@ -517,7 +517,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter * @param _aGetResultFrom * @return */ - protected String[] getNamesWithoutGroupNames(String[] _aList, String[] _aGetResultFrom) + private String[] getNamesWithoutGroupNames(String[] _aList, String[] _aGetResultFrom) { if (_aList == null) { @@ -695,7 +695,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } - protected String convertFromFieldName(String _sName) + private String convertFromFieldName(String _sName) { if (_sName.startsWith("field:[")) { @@ -723,7 +723,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return insertFormattedField(_xSection, _sFormattedfield, _aRect, _nWidth, _aSO, (short) com.sun.star.awt.TextAlign.LEFT); } - protected Rectangle insertFormattedField(XSection _xSection, String _sFormattedfield, Rectangle _aRect, int _nWidth, SectionObject _aSO, short _nAlignment) + private Rectangle insertFormattedField(XSection _xSection, String _sFormattedfield, Rectangle _aRect, int _nWidth, SectionObject _aSO, short _nAlignment) { if (_xSection != null) { @@ -832,9 +832,9 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter getReportDefinition().setCommandType(_aType); getReportDefinition().setCommand(_sTableName); } - protected XMultiServiceFactory m_xMSF; + private XMultiServiceFactory m_xMSF; - protected XMultiServiceFactory getMSFofReportDefinition() + private XMultiServiceFactory getMSFofReportDefinition() { if (m_xMSF == null) { @@ -846,12 +846,12 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter - protected Rectangle insertHorizontalLine(XSection _xSection, Rectangle _aRect, int _nWidth, int _nHeight) + private Rectangle insertHorizontalLine(XSection _xSection, Rectangle _aRect, int _nWidth, int _nHeight) { return insertLine(_xSection, _aRect, _nWidth, _nHeight, 0); } - protected Rectangle insertLine(XSection _xSection, Rectangle _aRect, int _nWidth, int _nHeight, int _nOrientation) + private Rectangle insertLine(XSection _xSection, Rectangle _aRect, int _nWidth, int _nHeight, int _nOrientation) { if (_xSection != null) { @@ -881,7 +881,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } - protected void clearReportHeader() + private void clearReportHeader() { XSection xSection; try @@ -898,7 +898,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } - protected void insertReportHeader() + private void insertReportHeader() { if (getDesignTemplate() != null) { @@ -931,7 +931,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } - protected void clearReportFooter() + private void clearReportFooter() { XSection xSection; try @@ -948,7 +948,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } - protected void insertReportFooter() + private void insertReportFooter() { if (getDesignTemplate() != null) { @@ -982,7 +982,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } - protected void clearPageHeader() + private void clearPageHeader() { XSection xSection; try @@ -999,7 +999,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } - protected void clearPageFooter() + private void clearPageFooter() { XSection xSection; try @@ -1051,7 +1051,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter * @param _aFont * @return width of given text in 1/100mm */ - Size getPreferredSize(String _sText, FontDescriptor _aFont) + private Size getPreferredSize(String _sText, FontDescriptor _aFont) { Size aSizeMM_100TH = new Size(0, 0); try @@ -1098,7 +1098,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return aSizeMM_100TH; } - protected String getTableName() + private String getTableName() { if (m_sTableName != null) { @@ -1107,7 +1107,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return PropertyNames.EMPTY_STRING; } - protected String getUserNameFromConfiguration() + private String getUserNameFromConfiguration() { String sFirstName = PropertyNames.EMPTY_STRING; String sLastName = PropertyNames.EMPTY_STRING; @@ -1200,7 +1200,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } - protected void insertPageHeader() + private void insertPageHeader() { if (getDesignTemplate() != null) { @@ -1301,7 +1301,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } - protected void insertPageFooter() + private void insertPageFooter() { if (getDesignTemplate() != null) { @@ -1395,13 +1395,13 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter { return m_aResource; } - protected int m_aCommandType; // Table or Query - protected String m_sTableName; - protected String[] m_aGroupNames; - protected String[] m_aFieldNames; - protected String[] m_aFieldTitleNames; - protected int[] m_aFieldWidths; - protected int[] m_aFieldTypes; + private int m_aCommandType; // Table or Query + private String m_sTableName; + private String[] m_aGroupNames; + private String[] m_aFieldNames; + private String[] m_aFieldTitleNames; + private int[] m_aFieldWidths; + private int[] m_aFieldTypes; private DesignTemplate m_xDesignTemplate = null; public void initializeData(IReportBuilderLayouter _aOther) @@ -1460,14 +1460,14 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter * @param _sLabel * @return the width in 1/100mm */ - protected int getLabelWidth(String _sLabel) + private int getLabelWidth(String _sLabel) { return getLabelWidth(_sLabel, 0.0f, 0.0f); } - XFixedText m_aFixedTextHelper = null; - HashMap<String, Integer> m_aLabelWidthMap; + private XFixedText m_aFixedTextHelper = null; + private HashMap<String, Integer> m_aLabelWidthMap; - protected int getLabelWidth(String _sLabel, FontDescriptor _aFD) + private int getLabelWidth(String _sLabel, FontDescriptor _aFD) { float fCharWeight = 0.0f; float fCharHeight = 0.0f; @@ -1479,7 +1479,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return getLabelWidth(_sLabel, fCharWeight, fCharHeight); } - protected int getLabelWidth(String _sLabel, float _nCharWeight, float _nCharHeight) + private int getLabelWidth(String _sLabel, float _nCharWeight, float _nCharHeight) { int nWidth = 0; diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java index b00d24cb01a7..8ee85ffc4d8b 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java @@ -23,7 +23,7 @@ import com.sun.star.report.XFixedText; public class SectionLabel extends SectionObject { - protected SectionLabel(XFixedText _aFixedText) + private SectionLabel(XFixedText _aFixedText) { m_aParentObject = _aFixedText; } diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java index de2d1cd4aded..c6d3887cccaf 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java @@ -25,7 +25,7 @@ abstract public class SectionObject { Object m_aParentObject; // this could be FixedText or FormattedField or null - PropertySetHelper m_aPropertySetHelper; + private PropertySetHelper m_aPropertySetHelper; public SectionObject() { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java index fae7d9a2fe37..46a42a0bd2a9 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java @@ -23,7 +23,7 @@ import com.sun.star.report.XFormattedField; public class SectionTextField extends SectionObject { - protected SectionTextField(XFormattedField _aFormattedField) + private SectionTextField(XFormattedField _aFormattedField) { m_aParentObject = _aFormattedField; // We would like to know, what properties are in this object. diff --git a/wizards/com/sun/star/wizards/table/CGCategory.java b/wizards/com/sun/star/wizards/table/CGCategory.java index d2b649afc383..5c2c3ad00412 100644 --- a/wizards/com/sun/star/wizards/table/CGCategory.java +++ b/wizards/com/sun/star/wizards/table/CGCategory.java @@ -31,10 +31,10 @@ public class CGCategory { private static final String CGROOTPATH = "/org.openoffice.Office.TableWizard/TableWizard/"; - XMultiServiceFactory xMSF; + private XMultiServiceFactory xMSF; XNameAccess xNameAccessTablesNode; - XNameAccess xNameAccessCurBusinessNode; - Object oconfigView; + private XNameAccess xNameAccessCurBusinessNode; + private Object oconfigView; public CGCategory(XMultiServiceFactory _xMSF) { diff --git a/wizards/com/sun/star/wizards/table/CGTable.java b/wizards/com/sun/star/wizards/table/CGTable.java index b6c8d1bb34f8..0d4d8e0ad8b2 100644 --- a/wizards/com/sun/star/wizards/table/CGTable.java +++ b/wizards/com/sun/star/wizards/table/CGTable.java @@ -26,9 +26,9 @@ import com.sun.star.wizards.common.PropertyNames; public class CGTable { - XMultiServiceFactory xMSF; + private XMultiServiceFactory xMSF; XNameAccess xNameAccessFieldsNode; - XNameAccess xNameAccessTableNode; + private XNameAccess xNameAccessTableNode; public CGTable(XMultiServiceFactory _xMSF) { diff --git a/wizards/com/sun/star/wizards/table/FieldDescription.java b/wizards/com/sun/star/wizards/table/FieldDescription.java index 3979199c5787..2128a760eabe 100644 --- a/wizards/com/sun/star/wizards/table/FieldDescription.java +++ b/wizards/com/sun/star/wizards/table/FieldDescription.java @@ -106,7 +106,7 @@ public class FieldDescription return bexists; } - public void setFieldProperties(XNameAccess _xNameAccessFieldNode) + private void setFieldProperties(XNameAccess _xNameAccessFieldNode) { try { diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index 42d118616fca..97dcf3b70e2c 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -41,18 +41,18 @@ import com.sun.star.wizards.ui.event.XTextListenerAdapter; public class FieldFormatter implements XItemListener { - TableWizard CurUnoDialog; - TableDescriptor curTableDescriptor; - Object oColumnDescriptorModel; - XTextComponent txtfieldname; - XListBox xlstFieldNames; - XButton btnplus; - XButton btnminus; - XButton btnShiftUp; - XButton btnShiftDown; + private TableWizard CurUnoDialog; + private TableDescriptor curTableDescriptor; + private Object oColumnDescriptorModel; + private XTextComponent txtfieldname; + private XListBox xlstFieldNames; + private XButton btnplus; + private XButton btnminus; + private XButton btnShiftUp; + private XButton btnShiftDown; short curtabindex; String suntitled; - Integer IFieldFormatStep; + private Integer IFieldFormatStep; public FieldFormatter(TableWizard _CurUnoDialog) { @@ -235,7 +235,7 @@ public class FieldFormatter implements XItemListener CurUnoDialog.setFocus("lstfieldnames"); } - public void toggleButtons() + private void toggleButtons() { boolean benableShiftUpButton = false; boolean benableShiftDownButton = false; @@ -321,7 +321,7 @@ public class FieldFormatter implements XItemListener CurUnoDialog.repaintDialogStep(); } - public void modifyFieldName() + private void modifyFieldName() { String newfieldname = txtfieldname.getText(); String oldfieldname = xlstFieldNames.getSelectedItem(); @@ -379,7 +379,7 @@ public class FieldFormatter implements XItemListener toggleButtons(); } - public String[] shiftArrayItem(String[] _slist, int _oldindex, int _shiftcount) + private String[] shiftArrayItem(String[] _slist, int _oldindex, int _shiftcount) { int newindex = _oldindex + _shiftcount; if ((newindex >= 0) && (newindex < _slist.length)) diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java index 1e5832ffe1f2..5e83129b5636 100644 --- a/wizards/com/sun/star/wizards/table/Finalizer.java +++ b/wizards/com/sun/star/wizards/table/Finalizer.java @@ -32,15 +32,15 @@ import com.sun.star.wizards.ui.event.XTextListenerAdapter; public class Finalizer { - TableWizard CurUnoDialog; - short curtabindex; - XRadioButton optModifyTable; - XRadioButton optWorkWithTable; - XTextComponent txtTableName; - XListBox xCatalogListBox; - XListBox xSchemaListBox; - TableDescriptor curtabledescriptor; - public static int WORKWITHTABLEMODE = 0; + private TableWizard CurUnoDialog; + private short curtabindex; + private XRadioButton optModifyTable; + private XRadioButton optWorkWithTable; + private XTextComponent txtTableName; + private XListBox xCatalogListBox; + private XListBox xSchemaListBox; + private TableDescriptor curtabledescriptor; + private static int WORKWITHTABLEMODE = 0; public static int MODIFYTABLEMODE = 1; public static int STARTFORMWIZARDMODE = 2; @@ -296,7 +296,7 @@ public class Finalizer return curtabledescriptor.getComposedTableName(scatalogname, sschemaname, _stablename); } - public void setTableName(String _tablename) + private void setTableName(String _tablename) { if (txtTableName.getText().equals(PropertyNames.EMPTY_STRING)) { diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index 77bad43d6ec1..99958fa72587 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -45,8 +45,8 @@ import com.sun.star.wizards.ui.event.XItemListenerAdapter; */ public class ScenarioSelector extends FieldSelection implements XItemListener, XFieldSelectionListener { - final static int PRIVATE = 0; - final static int BUSINESS = 1; + private final static int PRIVATE = 0; + private final static int BUSINESS = 1; private final XRadioButton optBusiness; private XListBox xTableListBox; @@ -171,7 +171,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X } } - public void initializeCategory(int _iCategory) + private void initializeCategory(int _iCategory) { try { @@ -187,7 +187,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X } } - public void initializeTable(int _iTable) + private void initializeTable(int _iTable) { Helper.setUnoPropertyValue(UnoDialog.getModel(xTableListBox), PropertyNames.SELECTED_ITEMS, new short[] { @@ -293,7 +293,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X public void disposing(EventObject arg0) { } - protected int ID; + private int ID; public int getID() { diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java index 8ece17c023e8..20af479290c6 100644 --- a/wizards/com/sun/star/wizards/table/TableWizard.java +++ b/wizards/com/sun/star/wizards/table/TableWizard.java @@ -38,19 +38,19 @@ import com.sun.star.wizards.ui.*; public class TableWizard extends DatabaseObjectWizard implements XTextListener { - static String slblFields; - static String slblSelFields; - Finalizer curFinalizer; - ScenarioSelector curScenarioSelector; - FieldFormatter curFieldFormatter; - PrimaryKeyHandler curPrimaryKeyHandler; + private static String slblFields; + private static String slblSelFields; + private Finalizer curFinalizer; + private ScenarioSelector curScenarioSelector; + private FieldFormatter curFieldFormatter; + private PrimaryKeyHandler curPrimaryKeyHandler; public HashMap<String, FieldDescription> fielditems; int wizardmode; String tablename; String serrToManyFields; String serrTableNameexists; String scomposedtablename; - TableDescriptor curTableDescriptor; + private TableDescriptor curTableDescriptor; public static final int SOMAINPAGE = 1; public static final int SOFIELDSFORMATPAGE = 2; public static final int SOPRIMARYKEYPAGE = 3; @@ -231,7 +231,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener } } */ - public void buildSteps() + private void buildSteps() { curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields); curFieldFormatter = new FieldFormatter(this); @@ -243,7 +243,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener enableNavigationButtons(false, false, false); } - public boolean createTable() + private boolean createTable() { boolean bIsSuccessfull = true; boolean bTableCreated = false; @@ -334,7 +334,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener xDialog.endExecute(); } - public void insertFormRelatedSteps() + private void insertFormRelatedSteps() { addRoadmap(); int i = 0; @@ -378,7 +378,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener return PropertyNames.EMPTY_STRING; } - public boolean getTableResources() + private boolean getTableResources() { super.m_oResource.getResText(UIConsts.RID_TABLE + 1); slblFields = m_oResource.getResText(UIConsts.RID_TABLE + 19); diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java index ecb490739be6..ea14f14d98b5 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.java +++ b/wizards/com/sun/star/wizards/text/TextDocument.java @@ -78,7 +78,7 @@ public class TextDocument private final String m_identifier; - protected final String getIdentifier() + private final String getIdentifier() { return m_identifier; } @@ -178,7 +178,7 @@ public class TextDocument xProgressBar.setValue(5); } - public XTextDocument loadAsPreview(String sDefaultTemplate, boolean asTemplate) + private XTextDocument loadAsPreview(String sDefaultTemplate, boolean asTemplate) { PropertyValue loadValues[] = new PropertyValue[3]; // open document in the Preview mode @@ -227,7 +227,7 @@ public class TextDocument } - public Size getPageSize() + private Size getPageSize() { try { diff --git a/wizards/com/sun/star/wizards/text/TextFieldHandler.java b/wizards/com/sun/star/wizards/text/TextFieldHandler.java index 28e0ef9e9aae..da43b3d883cc 100644 --- a/wizards/com/sun/star/wizards/text/TextFieldHandler.java +++ b/wizards/com/sun/star/wizards/text/TextFieldHandler.java @@ -45,7 +45,7 @@ import com.sun.star.wizards.common.PropertyNames; public class TextFieldHandler { - public XTextFieldsSupplier xTextFieldsSupplier; + private XTextFieldsSupplier xTextFieldsSupplier; private final XMultiServiceFactory xMSFDoc; /** @@ -57,7 +57,7 @@ public class TextFieldHandler xTextFieldsSupplier = UnoRuntime.queryInterface(XTextFieldsSupplier.class, xTextDocument); } - public void refreshTextFields() + private void refreshTextFields() { XRefreshable xUp = UnoRuntime.queryInterface(XRefreshable.class, xTextFieldsSupplier.getTextFields()); xUp.refresh(); @@ -111,7 +111,7 @@ public class TextFieldHandler } } - public XPropertySet createUserField(String FieldName, String FieldTitle) throws com.sun.star.uno.Exception + private XPropertySet createUserField(String FieldName, String FieldTitle) throws com.sun.star.uno.Exception { Object oMaster = xMSFDoc.createInstance("com.sun.star.text.FieldMaster.User"); XPropertySet xPSet = UnoRuntime.queryInterface(XPropertySet.class, oMaster); diff --git a/wizards/com/sun/star/wizards/text/TextSectionHandler.java b/wizards/com/sun/star/wizards/text/TextSectionHandler.java index 527e705486c5..14348b455674 100644 --- a/wizards/com/sun/star/wizards/text/TextSectionHandler.java +++ b/wizards/com/sun/star/wizards/text/TextSectionHandler.java @@ -84,7 +84,7 @@ public class TextSectionHandler } } - public void removeTextSection(Object _oTextSection) + private void removeTextSection(Object _oTextSection) { try { @@ -180,7 +180,7 @@ public class TextSectionHandler } } - public void linkSectiontoTemplate(Object oTextSection, String TemplateName, String SectionName) + private void linkSectiontoTemplate(Object oTextSection, String TemplateName, String SectionName) { SectionFileLink oSectionLink = new SectionFileLink(); oSectionLink.FileURL = TemplateName; @@ -220,7 +220,7 @@ public class TextSectionHandler } } - public void insertTextSection(String sectionName, String templateName, XTextCursor position) + private void insertTextSection(String sectionName, String templateName, XTextCursor position) { try { diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java index 94f7da83424e..74e8966392c6 100644 --- a/wizards/com/sun/star/wizards/text/TextTableHandler.java +++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java @@ -42,7 +42,7 @@ public class TextTableHandler { public XTextTablesSupplier xTextTablesSupplier; - public XTextDocument xTextDocument; + private XTextDocument xTextDocument; private NumberFormatter oNumberFormatter; /** Creates a new instance of TextTableHandler */ @@ -136,7 +136,7 @@ public class TextTableHandler } } - public void removeTextTable(Object oTextTable) + private void removeTextTable(Object oTextTable) { try { diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 458868357952..10aa56b4e42b 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -37,23 +37,23 @@ import com.sun.star.wizards.db.QueryMetaData; public class AggregateComponent extends ControlScroller { - String[] sFunctions; - String[] sFunctionOperators = new String[] + private String[] sFunctions; + private String[] sFunctionOperators = new String[] { "SUM", "AVG", "MIN", "MAX" }; - QueryMetaData CurDBMetaData; - String soptDetailQuery; - String soptSummaryQuery; - String slblAggregate; - String slblFieldNames; - String sDuplicateAggregateFunction; - int Count; - static final int SOADDROW = 1; - static final int SOREMOVEROW = 2; - ArrayList<ControlRow> ControlRowVector; - int curHelpID; - int lastHelpIndex; + private QueryMetaData CurDBMetaData; + private String soptDetailQuery; + private String soptSummaryQuery; + private String slblAggregate; + private String slblFieldNames; + private String sDuplicateAggregateFunction; + private int Count; + private static final int SOADDROW = 1; + private static final int SOREMOVEROW = 2; + private ArrayList<ControlRow> ControlRowVector; + private int curHelpID; + private int lastHelpIndex; /** Creates a new instance of AggrgateComponent */ public AggregateComponent(WizardDialog _CurUnoDialog, QueryMetaData _CurDBMetaData, int _iStep, int _iPosX, int _iPosY, int _iWidth, int _uitextfieldcount, int _firstHelpID) @@ -133,7 +133,7 @@ public class AggregateComponent extends ControlScroller } } - public int getQueryType() + private int getQueryType() { if (((Short) CurUnoDialog.getControlProperty("optDetailQuery", PropertyNames.PROPERTY_STATE)).intValue() == 1) { @@ -145,7 +145,7 @@ public class AggregateComponent extends ControlScroller } } - class ActionListenerImpl implements com.sun.star.awt.XActionListener + private class ActionListenerImpl implements com.sun.star.awt.XActionListener { public void disposing(EventObject eventObject) @@ -216,7 +216,7 @@ public class AggregateComponent extends ControlScroller } } - protected void addRow() + private void addRow() { int fieldcount = super.getTotalFieldCount(); registerControlGroupAtIndex(fieldcount); @@ -238,7 +238,7 @@ public class AggregateComponent extends ControlScroller CurUnoDialog.repaintDialogStep(); } - protected void removeRow() + private void removeRow() { int fieldcount = super.getTotalFieldCount(); if (fieldcount > 0) @@ -258,7 +258,7 @@ public class AggregateComponent extends ControlScroller CurUnoDialog.repaintDialogStep(); } - protected void toggleButtons() + private void toggleButtons() { ControlRow curcontrolrow = null; boolean biscomplete = true; @@ -274,7 +274,7 @@ public class AggregateComponent extends ControlScroller togglefollowingDialogSteps(); } - public void toggleComponent() + private void toggleComponent() { CurDBMetaData.Type = getQueryType(); boolean benableComponent = isAggregateComponentEnabled(); @@ -490,14 +490,14 @@ public class AggregateComponent extends ControlScroller } } - protected class ControlRow + private class ControlRow { private XListBox xFieldListBox; private XListBox xFunctionListBox; private int index; - protected ControlRow(int _index, int ypos, int _curHelpID) + private ControlRow(int _index, int ypos, int _curHelpID) { try { @@ -553,7 +553,7 @@ public class AggregateComponent extends ControlScroller UnoDialog.deselectListBox(xFunctionListBox); } - protected class ItemListenerImpl implements com.sun.star.awt.XItemListener + private class ItemListenerImpl implements com.sun.star.awt.XItemListener { public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject) diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index 3ae9bc8832f5..6fab9de4a712 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -65,7 +65,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener public int helpURL = 0; private IImageRenderer renderer; private ListModel listModel; - public IRenderer counterRenderer = new SimpleCounterRenderer(); + private IRenderer counterRenderer = new SimpleCounterRenderer(); private final static int LINE_HEIGHT = 8; /** Getter for property m_aButtonSize. @@ -420,7 +420,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener return gap; } - public ListModel getListModel() + private ListModel getListModel() { return listModel; } @@ -485,7 +485,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener step = short1; } - public void setPageStart(int i) + private void setPageStart(int i) { if (i == pageStart) { @@ -614,12 +614,12 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener } } - public static class Counter + private static class Counter { - public int start, end, max; + private int start, end, max; - public Counter(int start_, int end_, int max_) + private Counter(int start_, int end_, int max_) { start = start_; end = end_; diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java index 54797e3e3b7d..59bd1c770644 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -43,7 +43,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< private final WizardDialog oWizardDialog; private Collator aCollator = null; - class ItemListenerImpl implements com.sun.star.awt.XItemListener + private class ItemListenerImpl implements com.sun.star.awt.XItemListener { public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject) @@ -133,7 +133,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< /** * @return Returns the sQueryPrefix. */ - public String getQueryPrefix() + private String getQueryPrefix() { if (sQueryPrefix == null) { @@ -161,7 +161,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< /** * @return Returns the sTablePrefix. */ - public String getTablePrefix() + private String getTablePrefix() { if (sTablePrefix == null) { @@ -188,7 +188,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< } } - public void fillUpFieldsListbox() + private void fillUpFieldsListbox() { try { @@ -318,7 +318,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< toggleCommandListBox(bdoenable); } - public void toggleCommandListBox(boolean _bdoenable) + private void toggleCommandListBox(boolean _bdoenable) { Helper.setUnoPropertyValue(UnoDialog.getModel(xTableListBox), PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(_bdoenable)); Helper.setUnoPropertyValue(UnoDialog.getModel(xlblTable), PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(_bdoenable)); @@ -374,7 +374,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< } } - public void preselectCommand(String _selitem, int _nCommandType, boolean _bReadOnly) + private void preselectCommand(String _selitem, int _nCommandType, boolean _bReadOnly) { if (_selitem.length() > 0) { diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index afa33bf9e1c5..ed2afa0d38dc 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -28,28 +28,28 @@ public abstract class ControlScroller protected WizardDialog CurUnoDialog; protected int ncurfieldcount; - protected int nblockincrement; + private int nblockincrement; private int nlineincrement; - protected int nscrollvalue = 0; - protected int ntotfieldcount; - XScrollBar xScrollBar; - protected ArrayList<PropertyValue[]> scrollfields; + private int nscrollvalue = 0; + private int ntotfieldcount; + private XScrollBar xScrollBar; + private ArrayList<PropertyValue[]> scrollfields; protected int iCompPosX; protected int iCompPosY; protected int iCompWidth; protected int iCompHeight; - protected int iStartPosY; + private int iStartPosY; protected short curtabindex; - int iStep; + private int iStep; protected Integer IStep; - protected int linedistance; + private int linedistance; int iScrollBarWidth = 10; - int SORELFIRSTPOSY = 3; + private int SORELFIRSTPOSY = 3; protected int curHelpIndex; - String sIncSuffix; + private String sIncSuffix; protected ArrayList<Object> ControlGroupVector = new ArrayList<Object>(); - class AdjustmentListenerImpl implements com.sun.star.awt.XAdjustmentListener + private class AdjustmentListenerImpl implements com.sun.star.awt.XAdjustmentListener { public void disposing(com.sun.star.lang.EventObject eventObject) @@ -150,7 +150,7 @@ public abstract class ControlScroller } } - protected void fillupControls(boolean binitialize) + private void fillupControls(boolean binitialize) { for (int a = 0; a < this.nblockincrement; a++) { @@ -169,7 +169,7 @@ public abstract class ControlScroller } } - protected void fillupControls(int guiRow) + private void fillupControls(int guiRow) { PropertyValue[] nameProps = scrollfields.get(guiRow); PropertyValue[] valueProps = scrollfields.get(guiRow + nscrollvalue); @@ -186,7 +186,7 @@ public abstract class ControlScroller } } - protected void setScrollValue(int _nscrollvalue) + private void setScrollValue(int _nscrollvalue) { if (_nscrollvalue >= 0) { @@ -297,7 +297,7 @@ public abstract class ControlScroller } } - protected void scrollRowsInfo() + private void scrollRowsInfo() { int cols = scrollfields.size() > 0 @@ -320,7 +320,7 @@ public abstract class ControlScroller * @return the propertyValue object corresponding to * this control. */ - protected PropertyValue fieldInfo(int guiRow, int column) + private PropertyValue fieldInfo(int guiRow, int column) { if (guiRow + nscrollvalue < scrollfields.size()) { @@ -334,7 +334,7 @@ public abstract class ControlScroller } } - protected PropertyValue fieldInfo(PropertyValue valueProp, PropertyValue nameProp) + private PropertyValue fieldInfo(PropertyValue valueProp, PropertyValue nameProp) { if (CurUnoDialog.getDlgNameAccess().hasByName(nameProp.Name)) { @@ -370,7 +370,7 @@ public abstract class ControlScroller - protected void setControlData(String controlname, Object newvalue) + private void setControlData(String controlname, Object newvalue) { Object oControlModel = UnoDialog.getModel(CurUnoDialog.xDlgContainer.getControl(controlname)); String propertyname = UnoDialog.getDisplayProperty(oControlModel); @@ -380,7 +380,7 @@ public abstract class ControlScroller } } - protected Object getControlData(String controlname) + private Object getControlData(String controlname) { Object oControlModel = UnoDialog.getModel(CurUnoDialog.xDlgContainer.getControl(controlname)); String propertyname = UnoDialog.getDisplayProperty(oControlModel); diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java index 3282282636db..b134b77715f6 100644 --- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java @@ -30,14 +30,14 @@ public abstract class DBLimitedFieldSelection { protected WizardDialog CurUnoDialog; - protected String sNoField; + private String sNoField; protected Integer IStep; protected static final int rowcount = 4; - protected static final int MAXSELINDEX = rowcount - 1; + private static final int MAXSELINDEX = rowcount - 1; protected short curtabindex; protected int iCurPosY; protected int FirstHelpIndex; - protected int iCompPosX; + private int iCompPosX; public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int _iCompPosX, int iCompPosY, int _FirstHelpIndex) { diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index 62cfbf051fd0..f20007434f60 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -34,8 +34,8 @@ public class FieldSelection protected boolean AppendMode = false; protected Integer IStep; - protected int CompPosY; - protected int CompHeight; + private int CompPosY; + private int CompHeight; private XFieldSelectionListener xFieldSelection; private int maxfieldcount = 10000000; @@ -54,7 +54,7 @@ public class FieldSelection private final static int SOSELFLDSLST = 8; - class ItemListenerImpl implements com.sun.star.awt.XItemListener + private class ItemListenerImpl implements com.sun.star.awt.XItemListener { public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject) @@ -79,7 +79,7 @@ public class FieldSelection } } - class ActionListenerImpl implements com.sun.star.awt.XActionListener + private class ActionListenerImpl implements com.sun.star.awt.XActionListener { public void disposing(com.sun.star.lang.EventObject eventObject) @@ -557,7 +557,7 @@ public class FieldSelection } } - public void deselectFields(boolean bMoveAll) + private void deselectFields(boolean bMoveAll) { String SearchString; short iOldFieldSelected = xFieldsListBox.getSelectedItemPos(); diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 7ffab7e89439..3543c18639b9 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -59,46 +59,46 @@ public class FilterComponent private final String slblFieldNames; private final String slblOperators; private final String slblValue; - WizardDialog CurUnoDialog; + private WizardDialog CurUnoDialog; private static final int BaseID = 2300; private final String sIncSuffix; private final ControlRow[] oControlRows; private final String sDuplicateCondition; - static final int SOOPTORMODE = 100; - static final int SOOPTANDMODE = 101; - QueryMetaData oQueryMetaData; - int iDateFormat; - int iTimeFormat; + private static final int SOOPTORMODE = 100; + private static final int SOOPTANDMODE = 101; + private QueryMetaData oQueryMetaData; + private int iDateFormat; + private int iTimeFormat; private PropertyValue[][] filterconditions; private short curtabindex; - static final int SO_FIRSTFIELDNAME = 1; - static final int SO_SECONDFIELDNAME = 2; - static final int SO_THIRDFIELDNAME = 3; - static final int SO_FOURTHFIELDNAME = 4; - int[] SO_FIELDNAMELIST = new int[] + private static final int SO_FIRSTFIELDNAME = 1; + private static final int SO_SECONDFIELDNAME = 2; + private static final int SO_THIRDFIELDNAME = 3; + private static final int SO_FOURTHFIELDNAME = 4; + private int[] SO_FIELDNAMELIST = new int[] { SO_FIRSTFIELDNAME, SO_SECONDFIELDNAME, SO_THIRDFIELDNAME, SO_FOURTHFIELDNAME }; - static final int SO_FIRSTCONDITION = 5; - static final int SO_SECONDCONDITION = 6; - static final int SO_THIRDCONDITION = 7; - static final int SO_FOURTHCONDITION = 8; - int[] SO_CONDITIONLIST = new int[] + private static final int SO_FIRSTCONDITION = 5; + private static final int SO_SECONDCONDITION = 6; + private static final int SO_THIRDCONDITION = 7; + private static final int SO_FOURTHCONDITION = 8; + private int[] SO_CONDITIONLIST = new int[] { SO_FIRSTCONDITION, SO_SECONDCONDITION, SO_THIRDCONDITION, SO_FOURTHCONDITION }; - static final int SO_FIRSTTEXTFIELD = 1; - static final int SO_SECONDTEXTFIELD = 2; - static final int SO_THIRDTEXTFIELD = 3; - static final int SO_FOURTHTEXTFIELD = 4; - int[] SO_TEXTFIELDLIST = new int[] + private static final int SO_FIRSTTEXTFIELD = 1; + private static final int SO_SECONDTEXTFIELD = 2; + private static final int SO_THIRDTEXTFIELD = 3; + private static final int SO_FOURTHTEXTFIELD = 4; + private int[] SO_TEXTFIELDLIST = new int[] { SO_FIRSTTEXTFIELD, SO_SECONDTEXTFIELD, SO_THIRDTEXTFIELD, SO_FOURTHTEXTFIELD }; - static final int SO_FIRSTBOOLFIELDNAME = 256 + 1; - static final int SO_SECONDBOOLFIELDNAME = 256 + 2; - static final int SO_THIRDBOOLFIELDNAME = 256 + 3; - static final int SO_FOURTHBOOLFIELDNAME = 256 + 4; + private static final int SO_FIRSTBOOLFIELDNAME = 256 + 1; + private static final int SO_SECONDBOOLFIELDNAME = 256 + 2; + private static final int SO_THIRDBOOLFIELDNAME = 256 + 3; + private static final int SO_FOURTHBOOLFIELDNAME = 256 + 4; int SOI_MATCHALL = 0; int SOI_MATCHANY = 1; int curHelpID; @@ -173,7 +173,7 @@ public class FilterComponent } - public static String getIndexNumber(String _sStr) + private static String getIndexNumber(String _sStr) { return _sStr.substring(_sStr.length() - 1, _sStr.length()); } @@ -499,17 +499,17 @@ public class FilterComponent - final class ControlRow + private final class ControlRow { private final static int SOLSTFIELDNAME = 3; private final static int SOLSTOPERATOR = 4; private final static int SOTXTVALUE = 5; - protected XInterface[] ControlElements = new XInterface[6]; + private XInterface[] ControlElements = new XInterface[6]; private boolean m_bEnabled; - String[] FieldNames; + private String[] FieldNames; - protected ControlRow(int iCompPosX, int iCompPosY, int Index, boolean _bEnabled, int _firstRowHelpID) + private ControlRow(int iCompPosX, int iCompPosY, int Index, boolean _bEnabled, int _firstRowHelpID) { int nFieldWidth = 71; int nOperatorWidth = 70; @@ -693,7 +693,7 @@ public class FilterComponent * @return true if the current condition is complete, all needed fields are filled with values. * So we can enable the next. */ - boolean isConditionComplete() + private boolean isConditionComplete() { try { @@ -737,7 +737,7 @@ public class FilterComponent } } - protected void setCondition(PropertyValue _filtercondition) + private void setCondition(PropertyValue _filtercondition) { try { @@ -807,13 +807,13 @@ public class FilterComponent } } - protected void setFieldNames(String[] _FieldNames) + private void setFieldNames(String[] _FieldNames) { Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOLSTFIELDNAME]), PropertyNames.STRING_ITEM_LIST, _FieldNames); FieldNames = _FieldNames; } - protected boolean isEnabled() + private boolean isEnabled() { return m_bEnabled; } @@ -860,7 +860,7 @@ public class FilterComponent } } - protected String getSelectedFieldName() + private String getSelectedFieldName() { try { @@ -876,7 +876,7 @@ public class FilterComponent // TODO: check if it is really useful to match the indices of the listbox the API constants // =, <>, <, >, <=, >=, like, !like, is null, !is null - protected short getSelectedOperator() + private short getSelectedOperator() { try { @@ -915,7 +915,7 @@ public class FilterComponent } // TODO make a difference between Text and Numbers - protected Object getValue() + private Object getValue() { return (Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue")); } diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java index b25ebe6a6a1f..0250f2e6f816 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.java +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java @@ -33,9 +33,9 @@ public class PeerConfig implements XWindowListener { private final ArrayList<PeerTask> m_aPeerTasks = new ArrayList<PeerTask>(); - ArrayList<ControlTask> aControlTasks = new ArrayList<ControlTask>(); - ArrayList<ImageUrlTask> aImageUrlTasks = new ArrayList<ImageUrlTask>(); - UnoDialog oUnoDialog = null; + private ArrayList<ControlTask> aControlTasks = new ArrayList<ControlTask>(); + private ArrayList<ImageUrlTask> aImageUrlTasks = new ArrayList<ImageUrlTask>(); + private UnoDialog oUnoDialog = null; public PeerConfig(UnoDialog _oUnoDialog) { @@ -46,9 +46,9 @@ public class PeerConfig implements XWindowListener class PeerTask { - XControl xControl; - String[] propnames; - Object[] propvalues; + private XControl xControl; + private String[] propnames; + private Object[] propvalues; public PeerTask(XControl _xControl, String[] propNames_, Object[] propValues_) { @@ -159,7 +159,7 @@ public class PeerConfig implements XWindowListener - public void setPeerProperties(XControl _xControl, String[] propnames, Object[] propvalues) + private void setPeerProperties(XControl _xControl, String[] propnames, Object[] propvalues) { PeerTask oPeerTask = new PeerTask(_xControl, propnames, propvalues); this.m_aPeerTasks.add(oPeerTask); diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index 587c38d451fc..a15f3a78ce20 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -27,23 +27,23 @@ import java.util.ArrayList; public class SortingComponent { - WizardDialog CurUnoDialog; - int MaxSortIndex = -1; - static String sNoSorting; - static String sSortCriteriaisduplicate; - static String[] sSortHeader = new String[4]; - static String[] sSortAscend = new String[4]; - static String[] sSortDescend = new String[4]; - public int MAXSORTCRITERIAINDEX = 3; - static final int SOFIRSTSORTLST = 0; - static final int SOSECSORTLST = 1; - static final int SOTHIRDSORTLST = 2; - static final int SOFOURTHSORTLST = 3; - static final int[] SOSORTLST = new int[] + private WizardDialog CurUnoDialog; + private int MaxSortIndex = -1; + private static String sNoSorting; + private static String sSortCriteriaisduplicate; + private static String[] sSortHeader = new String[4]; + private static String[] sSortAscend = new String[4]; + private static String[] sSortDescend = new String[4]; + private int MAXSORTCRITERIAINDEX = 3; + private static final int SOFIRSTSORTLST = 0; + private static final int SOSECSORTLST = 1; + private static final int SOTHIRDSORTLST = 2; + private static final int SOFOURTHSORTLST = 3; + private static final int[] SOSORTLST = new int[] { SOFIRSTSORTLST, SOSECSORTLST, SOTHIRDSORTLST, SOFOURTHSORTLST }; - XListBox[] xSortListBox = new XListBox[4]; + private XListBox[] xSortListBox = new XListBox[4]; class ItemListenerImpl implements com.sun.star.awt.XItemListener { @@ -191,7 +191,7 @@ public class SortingComponent * sets the controls of a Sorting criterion to readonly or not. * @param _index index of the Sorting criterion */ - public void setReadOnly(int _index, boolean _breadonly) + private void setReadOnly(int _index, boolean _breadonly) { CurUnoDialog.setControlProperty("lstSort" + Integer.toString(_index + 1), PropertyNames.READ_ONLY, Boolean.valueOf(_breadonly)); } diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java index 7fc279c778f8..1041568fb26e 100644 --- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java +++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java @@ -29,13 +29,13 @@ import java.util.*; public class TitlesComponent extends ControlScroller { - int iLabelPosX; - static final int iRelLabelPosXDist = 6; - public String[] fieldnames; - public Map<String, String> fieldtitleset; - public String[] fieldtitles; - static final String SOLABELPREFIX = "lblColumnName_"; - static final String SOTITLEPREFIX = "lblTitleName_"; + private int iLabelPosX; + private static final int iRelLabelPosXDist = 6; + private String[] fieldnames; + private Map<String, String> fieldtitleset; + private String[] fieldtitles; + private static final String SOLABELPREFIX = "lblColumnName_"; + private static final String SOTITLEPREFIX = "lblTitleName_"; public TitlesComponent(WizardDialog _CurUnoDialog, int _iStep, int _iCompPosX, int _iCompPosY, int _iCompWidth, int _uitextfieldcount, String _slblColumnNames, String _slblColumnTitles, int _firsthelpindex) { @@ -86,7 +86,7 @@ public class TitlesComponent extends ControlScroller class ControlRow { - XTextComponent xTextComponent; + private XTextComponent xTextComponent; public ControlRow(int _index, int _iCompPosY) { diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index d9ccac6fd77d..0690c72478db 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -36,7 +36,7 @@ public class UnoDialog public XMultiServiceFactory xMSF; public XMultiServiceFactory MSFDialogModel; - public XNameContainer xDlgNames; + private XNameContainer xDlgNames; public XControlContainer xDlgContainer; private XNameAccess m_xDlgNameAccess; public XControl xControl; @@ -45,8 +45,8 @@ public class UnoDialog public XWindow xWindow; public XComponent xComponent; public XInterface xDialogModel; - public XInterface xUnoDialog; - public XVclWindowPeer xVclWindowPeer; + private XInterface xUnoDialog; + private XVclWindowPeer xVclWindowPeer; public HashMap<String, Integer> ControlList; public Resource m_oResource; public XWindowPeer xWindowPeer = null; @@ -98,7 +98,7 @@ public class UnoDialog return iKey; } - public void createPeerConfiguration() + private void createPeerConfiguration() { m_oPeerConfig = new PeerConfig(this); } @@ -316,7 +316,7 @@ public class UnoDialog return insertEditField("com.sun.star.awt.UnoControlFormattedFieldModel", sName, iControlKey, xTextListener, sProperties, sValues); } - public XTextComponent insertEditField(String ServiceName, String sName, int iControlKey, XTextListener xTextListener, String[] sProperties, Object[] sValues) + private XTextComponent insertEditField(String ServiceName, String sName, int iControlKey, XTextListener xTextListener, String[] sProperties, Object[] sValues) { try { @@ -626,7 +626,7 @@ public class UnoDialog setEnabled(control, enabled ? Boolean.TRUE : Boolean.FALSE); } - public static void setEnabled(Object control, Boolean enabled) + private static void setEnabled(Object control, Boolean enabled) { Helper.setUnoPropertyValue(getModel(control), PropertyNames.PROPERTY_ENABLED, enabled); } @@ -635,7 +635,7 @@ public class UnoDialog * @param oControlModel the model of a control * @return the LabelType according to UIConsts.CONTROLTYPE */ - public static int getControlModelType(Object oControlModel) + private static int getControlModelType(Object oControlModel) { XServiceInfo xServiceInfo = UnoRuntime.queryInterface(XServiceInfo.class, oControlModel); if (xServiceInfo.supportsService("com.sun.star.awt.UnoControlFixedTextModel")) @@ -729,7 +729,7 @@ public class UnoDialog * @param itype The type of the control conforming to UIConst.ControlType * @return the name of the property that contains the value of a controlmodel */ - public static String getDisplayProperty(int itype) + private static String getDisplayProperty(int itype) { switch (itype) { @@ -783,7 +783,7 @@ public class UnoDialog } private Boolean BisHighContrastModeActivated = null; - public boolean isHighContrastModeActivated() + private boolean isHighContrastModeActivated() { if (xVclWindowPeer != null) { @@ -819,20 +819,20 @@ public class UnoDialog } } - public static int getRedColorShare(int _nColor) + private static int getRedColorShare(int _nColor) { int nRed = _nColor / 65536; return nRed; } - public static int getGreenColorShare(int _nColor) + private static int getGreenColorShare(int _nColor) { int nRedModulo = _nColor % 65536; int nGreen = nRedModulo / 256; return nGreen; } - public static int getBlueColorShare(int _nColor) + private static int getBlueColorShare(int _nColor) { int nRedModulo = _nColor % 65536; int nGreenModulo = (nRedModulo % 256); diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java b/wizards/com/sun/star/wizards/ui/UnoDialog2.java index 59fa0bc5a456..0e70598e696f 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java @@ -114,7 +114,7 @@ public class UnoDialog2 extends UnoDialog return (XTextComponent) insertEditField(sName, textListener, "com.sun.star.awt.UnoControlEditModel", sPropNames, oPropValues, XTextComponent.class); } - public XControl insertImage(String sName, String[] sPropNames, Object[] oPropValues) + private XControl insertImage(String sName, String[] sPropNames, Object[] oPropValues) { return (XControl) insertControlModel2("com.sun.star.awt.UnoControlImageControlModel", sName, sPropNames, oPropValues, XControl.class); } @@ -160,7 +160,7 @@ public class UnoDialog2 extends UnoDialog - public Object insertControlModel2(String serviceName, String componentName, String[] sPropNames, Object[] oPropValues) + private Object insertControlModel2(String serviceName, String componentName, String[] sPropNames, Object[] oPropValues) { try { @@ -179,7 +179,7 @@ public class UnoDialog2 extends UnoDialog return xDlgContainer.getControl(componentName); } - public Object insertControlModel2(String serviceName, String componentName, String[] sPropNames, Object[] oPropValues, Class<? extends XInterface> type) + private Object insertControlModel2(String serviceName, String componentName, String[] sPropNames, Object[] oPropValues, Class<? extends XInterface> type) { return UnoRuntime.queryInterface(type, insertControlModel2(serviceName, componentName, sPropNames, oPropValues)); } diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index bd2b896880b4..3218daed72d1 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -51,8 +51,8 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL private int nNewStep = 1; private int nOldStep = 1; private int nMaxStep = 1; - XItemEventBroadcaster xRoadmapBroadcaster; - String[] sRMItemLabels; + private XItemEventBroadcaster xRoadmapBroadcaster; + private String[] sRMItemLabels; private Object oRoadmap; private XSingleServiceFactory xSSFRoadmap; public XIndexContainer xIndexContRoadmap; @@ -82,7 +82,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL return oWizardResource; } - public void activate() + private void activate() { try { @@ -146,7 +146,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL Helper.setUnoPropertyValue(oRoadmap, "Complete", Boolean.valueOf(bComplete)); } - public boolean isRoadmapComplete() + private boolean isRoadmapComplete() { try { @@ -171,7 +171,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL } } - public int getCurrentRoadmapItemID() + private int getCurrentRoadmapItemID() { try { @@ -350,7 +350,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL abstract protected void enterStep(int nOldStep, int nNewStep); - protected void changeToStep(int nNewStep) + private void changeToStep(int nNewStep) { Helper.setUnoPropertyValue(xDialogModel, PropertyNames.PROPERTY_STEP, Integer.valueOf(nNewStep)); setCurrentRoadmapItemID((short) (nNewStep)); @@ -509,7 +509,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL enableFinishButton(_bEnableFinish); } - public void enableBackButton(boolean enabled) + private void enableBackButton(boolean enabled) { setControlProperty("btnWizardBack", PropertyNames.PROPERTY_ENABLED, enabled ? Boolean.TRUE : Boolean.FALSE); } @@ -553,7 +553,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL } } - public boolean isStepEnabled(int _nStep) + private boolean isStepEnabled(int _nStep) { try { @@ -599,7 +599,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL } //TODO discuss with rp - protected int getNextAvailableStep() + private int getNextAvailableStep() { if (isRoadmapComplete()) { @@ -702,12 +702,12 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL xDialog.endExecute(); } - protected void callHelp() + private void callHelp() { //should be overridden by extending class } - public void removeTerminateListener() + private void removeTerminateListener() { if (bTerminateListenermustberemoved) { diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java index 5b9ad62a537f..cc34373f04ee 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java @@ -38,12 +38,12 @@ public abstract class DataAware { /** * this is the data object. */ - protected Object dataObject; + private Object dataObject; /** * A Value Object knows how to get/set a value * from/to the data object. */ - protected Value value; + private Value value; /** * creates a DataAware object for the given data object and Value object. @@ -58,7 +58,7 @@ public abstract class DataAware { /** * returns the data object. */ - public Object getDataObject() { + private Object getDataObject() { return dataObject; } @@ -69,7 +69,7 @@ public abstract class DataAware { * another kind of Data is needed. * @param newValue the new value to set to the DataObject. */ - protected void setToData(Object newValue) { + private void setToData(Object newValue) { value.set(newValue,getDataObject()); } @@ -79,7 +79,7 @@ public abstract class DataAware { * the value object. * @return the current value of the data object. */ - protected Object getFromData() { + private Object getFromData() { return value.get(getDataObject()); } @@ -99,7 +99,7 @@ public abstract class DataAware { * enables * @param currentValue */ - protected void enableControls(Object currentValue) { + private void enableControls(Object currentValue) { } /** @@ -126,7 +126,7 @@ public abstract class DataAware { * @param b second object to compare. * @return true if both are null or both are equal. */ - protected boolean equals(Object a, Object b) { + private boolean equals(Object a, Object b) { if (a == null && b == null) return true; if (a == null || b == null) diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java index 6d0135aaf468..839b43100938 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java @@ -266,7 +266,7 @@ public abstract class OfficeDocument * * @return An {@code Iterator} of {@code EmbeddedObject} objects. */ - public Iterator<EmbeddedObject> getEmbeddedObjects() { + private Iterator<EmbeddedObject> getEmbeddedObjects() { if (embeddedObjects == null && manifestDoc != null) { embeddedObjects = new HashMap<String, EmbeddedObject>(); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java index 3b880083f7d5..c9ff20591314 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java @@ -112,7 +112,7 @@ public class ColumnStyle extends Style implements Cloneable { * * @param colWidth The width of this column. */ - public void setColWidth(int colWidth) { + private void setColWidth(int colWidth) { this.colWidth = colWidth; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java index 84514bedd2d1..68a62b620fd5 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java @@ -188,7 +188,7 @@ public class Format implements Cloneable { * * @return The formatting category of the object. */ - public String getCategory() { + private String getCategory() { return category; } @@ -197,7 +197,7 @@ public class Format implements Cloneable { * * @return The value of the formula. */ - public String getValue() { + private String getValue() { return value; } @@ -225,7 +225,7 @@ public class Format implements Cloneable { * * @return {@code Format} specifier for this category. */ - public String getFormatSpecifier() { + private String getFormatSpecifier() { return formatSpecifier; } @@ -243,7 +243,7 @@ public class Format implements Cloneable { * * @return Number of decimal places. */ - public int getDecimalPlaces() { + private int getDecimalPlaces() { return decimalPlaces; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java index 051236d4fe4d..b243794b3c5e 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java @@ -78,7 +78,7 @@ public class NameDefinition implements OfficeConstants { * * @return the name which identifies the definition. */ - public String getName() { + private String getName() { return name; } @@ -96,7 +96,7 @@ public class NameDefinition implements OfficeConstants { * * @return the definition. */ - public String getDefinition() { + private String getDefinition() { return definition; } @@ -105,7 +105,7 @@ public class NameDefinition implements OfficeConstants { * * @return the base cell address. */ - public String getBaseCellAddress() { + private String getBaseCellAddress() { return baseCellAddress; } @@ -114,7 +114,7 @@ public class NameDefinition implements OfficeConstants { * * @return whether or not this name definition is of type expression. */ - public boolean isExpressionType() { + private boolean isExpressionType() { return expressionType; } @@ -123,7 +123,7 @@ public class NameDefinition implements OfficeConstants { * * @return whether or not this name definition is of type range. */ - public boolean isRangeType() { + private boolean isRangeType() { return rangeType; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java index 97bf0c9a0884..5b0446a61ac7 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java @@ -113,7 +113,7 @@ public class RowStyle extends Style implements Cloneable { * * @param RowHeight The height of this row. */ - public void setRowHeight(int RowHeight) { + private void setRowHeight(int RowHeight) { this.rowHeight = RowHeight; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java index d3ce082bc925..8f6603a458ac 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java @@ -205,7 +205,7 @@ public class SheetSettings implements OfficeConstants { * * @return the name of the worksheet. */ - public String getSheetName() { + private String getSheetName() { return sheetName; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java index cae4e7667f53..0352ee714a6a 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java @@ -126,7 +126,7 @@ public final class PluginFactoryImpl extends PluginFactory * * @return The file extension of a {@code Document}. */ - public String getDeviceFileExtension() { + private String getDeviceFileExtension() { Class<? extends PluginFactoryImpl> c = this.getClass(); InputStream is = c.getResourceAsStream("XsltPlugin.properties"); Properties props = new Properties(); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java index 8ab83be1c4ae..a8501f8b9fa9 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java @@ -43,7 +43,7 @@ public class TwipsConverter { * * @return {@code int} containing the converted value. */ - public static int cm2twips(float value) { + private static int cm2twips(float value) { int twips = (int) ((value/2.54)*1440); return twips; } @@ -55,7 +55,7 @@ public class TwipsConverter { * * @return {@code int} containing the converted value. */ - public static int inches2twips(float value) { + private static int inches2twips(float value) { return (int) (value*1440); } |