diff options
| author | Noel Grandin <noel@peralex.com> | 2014-08-08 11:36:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-08-13 08:49:22 +0200 |
| commit | da677dfd59c2b551f3335ee0a5d5dfb33f9869c5 (patch) | |
| tree | 9aa09066c95935117bf405b119ed9f89f448a54d | |
| parent | 14d1a11ec4a7ed0deeac522403248536e8d23f57 (diff) | |
java: reduce scope, make fields private
found by UCDetector
Change-Id: I7f97e15667159cf8ee776e8f32fdcdec8ec00ed6
228 files changed, 894 insertions, 894 deletions
diff --git a/bean/com/sun/star/beans/JavaWindowPeerFake.java b/bean/com/sun/star/beans/JavaWindowPeerFake.java index 5356a13883fb..a30fb146cd1d 100644 --- a/bean/com/sun/star/beans/JavaWindowPeerFake.java +++ b/bean/com/sun/star/beans/JavaWindowPeerFake.java @@ -27,8 +27,8 @@ import com.sun.star.awt.*; implements XSystemDependentWindowPeer, XWindowPeer { - protected long hWindow; - protected int localSystemType; + private long hWindow; + private int localSystemType; /** Create the faked window peer. * @param _hWindow the system handle to the window. diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java index afeb89e0fd38..290c53e8727a 100644 --- a/bean/com/sun/star/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/beans/LocalOfficeWindow.java @@ -260,8 +260,8 @@ public class LocalOfficeWindow */ class CallWatchThread extends Thread { - Thread aWatchedThread; - long nTimeout; + private Thread aWatchedThread; + private long nTimeout; private CallWatchThread( long nTimeout ) { diff --git a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java index 7bcfa7ada7ff..24679934cf33 100644 --- a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java +++ b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java @@ -28,8 +28,8 @@ import com.sun.star.awt.*; class JavaWindowPeerFake implements XSystemDependentWindowPeer, XWindowPeer { - protected int localSystemType; - protected Any wrappedHandle; + private int localSystemType; + private Any wrappedHandle; /** Create the faked window peer. * @param _hWindow the system handle to the window. diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index f9e5d50cd3e1..9fb9452d8610 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -729,8 +729,8 @@ public class LocalOfficeConnection class StreamProcessor extends Thread { - java.io.InputStream m_in; - java.io.PrintStream m_print; + private java.io.InputStream m_in; + private java.io.PrintStream m_print; private StreamProcessor(final java.io.InputStream in, final java.io.PrintStream out) { diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index 5e5e933fcebe..b81517355313 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -40,9 +40,9 @@ public class OOoBean java.io.Externalizable { // timeout values (milli secs) - int nOOoStartTimeOut = 60000; - int nOOoCallTimeOut = 3000; - int nOOoCheckCycle = 1000; + private int nOOoStartTimeOut = 60000; + private int nOOoCallTimeOut = 3000; + private int nOOoCheckCycle = 1000; // This member contains the connection to an OOo instance if established. private transient OfficeConnection iConnection; diff --git a/bean/qa/complex/bean/ScreenComparer.java b/bean/qa/complex/bean/ScreenComparer.java index a5e7d1db97e1..164e302f8002 100644 --- a/bean/qa/complex/bean/ScreenComparer.java +++ b/bean/qa/complex/bean/ScreenComparer.java @@ -28,12 +28,12 @@ import javax.imageio.ImageIO; class ScreenComparer { - Rectangle m_rect; - BufferedImage m_img1; - BufferedImage m_img2; - BufferedImage m_imgDiff; + private Rectangle m_rect; + private BufferedImage m_img1; + private BufferedImage m_img2; + private BufferedImage m_imgDiff; - int m_diffColor; + private int m_diffColor; public ScreenComparer(int x, int y, int width, int height) { this(new Rectangle(x, y, width, height)); diff --git a/bean/qa/complex/bean/WriterFrame.java b/bean/qa/complex/bean/WriterFrame.java index 82448ef74bf8..e4700445d8bf 100644 --- a/bean/qa/complex/bean/WriterFrame.java +++ b/bean/qa/complex/bean/WriterFrame.java @@ -29,7 +29,7 @@ import com.sun.star.uno.UnoRuntime; class WriterFrame extends java.awt.Frame { - com.sun.star.comp.beans.OOoBean m_bean; + private com.sun.star.comp.beans.OOoBean m_bean; private final static String m_sDocURL = "private:factory/swriter"; /** diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java index ba8eb10b6caa..74f7c4a880dd 100644 --- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java +++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java @@ -50,18 +50,18 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler NativeLibraryLoader.loadLibrary(JNI_proxy.class.getClassLoader(), "java_uno"); } - protected static ClassLoader s_classloader = + private static ClassLoader s_classloader = JNI_proxy.class.getClassLoader(); - protected static Class s_InvocationHandler [] = + private static Class s_InvocationHandler [] = new Class [] { java.lang.reflect.InvocationHandler.class }; - protected long m_bridge_handle; - protected IEnvironment m_java_env; - protected long m_receiver_handle; - protected long m_td_handle; - protected Type m_type; - protected String m_oid; - protected Class m_class; + private long m_bridge_handle; + private IEnvironment m_java_env; + private long m_receiver_handle; + private long m_td_handle; + private Type m_type; + private String m_oid; + private Class m_class; public static String get_stack_trace( Throwable throwable ) diff --git a/cli_ure/qa/climaker/ClimakerTestCase.java b/cli_ure/qa/climaker/ClimakerTestCase.java index d04412054a97..5285ad4a1b70 100644 --- a/cli_ure/qa/climaker/ClimakerTestCase.java +++ b/cli_ure/qa/climaker/ClimakerTestCase.java @@ -69,7 +69,7 @@ public class ClimakerTestCase 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/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java index db71e8679b96..fd9a6b5b90bc 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java @@ -72,7 +72,7 @@ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{ public class FileSync implements FileAccess.FileSync { - NativeOutputStreamHelper os; + private NativeOutputStreamHelper os; private FileSync(NativeOutputStreamHelper _os) { os = _os; diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java index de22fc41922c..281c9b173d6d 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java @@ -27,8 +27,8 @@ package com.sun.star.sdbcx.comp.hsqldb; public class StorageNativeOutputStream { static { NativeLibraries.load(); } - String name; - Object key; + private String name; + private Object key; /** Creates a new instance of StorageNativeOutputStream */ public StorageNativeOutputStream(String _name,Object _key) { diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java b/connectivity/qa/connectivity/tools/AbstractDatabase.java index 4e048e08ca61..78cdf43a9dfc 100644 --- a/connectivity/qa/connectivity/tools/AbstractDatabase.java +++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java @@ -203,5 +203,5 @@ public abstract class AbstractDatabase implements DatabaseAccess // the data source belonging to the database document protected DataSource m_dataSource; // the default connection - protected Connection m_connection; + private Connection m_connection; } diff --git a/connectivity/qa/connectivity/tools/FlatFileDatabase.java b/connectivity/qa/connectivity/tools/FlatFileDatabase.java index f3fddff77849..31f263a1196b 100644 --- a/connectivity/qa/connectivity/tools/FlatFileDatabase.java +++ b/connectivity/qa/connectivity/tools/FlatFileDatabase.java @@ -88,6 +88,6 @@ class FlatFileDatabase extends AbstractDatabase storable.storeAsURL( m_databaseDocumentFile, new PropertyValue[] { } ); } - final String m_urlSubScheme; - File m_tableFileLocation = null; + private final String m_urlSubScheme; + private File m_tableFileLocation = null; } diff --git a/connectivity/qa/connectivity/tools/QueryDefinition.java b/connectivity/qa/connectivity/tools/QueryDefinition.java index ee224633c801..ab5fe513988f 100644 --- a/connectivity/qa/connectivity/tools/QueryDefinition.java +++ b/connectivity/qa/connectivity/tools/QueryDefinition.java @@ -26,7 +26,7 @@ import com.sun.star.lang.IllegalArgumentException; public class QueryDefinition { - XPropertySet m_queryDef; + private XPropertySet m_queryDef; public QueryDefinition( XPropertySet _queryDef ) { diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java index f4870f55d8c4..5bb494b025df 100644 --- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java +++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java @@ -92,7 +92,7 @@ public class CopyTableWizard extends CRMBasedTestCase class CopyThread implements Runnable { - final XCopyTableWizard copyWizard; + private final XCopyTableWizard copyWizard; private CopyThread(final XCopyTableWizard copyWizard) { diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java index f36a3220da8b..a506f516f6f0 100644 --- a/dbaccess/qa/complex/dbaccess/RowSet.java +++ b/dbaccess/qa/complex/dbaccess/RowSet.java @@ -73,9 +73,9 @@ public class RowSet extends TestCase class ResultSetMovementStress implements Runnable { - XResultSet m_resultSet; - XRow m_row; - int m_id; + private XResultSet m_resultSet; + private XRow m_row; + private int m_id; private ResultSetMovementStress(XResultSet _resultSet, int _id) throws java.lang.Exception { diff --git a/dbaccess/qa/complex/dbaccess/RowSetEventListener.java b/dbaccess/qa/complex/dbaccess/RowSetEventListener.java index 1cec08c7f457..991dfb7af784 100644 --- a/dbaccess/qa/complex/dbaccess/RowSetEventListener.java +++ b/dbaccess/qa/complex/dbaccess/RowSetEventListener.java @@ -36,8 +36,8 @@ public final class RowSetEventListener implements XRowSetApproveListener,XRowSet public static final int ROW_COUNT = 7; public static final int IS_ROW_COUNT_FINAL = 8; - int callPos = 1; - int calling []; + private int callPos = 1; + private int calling []; RowSetEventListener(){ calling = new int [9]; diff --git a/filter/qa/complex/filter/detection/typeDetection/Helper.java b/filter/qa/complex/filter/detection/typeDetection/Helper.java index bef8f74ffd12..65ae91bf86f3 100644 --- a/filter/qa/complex/filter/detection/typeDetection/Helper.java +++ b/filter/qa/complex/filter/detection/typeDetection/Helper.java @@ -50,17 +50,17 @@ public class Helper { * @member m_param the test parameters */ - LogWriter m_log = null; + private LogWriter m_log = null; - String m_sTestDocPath = null; + private String m_sTestDocPath = null; - ArrayList<ArrayList<String>> m_vFiles = null; + private ArrayList<ArrayList<String>> m_vFiles = null; - HashMap<String,String> m_hFileURLs = new HashMap<String,String>(); + private HashMap<String,String> m_hFileURLs = new HashMap<String,String>(); - HashMap<String,String> m_hFileTypes = new HashMap<String,String>(); + private HashMap<String,String> m_hFileTypes = new HashMap<String,String>(); - TestParameters m_param = null; + private TestParameters m_param = null; /** * construct a new instance of this class diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java b/forms/qa/complex/forms/CheckOGroupBoxModel.java index e20a394d252c..a1a983c47f19 100644 --- a/forms/qa/complex/forms/CheckOGroupBoxModel.java +++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java @@ -163,7 +163,7 @@ public class CheckOGroupBoxModel public class MyChangeListener implements XPropertiesChangeListener { - boolean propertiesChanged = false; + private boolean propertiesChanged = false; public void propertiesChange(PropertyChangeEvent[] e) { diff --git a/framework/qa/complex/framework/recovery/CrashThread.java b/framework/qa/complex/framework/recovery/CrashThread.java index 56af134c039b..437b1309605c 100644 --- a/framework/qa/complex/framework/recovery/CrashThread.java +++ b/framework/qa/complex/framework/recovery/CrashThread.java @@ -33,8 +33,8 @@ import com.sun.star.util.XURLTransformer; * is nopt longer available. */ public class CrashThread extends Thread { - public XComponent xDoc = null; - public XMultiServiceFactory msf = null; + private XComponent xDoc = null; + private XMultiServiceFactory msf = null; public CrashThread(XComponent xDoc, XMultiServiceFactory msf) { this.xDoc = xDoc; diff --git a/framework/qa/complex/imageManager/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java index e1051d28ab56..3e1dddf9378c 100644 --- a/framework/qa/complex/imageManager/_XComponent.java +++ b/framework/qa/complex/imageManager/_XComponent.java @@ -38,19 +38,19 @@ import lib.TestParameters; */ public class _XComponent { - public static XComponent oObj = null; + private static XComponent oObj = null; private XComponent altDispose = null; - TestParameters tEnv = null; - boolean listenerDisposed[] = new boolean[2]; - String[] Loutput = new String[2]; + private TestParameters tEnv = null; + private boolean listenerDisposed[] = new boolean[2]; + private String[] Loutput = new String[2]; /** * Listener which added but not removed, and its method must be called * on <code>dispose</code> call. */ public class MyEventListener implements XEventListener { - int number = 0; - String message = null; + private int number = 0; + private String message = null; private MyEventListener(int number, String message) { this.message = message; this.number = number; @@ -61,8 +61,8 @@ public class _XComponent { } } - XEventListener listener1 = new MyEventListener(0, "EV1"); - XEventListener listener2 = new MyEventListener(1, "EV2"); + private XEventListener listener1 = new MyEventListener(0, "EV1"); + private XEventListener listener2 = new MyEventListener(1, "EV2"); public _XComponent(TestParameters tEnv, XComponent oObj) { this.tEnv = tEnv; @@ -115,7 +115,7 @@ public class _XComponent { return true; } // finished _removeEventListener() - static boolean disposed = false; + private static boolean disposed = false; /** * Disposes the object and then check appropriate listeners were diff --git a/framework/qa/complex/imageManager/_XImageManager.java b/framework/qa/complex/imageManager/_XImageManager.java index 6fa6a59433ad..12a3da817654 100644 --- a/framework/qa/complex/imageManager/_XImageManager.java +++ b/framework/qa/complex/imageManager/_XImageManager.java @@ -28,10 +28,10 @@ import lib.TestParameters; */ public class _XImageManager { - TestParameters tEnv = null; - String[]imageNames = null; - XGraphic[] xGraphicArray = null; - public XImageManager oObj; + private TestParameters tEnv = null; + private String[]imageNames = null; + private XGraphic[] xGraphicArray = null; + private XImageManager oObj; public _XImageManager( TestParameters tEnv, XImageManager oObj) { diff --git a/framework/qa/complex/imageManager/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java index c0d625f73fe3..fce31d4a3835 100644 --- a/framework/qa/complex/imageManager/_XInitialization.java +++ b/framework/qa/complex/imageManager/_XInitialization.java @@ -40,8 +40,8 @@ import lib.TestParameters; public class _XInitialization { - TestParameters tEnv = null; - public static XInitialization oObj = null; + private TestParameters tEnv = null; + private static XInitialization oObj = null; public _XInitialization(TestParameters tEnv, XInitialization oObj) { diff --git a/framework/qa/complex/imageManager/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java index dffbe0e9b7e1..1f45f9a3492b 100644 --- a/framework/qa/complex/imageManager/_XTypeProvider.java +++ b/framework/qa/complex/imageManager/_XTypeProvider.java @@ -37,9 +37,9 @@ import lib.TestParameters; public class _XTypeProvider { - TestParameters tEnv = null; - public static XTypeProvider oObj = null; - public static Type[] types = null; + private TestParameters tEnv = null; + private static XTypeProvider oObj = null; + private static Type[] types = null; public _XTypeProvider(TestParameters tEnv, XTypeProvider oObj) { diff --git a/framework/qa/complex/imageManager/_XUIConfiguration.java b/framework/qa/complex/imageManager/_XUIConfiguration.java index bee3a42fffbf..fa05dc07f47e 100644 --- a/framework/qa/complex/imageManager/_XUIConfiguration.java +++ b/framework/qa/complex/imageManager/_XUIConfiguration.java @@ -28,9 +28,9 @@ import lib.TestParameters; public class _XUIConfiguration { - TestParameters tEnv = null; - public XUIConfiguration oObj; - XUIConfigurationListenerImpl xListener = null; + private TestParameters tEnv = null; + private XUIConfiguration oObj; + private XUIConfigurationListenerImpl xListener = null; public static interface XUIConfigurationListenerImpl extends XUIConfigurationListener { diff --git a/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java b/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java index a887aafd1f64..aa00c59b57c7 100644 --- a/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java +++ b/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java @@ -27,8 +27,8 @@ import lib.TestParameters; public class _XUIConfigurationPersistence { - TestParameters tEnv = null; - public XUIConfigurationPersistence oObj; + private TestParameters tEnv = null; + private XUIConfigurationPersistence oObj; private XStorage xStore = null; public _XUIConfigurationPersistence(TestParameters tEnv, XUIConfigurationPersistence oObj) { diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java index 3107fa8deff1..5482b180cd88 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java @@ -41,28 +41,28 @@ import net.adaptivebox.space.*; public class DEPSAgent implements ILibEngine { //Describes the problem to be solved - protected ProblemEncoder problemEncoder; + private ProblemEncoder problemEncoder; //Forms the goodness landscape - protected IGoodnessCompareEngine qualityComparator; + private IGoodnessCompareEngine qualityComparator; //store the point that generated in current learning cycle - protected SearchPoint trailPoint; + private SearchPoint trailPoint; //temp variable private AbsGTBehavior selectGTBehavior; //The referred library - protected Library socialLib; + private Library socialLib; //the own memory: store the point that generated in old learning cycle - protected BasicPoint pold_t; + private BasicPoint pold_t; //the own memory: store the point that generated in last learning cycle - protected BasicPoint pcurrent_t; + private BasicPoint pcurrent_t; //the own memory: store the personal best point - protected SearchPoint pbest_t; + private SearchPoint pbest_t; //Generate-and-test Behaviors - protected DEGTBehavior deGTBehavior; - protected PSGTBehavior psGTBehavior; + private DEGTBehavior deGTBehavior; + private PSGTBehavior psGTBehavior; public double switchP = 0.5; public void setLibrary(Library lib) { diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java index 3c1a12a0be9b..b215c348e3f4 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java @@ -40,12 +40,12 @@ import net.adaptivebox.problem.*; import net.adaptivebox.space.*; public class DEGTBehavior extends AbsGTBehavior implements ILibEngine { - public int DVNum = 2; //Number of differential vectors, normally be 1 or 2 + private int DVNum = 2; //Number of differential vectors, normally be 1 or 2 public double FACTOR = 0.5; //scale constant: (0, 1.2], normally be 0.5 public double CR = 0.9; //crossover constant: [0, 1], normally be 0.1 or 0.9 //the own memory: store the point that generated in last learning cycle - protected SearchPoint pbest_t; + private SearchPoint pbest_t; public void setPbest(SearchPoint pbest) { pbest_t = pbest; diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java index 68c3270adb79..19f1971f6c0c 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java @@ -71,11 +71,11 @@ public class PSGTBehavior extends AbsGTBehavior { public double CL=0; //See ref[4], normally be 0.001~0.005 //the own memory: store the point that generated in old learning cycle - protected BasicPoint pold_t; + private BasicPoint pold_t; //the own memory: store the point that generated in last learning cycle - protected BasicPoint pcurrent_t; + private BasicPoint pcurrent_t; //the own memory: store the personal best point - protected SearchPoint pbest_t; + private SearchPoint pbest_t; public void setMemPoints(SearchPoint pbest, BasicPoint pcurrent, BasicPoint pold) { pcurrent_t = pcurrent; diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java index ad44df1dc2d2..8fba6038e8b7 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java @@ -27,7 +27,7 @@ package net.adaptivebox.encode; public class EvalStruct { // The information for evaluating all the responses - public EvalElement[] evalElems = null; + private EvalElement[] evalElems = null; public EvalStruct(int elemsNum) { evalElems = new EvalElement[elemsNum]; diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java index eb2045765594..c94812edf5ce 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java @@ -30,7 +30,7 @@ import net.adaptivebox.problem.*; public class Library { private SearchPoint[] libPoints = new SearchPoint[0]; - protected int gIndex = -1; + private int gIndex = -1; public Library(SearchPoint[] points){ this.libPoints = points; diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java index 2e91e65cde51..5bbd88a26a45 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java @@ -33,14 +33,14 @@ import net.adaptivebox.knowledge.*; public abstract class ProblemEncoder { //Store the calculated results for the responses - double[] tempResponseSet; //temp values - double[] tempLocation; //temp values + private double[] tempResponseSet; //temp values + private double[] tempLocation; //temp values //the search space (S) - protected DesignSpace designSpace = null; + private DesignSpace designSpace = null; // For evaluate the response vector into encoded vector double[2] - protected EvalStruct evalStruct = null; + private EvalStruct evalStruct = null; protected ProblemEncoder(int paramNum, int targetNum) throws Exception { designSpace = new DesignSpace(paramNum); diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java index 910270e9e2da..80be5148c8f2 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java @@ -48,16 +48,16 @@ public class SCAgent { private IGoodnessCompareEngine specComparator; //the coefficients of SCAgent - protected int TaoB = 2; + private int TaoB = 2; //The early version set TaoW as the size of external library (NL), but 4 is often enough - protected int TaoW = 4; + private int TaoW = 4; //The referred external library - protected Library externalLib; + private Library externalLib; //store the point that generated in current learning cycle - protected SearchPoint trailPoint; + private SearchPoint trailPoint; //the own memory: store the point that generated in last learning cycle - protected SearchPoint pcurrent_t; + private SearchPoint pcurrent_t; public void setExternalLib(Library lib) { externalLib = lib; diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java index a10a82eecb7b..a1a9cf29faea 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java @@ -61,11 +61,11 @@ public abstract class BaseEvolutionarySolver extends BaseNLPSolver { } protected class Variable { - protected CellMap CellMap; - protected int OriginalVariable; - protected double MinValue; - protected double MaxValue; - protected double Granularity; + private CellMap CellMap; + private int OriginalVariable; + private double MinValue; + private double MaxValue; + private double Granularity; private Variable(CellMap cellMap, int originalVariable) { this.CellMap = cellMap; @@ -152,19 +152,19 @@ public abstract class BaseEvolutionarySolver extends BaseNLPSolver { protected double m_toleratedMin; protected double m_toleratedMax; - protected ArrayList<Variable> m_variables = new ArrayList<Variable>(); + private ArrayList<Variable> m_variables = new ArrayList<Variable>(); //properties protected PropertyInfo<Integer> m_swarmSize = new PropertyInfo<Integer>("SwarmSize", 70, "Size of Swam"); protected PropertyInfo<Integer> m_librarySize = new PropertyInfo<Integer>("LibrarySize", 210, "Size of Library"); protected PropertyInfo<Integer> m_learningCycles = new PropertyInfo<Integer>("LearningCycles", 2000, "Learning Cycles"); - protected PropertyInfo<Boolean> m_guessVariableRange = new PropertyInfo<Boolean>("GuessVariableRange", true, "Variable Bounds Guessing"); - protected PropertyInfo<Double> m_variableRangeThreshold = new PropertyInfo<Double>("VariableRangeThreshold", 3.0, "Variable Bounds Threshold (when guessing)"); //to approximate the variable bounds - protected PropertyInfo<Boolean> m_useACRComperator = new PropertyInfo<Boolean>("UseACRComparator", false, "Use ACR Comparator (instead of BCH)"); - protected PropertyInfo<Boolean> m_useRandomStartingPoint = new PropertyInfo<Boolean>("UseRandomStartingPoint", false, "Use Random starting point"); + private PropertyInfo<Boolean> m_guessVariableRange = new PropertyInfo<Boolean>("GuessVariableRange", true, "Variable Bounds Guessing"); + private PropertyInfo<Double> m_variableRangeThreshold = new PropertyInfo<Double>("VariableRangeThreshold", 3.0, "Variable Bounds Threshold (when guessing)"); //to approximate the variable bounds + private PropertyInfo<Boolean> m_useACRComperator = new PropertyInfo<Boolean>("UseACRComparator", false, "Use ACR Comparator (instead of BCH)"); + private PropertyInfo<Boolean> m_useRandomStartingPoint = new PropertyInfo<Boolean>("UseRandomStartingPoint", false, "Use Random starting point"); protected PropertyInfo<Integer> m_required = new PropertyInfo<Integer>("StagnationLimit", 70, "Stagnation Limit"); protected PropertyInfo<Double> m_tolerance = new PropertyInfo<Double>("Tolerance", 1e-6, "Stagnation Tolerance"); - protected PropertyInfo<Boolean> m_enhancedSolverStatus = new PropertyInfo<Boolean>("EnhancedSolverStatus", true, "Show enhanced solver status"); + private PropertyInfo<Boolean> m_enhancedSolverStatus = new PropertyInfo<Boolean>("EnhancedSolverStatus", true, "Show enhanced solver status"); protected IEvolutionarySolverStatusDialog m_solverStatusDialog; diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java index 3709ecb9c12a..34338123c2dd 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java @@ -71,13 +71,13 @@ public abstract class BaseNLPSolver extends WeakBase { protected final XComponentContext m_xContext; - protected final String m_name; + private final String m_name; - protected final ArrayList<PropertyInfo> m_properties = new ArrayList<PropertyInfo>(); - protected final HashMap<String, PropertyInfo> m_propertyMap = new HashMap<String, PropertyInfo>(); + private final ArrayList<PropertyInfo> m_properties = new ArrayList<PropertyInfo>(); + private final HashMap<String, PropertyInfo> m_propertyMap = new HashMap<String, PropertyInfo>(); - protected com.sun.star.lang.Locale m_locale = new com.sun.star.lang.Locale(); - protected final ResourceManager resourceManager; + private com.sun.star.lang.Locale m_locale = new com.sun.star.lang.Locale(); + private final ResourceManager resourceManager; public BaseNLPSolver(XComponentContext xContext, String name) { m_xContext = xContext; @@ -115,11 +115,11 @@ public abstract class BaseNLPSolver extends WeakBase // com.sun.star.sheet.XSolver: - protected XSpreadsheetDocument m_document; - protected XMultiComponentFactory m_componentFactory; - protected XModel m_xModel; + private XSpreadsheetDocument m_document; + private XMultiComponentFactory m_componentFactory; + private XModel m_xModel; protected XReschedule m_xReschedule; - protected CellAddress m_objective; + private CellAddress m_objective; protected CellAddress[] m_variables; protected SolverConstraint[] m_constraints; protected ExtSolverConstraint[] m_extConstraints; @@ -130,7 +130,7 @@ public abstract class BaseNLPSolver extends WeakBase protected int m_cellRangeCount; protected XCell m_objectiveCell; protected XCell[] m_variableCells; - protected CellRangeAddress[] m_cellRanges; + private CellRangeAddress[] m_cellRanges; protected XChartDataArray[] m_cellRangeData; protected CellMap[] m_variableMap; protected double[][][] m_variableData; @@ -165,10 +165,10 @@ public abstract class BaseNLPSolver extends WeakBase } protected class RowInfo { - protected short Sheet; - protected int Row; - protected int StartCol; - protected int EndCol; + private short Sheet; + private int Row; + private int StartCol; + private int EndCol; private RowInfo(short sheet, int row) { Sheet = sheet; 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 fec55c92a833..2aaa534ddff2 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 @@ -61,8 +61,8 @@ public abstract class BaseDialog extends BaseControl { private XMultiServiceFactory xMSF; protected XWindow xWindow; protected XDialog xDialog; - protected XWindowPeer xWindowPeer; - protected ModalState modalState; + private XWindowPeer xWindowPeer; + private ModalState modalState; @Override public String getName() { diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java index 01d724c351d0..a1de9d28ff29 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java @@ -46,8 +46,8 @@ public abstract class BaseControl { protected XComponentContext context; private Object unoModel; protected Object unoControl; - protected XPropertySet properties; - protected BaseControl parentControl; + private XPropertySet properties; + private BaseControl parentControl; public abstract String getName(); diff --git a/odk/examples/DevelopersGuide/Config/ConfigExamples.java b/odk/examples/DevelopersGuide/Config/ConfigExamples.java index 13a314254160..ba1e7034af24 100644 --- a/odk/examples/DevelopersGuide/Config/ConfigExamples.java +++ b/odk/examples/DevelopersGuide/Config/ConfigExamples.java @@ -357,11 +357,11 @@ public class ConfigExamples /// class to hold information about grid settings public static class GridOptions { - public boolean visible; - public int resolution_x; - public int resolution_y; - public int subdivision_x; - public int subdivision_y; + private boolean visible; + private int resolution_x; + private int resolution_y; + private int subdivision_x; + private int subdivision_y; @Override public String toString() { diff --git a/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java b/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java index 0c3d3a933261..fbb1933387aa 100644 --- a/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java +++ b/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java @@ -26,7 +26,7 @@ public abstract class DocumentBasedExample implements com.sun.star.lang.XEventLi /// our current test document protected DocumentHelper m_document; protected FormLayer m_formLayer; - protected DocumentType m_documentType; + private DocumentType m_documentType; /** Creates a new instance of DocumentBasedExample */ public DocumentBasedExample( DocumentType documentType ) diff --git a/odk/examples/DevelopersGuide/Forms/DocumentHelper.java b/odk/examples/DevelopersGuide/Forms/DocumentHelper.java index 631d41876a8e..6b9518631396 100644 --- a/odk/examples/DevelopersGuide/Forms/DocumentHelper.java +++ b/odk/examples/DevelopersGuide/Forms/DocumentHelper.java @@ -31,9 +31,9 @@ import com.sun.star.container.*; public class DocumentHelper { /// the remote office context - protected XComponentContext m_remoteContext; + private XComponentContext m_remoteContext; /// the remote service manager - protected XMultiServiceFactory m_orb; + private XMultiServiceFactory m_orb; protected XComponent m_documentComponent; /* ------------------------------------------------------------------ */ diff --git a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java index e349892d3ea9..5c15718706a7 100644 --- a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java +++ b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java @@ -37,14 +37,14 @@ import com.sun.star.util.CloseVetoException; public class HsqlDatabase { - XComponentContext m_context; + private XComponentContext m_context; // the URL of the temporary file used for the database document - String m_databaseDocumentFile; + private String m_databaseDocumentFile; // the database document - XOfficeDatabaseDocument m_databaseDocument; + private XOfficeDatabaseDocument m_databaseDocument; // the data source belonging to the database document // the default connection - XConnection m_connection; + private XConnection m_connection; public HsqlDatabase( XComponentContext _context ) throws Exception diff --git a/odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java b/odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java index 69a7f77d4cab..4f084d629df6 100644 --- a/odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java +++ b/odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java @@ -39,7 +39,7 @@ import com.sun.star.uno.UnoRuntime; public class RoadmapItemStateChangeListener implements XItemListener { - protected com.sun.star.lang.XMultiServiceFactory m_xMSFDialogModel; + private com.sun.star.lang.XMultiServiceFactory m_xMSFDialogModel; public RoadmapItemStateChangeListener(com.sun.star.lang.XMultiServiceFactory xMSFDialogModel) { m_xMSFDialogModel = xMSFDialogModel; diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java index 1b68cfa81c76..fc67ea18c166 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java +++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java @@ -107,15 +107,15 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis protected XComponentContext m_xContext = null; protected com.sun.star.lang.XMultiComponentFactory m_xMCF; protected XMultiServiceFactory m_xMSFDialogModel; - protected XModel m_xModel; + private XModel m_xModel; protected XNameContainer m_xDlgModelNameContainer; protected XControlContainer m_xDlgContainer; // protected XNameAccess m_xDlgModelNameAccess; protected XControl m_xDialogControl; protected XDialog xDialog; - protected XReschedule mxReschedule; + private XReschedule mxReschedule; protected XWindowPeer m_xWindowPeer = null; - protected XTopWindow m_xTopWindow = null; + private XTopWindow m_xTopWindow = null; protected XFrame m_xFrame = null; protected XComponent m_xComponent = null; @@ -1399,8 +1399,8 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Globally available object variables of the roadmapmodel XPropertySet m_xRMPSet; - XSingleServiceFactory m_xSSFRoadmap; - XIndexContainer m_xRMIndexCont; + private XSingleServiceFactory m_xSSFRoadmap; + private XIndexContainer m_xRMIndexCont; public void addRoadmap() { XPropertySet xDialogModelPropertySet = null; diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java index ff88ebe3ce08..c06dcce3bde3 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java @@ -176,11 +176,11 @@ public class CustomizeView extends JPanel com.sun.star.lang.XEventListener { /// URL, to toogle the requested UI item - String m_sURL; + private String m_sURL; /// name of the property which must be used in combination with the URL - String m_sProp; + private String m_sProp; /// we must use this frame to dispatch a request - com.sun.star.frame.XFrame m_xFrame; + private com.sun.star.frame.XFrame m_xFrame; diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java index 4405f05ebf09..2d07f9642d9c 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java @@ -40,7 +40,7 @@ class JavaWindowPeerFake implements com.sun.star.awt.XSystemDependentWindowPeer, com.sun.star.awt.XWindowPeer { - NativeView maView; + private NativeView maView; public JavaWindowPeerFake(NativeView aNative) { diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java index 66ac7893f835..da283d365b98 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java @@ -61,7 +61,7 @@ public class FilterOptions public com.sun.star.io.XInputStream m_xInput ; public com.sun.star.io.XOutputStream m_xOutput ; public boolean m_bStreamOwner ; - public String m_sURL ; + private String m_sURL ; public String m_sOld ; public String m_sNew ; public boolean m_bCaseChange ; diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java index 7025fdd7d648..9c9978da3ac2 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java @@ -52,10 +52,10 @@ public class OneInstanceFactory implements XSingleComponentFactory, XServiceInfo { - Class aMyClass; - String aSvcImplName; - String[] aSupportedSvcNames; - XInterface xInstantiatedService; + private Class aMyClass; + private String aSvcImplName; + private String[] aSupportedSvcNames; + private XInterface xInstantiatedService; public OneInstanceFactory( Class aMyClass, diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java index b304bedc920a..2352ff8cceeb 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java @@ -47,10 +47,10 @@ public class PropChgHelper implements XPropertyChangeListener, XLinguServiceEventBroadcaster { - XInterface xEvtSource; - String[] aPropNames; - XPropertySet xPropSet; - ArrayList<XLinguServiceEventListener> aLngSvcEvtListeners; + private XInterface xEvtSource; + private String[] aPropNames; + private XPropertySet xPropSet; + private ArrayList<XLinguServiceEventListener> aLngSvcEvtListeners; public PropChgHelper( XInterface xEvtSource, diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XHyphenatedWord_impl.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XHyphenatedWord_impl.java index 039b67f89f09..01b9acd7f9c9 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XHyphenatedWord_impl.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XHyphenatedWord_impl.java @@ -37,12 +37,12 @@ import com.sun.star.lang.Locale; public class XHyphenatedWord_impl implements com.sun.star.linguistic2.XHyphenatedWord { - String aWord; - String aHyphenatedWord; - short nHyphenPos; - short nHyphenationPos; - Locale aLang; - boolean bIsAltSpelling; + private String aWord; + private String aHyphenatedWord; + private short nHyphenPos; + private short nHyphenationPos; + private Locale aLang; + private boolean bIsAltSpelling; public XHyphenatedWord_impl( String aWord, diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XMeaning_impl.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XMeaning_impl.java index 133def0e4b0a..0df2eb430b09 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XMeaning_impl.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XMeaning_impl.java @@ -37,8 +37,8 @@ public class XMeaning_impl implements com.sun.star.linguistic2.XMeaning { - String aMeaning; - String[] aSynonyms; + private String aMeaning; + private String[] aSynonyms; public XMeaning_impl ( String aMeaning, String[] aSynonyms ) { diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XPossibleHyphens_impl.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XPossibleHyphens_impl.java index 11eb33fff6f0..cf59d407bf13 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XPossibleHyphens_impl.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XPossibleHyphens_impl.java @@ -37,10 +37,10 @@ import com.sun.star.lang.Locale; public class XPossibleHyphens_impl implements com.sun.star.linguistic2.XPossibleHyphens { - String aWord; - String aHyphWord; - short[] aOrigHyphenPos; - Locale aLang; + private String aWord; + private String aHyphWord; + private short[] aOrigHyphenPos; + private Locale aLang; public XPossibleHyphens_impl( String aWord, diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XSpellAlternatives_impl.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XSpellAlternatives_impl.java index 9b3d671a7b93..ae26a447ce55 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XSpellAlternatives_impl.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XSpellAlternatives_impl.java @@ -38,10 +38,10 @@ import com.sun.star.lang.Locale; public class XSpellAlternatives_impl implements com.sun.star.linguistic2.XSpellAlternatives { - String aWord; - Locale aLanguage; - String[] aAlt; // list of alternatives, may be empty. - short nType; // type of failure + private String aWord; + private Locale aLanguage; + private String[] aAlt; // list of alternatives, may be empty. + private short nType; // type of failure public XSpellAlternatives_impl( String aWord, diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java index b6f58d9a4c79..b0092d9d123f 100644 --- a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java +++ b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java @@ -203,7 +203,7 @@ class ScriptSelectorPanel extends JPanel { private XBrowseNode myrootnode = null; public JTextField textField; public JTree tree; - public DefaultTreeModel treeModel; + private DefaultTreeModel treeModel; public ScriptSelectorPanel(XBrowseNode root) { diff --git a/odk/examples/DevelopersGuide/UCB/MyActiveDataSink.java b/odk/examples/DevelopersGuide/UCB/MyActiveDataSink.java index 9ef646e47beb..0038b8f304eb 100644 --- a/odk/examples/DevelopersGuide/UCB/MyActiveDataSink.java +++ b/odk/examples/DevelopersGuide/UCB/MyActiveDataSink.java @@ -44,7 +44,7 @@ public class MyActiveDataSink implements XActiveDataSink { /** * Member properties */ - XInputStream m_aStream = null; + private XInputStream m_aStream = null; /** * Constructor diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java b/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java index d30175f2b1bc..f923b15ab9fc 100644 --- a/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java +++ b/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java @@ -26,11 +26,11 @@ import javax.imageio.ImageIO; public class EditorFrame extends JFrame { - OwnEmbeddedObject m_aEmbObj; - JTextArea m_aTextArea; - BufferedImage m_aBufImage; + private OwnEmbeddedObject m_aEmbObj; + private JTextArea m_aTextArea; + private BufferedImage m_aBufImage; - WindowListener m_aCloser = new WindowAdapter() + private WindowListener m_aCloser = new WindowAdapter() { @Override public void windowClosing( WindowEvent e ) diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java index d84531dcb6d3..059526184202 100644 --- a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java +++ b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java @@ -40,30 +40,30 @@ public final class OwnEmbeddedObject extends WeakBase implements com.sun.star.embed.XEmbedPersist, com.sun.star.embed.XEmbeddedObject { - protected final XComponentContext m_xContext; - protected final byte[] m_aClassID; + private final XComponentContext m_xContext; + private final byte[] m_aClassID; - protected boolean m_bDisposed = false; - protected int m_nObjectState = -1; + private boolean m_bDisposed = false; + private int m_nObjectState = -1; - protected com.sun.star.embed.XStorage m_xParentStorage; - protected com.sun.star.embed.XStorage m_xOwnStorage; - protected String m_aEntryName; + private com.sun.star.embed.XStorage m_xParentStorage; + private com.sun.star.embed.XStorage m_xOwnStorage; + private String m_aEntryName; - protected com.sun.star.embed.XStorage m_xNewParentStorage; - protected com.sun.star.embed.XStorage m_xNewOwnStorage; - protected String m_aNewEntryName; - protected boolean m_bWaitSaveCompleted = false; + private com.sun.star.embed.XStorage m_xNewParentStorage; + private com.sun.star.embed.XStorage m_xNewOwnStorage; + private String m_aNewEntryName; + private boolean m_bWaitSaveCompleted = false; - protected EditorFrame m_aEditorFrame; + private EditorFrame m_aEditorFrame; - protected ArrayList<Object> m_aListeners; + private ArrayList<Object> m_aListeners; - com.sun.star.embed.VerbDescriptor[] m_pOwnVerbs; + private com.sun.star.embed.VerbDescriptor[] m_pOwnVerbs; - com.sun.star.embed.XEmbeddedClient m_xClient; + private com.sun.star.embed.XEmbeddedClient m_xClient; - Dimension m_aObjSize; + private Dimension m_aObjSize; protected ArrayList<Object> GetListeners() diff --git a/odk/examples/java/Inspector/HideableMutableTreeNode.java b/odk/examples/java/Inspector/HideableMutableTreeNode.java index ffa39db2e743..4148b879ae28 100644 --- a/odk/examples/java/Inspector/HideableMutableTreeNode.java +++ b/odk/examples/java/Inspector/HideableMutableTreeNode.java @@ -26,7 +26,7 @@ public class HideableMutableTreeNode extends DefaultMutableTreeNode { /** * The node is visible flag. */ - public boolean bIsvisible = true; + private boolean bIsvisible = true; private static final String SDUMMY = "Dummy"; diff --git a/odk/examples/java/Inspector/InspectorAddon.java b/odk/examples/java/Inspector/InspectorAddon.java index 3b28adcde282..ace1b69ded53 100644 --- a/odk/examples/java/Inspector/InspectorAddon.java +++ b/odk/examples/java/Inspector/InspectorAddon.java @@ -54,9 +54,9 @@ public class InspectorAddon { * XTypeProvider, and XInitialization should be provided by the service. */ public static class InspectorAddonImpl extends WeakBase implements XDispatchProvider, XInitialization, XServiceInfo { - org.openoffice.XInstanceInspector xInstInspector = null; + private org.openoffice.XInstanceInspector xInstInspector = null; // Dispatcher oDispatcher = null; - XFrame m_xFrame = null; + private XFrame m_xFrame = null; private static final String[] m_serviceNames = { "org.openoffice.InstanceInspectorAddon", diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java index 3b48b0fe93eb..ca8bb688486d 100644 --- a/odk/examples/java/Inspector/SourceCodeGenerator.java +++ b/odk/examples/java/Inspector/SourceCodeGenerator.java @@ -48,7 +48,7 @@ import com.sun.star.uno.TypeClass; public class SourceCodeGenerator { private ArrayList<String> sExceptions = new ArrayList<String>(); - ArrayList<String> sHeaderStatements = new HeaderStatements(); + private ArrayList<String> sHeaderStatements = new HeaderStatements(); private XLanguageSourceCodeGenerator m_xLanguageSourceCodeGenerator; private String sStatementCode = ""; private String sMainMethodSignature = ""; @@ -544,14 +544,14 @@ public class SourceCodeGenerator { class UnoObjectDefinition{ - Object m_oUnoObject = null; + private Object m_oUnoObject = null; Type aType = null; - String sVariableStemName = ""; - String m_sCentralVariableStemName = ""; - String sVariableName = ""; - String m_sTypeName = ""; - TypeClass m_aTypeClass = null; - Object[] m_oParameterObjects = null; + private String sVariableStemName = ""; + private String m_sCentralVariableStemName = ""; + private String sVariableName = ""; + private String m_sTypeName = ""; + private TypeClass m_aTypeClass = null; + private Object[] m_oParameterObjects = null; private UnoObjectDefinition(Any _oUnoObject){ @@ -840,8 +840,8 @@ class UnoObjectDefinition{ public class JavaCodeGenerator implements XLanguageSourceCodeGenerator{ String sStatementsCode = ""; - boolean bAddAnyConverter = false; - boolean bIsPropertyUnoObjectDefined = false; + private boolean bAddAnyConverter = false; + private boolean bIsPropertyUnoObjectDefined = false; public JavaCodeGenerator(){ } @@ -1391,9 +1391,9 @@ class UnoObjectDefinition{ public class CPlusPlusCodeGenerator implements XLanguageSourceCodeGenerator{ String sStatementsCode = ""; - boolean bIncludeStringHeader = false; - boolean bIncludeAny = false; - boolean bIncludeSequenceHeader = false; + private boolean bIncludeStringHeader = false; + private boolean bIncludeAny = false; + private boolean bIncludeSequenceHeader = false; public CPlusPlusCodeGenerator(){ } diff --git a/odk/examples/java/Inspector/SwingTreePathProvider.java b/odk/examples/java/Inspector/SwingTreePathProvider.java index ee8d00ad8521..dba9ff40fade 100644 --- a/odk/examples/java/Inspector/SwingTreePathProvider.java +++ b/odk/examples/java/Inspector/SwingTreePathProvider.java @@ -19,7 +19,7 @@ import javax.swing.tree.TreePath; public class SwingTreePathProvider implements XTreePathProvider { - TreePath m_aTreePath; + private TreePath m_aTreePath; /** Creates a new instance of TreePathProvider */ public SwingTreePathProvider(TreePath _aTreePath) { diff --git a/odk/examples/java/Inspector/SwingUnoFacetteNode.java b/odk/examples/java/Inspector/SwingUnoFacetteNode.java index dc726beaa62d..1d573f0c01f8 100644 --- a/odk/examples/java/Inspector/SwingUnoFacetteNode.java +++ b/odk/examples/java/Inspector/SwingUnoFacetteNode.java @@ -35,7 +35,7 @@ public class SwingUnoFacetteNode extends SwingUnoNode implements XUnoFacetteNode{ - String m_sFilter = ""; + private String m_sFilter = ""; /** Creates a new instance of UnoMethodNode */ public SwingUnoFacetteNode(Object _oUnoObject){ diff --git a/odk/examples/java/Inspector/UnoMethodNode.java b/odk/examples/java/Inspector/UnoMethodNode.java index 8b2e0749b730..896db027cefd 100644 --- a/odk/examples/java/Inspector/UnoMethodNode.java +++ b/odk/examples/java/Inspector/UnoMethodNode.java @@ -39,11 +39,11 @@ import com.sun.star.reflection.XIdlMethod; import com.sun.star.uno.TypeClass; public class UnoMethodNode extends UnoNode{ - XIdlMethod m_xIdlMethod = null; - Object[] m_oParamObjects = null; - Object m_oUnoReturnObject = null; - boolean m_bisInvoked = false; - XUnoMethodNode m_xUnoMethodNode = null; + private XIdlMethod m_xIdlMethod = null; + private Object[] m_oParamObjects = null; + private Object m_oUnoReturnObject = null; + private boolean m_bisInvoked = false; + private XUnoMethodNode m_xUnoMethodNode = null; /** Creates a new instance of UnoMethodNode */ diff --git a/odk/examples/java/Inspector/UnoPropertyNode.java b/odk/examples/java/Inspector/UnoPropertyNode.java index 3c83ed886be8..cd7882110339 100644 --- a/odk/examples/java/Inspector/UnoPropertyNode.java +++ b/odk/examples/java/Inspector/UnoPropertyNode.java @@ -40,10 +40,10 @@ import com.sun.star.uno.UnoRuntime; public class UnoPropertyNode extends UnoNode{ - Property aProperty; - PropertyValue aPropertyValue; - String m_sPropertyName; - Object m_oUnoReturnObject; + private Property aProperty; + private PropertyValue aPropertyValue; + private String m_sPropertyName; + private Object m_oUnoReturnObject; private int m_nPropertyType = XUnoPropertyNode.nDEFAULT; private String sLabel = ""; diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java index bca42faa0fbc..3df834d97236 100644 --- a/qadevOOo/runner/complexlib/ComplexTestCase.java +++ b/qadevOOo/runner/complexlib/ComplexTestCase.java @@ -38,11 +38,11 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest /** * The method name which will be written into f.e. the data base **/ - protected String mTestMethodName = null; + private String mTestMethodName = null; /** Maximal time one method is allowed to execute * Can be set with parameter 'ThreadTimeOut' **/ - protected int m_nThreadTimeOut = 0; + private int m_nThreadTimeOut = 0; /** End a test if it did fail **/ public static final boolean BREAK = true; diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/runner/convwatch/BorderRemover.java index c96b8f4853ec..e1f75a22122e 100644 --- a/qadevOOo/runner/convwatch/BorderRemover.java +++ b/qadevOOo/runner/convwatch/BorderRemover.java @@ -27,10 +27,10 @@ import java.lang.reflect.Method; class Rect { - int x; - int y; - int w; - int h; + private int x; + private int y; + private int w; + private int h; public Rect(int _x, int _y, int _w, int _h) { @@ -47,7 +47,7 @@ class Rect class BorderRemover { - ImageHelper m_aImage; + private ImageHelper m_aImage; // Helper values, filled after find Border diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java index 844e3359045d..f94e7274ce57 100644 --- a/qadevOOo/runner/convwatch/DBHelper.java +++ b/qadevOOo/runner/convwatch/DBHelper.java @@ -53,8 +53,8 @@ class ShareConnection class MySQLThread extends Thread { - Connection m_aCon = null; - String m_sSQL; + private Connection m_aCon = null; + private String m_sSQL; public MySQLThread(Connection _aCon, String _sSQL) { m_aCon = _aCon; diff --git a/qadevOOo/runner/convwatch/DirectoryHelper.java b/qadevOOo/runner/convwatch/DirectoryHelper.java index 60896af030b8..02a81d94d7df 100644 --- a/qadevOOo/runner/convwatch/DirectoryHelper.java +++ b/qadevOOo/runner/convwatch/DirectoryHelper.java @@ -27,8 +27,8 @@ import java.util.ArrayList; */ public class DirectoryHelper { - ArrayList<String> m_aFileList = new ArrayList<String>(); - boolean m_bRecursiveIsAllowed = true; + private ArrayList<String> m_aFileList = new ArrayList<String>(); + private boolean m_bRecursiveIsAllowed = true; void setRecursiveIsAllowed(boolean _bValue) { diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/runner/convwatch/FilenameHelper.java index 1822232fc205..c26e8ee99921 100644 --- a/qadevOOo/runner/convwatch/FilenameHelper.java +++ b/qadevOOo/runner/convwatch/FilenameHelper.java @@ -42,11 +42,11 @@ interface Filenamer abstract class FilenameHelper_impl implements Filenamer { - String fs; // file separator like '/' - String m_sPath; - String m_sFilename; - String m_sSuffix; - int m_nNumber = 0; + private String fs; // file separator like '/' + private String m_sPath; + private String m_sFilename; + private String m_sSuffix; + private int m_nNumber = 0; public String getNumber() { diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index 338524324120..16062bd3629c 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -67,37 +67,37 @@ public class GraphicalTestArguments // pdf // msoffice */ - String m_sReferenceType = "OOo"; + private String m_sReferenceType = "OOo"; - String m_sTargetFrameName = "_blank"; + private String m_sTargetFrameName = "_blank"; - String m_sPrinterName = null; + private String m_sPrinterName = null; // Hidden = true hiddes a used OpenOffice.org, all code is executed in the background // This parameter is not used for RefType: msoffice - boolean m_bHidden = true; + private boolean m_bHidden = true; - String m_sDefaultXMLFormatApplication = null; + private String m_sDefaultXMLFormatApplication = null; - boolean m_bIncludeSubdirectories; + private boolean m_bIncludeSubdirectories; - TestParameters m_aCurrentParams; + private TestParameters m_aCurrentParams; - int m_nMaxPages = 0; // default is 0 (print all pages) + private int m_nMaxPages = 0; // default is 0 (print all pages) String m_sOnlyPage = ""; // default is "", there is no page which we want to print only. - int m_nResolutionInDPI = 0; + private int m_nResolutionInDPI = 0; - boolean m_bStoreFile = true; - boolean m_bResuseOffice = false; + private boolean m_bStoreFile = true; + private boolean m_bResuseOffice = false; boolean m_bDebugMode = false; - String m_sLeaveOutNames = null; + private String m_sLeaveOutNames = null; - String m_sDistinct = null; + private String m_sDistinct = null; - boolean m_bCreateDefaultReference = false; + private boolean m_bCreateDefaultReference = false; public GraphicalTestArguments(TestParameters param) { @@ -563,8 +563,8 @@ public class GraphicalTestArguments // get the right Filtername (internal Name) from // http://framework.openoffice.org/files/documents/25/897/filter_description.html - String m_sImportFilterName = ""; - String m_sExportFilterName = ""; + private String m_sImportFilterName = ""; + private String m_sExportFilterName = ""; public void setImportFilterName(String _sImportFilterName) { m_sImportFilterName = _sImportFilterName; @@ -582,7 +582,7 @@ public class GraphicalTestArguments return m_sExportFilterName; } - String m_sOfficeProgram = ""; + private String m_sOfficeProgram = ""; public void setOfficeProgram(String _sName) { m_sOfficeProgram = _sName; @@ -601,13 +601,13 @@ public class GraphicalTestArguments return false; } - String m_sHTMLOutputPrefix = ""; + private String m_sHTMLOutputPrefix = ""; public String getHTMLOutputPrefix() { return m_sHTMLOutputPrefix; } - TriState m_tWithBorderMove = TriState.UNSET; + private TriState m_tWithBorderMove = TriState.UNSET; public TriState getBorderMove() { return m_tWithBorderMove; @@ -617,7 +617,7 @@ public class GraphicalTestArguments m_tWithBorderMove = _tBorderMove; } - String m_sDocumentType = ""; + private String m_sDocumentType = ""; public void setDocumentType(String _sName) { m_sDocumentType = _sName; @@ -630,7 +630,7 @@ public class GraphicalTestArguments /* helper class for performance analyser features */ - PerformanceContainer m_aPerformanceContainer = null; + private PerformanceContainer m_aPerformanceContainer = null; public PerformanceContainer getPerformance() { if (m_aPerformanceContainer == null) diff --git a/qadevOOo/runner/convwatch/HTMLOutputter.java b/qadevOOo/runner/convwatch/HTMLOutputter.java index 2dea50fec6e0..828d76bda74f 100644 --- a/qadevOOo/runner/convwatch/HTMLOutputter.java +++ b/qadevOOo/runner/convwatch/HTMLOutputter.java @@ -24,14 +24,14 @@ import helper.OSHelper; public class HTMLOutputter { - FileWriter m_aOut; - String m_sFilename; - String m_sNamePrefix; // the HTML files used a suffix to build it's right name + private FileWriter m_aOut; + private String m_sFilename; + private String m_sNamePrefix; // the HTML files used a suffix to build it's right name /** * ls is the current line separator (carridge return) */ - String ls; + private String ls; HTMLOutputter() {} public static HTMLOutputter create( String _sOutputPath, String _sHTMLFilename, String _sNamePrefix ) diff --git a/qadevOOo/runner/convwatch/INIOutputter.java b/qadevOOo/runner/convwatch/INIOutputter.java index 30d6a0d913f7..0851a9561302 100644 --- a/qadevOOo/runner/convwatch/INIOutputter.java +++ b/qadevOOo/runner/convwatch/INIOutputter.java @@ -23,14 +23,14 @@ import java.io.FileWriter; public class INIOutputter { - FileWriter m_aOut; - String m_sFilename; - String m_sNamePrefix; // the HTML files used a suffix to build it's right name + private FileWriter m_aOut; + private String m_sFilename; + private String m_sNamePrefix; // the HTML files used a suffix to build it's right name /** * ls is the current line separator (carridge return) */ - String ls; + private String ls; public static INIOutputter create( String _sOutputPath, String _sHTMLFilename, String _sNamePrefix ) { diff --git a/qadevOOo/runner/convwatch/ImageHelper.java b/qadevOOo/runner/convwatch/ImageHelper.java index 79c5d5cc1fdd..c5b2f11c0093 100644 --- a/qadevOOo/runner/convwatch/ImageHelper.java +++ b/qadevOOo/runner/convwatch/ImageHelper.java @@ -26,11 +26,11 @@ import java.lang.reflect.Method; class ImageHelper { - Image m_aImage; - int[] m_aPixels; - int m_w = 0; - int m_h = 0; - boolean m_bGrabbed = false; + private Image m_aImage; + private int[] m_aPixels; + private int m_w = 0; + private int m_h = 0; + private boolean m_bGrabbed = false; private ImageHelper(Image _aImage) { diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java index 58f39e9e4c38..404751328f01 100644 --- a/qadevOOo/runner/convwatch/IniFile.java +++ b/qadevOOo/runner/convwatch/IniFile.java @@ -32,9 +32,9 @@ class IniFile * internal representation of the ini file content. * Problem, if ini file changed why other write something difference, we don't realise this. */ - String m_sFilename; - ArrayList<String> m_aList; - boolean m_bListContainUnsavedChanges = false; + private String m_sFilename; + private ArrayList<String> m_aList; + private boolean m_bListContainUnsavedChanges = false; /** open a ini file by its name diff --git a/qadevOOo/runner/convwatch/LISTOutputter.java b/qadevOOo/runner/convwatch/LISTOutputter.java index 23a83198b396..3053953f1f3c 100644 --- a/qadevOOo/runner/convwatch/LISTOutputter.java +++ b/qadevOOo/runner/convwatch/LISTOutputter.java @@ -23,13 +23,13 @@ import java.io.FileWriter; public class LISTOutputter { - FileWriter m_aOut; - String m_sFilename; + private FileWriter m_aOut; + private String m_sFilename; /** * ls is the current line separator (carridge return) */ - String ls; + private String ls; public static LISTOutputter create( String _sOutputPath, String _sFilename) { diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java index 38955f252004..ff676ea18fb3 100644 --- a/qadevOOo/runner/convwatch/PRNCompare.java +++ b/qadevOOo/runner/convwatch/PRNCompare.java @@ -32,7 +32,7 @@ import java.util.ArrayList; public class PRNCompare { - String fs; + private String fs; public PRNCompare() { @@ -91,16 +91,16 @@ public class PRNCompare return nMaxNumber; } - String m_sInputPath; - String m_sReferencePath; - String m_sOutputPath; - String m_sDocFile; - String m_sReferenceFile; - String m_sPostScriptFile; - int m_nMaxPages = 0; - int m_nResolutionInDPI = 0; - TriState m_tUseBorderMove; - String m_sDocumentType; + private String m_sInputPath; + private String m_sReferencePath; + private String m_sOutputPath; + private String m_sDocFile; + private String m_sReferenceFile; + private String m_sPostScriptFile; + private int m_nMaxPages = 0; + private int m_nResolutionInDPI = 0; + private TriState m_tUseBorderMove; + private String m_sDocumentType; public void setInputPath(String _sInputPath) { m_sInputPath = _sInputPath; } diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java index 63523f60047e..6e41bca6232e 100644 --- a/qadevOOo/runner/convwatch/PixelCounter.java +++ b/qadevOOo/runner/convwatch/PixelCounter.java @@ -125,7 +125,7 @@ class graphics_stuff public class PixelCounter { - ImageHelper m_aImage; + private ImageHelper m_aImage; public int countNotWhitePixel(String _sFile) diff --git a/qadevOOo/runner/convwatch/TriState.java b/qadevOOo/runner/convwatch/TriState.java index 835ff6e67b66..5c27afa4153f 100644 --- a/qadevOOo/runner/convwatch/TriState.java +++ b/qadevOOo/runner/convwatch/TriState.java @@ -24,7 +24,7 @@ public class TriState public static final TriState FALSE = new TriState(0); public static final TriState UNSET = new TriState(-1); - int m_nValue; + private int m_nValue; /** Allocates a <code>TriState</code> object representing the diff --git a/qadevOOo/runner/graphical/DirectoryHelper.java b/qadevOOo/runner/graphical/DirectoryHelper.java index 0033de9853d5..ca36ef8b0839 100644 --- a/qadevOOo/runner/graphical/DirectoryHelper.java +++ b/qadevOOo/runner/graphical/DirectoryHelper.java @@ -27,8 +27,8 @@ import java.util.ArrayList; */ public class DirectoryHelper { - ArrayList<String> m_aFileList = new ArrayList<String>(); - boolean m_bRecursiveIsAllowed = true; + private ArrayList<String> m_aFileList = new ArrayList<String>(); + private boolean m_bRecursiveIsAllowed = true; void setRecursiveIsAllowed(boolean _bValue) { diff --git a/qadevOOo/runner/graphical/ImageHelper.java b/qadevOOo/runner/graphical/ImageHelper.java index e06a6880f27b..ec2a5cee573d 100644 --- a/qadevOOo/runner/graphical/ImageHelper.java +++ b/qadevOOo/runner/graphical/ImageHelper.java @@ -26,11 +26,11 @@ import java.lang.reflect.Method; class ImageHelper { - Image m_aImage; - int[] m_aPixels; - int m_w = 0; - int m_h = 0; - boolean m_bGrabbed = false; + private Image m_aImage; + private int[] m_aPixels; + private int m_w = 0; + private int m_h = 0; + private boolean m_bGrabbed = false; private ImageHelper(Image _aImage) { diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index 9640e6076a73..30b38c3b15e8 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -35,7 +35,7 @@ public class IniFile implements Enumeration<String> */ private String m_sFilename; private ArrayList<String> m_aList; - boolean m_bListContainUnsavedChanges = false; + private boolean m_bListContainUnsavedChanges = false; private int m_aEnumerationPos = 0; /** diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java index 05de2b8a5f9c..f6d1d3fcf922 100644 --- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java @@ -1003,7 +1003,7 @@ public class OpenOfficePostscriptCreator implements IOffice } - OfficeProvider m_aProvider = null; + private OfficeProvider m_aProvider = null; private void startOffice() { m_aParameterHelper.getTestParameters().put(util.PropertyName.DONT_BACKUP_USERLAYER, Boolean.TRUE); diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java index 8839a728dec8..418c06a6b3d1 100644 --- a/qadevOOo/runner/graphical/ParameterHelper.java +++ b/qadevOOo/runner/graphical/ParameterHelper.java @@ -181,7 +181,7 @@ public class ParameterHelper return m_sPrinterName; } - PerformanceContainer m_aPerformanceContainer = null; + private PerformanceContainer m_aPerformanceContainer = null; /** * helper class for performance analyser features */ @@ -261,8 +261,8 @@ public class ParameterHelper // get the right Filtername (internal Name) from // http://framework.openoffice.org/files/documents/25/897/filter_description.html - String m_sImportFilterName = ""; - String m_sExportFilterName = ""; + private String m_sImportFilterName = ""; + private String m_sExportFilterName = ""; public void setImportFilterName(String _sImportFilterName) { m_sImportFilterName = _sImportFilterName; @@ -279,7 +279,7 @@ public class ParameterHelper { return m_sExportFilterName; } - String m_sDocumentType = ""; + private String m_sDocumentType = ""; public void setDocumentType(String _sName) { m_sDocumentType = _sName; diff --git a/qadevOOo/runner/helper/CfgParser.java b/qadevOOo/runner/helper/CfgParser.java index f34b4e6fb0a5..bda0cf09d9b3 100644 --- a/qadevOOo/runner/helper/CfgParser.java +++ b/qadevOOo/runner/helper/CfgParser.java @@ -33,8 +33,8 @@ import util.PropertyName; public class CfgParser { - protected boolean debug = false; - protected String iniFile = ""; + private boolean debug = false; + private String iniFile = ""; public CfgParser(String ini) { diff --git a/qadevOOo/runner/helper/ConfigurationRead.java b/qadevOOo/runner/helper/ConfigurationRead.java index 5a3e476421dc..bde788a5e687 100644 --- a/qadevOOo/runner/helper/ConfigurationRead.java +++ b/qadevOOo/runner/helper/ConfigurationRead.java @@ -30,7 +30,7 @@ import com.sun.star.uno.UnoRuntime; */ public class ConfigurationRead { - XHierarchicalNameAccess root = null; + private XHierarchicalNameAccess root = null; /** * Creates new ConfigurationRead diff --git a/qadevOOo/runner/helper/LoggingThread.java b/qadevOOo/runner/helper/LoggingThread.java index 41e97845fc2d..9869e7885b9d 100644 --- a/qadevOOo/runner/helper/LoggingThread.java +++ b/qadevOOo/runner/helper/LoggingThread.java @@ -36,10 +36,10 @@ import util.utils; */ public class LoggingThread extends Thread { - TestParameters param; - LogWriter log = null; - boolean finished = false; - boolean debug = false; + private TestParameters param; + private LogWriter log = null; + private boolean finished = false; + private boolean debug = false; public LoggingThread(LogWriter log, TestParameters tParam) { this.log = log; diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java index 4352ca8eaf49..205925dcb9f1 100644 --- a/qadevOOo/runner/helper/StreamSimulator.java +++ b/qadevOOo/runner/helper/StreamSimulator.java @@ -51,8 +51,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , private com.sun.star.io.XOutputStream m_xOutStream ; private com.sun.star.io.XSeekable m_xSeek ; - public boolean m_bInWasUsed ; - public boolean m_bOutWasUsed ; + private boolean m_bInWasUsed ; + private boolean m_bOutWasUsed ; /** diff --git a/qadevOOo/runner/helper/WindowListener.java b/qadevOOo/runner/helper/WindowListener.java index 602bebbfdb8f..e1622327a069 100644 --- a/qadevOOo/runner/helper/WindowListener.java +++ b/qadevOOo/runner/helper/WindowListener.java @@ -31,15 +31,15 @@ package helper; public class WindowListener implements com.sun.star.awt.XWindowListener { // hidden called - public boolean hiddenTrigger; + private boolean hiddenTrigger; // move called - public boolean movedTrigger; + private boolean movedTrigger; // resize called public boolean resizedTrigger; // show called - public boolean shownTrigger; + private boolean shownTrigger; // dispose called - public boolean disposeTrigger; + private boolean disposeTrigger; /** * Creates a new WindowListener diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java index 6901323e9641..900646fcb807 100644 --- a/qadevOOo/runner/lib/Parameters.java +++ b/qadevOOo/runner/lib/Parameters.java @@ -37,9 +37,9 @@ import com.sun.star.uno.Type; * Parameters is a container of String parameters. */ public class Parameters implements XPropertySet { - final protected Map<String, Object> parameters; - final Parameters defaults; - Property[] props; + final private Map<String, Object> parameters; + private final Parameters defaults; + private Property[] props; public Parameters(Map<String, Object> params) { this (params, null); diff --git a/qadevOOo/runner/lib/SimpleStatus.java b/qadevOOo/runner/lib/SimpleStatus.java index cafdc3208db2..2639faea50d1 100644 --- a/qadevOOo/runner/lib/SimpleStatus.java +++ b/qadevOOo/runner/lib/SimpleStatus.java @@ -66,12 +66,12 @@ class SimpleStatus { /** * The field is holding state of the status. */ - protected final boolean state; + private final boolean state; /** * The field is holding reason of the status. */ - protected final int runState; + private final int runState; /** * This is the run state: either SKIPPED, PASSED, etc. diff --git a/qadevOOo/runner/lib/StatusException.java b/qadevOOo/runner/lib/StatusException.java index a238319f968c..c9658926bca9 100644 --- a/qadevOOo/runner/lib/StatusException.java +++ b/qadevOOo/runner/lib/StatusException.java @@ -27,7 +27,7 @@ public class StatusException extends RuntimeException { /** * The Status contained in the StatusException. */ - protected Status status; + private Status status; /** * Constructs a StatusException containing an exception Status. diff --git a/qadevOOo/runner/stats/DataBaseOutProducer.java b/qadevOOo/runner/stats/DataBaseOutProducer.java index 129d1dd6bb55..b36dcfc07c98 100644 --- a/qadevOOo/runner/stats/DataBaseOutProducer.java +++ b/qadevOOo/runner/stats/DataBaseOutProducer.java @@ -24,9 +24,9 @@ import java.util.HashMap; public abstract class DataBaseOutProducer implements LogWriter { protected HashMap<String,Object> mSqlInput = null; - protected HashMap<String, String[]> mSqlOutput = null; - protected String[] mWriteableEntryTypes = null; - protected SQLExecution mSqlExec; + private HashMap<String, String[]> mSqlOutput = null; + private String[] mWriteableEntryTypes = null; + private SQLExecution mSqlExec; protected boolean m_bDebug = false; diff --git a/qadevOOo/runner/stats/InternalLogWriter.java b/qadevOOo/runner/stats/InternalLogWriter.java index 7c4f988b281a..5c2d165a167d 100644 --- a/qadevOOo/runner/stats/InternalLogWriter.java +++ b/qadevOOo/runner/stats/InternalLogWriter.java @@ -27,9 +27,9 @@ import java.io.StringWriter; public class InternalLogWriter extends PrintWriter implements share.LogWriter { /** log active **/ - boolean active; + private boolean active; /** write all output to a StringBuffer **/ - static StringWriter writer = new StringWriter(); + private static StringWriter writer = new StringWriter(); /** * c'*tor diff --git a/qadevOOo/runner/stats/SQLExecution.java b/qadevOOo/runner/stats/SQLExecution.java index 1401156e6d82..9c6dca8a69c9 100644 --- a/qadevOOo/runner/stats/SQLExecution.java +++ b/qadevOOo/runner/stats/SQLExecution.java @@ -32,14 +32,14 @@ import java.util.StringTokenizer; */ public class SQLExecution { - protected Connection mConnection = null; - protected Statement mStatement = null; - protected String mJdbcClass = null; - protected String mDbURL = null; - protected String mUser = null; - protected String mPassword = null; - protected boolean m_bConnectionOpen = false; - protected boolean m_bDebug = false; + private Connection mConnection = null; + private Statement mStatement = null; + private String mJdbcClass = null; + private String mDbURL = null; + private String mUser = null; + private String mPassword = null; + private boolean m_bConnectionOpen = false; + private boolean m_bDebug = false; /** Creates a new instance of SQLExecution diff --git a/qadevOOo/runner/stats/SimpleLogWriter.java b/qadevOOo/runner/stats/SimpleLogWriter.java index b3a236fa798e..46e0e69a5c25 100644 --- a/qadevOOo/runner/stats/SimpleLogWriter.java +++ b/qadevOOo/runner/stats/SimpleLogWriter.java @@ -26,9 +26,9 @@ import java.util.GregorianCalendar; public class SimpleLogWriter extends PrintWriter implements LogWriter { - boolean m_bLogging = false; - share.DescEntry entry = null; - share.Watcher ow = null; + private boolean m_bLogging = false; + private share.DescEntry entry = null; + private share.Watcher ow = null; public SimpleLogWriter() { super(System.out); diff --git a/qadevOOo/runner/util/BookmarkDsc.java b/qadevOOo/runner/util/BookmarkDsc.java index 5eb821318380..6772f1ce4cc1 100644 --- a/qadevOOo/runner/util/BookmarkDsc.java +++ b/qadevOOo/runner/util/BookmarkDsc.java @@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent; */ public class BookmarkDsc extends InstDescr { - final String service = "com.sun.star.text.Bookmark"; - String ifcName = "com.sun.star.text.XTextContent"; + private final String service = "com.sun.star.text.Bookmark"; + private String ifcName = "com.sun.star.text.XTextContent"; private String name = null; diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java index 43aa834cb1d7..e0bf47016e6e 100644 --- a/qadevOOo/runner/util/DBTools.java +++ b/qadevOOo/runner/util/DBTools.java @@ -137,19 +137,19 @@ public class DBTools { /** * Representation of <code>'SuppressVersionColumns'</code> property. */ - public Boolean SuppressVersionColumns = null ; + private Boolean SuppressVersionColumns = null ; /** * Representation of <code>'IsReadOnly'</code> property. */ - public Boolean IsReadOnly = null ; + private Boolean IsReadOnly = null ; /** * Representation of <code>'TableFilter'</code> property. */ - public String[] TableFilter = null ; + private String[] TableFilter = null ; /** * Representation of <code>'TableTypeFilter'</code> property. */ - public String[] TableTypeFilter = null ; + private String[] TableTypeFilter = null ; /** * Creates an empty instance. diff --git a/qadevOOo/runner/util/DefaultDsc.java b/qadevOOo/runner/util/DefaultDsc.java index 9aedebb11008..8090fad5c2a2 100644 --- a/qadevOOo/runner/util/DefaultDsc.java +++ b/qadevOOo/runner/util/DefaultDsc.java @@ -29,8 +29,8 @@ import com.sun.star.uno.UnoRuntime; public class DefaultDsc extends InstDescr { private String name = null; - String ifcName = null; - String service = null; + private String ifcName = null; + private String service = null; public DefaultDsc( String Interface, String kind ) { service = kind; diff --git a/qadevOOo/runner/util/FootnoteDsc.java b/qadevOOo/runner/util/FootnoteDsc.java index 3e9fb89f2867..7ff9f6b7a42a 100644 --- a/qadevOOo/runner/util/FootnoteDsc.java +++ b/qadevOOo/runner/util/FootnoteDsc.java @@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent; */ public class FootnoteDsc extends InstDescr { - final String service = "com.sun.star.text.Footnote"; - String ifcName = "com.sun.star.text.XTextContent"; + private final String service = "com.sun.star.text.Footnote"; + private String ifcName = "com.sun.star.text.XTextContent"; private String name = null; diff --git a/qadevOOo/runner/util/FrameDsc.java b/qadevOOo/runner/util/FrameDsc.java index 0af97f9eedf6..147ed14a0423 100644 --- a/qadevOOo/runner/util/FrameDsc.java +++ b/qadevOOo/runner/util/FrameDsc.java @@ -34,8 +34,8 @@ public class FrameDsc extends InstDescr { private int height = 2000; private int width = 2000; private String name = null; - final String ifcName = "com.sun.star.text.XTextFrame"; - final String service = "com.sun.star.text.TextFrame"; + private final String ifcName = "com.sun.star.text.XTextFrame"; + private final String service = "com.sun.star.text.TextFrame"; public FrameDsc() { initFrame(); diff --git a/qadevOOo/runner/util/InstCreator.java b/qadevOOo/runner/util/InstCreator.java index 2f131a263fea..5259b4340558 100644 --- a/qadevOOo/runner/util/InstCreator.java +++ b/qadevOOo/runner/util/InstCreator.java @@ -33,11 +33,11 @@ import com.sun.star.container.XIndexAccess; public class InstCreator implements XInstCreator { - XInterface xParent; - XMultiServiceFactory xMSF; - XInterface xInstance; - XIndexAccess xIA; - InstDescr iDsc; + private XInterface xParent; + private XMultiServiceFactory xMSF; + private XInterface xInstance; + private XIndexAccess xIA; + private InstDescr iDsc; public InstCreator( XInterface xParent, InstDescr iDsc ) { this.xParent = xParent; diff --git a/qadevOOo/runner/util/ParagraphDsc.java b/qadevOOo/runner/util/ParagraphDsc.java index 65ec021b2d52..16508836f107 100644 --- a/qadevOOo/runner/util/ParagraphDsc.java +++ b/qadevOOo/runner/util/ParagraphDsc.java @@ -28,8 +28,8 @@ import com.sun.star.text.XTextContent; */ public class ParagraphDsc extends InstDescr { - final String service = "com.sun.star.text.Paragraph"; - String ifcName = "com.sun.star.text.XTextContent"; + private final String service = "com.sun.star.text.Paragraph"; + private String ifcName = "com.sun.star.text.XTextContent"; private String name = null; diff --git a/qadevOOo/runner/util/ReferenceMarkDsc.java b/qadevOOo/runner/util/ReferenceMarkDsc.java index 0441a89d0e1e..8185bd9ae774 100644 --- a/qadevOOo/runner/util/ReferenceMarkDsc.java +++ b/qadevOOo/runner/util/ReferenceMarkDsc.java @@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent; */ public class ReferenceMarkDsc extends InstDescr { - final String service = "com.sun.star.text.ReferenceMark"; - String ifcName = "com.sun.star.text.XTextContent"; + private final String service = "com.sun.star.text.ReferenceMark"; + private String ifcName = "com.sun.star.text.XTextContent"; private String name = null; diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java index dec23a20f8ae..f6db1c696bcd 100644 --- a/qadevOOo/runner/util/SOfficeFactory.java +++ b/qadevOOo/runner/util/SOfficeFactory.java @@ -45,7 +45,7 @@ import com.sun.star.awt.*; public class SOfficeFactory { private static HashMap<String, SOfficeFactory> lookup = new HashMap<String, SOfficeFactory>(10); - protected XComponentLoader oCLoader; + private XComponentLoader oCLoader; private SOfficeFactory(XMultiServiceFactory xMSF) { // get XInterface of Desktop service diff --git a/qadevOOo/runner/util/ShapeDsc.java b/qadevOOo/runner/util/ShapeDsc.java index faea91984842..c8f970e50701 100644 --- a/qadevOOo/runner/util/ShapeDsc.java +++ b/qadevOOo/runner/util/ShapeDsc.java @@ -32,9 +32,9 @@ public class ShapeDsc extends InstDescr { private int y = 0; private int height = 0; private int width = 0; - private String name = null; - final String ifcName = "com.sun.star.drawing.XShape"; - String service = "com.sun.star.drawing.RectangleShape"; + private String name = null; + private final String ifcName = "com.sun.star.drawing.XShape"; + private String service = "com.sun.star.drawing.RectangleShape"; public ShapeDsc( int nheight, int nwidth, int nx, int ny, String kind ) { x=nx; diff --git a/qadevOOo/runner/util/SysUtils.java b/qadevOOo/runner/util/SysUtils.java index 68166bb3e3bf..0d289f4d68da 100644 --- a/qadevOOo/runner/util/SysUtils.java +++ b/qadevOOo/runner/util/SysUtils.java @@ -41,7 +41,7 @@ public class SysUtils { return jh; } - static ArrayList<String> files = new ArrayList<String>(); + private static ArrayList<String> files = new ArrayList<String>(); public static Object[] traverse( String afileDirectory ) { diff --git a/qadevOOo/runner/util/TableDsc.java b/qadevOOo/runner/util/TableDsc.java index bfeabf615492..0821fd20ee20 100644 --- a/qadevOOo/runner/util/TableDsc.java +++ b/qadevOOo/runner/util/TableDsc.java @@ -30,8 +30,8 @@ public class TableDsc extends InstDescr { private int rows = 0; private int columns = 0; private String name = null; - final String ifcName = "com.sun.star.text.XTextTable"; - final String service = "com.sun.star.text.TextTable"; + private final String ifcName = "com.sun.star.text.XTextTable"; + private final String service = "com.sun.star.text.TextTable"; public TableDsc() { initTable(); diff --git a/qadevOOo/runner/util/TextSectionDsc.java b/qadevOOo/runner/util/TextSectionDsc.java index bb1a1b13cad7..2a435e5395ab 100644 --- a/qadevOOo/runner/util/TextSectionDsc.java +++ b/qadevOOo/runner/util/TextSectionDsc.java @@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent; */ public class TextSectionDsc extends InstDescr { - final String service = "com.sun.star.text.TextSection"; - String ifcName = "com.sun.star.text.XTextContent"; + private final String service = "com.sun.star.text.TextSection"; + private String ifcName = "com.sun.star.text.XTextContent"; private String name = null; diff --git a/qadevOOo/runner/util/XLayerHandlerImpl.java b/qadevOOo/runner/util/XLayerHandlerImpl.java index 262bebd841ed..2f7dcaf50857 100644 --- a/qadevOOo/runner/util/XLayerHandlerImpl.java +++ b/qadevOOo/runner/util/XLayerHandlerImpl.java @@ -19,8 +19,8 @@ package util; public class XLayerHandlerImpl implements com.sun.star.configuration.backend.XLayerHandler { - protected String calls = ""; - protected String ls = System.getProperty("line.separator"); + private String calls = ""; + private String ls = System.getProperty("line.separator"); public void addOrReplaceNode(String str, short param) throws com.sun.star.configuration.backend.MalformedDataException, diff --git a/qadevOOo/runner/util/XLayerImpl.java b/qadevOOo/runner/util/XLayerImpl.java index 62ac73c749b2..351450292536 100644 --- a/qadevOOo/runner/util/XLayerImpl.java +++ b/qadevOOo/runner/util/XLayerImpl.java @@ -20,7 +20,7 @@ package util; public class XLayerImpl implements com.sun.star.configuration.backend.XLayer { - protected boolean wasCalled = false; + private boolean wasCalled = false; public XLayerImpl() { } diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java index 7516d4b8c895..f4d7fbf0f515 100644 --- a/qadevOOo/runner/util/XMLTools.java +++ b/qadevOOo/runner/util/XMLTools.java @@ -252,13 +252,13 @@ public class XMLTools { * if the XML data and structure was valid. */ public static class XMLWellFormChecker extends XMLWriter { - protected boolean docStarted = false ; - protected boolean docEnded = false ; - protected ArrayList<String> tagStack = new ArrayList<String>() ; - protected boolean wellFormed = true ; - protected boolean noOtherErrors = true ; - protected PrintWriter log = null ; - protected boolean printXMLData = false ; + private boolean docStarted = false ; + private boolean docEnded = false ; + ArrayList<String> tagStack = new ArrayList<String>() ; + private boolean wellFormed = true ; + private boolean noOtherErrors = true ; + PrintWriter log = null ; + private boolean printXMLData = false ; private XMLWellFormChecker(PrintWriter log) { super() ; @@ -371,9 +371,9 @@ public class XMLTools { * appropriate message is output. */ public static class XMLTagsChecker extends XMLWellFormChecker { - protected HashMap<String,String> tags = new HashMap<String,String>() ; - protected HashMap<String,String> chars = new HashMap<String,String>() ; - protected boolean allOK = true ; + private HashMap<String,String> tags = new HashMap<String,String>() ; + private HashMap<String,String> chars = new HashMap<String,String>() ; + private boolean allOK = true ; public XMLTagsChecker(PrintWriter log) { super(log) ; @@ -627,11 +627,11 @@ public class XMLTools { * character data exists inside any tag specified. */ public static class XMLChecker extends XMLWellFormChecker { - protected HashSet<String> tagSet = new HashSet<String>() ; - protected ArrayList<Tag[]> tags = new ArrayList<Tag[]>() ; - protected ArrayList<Object[]> chars = new ArrayList<Object[]>() ; - protected ArrayList<String> tagStack = new ArrayList<String>() ; - protected ArrayList<AttributeList> attrStack = new ArrayList<AttributeList>() ; + private HashSet<String> tagSet = new HashSet<String>() ; + private ArrayList<Tag[]> tags = new ArrayList<Tag[]>() ; + private ArrayList<Object[]> chars = new ArrayList<Object[]>() ; + private ArrayList<String> tagStack = new ArrayList<String>() ; + private ArrayList<AttributeList> attrStack = new ArrayList<AttributeList>() ; public XMLChecker(PrintWriter log, boolean writeXML) { super(log, writeXML) ; diff --git a/qadevOOo/runner/util/XSchemaHandlerImpl.java b/qadevOOo/runner/util/XSchemaHandlerImpl.java index fb308ac921a1..06758014bbc7 100644 --- a/qadevOOo/runner/util/XSchemaHandlerImpl.java +++ b/qadevOOo/runner/util/XSchemaHandlerImpl.java @@ -19,8 +19,8 @@ package util; public class XSchemaHandlerImpl implements com.sun.star.configuration.backend.XSchemaHandler { - protected String calls = ""; - protected String ls = System.getProperty("line.separator"); + private String calls = ""; + private String ls = System.getProperty("line.separator"); public void addInstance(String str, com.sun.star.configuration.backend.TemplateIdentifier templateIdentifier) diff --git a/qadevOOo/runner/util/compare/GraphicalComparator.java b/qadevOOo/runner/util/compare/GraphicalComparator.java index 420f0249c16f..47b99b8aa218 100644 --- a/qadevOOo/runner/util/compare/GraphicalComparator.java +++ b/qadevOOo/runner/util/compare/GraphicalComparator.java @@ -33,7 +33,7 @@ import convwatch.ConvWatchException; class GraphicalComparator implements DocComparator { - GraphicalTestArguments m_aArguments; + private GraphicalTestArguments m_aArguments; protected GraphicalComparator(TestParameters aParams) { diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java index c02406add999..7dcc7bba878e 100644 --- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java +++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java @@ -134,7 +134,7 @@ public class SDBCReportDataFactory implements DataSourceFactory class ParameterDefinition { - int parameterCount = 0; + private int parameterCount = 0; private ArrayList<Integer> parameterIndex = new ArrayList<Integer>(); } private static final Log LOGGER = LogFactory.getLog(SDBCReportDataFactory.class); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupInstanceSection.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupInstanceSection.java index cd7ed7b694c1..d4c30ea8bd80 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupInstanceSection.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupInstanceSection.java @@ -27,7 +27,7 @@ import org.jfree.report.structure.Group; public class OfficeGroupInstanceSection extends Group { - String sortingExpression; + private String sortingExpression; public OfficeGroupInstanceSection() { diff --git a/reportdesign/qa/complex/reportdesign/FileURL.java b/reportdesign/qa/complex/reportdesign/FileURL.java index c2408038211b..02c3a00a010e 100644 --- a/reportdesign/qa/complex/reportdesign/FileURL.java +++ b/reportdesign/qa/complex/reportdesign/FileURL.java @@ -24,7 +24,7 @@ import java.net.URISyntaxException; public class FileURL { - String m_sFileURL; + private String m_sFileURL; public FileURL(String _sFileURL) { diff --git a/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java b/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java index 47960090b011..9971c74e0419 100644 --- a/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java +++ b/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java @@ -52,13 +52,13 @@ import lib.TestParameters; */ public class _XDataPilotDescriptor { - public XDataPilotDescriptor oObj = null; - CellRangeAddress CRA = new CellRangeAddress((short)1, 0, 0, 5, 5); - CellRangeAddress oldCRA = null ; - String sTag = new String ("XDataPilotDescriptor_Tag"); - String fieldsNames[]; - int fieldsAmount = 0; - int tEnvFieldsAmount = 0; + private XDataPilotDescriptor oObj = null; + private CellRangeAddress CRA = new CellRangeAddress((short)1, 0, 0, 5, 5); + private CellRangeAddress oldCRA = null ; + private String sTag = new String ("XDataPilotDescriptor_Tag"); + private String fieldsNames[]; + private int fieldsAmount = 0; + private int tEnvFieldsAmount = 0; /** * The test parameters diff --git a/sc/qa/complex/dataPilot/_XDataPilotTable.java b/sc/qa/complex/dataPilot/_XDataPilotTable.java index 416afcd1f018..1f9d13357eaa 100644 --- a/sc/qa/complex/dataPilot/_XDataPilotTable.java +++ b/sc/qa/complex/dataPilot/_XDataPilotTable.java @@ -45,11 +45,11 @@ import lib.TestParameters; */ public class _XDataPilotTable { - public XDataPilotTable oObj = null; - XCell xCellForChange = null; - XCell xCellForCheck = null; - CellAddress OutputRange = null; - int changeValue = 0; + private XDataPilotTable oObj = null; + private XCell xCellForChange = null; + private XCell xCellForCheck = null; + private CellAddress OutputRange = null; + private int changeValue = 0; /** * The test parameters diff --git a/sc/qa/complex/dataPilot/_XNamed.java b/sc/qa/complex/dataPilot/_XNamed.java index 4044f3d7712a..277971cbfe59 100644 --- a/sc/qa/complex/dataPilot/_XNamed.java +++ b/sc/qa/complex/dataPilot/_XNamed.java @@ -43,7 +43,7 @@ public class _XNamed { /** * The object that is testsed. */ - public XNamed oObj = null; + private XNamed oObj = null; /** * Constructor: gets the object to test, a logger and the test parameters diff --git a/sc/qa/complex/dataPilot/_XPropertySet.java b/sc/qa/complex/dataPilot/_XPropertySet.java index 470d83a13517..ea2cd95ddb7d 100644 --- a/sc/qa/complex/dataPilot/_XPropertySet.java +++ b/sc/qa/complex/dataPilot/_XPropertySet.java @@ -61,13 +61,13 @@ public class _XPropertySet { /** * Flag that indicates change listener was called. */ - boolean propertyChanged = false; + private boolean propertyChanged = false; /** * The own property change listener */ - XPropertyChangeListener PClistener = new MyChangeListener(); + private XPropertyChangeListener PClistener = new MyChangeListener(); /** * Listener that must be called on bound property changing. @@ -86,12 +86,12 @@ public class _XPropertySet { /** * Flag that indicates veto listener was called. */ - boolean vetoableChanged = false; + private boolean vetoableChanged = false; /** * The own vetoable change listener */ - XVetoableChangeListener VClistener = new MyVetoListener(); + private XVetoableChangeListener VClistener = new MyVetoListener(); /** * Listener that must be called on constrained property changing. @@ -110,7 +110,7 @@ public class _XPropertySet { /** * Properties to test */ - PropsToTest PTT = new PropsToTest(); + private PropsToTest PTT = new PropsToTest(); /** * Structure that collects three properties of each type to test : diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java index 01eda4dcd276..75e4771ddf78 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java @@ -57,10 +57,10 @@ public class ParcelBrowseNode extends PropertySet private Collection<XBrowseNode> browsenodes; private ParcelContainer container; private Parcel parcel; - public boolean deletable = true; - public boolean editable = false; - public boolean creatable = false; - public boolean renamable = true; + private boolean deletable = true; + private boolean editable = false; + private boolean creatable = false; + private boolean renamable = true; public ParcelBrowseNode( ScriptProvider provider, ParcelContainer container, String parcelName ) { this.provider = provider; diff --git a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java index 3000ece25e64..3f0f7c2b4ce2 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java @@ -46,12 +46,12 @@ import javax.swing.JOptionPane; public class ProviderBrowseNode extends PropertySet implements XBrowseNode, XInvocation { - protected ScriptProvider provider; - protected Collection<XBrowseNode> browsenodes; - protected String name; + private ScriptProvider provider; + private Collection<XBrowseNode> browsenodes; + private String name; protected ParcelContainer container; protected Parcel parcel; - protected XComponentContext m_xCtx; + private XComponentContext m_xCtx; public boolean deletable = true; public boolean creatable = true; diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java index f59b9594c1a1..88557010d9bf 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java @@ -52,11 +52,11 @@ public class ScriptBrowseNode extends PropertySet private Parcel parent; private String name; - public String uri; - public String description; - public boolean editable = false; - public boolean deletable = false; - public boolean renamable = false; + private String uri; + private String description; + private boolean editable = false; + private boolean deletable = false; + private boolean renamable = false; public ScriptBrowseNode( ScriptProvider provider, Parcel parent, String name ) diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java b/scripting/java/com/sun/star/script/framework/container/Parcel.java index 1b3da878752b..0a5b75a5c3f0 100644 --- a/scripting/java/com/sun/star/script/framework/container/Parcel.java +++ b/scripting/java/com/sun/star/script/framework/container/Parcel.java @@ -30,8 +30,8 @@ import java.io.*; public class Parcel implements XNameContainer { - protected ParcelDescriptor m_descriptor; - protected String name; + private ParcelDescriptor m_descriptor; + private String name; protected ParcelContainer parent; protected XSimpleFileAccess m_xSFA; public Parcel( XSimpleFileAccess xSFA, ParcelContainer parent, ParcelDescriptor desc, String parcelName ) diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java index 22a0b0059bfb..bb6c6fd39781 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java @@ -47,7 +47,7 @@ public class ParcelContainer implements XNameAccess { protected String language; protected String containerUrl; - protected Collection<Parcel> parcels = new ArrayList<Parcel>(10); + private Collection<Parcel> parcels = new ArrayList<Parcel>(10); static protected XSimpleFileAccess m_xSFA; protected XComponentContext m_xCtx; private ParcelContainer parent = null; diff --git a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java index 34fc62f5bbe0..bff215e08a1b 100644 --- a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java +++ b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java @@ -40,8 +40,8 @@ public class UnoPkgContainer extends ParcelContainer { private Map<String,ParcelContainer> registeredPackages = new HashMap<String,ParcelContainer>(); - protected String extensionDb; - protected String extensionRepository; + private String extensionDb; + private String extensionRepository; public UnoPkgContainer( XComponentContext xCtx, String locationURL, String _extensionDb, String _extensionRepository, String language ) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.lang.WrappedTargetException diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java index 2dd7381f2bb7..8c53edd39c74 100644 --- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java +++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java @@ -37,7 +37,7 @@ public class UCBStreamHandler extends URLStreamHandler { private XSimpleFileAccess m_xSimpleFileAccess = null; private HashMap<String,InputStream> m_jarStreamMap = new HashMap<String,InputStream>(12); - public static String m_ucbscheme; + private static String m_ucbscheme; public UCBStreamHandler( String scheme, XSimpleFileAccess xSFA ) { diff --git a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java index f5694477725e..b931aea238ea 100644 --- a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java +++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java @@ -24,7 +24,7 @@ import java.io.IOException; public class XInputStreamImpl implements XInputStream { - InputStream is; + private InputStream is; public XInputStreamImpl( InputStream is ) { this.is = is; diff --git a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java index e3c561cff48d..d221155d3902 100644 --- a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java +++ b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java @@ -21,7 +21,7 @@ import com.sun.star.io.XOutputStream; public class XOutputStreamWrapper extends OutputStream { - XOutputStream m_xOutputStream; + private XOutputStream m_xOutputStream; public XOutputStreamWrapper(XOutputStream xOs ) { this.m_xOutputStream = xOs; } diff --git a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java index 5229b76cf1c3..63e8296e0b91 100644 --- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java +++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java @@ -27,7 +27,7 @@ import com.sun.star.uno.IQueryInterface; public class PathUtils { - public static String FILE_URL_PREFIX; + private static String FILE_URL_PREFIX; public static String BOOTSTRAP_NAME; private static boolean m_windows = false; diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java index 6532c5f6a95a..0f21981b8678 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java @@ -40,12 +40,12 @@ public class ScriptContext extends PropertySet implements XScriptContext private final static String DOC_URI = "SCRIPTING_DOC_URI"; - public XModel m_xModel = null; - public XScriptInvocationContext m_xInvocationContext = null; + private XModel m_xModel = null; + private XScriptInvocationContext m_xInvocationContext = null; public String m_sDocURI = null; - public XDesktop m_xDeskTop = null; + private XDesktop m_xDeskTop = null; public Integer m_iStorageID = null; - public XComponentContext m_xComponentContext = null; + private XComponentContext m_xComponentContext = null; private ScriptContext( XComponentContext xmComponentContext, XDesktop xDesktop, XModel xModel, XScriptInvocationContext xInvocContext) diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java index 9fb9f15f12aa..ad0c7b07fcad 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java @@ -92,10 +92,10 @@ public abstract class ScriptProvider protected String language; protected XComponentContext m_xContext; - protected XMultiComponentFactory m_xMultiComponentFactory; + private XMultiComponentFactory m_xMultiComponentFactory; protected XModel m_xModel; protected XScriptInvocationContext m_xInvocContext; - protected ParcelContainer m_container; + private ParcelContainer m_container; // proxies to helper objects which implement interfaces private XPropertySet m_xPropertySetProxy; diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java index 130c44bb37ab..b18325d47d46 100644 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java @@ -325,7 +325,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor class closeHandler implements Runnable { - URL url; + private URL url; private closeHandler( URL url ) { this.url = url; diff --git a/scripting/workben/installer/IdeVersion.java b/scripting/workben/installer/IdeVersion.java index bd6fc1012c59..32e77552165e 100644 --- a/scripting/workben/installer/IdeVersion.java +++ b/scripting/workben/installer/IdeVersion.java @@ -243,7 +243,7 @@ public class IdeVersion extends javax.swing.JPanel implements ActionListener, Ta class MyTableModelIDE extends AbstractTableModel { ArrayList<ArrayList<Object>> data; - String colNames[] = {"", "IDE Name", "IDE Location"}; + private String colNames[] = {"", "IDE Name", "IDE Location"}; Object[] longValues = new Object[] {Boolean.TRUE, "Name", "Location"}; MyTableModelIDE (Properties properties, String [] validVersions) { diff --git a/scripting/workben/installer/NavPanel.java b/scripting/workben/installer/NavPanel.java index ea35660dc1c5..af2b21f45046 100644 --- a/scripting/workben/installer/NavPanel.java +++ b/scripting/workben/installer/NavPanel.java @@ -118,7 +118,7 @@ public class NavPanel extends JPanel implements ActionListener { navCancel.removeActionListener(listener); } - public JButton navBack; + private JButton navBack; public JButton navNext; public JButton navCancel; private GridBagConstraints gridBagConstraints1; diff --git a/scripting/workben/installer/Version.java b/scripting/workben/installer/Version.java index a7982636575a..40ec3c8dbef1 100644 --- a/scripting/workben/installer/Version.java +++ b/scripting/workben/installer/Version.java @@ -241,7 +241,7 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table class MyTableModel extends AbstractTableModel { ArrayList<ArrayList<Object>> data; - String colNames[] = {"", "Name", "Location"}; + private String colNames[] = {"", "Name", "Location"}; Object[] longValues = new Object[] {Boolean.TRUE, "Name", "Location"}; MyTableModel (Properties properties) { diff --git a/sfx2/qa/complex/sfx2/tools/DialogThread.java b/sfx2/qa/complex/sfx2/tools/DialogThread.java index b7dc1691b46f..b4a8ddae3e1a 100644 --- a/sfx2/qa/complex/sfx2/tools/DialogThread.java +++ b/sfx2/qa/complex/sfx2/tools/DialogThread.java @@ -33,9 +33,9 @@ import com.sun.star.util.XURLTransformer; * */ public class DialogThread extends Thread { - public XComponent m_xDoc = null; - public XMultiServiceFactory m_xMSF = null; - public String m_url = ""; + private XComponent m_xDoc = null; + private XMultiServiceFactory m_xMSF = null; + private String m_url = ""; public DialogThread(XComponent xDoc, XMultiServiceFactory msf, String url) { this.m_xDoc = xDoc; diff --git a/sfx2/qa/complex/sfx2/tools/WriterHelper.java b/sfx2/qa/complex/sfx2/tools/WriterHelper.java index 248d6494a3e6..9f6672f8d8ce 100644 --- a/sfx2/qa/complex/sfx2/tools/WriterHelper.java +++ b/sfx2/qa/complex/sfx2/tools/WriterHelper.java @@ -42,7 +42,7 @@ import util.WriterTools; * */ public class WriterHelper { - XMultiServiceFactory m_xMSF = null; + private XMultiServiceFactory m_xMSF = null; /** Creates a new instance of WriterHelper * @param m_xMSF The MultiServiceFactory gained from the office diff --git a/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java b/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java index f72423f96ced..b5432023f9e6 100644 --- a/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java +++ b/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java @@ -28,7 +28,7 @@ import com.sun.star.uno.UnoRuntime; public class MasterPasswdHandler extends WeakBase implements XInteractionHandler { - XInteractionHandler m_xHandler; + private XInteractionHandler m_xHandler; public MasterPasswdHandler( XInteractionHandler xHandler ) { m_xHandler = xHandler; diff --git a/sw/qa/complex/writer/CheckBookmarks.java b/sw/qa/complex/writer/CheckBookmarks.java index e53dffc28cc7..348844cf4868 100644 --- a/sw/qa/complex/writer/CheckBookmarks.java +++ b/sw/qa/complex/writer/CheckBookmarks.java @@ -46,7 +46,7 @@ class BookmarkHashes { public BigInteger m_nDeleteRandomHash; public BigInteger m_nLinebreakHash; public BigInteger m_nOdfReloadHash; - public BigInteger m_nMsWordReloadHash; + private BigInteger m_nMsWordReloadHash; public void assertExpectation(BookmarkHashes aExpectation) { assertEquals(aExpectation.m_nSetupHash, m_nSetupHash); diff --git a/sw/qa/complex/writer/TextPortionEnumerationTest.java b/sw/qa/complex/writer/TextPortionEnumerationTest.java index 8ef7b8870b8e..5c51ae70e4cd 100644 --- a/sw/qa/complex/writer/TextPortionEnumerationTest.java +++ b/sw/qa/complex/writer/TextPortionEnumerationTest.java @@ -105,7 +105,7 @@ abstract class MarkNode extends TreeNode { boolean m_isPoint; boolean m_isStart = false; - String m_Name; + private String m_Name; boolean isPoint() { return m_isPoint; } boolean isStart() { return m_isStart; } String getName() { return m_Name; } diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java index 417308c7fd43..daa35a47f1dd 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java @@ -53,7 +53,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase private XDialog m_xDialog; private XControlContainer m_xControlContainer; - Settings m_aSettings; + private Settings m_aSettings; public WikiOptionsEventHandlerImpl( XComponentContext xContext ) { diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java index ea8c29b484e9..4b7e6bae01bb 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java @@ -47,7 +47,7 @@ import com.sun.star.uno.XInterface; */ public class _XAccessibleComponent { - public XAccessibleComponent oObj = null; + private XAccessibleComponent oObj = null; private Rectangle bounds = null ; diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java index 808f3120d38d..112f96865e83 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java @@ -48,7 +48,7 @@ import util.AccessibilityTools; */ public class _XAccessibleContext { - public XAccessibleContext oObj = null; + private XAccessibleContext oObj = null; private int childCount = 0; private XAccessible parent = null ; diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java index 2d18276cbb0d..f6cb56170e0b 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java @@ -51,15 +51,15 @@ import com.sun.star.uno.UnoRuntime; */ public class _XAccessibleEventBroadcaster { - public XAccessibleEventBroadcaster oObj = null; - EventProducer prod = null ; - EvListener list = new EvListener(); + private XAccessibleEventBroadcaster oObj = null; + private EventProducer prod = null ; + private EvListener list = new EvListener(); /** * An event producer */ public static class EventProducer { - XWindow xWindow; + private XWindow xWindow; private EventProducer(XWindow window) { xWindow = window; } diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java index ad278316efb4..24b1f4e6f42c 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java @@ -41,7 +41,7 @@ public class _XAccessibleExtendedComponent { private static final String className = "com.sun.star.accessibility.XAccessibleExtendedComponent" ; - public XAccessibleExtendedComponent oObj = null; + private XAccessibleExtendedComponent oObj = null; // temporary while accessibility package is in com.sun.star protected String getTestedClassName() { diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java index 4c91a01a294a..61f1bd480f6b 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java @@ -63,14 +63,14 @@ import com.sun.star.uno.UnoRuntime; */ public class _XAccessibleText { - public XAccessibleText oObj = null; + private XAccessibleText oObj = null; private XMultiServiceFactory xMSF; - Rectangle chBounds = null; - int chCount = 0; + private Rectangle chBounds = null; + private int chCount = 0; - String text = null; - String editOnly = null; + private String text = null; + private String editOnly = null; public _XAccessibleText(XInterface object, XMultiServiceFactory xMSF, String editOnly) { diff --git a/ucb/qa/complex/tdoc/_XChild.java b/ucb/qa/complex/tdoc/_XChild.java index 067afd8a0fcd..8d80e7856f46 100644 --- a/ucb/qa/complex/tdoc/_XChild.java +++ b/ucb/qa/complex/tdoc/_XChild.java @@ -35,8 +35,8 @@ import share.LogWriter; public class _XChild { public XChild oObj = null; - public Object gotten = null; - public LogWriter log = null; + private Object gotten = null; + private LogWriter log = null; /** diff --git a/ucb/qa/complex/tdoc/_XCommandProcessor.java b/ucb/qa/complex/tdoc/_XCommandProcessor.java index 1e04f59d7fa9..ad54704ba498 100644 --- a/ucb/qa/complex/tdoc/_XCommandProcessor.java +++ b/ucb/qa/complex/tdoc/_XCommandProcessor.java @@ -71,14 +71,14 @@ public class _XCommandProcessor { * Conatins the tested object. */ public XCommandProcessor oObj; - public LogWriter log = null; + private LogWriter log = null; private XMultiServiceFactory xMSF = null; /** * Contains the command id returned by <code>createCommandIdentifier() * </code>. It is used in <code>abort()</code> test. */ - int cmdId; + private int cmdId; public void before(XMultiServiceFactory _xMSF) { xMSF = _xMSF; diff --git a/ucb/qa/complex/tdoc/_XComponent.java b/ucb/qa/complex/tdoc/_XComponent.java index 50f5747bbc7f..63adb1fe50cc 100644 --- a/ucb/qa/complex/tdoc/_XComponent.java +++ b/ucb/qa/complex/tdoc/_XComponent.java @@ -38,10 +38,10 @@ import share.LogWriter; public class _XComponent { public static XComponent oObj = null; - public LogWriter log = null; + private LogWriter log = null; - boolean listenerDisposed[] = new boolean[2]; - String[] Loutput = new String[2]; + private boolean listenerDisposed[] = new boolean[2]; + private String[] Loutput = new String[2]; /** * Listener which added but not removed, and its method must be called @@ -65,8 +65,8 @@ public class _XComponent { } } - XEventListener listener1 = new MyEventListener(); - XEventListener listener2 = new MyEventListener2(); + private XEventListener listener1 = new MyEventListener(); + private XEventListener listener2 = new MyEventListener2(); /** * For the cfgmgr2.OSetElement tests: dispose the owner element. @@ -110,7 +110,7 @@ public class _XComponent { return true; } // finished _removeEventListener() - static boolean disposed = false; + private static boolean disposed = false; /** * Disposes the object and then check appropriate listeners were diff --git a/ucb/qa/complex/tdoc/_XContent.java b/ucb/qa/complex/tdoc/_XContent.java index 19c91e0a895b..735c40167eaa 100644 --- a/ucb/qa/complex/tdoc/_XContent.java +++ b/ucb/qa/complex/tdoc/_XContent.java @@ -24,7 +24,7 @@ import share.LogWriter; public class _XContent { public XContent oObj = null; - public LogWriter log = null; + private LogWriter log = null; private ContentListener listener = null; public boolean _addContentEventListener() { diff --git a/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java index 5c9dedb354de..4f945d09f94e 100644 --- a/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java +++ b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java @@ -28,8 +28,8 @@ public class _XPropertiesChangeNotifier { public XPropertiesChangeNotifier oObj = null; public LogWriter log = null; - PropertiesChangeListener listener = new PropertiesChangeListener(); - String[] args = null; + private PropertiesChangeListener listener = new PropertiesChangeListener(); + private String[] args = null; public boolean _addPropertiesChangeListener() { diff --git a/ucb/qa/complex/tdoc/_XPropertyContainer.java b/ucb/qa/complex/tdoc/_XPropertyContainer.java index 50be2d929a06..7bb5fa01ec0a 100644 --- a/ucb/qa/complex/tdoc/_XPropertyContainer.java +++ b/ucb/qa/complex/tdoc/_XPropertyContainer.java @@ -22,7 +22,7 @@ import share.LogWriter; public class _XPropertyContainer { public XPropertyContainer oObj = null; - public LogWriter log = null; + private LogWriter log = null; public boolean _addProperty() { boolean result = true; diff --git a/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java index 0b669f7eb21c..0505c6796108 100644 --- a/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java +++ b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java @@ -28,7 +28,7 @@ public class _XPropertySetInfoChangeNotifier { public XPropertySetInfoChangeNotifier oObj = null; public LogWriter log = null; - PropertySetInfoChangeListener listener = new PropertySetInfoChangeListener(); + private PropertySetInfoChangeListener listener = new PropertySetInfoChangeListener(); String[] args = null; diff --git a/ucb/qa/complex/tdoc/_XServiceInfo.java b/ucb/qa/complex/tdoc/_XServiceInfo.java index 85cd5211d2c2..63f979b75618 100644 --- a/ucb/qa/complex/tdoc/_XServiceInfo.java +++ b/ucb/qa/complex/tdoc/_XServiceInfo.java @@ -34,8 +34,8 @@ import share.LogWriter; */ public class _XServiceInfo { public static XServiceInfo oObj = null; - public static String[] names = null; - public LogWriter log = null; + private static String[] names = null; + private LogWriter log = null; /** * Just calls the method.<p> diff --git a/ucb/qa/complex/tdoc/_XTypeProvider.java b/ucb/qa/complex/tdoc/_XTypeProvider.java index bcf8f5f6bfcd..2622db30f946 100644 --- a/ucb/qa/complex/tdoc/_XTypeProvider.java +++ b/ucb/qa/complex/tdoc/_XTypeProvider.java @@ -35,8 +35,8 @@ import share.LogWriter; public class _XTypeProvider { public static XTypeProvider oObj = null; - public static Type[] types = null; - public LogWriter log = null; + private static Type[] types = null; + private LogWriter log = null; /** * Just calls the method.<p> diff --git a/vcl/qa/complex/persistent_window_states/DocumentHandle.java b/vcl/qa/complex/persistent_window_states/DocumentHandle.java index 10caf3cab52a..88393b2fbf37 100644 --- a/vcl/qa/complex/persistent_window_states/DocumentHandle.java +++ b/vcl/qa/complex/persistent_window_states/DocumentHandle.java @@ -36,13 +36,13 @@ import helper.WindowListener; */ public class DocumentHandle { // the component loader to load a document - XComponentLoader xCompLoader = null; + private XComponentLoader xCompLoader = null; // the document - XComponent xComp = null; + private XComponent xComp = null; // the current window - XWindow xWin = null; + private XWindow xWin = null; // a own window listener - WindowListener wl = null; + private WindowListener wl = null; /** * Constructor diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java index 1b762f761349..106f5bd33346 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.java +++ b/wizards/com/sun/star/wizards/common/FileAccess.java @@ -685,7 +685,7 @@ public class FileAccess return LocLayoutFiles; } public XSimpleFileAccess2 fileAccess; - public XFileIdentifierConverter filenameConverter; + private XFileIdentifierConverter filenameConverter; public FileAccess(XMultiServiceFactory xmsf) throws com.sun.star.uno.Exception { diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java index 42c4689a42ee..b05b7624d39e 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 boolean bNullDateCorrectionIsDefined = false; private Locale aLocale; diff --git a/wizards/com/sun/star/wizards/common/ParaStyled.java b/wizards/com/sun/star/wizards/common/ParaStyled.java index e1eedfdfd2d3..31d7327ca320 100644 --- a/wizards/com/sun/star/wizards/common/ParaStyled.java +++ b/wizards/com/sun/star/wizards/common/ParaStyled.java @@ -25,7 +25,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 ea5a7617d276..ea0a84cbd983 100644 --- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java +++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java @@ -29,9 +29,9 @@ import com.sun.star.wizards.common.PlaceholderTextElement; public class PlaceholderTextElement extends TextElement { - String hint; - String placeHolderText; - XMultiServiceFactory xmsf; + private String hint; + private String placeHolderText; + private XMultiServiceFactory xmsf; TextDocument templateDocument; public PlaceholderTextElement(XTextRange textRange, String placeHolderText_, String hint_, XMultiServiceFactory xmsf_) diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.java b/wizards/com/sun/star/wizards/common/PropertySetHelper.java index 5862300ea316..304b6e58b1bc 100644 --- a/wizards/com/sun/star/wizards/common/PropertySetHelper.java +++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.java @@ -29,7 +29,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) diff --git a/wizards/com/sun/star/wizards/common/Resource.java b/wizards/com/sun/star/wizards/common/Resource.java index 0ea3f5dd3de7..33e3557ac263 100644 --- a/wizards/com/sun/star/wizards/common/Resource.java +++ b/wizards/com/sun/star/wizards/common/Resource.java @@ -28,10 +28,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/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java index 25cee169add4..5e03edb45126 100644 --- a/wizards/com/sun/star/wizards/common/SystemDialog.java +++ b/wizards/com/sun/star/wizards/common/SystemDialog.java @@ -34,16 +34,16 @@ import com.sun.star.beans.PropertyValue; public class SystemDialog { - Object systemDialog; - XFilePicker xFilePicker; - XFolderPicker2 xFolderPicker; - XFilterManager xFilterManager; - XInitialization xInitialize; - XExecutableDialog xExecutable; - XComponent xComponent; - XFilePickerControlAccess xFilePickerControlAccess; - XMultiServiceFactory xMSF; - public XStringSubstitution xStringSubstitution; + private Object systemDialog; + private XFilePicker xFilePicker; + private XFolderPicker2 xFolderPicker; + private XFilterManager xFilterManager; + private XInitialization xInitialize; + private XExecutableDialog xExecutable; + private XComponent xComponent; + private XFilePickerControlAccess xFilePickerControlAccess; + private XMultiServiceFactory xMSF; + private XStringSubstitution xStringSubstitution; public String sStorePath; /** diff --git a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java index 10458ac87204..ef0b0ec2e4c5 100644 --- a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java +++ b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java @@ -27,7 +27,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 6b1f256c3021..973345a7a882 100644 --- a/wizards/com/sun/star/wizards/db/CommandMetaData.java +++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java @@ -66,10 +66,10 @@ public class CommandMetaData extends DBMetaData public String[] NonAggregateFieldNames; private int CommandType; private String Command; - boolean bCatalogAtStart = true; - String sCatalogSep = PropertyNames.EMPTY_STRING; - String sIdentifierQuote = PropertyNames.EMPTY_STRING; - boolean bCommandComposerAttributesalreadyRetrieved = false; + private boolean bCatalogAtStart = true; + private String sCatalogSep = PropertyNames.EMPTY_STRING; + private String sIdentifierQuote = PropertyNames.EMPTY_STRING; + private boolean bCommandComposerAttributesalreadyRetrieved = false; private XIndexAccess xIndexKeys; public CommandMetaData(XMultiServiceFactory xMSF, Locale _aLocale, NumberFormatter oNumberFormatter) diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java index 2621b96e167b..5dda8ef4f3aa 100644 --- a/wizards/com/sun/star/wizards/db/CommandName.java +++ b/wizards/com/sun/star/wizards/db/CommandName.java @@ -25,17 +25,17 @@ 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 String sIdentifierQuote; - 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 String sIdentifierQuote; + private boolean baddQuotation = true; public CommandName(CommandMetaData _CommandMetaData, String _DisplayName) { diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index 5a2660c24236..4204ebcc48f8 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -85,16 +85,16 @@ public class DBMetaData private XPropertySet m_dataSourceSettings; private XOfficeDatabaseDocument xModel; private XPropertySet xDataSourcePropertySet; - public String[] DataSourceNames; + private String[] DataSourceNames; public String[] CommandNames; - public java.util.ArrayList<CommandObject> CommandObjects = new ArrayList<CommandObject>(1); - public Locale aLocale; - public int[] CommandTypes; + private java.util.ArrayList<CommandObject> CommandObjects = new ArrayList<CommandObject>(1); + private Locale aLocale; + private int[] CommandTypes; 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; diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java index 3db987015417..31a443dd1619 100644 --- a/wizards/com/sun/star/wizards/db/QueryMetaData.java +++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java @@ -36,7 +36,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 1887751af855..946bf8838db4 100644 --- a/wizards/com/sun/star/wizards/db/RecordParser.java +++ b/wizards/com/sun/star/wizards/db/RecordParser.java @@ -40,15 +40,15 @@ import com.sun.star.wizards.common.PropertyNames; public class RecordParser extends QueryMetaData { - XNameAccess xColumns; + private XNameAccess xColumns; com.sun.star.sdbc.XRow xRow; - com.sun.star.sdbc.XRow xResultSetRow; + private com.sun.star.sdbc.XRow xResultSetRow; public XResultSet ResultSet; - XInterface xRowSet; - XCompletedExecution xExecute; - XColumnsSupplier xRowSetColumnsSupplier; - XComponent xRowSetComponent; - XInteractionHandler xInteraction; + private XInterface xRowSet; + private XCompletedExecution xExecute; + private XColumnsSupplier xRowSetColumnsSupplier; + private XComponent xRowSetComponent; + private XInteractionHandler xInteraction; public FieldColumn[] GroupFieldColumns; public FieldColumn[] RecordFieldColumns; diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java index 49e1db3842cf..16abe115d3fa 100644 --- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java +++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java @@ -41,12 +41,12 @@ public class SQLQueryComposer { public XColumnsSupplier xColSuppl; - 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) { diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java index 8657b636aec7..7de631020ced 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; diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java index b7930bd0f492..fa08c1737e93 100644 --- a/wizards/com/sun/star/wizards/db/TypeInspector.java +++ b/wizards/com/sun/star/wizards/db/TypeInspector.java @@ -47,13 +47,13 @@ public class TypeInspector DataType.INTEGER, DataType.FLOAT, DataType.REAL, DataType.DOUBLE, DataType.NUMERIC, DataType.DECIMAL }; final int INVALID = 999999; - XResultSet xResultSet; + private XResultSet xResultSet; public class TypeInfo { - public int nDataType; - public String sDataTypeName; + private int nDataType; + private String sDataTypeName; public boolean bisAutoIncrementable; private TypeInfo(int _nDataType, String _sDataTypeName, boolean _bisAutoIncrementable) diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java index e1d6d7aed911..3ba66acbff60 100644 --- a/wizards/com/sun/star/wizards/document/Control.java +++ b/wizards/com/sun/star/wizards/document/Control.java @@ -41,18 +41,18 @@ public class Control extends Shape { XControlModel xControlModel; - XControl xControl; + private XControl xControl; public XPropertySet xPropertySet; - XPropertySet xControlPropertySet; + private XPropertySet xControlPropertySet; XWindowPeer xWindowPeer; Object oDefaultValue; GridControl oGridControl; - String sServiceName; + private String sServiceName; XNamed xNamed; - final int SOMAXTEXTSIZE = 50; + private final int SOMAXTEXTSIZE = 50; private int icontroltype; - protected XNameContainer xFormName; - protected final int IIMGFIELDWIDTH = 3000; + private XNameContainer xFormName; + private final int IIMGFIELDWIDTH = 3000; public Control() { diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java index e1dceaa98f98..8aa88ba608f6 100644 --- a/wizards/com/sun/star/wizards/document/FormHandler.java +++ b/wizards/com/sun/star/wizards/document/FormHandler.java @@ -61,7 +61,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; @@ -78,28 +78,28 @@ 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 { int DataType; - int ControlType; - String ControlService; + private int ControlType; + private String ControlService; String GridColumnName; - boolean bIsText; + private boolean bIsText; } /** Creates a new instance of FormHandler */ diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java index ab78017c397b..13436ee5eebc 100644 --- a/wizards/com/sun/star/wizards/document/GridControl.java +++ b/wizards/com/sun/star/wizards/document/GridControl.java @@ -35,13 +35,13 @@ 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; final String SODEFAULTNAME = "Grid1"; - 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/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 00e0bb28f326..b627c7ed8baf 100644 --- a/wizards/com/sun/star/wizards/document/TimeStampControl.java +++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java @@ -35,19 +35,19 @@ import com.sun.star.drawing.XShapes; public class TimeStampControl extends DatabaseControl { - DatabaseControl oDateControl; - DatabaseControl oTimeControl; + private DatabaseControl oDateControl; + private DatabaseControl oTimeControl; // XShape xGroupShape; - Resource oResource; + private Resource oResource; private String sDateAppendix; // = GetResText(RID_FORM + 4) private String sTimeAppendix; // = GetResText(RID_FORM + 5) XShapes xGroupShapes = null; - double nreldatewidth; - double nreltimewidth; - int nTimeWidth; - int nDBWidth; - int nDateWidth; - XShape xShapeGroup; + private double nreldatewidth; + private double nreltimewidth; + private int nTimeWidth; + private int nDBWidth; + private int nDateWidth; + private XShape xShapeGroup; public TimeStampControl(Resource _oResource, FormHandler _oFormHandler, XNameContainer _xFormName, String _curFieldName, Point _aPoint) { diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java index 6a4cf5902b84..81f3d87e3b58 100644 --- a/wizards/com/sun/star/wizards/form/Finalizer.java +++ b/wizards/com/sun/star/wizards/form/Finalizer.java @@ -31,12 +31,12 @@ import com.sun.star.wizards.ui.*; public class Finalizer { - WizardDialog CurUnoDialog; - short curtabindex; - XRadioButton optModifyForm; + private WizardDialog CurUnoDialog; + private short curtabindex; + private XRadioButton optModifyForm; XRadioButton optWorkWithForm; - XTextComponent txtFormName; - FormDocument oFormDocument; + 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 52ce66cfe113..1159888fae34 100644 --- a/wizards/com/sun/star/wizards/form/FormConfiguration.java +++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java @@ -36,21 +36,21 @@ import com.sun.star.wizards.db.RelationController; public class FormConfiguration { - WizardDialog CurUnoDialog; - short curtabindex; - XRadioButton optOnExistingRelation; - XCheckBox chkcreateSubForm; - XRadioButton optSelectManually; - XFixedText lblSubFormDescription; - XFixedText lblRelations; - XListBox lstRelations; - String[] sreferencedTables; - CommandFieldSelection CurSubFormFieldSelection; - String SSUBFORMMODE = "toggleSubFormMode"; - String STOGGLESTEPS = "toggleSteps"; - String SONEXISTINGRELATIONSELECTION = "onexistingRelationSelection"; - boolean bsupportsRelations; - RelationController oRelationController = null; + private WizardDialog CurUnoDialog; + private short curtabindex; + private XRadioButton optOnExistingRelation; + private XCheckBox chkcreateSubForm; + private XRadioButton optSelectManually; + private XFixedText lblSubFormDescription; + private XFixedText lblRelations; + private XListBox lstRelations; + private String[] sreferencedTables; + private CommandFieldSelection CurSubFormFieldSelection; + private String SSUBFORMMODE = "toggleSubFormMode"; + private String STOGGLESTEPS = "toggleSteps"; + private String SONEXISTINGRELATIONSELECTION = "onexistingRelationSelection"; + private boolean bsupportsRelations; + private RelationController oRelationController = null; public FormConfiguration(WizardDialog _CurUnoDialog) { diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java index f24cbe4d01f9..583953e37d77 100644 --- a/wizards/com/sun/star/wizards/form/FormDocument.java +++ b/wizards/com/sun/star/wizards/form/FormDocument.java @@ -336,16 +336,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; private ControlForm(FormDocument _oFormDocument, String _sname, Point _astartPoint, Size _aFormSize) { diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java index d6351398d1df..fc613019f10d 100644 --- a/wizards/com/sun/star/wizards/form/FormWizard.java +++ b/wizards/com/sun/star/wizards/form/FormWizard.java @@ -388,7 +388,7 @@ public class FormWizard extends DatabaseObjectWizard public 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/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java index 204fe281dd66..611556951fa1 100644 --- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java +++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java @@ -56,7 +56,7 @@ public class CallQueryWizard public static class QueryWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor { private PropertyValue[] m_wizardContext; - public String Command; + private String Command; public final Integer CommandType = com.sun.star.sdb.CommandType.QUERY; /** The constructor of the inner class has a XMultiServiceFactory parameter. diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java index 47dc89fa2432..b8048a577eae 100644 --- a/wizards/com/sun/star/wizards/query/QuerySummary.java +++ b/wizards/com/sun/star/wizards/query/QuerySummary.java @@ -29,10 +29,10 @@ import com.sun.star.wizards.ui.FilterComponent; public class QuerySummary extends QueryMetaData { - final protected int RID_QUERY = 2300; + final private int RID_QUERY = 2300; final protected int RID_REPORT = 2400; - String sSummary; - Resource oResource; + private String sSummary; + private Resource oResource; private String sSeparator; private String sReturnChar; private String sAnd; diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java index cd51e78de6ea..78709f14ea00 100644 --- a/wizards/com/sun/star/wizards/query/QueryWizard.java +++ b/wizards/com/sun/star/wizards/query/QueryWizard.java @@ -396,7 +396,7 @@ public class QueryWizard extends DatabaseObjectWizard public 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/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java index 91da0b0846bb..f59dbefdab50 100644 --- a/wizards/com/sun/star/wizards/report/CallReportWizard.java +++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java @@ -33,7 +33,7 @@ import java.util.logging.Logger; public class CallReportWizard { - static boolean bWizardstartedalready; + private static boolean bWizardstartedalready; /** Gives a factory for creating the service. * This method is called by the <code>JavaLoader</code> diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java index 4c5884cf3f00..9da1ed770379 100644 --- a/wizards/com/sun/star/wizards/report/DBColumn.java +++ b/wizards/com/sun/star/wizards/report/DBColumn.java @@ -44,19 +44,19 @@ 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 XNumberFormats xValCellNumberFormats; public XCell xNameCell; - public XTextRange xNameTextCell; - public boolean bAlignLeft; + private XTextRange xNameTextCell; + private boolean bAlignLeft; public Object DefaultValue; - public String CharFontName; + private String CharFontName; public int FormatKey; - public PropertyState PropertyState; + private PropertyState PropertyState; public int ValColumn = 1; - public int ValRow = 0; + private int ValRow = 0; public FieldColumn CurDBField; private XTextTable xTextTable; private XTableColumns xTableColumns; @@ -64,9 +64,9 @@ public class DBColumn public XNamed xTableName; private boolean bIsGroupColumn; TextDocument oTextDocument; - RecordParser CurDBMetaData; - RecordTable CurRecordTable; - TextTableHandler oTextTableHandler; + private RecordParser CurDBMetaData; + private RecordTable CurRecordTable; + private TextTableHandler oTextTableHandler; public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, int i) { diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index 77ed2f34e8ad..df11132d8371 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -35,12 +35,12 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi IReportDocument CurReportDocument; static boolean bStopProcess; - static String sProgressDBConnection; - static String sProgressDataImport; - static String sProgressBaseCurRecord; + private static String sProgressDBConnection; + private static String sProgressDataImport; + private static String sProgressBaseCurRecord; static String sProgressCurRecord; - static String sProgressTitle; - static String sStop; + private static String sProgressTitle; + private static String sStop; public Dataimport(XMultiServiceFactory _xMSF) { diff --git a/wizards/com/sun/star/wizards/report/RecordTable.java b/wizards/com/sun/star/wizards/report/RecordTable.java index 7b4cd1a76e78..14c9c6baa711 100644 --- a/wizards/com/sun/star/wizards/report/RecordTable.java +++ b/wizards/com/sun/star/wizards/report/RecordTable.java @@ -40,7 +40,7 @@ public class RecordTable public XTextTable xTextTable; private TextTableHandler oTextTableHandler; public XTableColumns xTableColumns; - public XTableRows xTableRows; + private XTableRows xTableRows; public RecordTable(TextTableHandler _oTextTableHandler) { diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index dbd01df3cc05..9f750692ec1c 100644 --- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java +++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java @@ -30,18 +30,18 @@ import com.sun.star.wizards.db.RecordParser; public class ReportFinalizer { - WizardDialog CurUnoDialog; - XTextComponent xTitleTextBox; + private WizardDialog CurUnoDialog; + private XTextComponent xTitleTextBox; XTextComponent[] xSaveTextBox = new XTextComponent[2]; Object chkTemplate; - String CHANGEREPORTTITLE_FUNCNAME = "changeReportTitle"; - String TOGGLESUBTEMPLATECONTROLS_FUNCNAME = "toggleSubTemplateControls"; + private String CHANGEREPORTTITLE_FUNCNAME = "changeReportTitle"; + private String TOGGLESUBTEMPLATECONTROLS_FUNCNAME = "toggleSubTemplateControls"; String TemplatePath; - String StoreName; + private String StoreName; boolean bfinalaskbeforeOverwrite; - String DefaultName; - String OldDefaultName; - IReportDocument CurReportDocument; + 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 598b74a8d0dd..1028747ceedd 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -36,20 +36,20 @@ import java.util.ArrayList; public class ReportLayouter { - UnoDialog CurUnoDialog; + private UnoDialog CurUnoDialog; final int SOTXTTITLE = 28; - final int SOCONTENTLST = 29; + private final int SOCONTENTLST = 29; final static public int SOOPTLANDSCAPE = 30; final static public int SOOPTPORTRAIT = 31; - final int SOLAYOUTLST = 32; - XListBox xContentListBox; - XListBox xLayoutListBox; - int iOldContentPos; - int iOldLayoutPos; - IReportDocument CurReportDocument; - public String[][] LayoutFiles; - public String[][] ContentFiles; - Object aOrientationImage; + private final int SOLAYOUTLST = 32; + private XListBox xContentListBox; + private XListBox xLayoutListBox; + private int iOldContentPos; + private int iOldLayoutPos; + private IReportDocument CurReportDocument; + private String[][] LayoutFiles; + private String[][] ContentFiles; + private Object aOrientationImage; private XMultiServiceFactory m_xMSF; private XTextRange trTitleconst, trAuthorconst, trDateconst, trPageconst; private TextElement teTitleconst, teAuthorconst, teDateconst, tePageconst; diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java index c0871b942754..67036c7437a2 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java +++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java @@ -58,14 +58,14 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen private String sMsgCommonReportError; private String ContentTemplatePath; private String sMsgEndAutopilot; - 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"; diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java index 09d319210672..da5089f5fe4e 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java +++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java @@ -125,12 +125,12 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme { return getDoc().xWindowPeer; } - static String sMsgQueryCreationImpossible; - static String sReportFormNotExisting; - static String sMsgHiddenControlMissing; - static String sMsgEndAutopilot; + private static String sMsgQueryCreationImpossible; + private static String sReportFormNotExisting; + private static String sMsgHiddenControlMissing; + private static String sMsgEndAutopilot; static String sMsgConnectionImpossible; - static String sMsgNoConnection; + private static String sMsgNoConnection; static String[] ReportMessages = new String[4]; private void initialResources() diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java index e76f93c0cf50..b9de1d542545 100644 --- a/wizards/com/sun/star/wizards/report/ReportWizard.java +++ b/wizards/com/sun/star/wizards/report/ReportWizard.java @@ -55,7 +55,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; @@ -648,7 +648,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener public 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/DesignTemplate.java b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java index 2315ea5bead9..cbf4ee93d76b 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java @@ -33,8 +33,8 @@ public class DesignTemplate { private XReportDefinition m_xReportDefinition; - XMultiServiceFactory m_xGlobalMSF; - String m_sFilename; + private XMultiServiceFactory m_xGlobalMSF; + private String m_sFilename; private DesignTemplate() { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java index ac1f431e4998..c7c34c68cb06 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java @@ -232,7 +232,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return nIndent; } - int m_nLeftIndent = -1; + private int m_nLeftIndent = -1; /** * Get left page indent. @@ -249,7 +249,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return m_nLeftIndent; } - int m_nRightIndent = -1; + private int m_nRightIndent = -1; /** * Get right page indent. @@ -320,7 +320,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. @@ -831,7 +831,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter getReportDefinition().setCommandType(_aType); getReportDefinition().setCommand(_sTableName); } - protected XMultiServiceFactory m_xMSF; + private XMultiServiceFactory m_xMSF; protected XMultiServiceFactory getMSFofReportDefinition() { @@ -1397,13 +1397,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) @@ -1466,8 +1466,8 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter { 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) { 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/table/CGCategory.java b/wizards/com/sun/star/wizards/table/CGCategory.java index bdcad65db0f2..bbc244a6e922 100644 --- a/wizards/com/sun/star/wizards/table/CGCategory.java +++ b/wizards/com/sun/star/wizards/table/CGCategory.java @@ -33,10 +33,10 @@ public class CGCategory public String Name; public int Index; private 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 21f8a9136666..c86718cd5081 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 String Index; public String Name; diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java index 8c994e862115..aa1fb214a6b1 100644 --- a/wizards/com/sun/star/wizards/table/CallTableWizard.java +++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java @@ -57,7 +57,7 @@ public class CallTableWizard private PropertyValue[] m_wizardContext; // <properties> - public String Command; + private String Command; public final Integer CommandType = com.sun.star.sdb.CommandType.TABLE; // </properties> diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index f5ceb87fed1b..aeb091300444 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -37,23 +37,23 @@ import com.sun.star.wizards.ui.UnoDialog; public class FieldFormatter implements XItemListener { - TableWizard CurUnoDialog; - TableDescriptor curTableDescriptor; - Object oColumnDescriptorModel; - XTextComponent txtfieldname; - XListBox xlstFieldNames; - XButton btnplus; - XButton btnminus; - XButton btnShiftUp; - XButton btnShiftDown; - short curtabindex; + 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; + private short curtabindex; String TOGGLEBUTTONS = "toggleButtons"; String ADDFIELDNAME = "addFieldName"; String REMOVEFIELDNAME = "removeFieldName"; - String MODIFYFIELDNAME = "modifyFieldName"; + private String MODIFYFIELDNAME = "modifyFieldName"; String[] fieldnames; - String suntitled; - Integer IFieldFormatStep; + private String suntitled; + private Integer IFieldFormatStep; public FieldFormatter(TableWizard _CurUnoDialog) { diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java index 17883abbfb78..684055f3ee96 100644 --- a/wizards/com/sun/star/wizards/table/Finalizer.java +++ b/wizards/com/sun/star/wizards/table/Finalizer.java @@ -30,17 +30,17 @@ import com.sun.star.wizards.ui.*; public class Finalizer { - TableWizard CurUnoDialog; - short curtabindex; - XRadioButton optModifyTable; - XRadioButton optWorkWithTable; - XRadioButton optStartFormWizard; - XTextComponent txtTableName; - XListBox xCatalogListBox; - XListBox xSchemaListBox; - TableDescriptor curtabledescriptor; - public String SETCOMPLETIONFLAG = "setCompletionFlag"; - public static int WORKWITHTABLEMODE = 0; + private TableWizard CurUnoDialog; + private short curtabindex; + private XRadioButton optModifyTable; + private XRadioButton optWorkWithTable; + private XRadioButton optStartFormWizard; + private XTextComponent txtTableName; + private XListBox xCatalogListBox; + private XListBox xSchemaListBox; + private TableDescriptor curtabledescriptor; + private String SETCOMPLETIONFLAG = "setCompletionFlag"; + private static int WORKWITHTABLEMODE = 0; public static int MODIFYTABLEMODE = 1; public static int STARTFORMWIZARDMODE = 2; diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index 77e063e87197..bfa079651e25 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -292,7 +292,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 8ee556da7e22..16e90eb59c3c 100644 --- a/wizards/com/sun/star/wizards/table/TableWizard.java +++ b/wizards/com/sun/star/wizards/table/TableWizard.java @@ -38,20 +38,20 @@ 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; - String sMsgWizardName = PropertyNames.EMPTY_STRING; + private static String slblFields; + private static String slblSelFields; + private Finalizer curFinalizer; + private ScenarioSelector curScenarioSelector; + private FieldFormatter curFieldFormatter; + private PrimaryKeyHandler curPrimaryKeyHandler; + private String sMsgWizardName = PropertyNames.EMPTY_STRING; public HashMap<String, FieldDescription> fielditems; - int wizardmode; - String tablename; - String serrToManyFields; - String serrTableNameexists; - String scomposedtablename; - TableDescriptor curTableDescriptor; + private int wizardmode; + private String tablename; + private String serrToManyFields; + private String serrTableNameexists; + private String scomposedtablename; + private TableDescriptor curTableDescriptor; public static final int SONULLPAGE = 0; public static final int SOMAINPAGE = 1; public static final int SOFIELDSFORMATPAGE = 2; diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java index 6fb26b50e404..dfc48860a9b3 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.java +++ b/wizards/com/sun/star/wizards/text/TextDocument.java @@ -80,14 +80,14 @@ public class TextDocument public XText xText; public XMultiServiceFactory xMSFDoc; public XMultiServiceFactory xMSF; - public com.sun.star.util.XNumberFormatsSupplier xNumberFormatsSupplier; + private com.sun.star.util.XNumberFormatsSupplier xNumberFormatsSupplier; public com.sun.star.awt.XWindowPeer xWindowPeer; public int PageWidth; public int ScaleWidth; - public Size DocSize; + private Size DocSize; public com.sun.star.awt.Rectangle PosSize; - public com.sun.star.lang.Locale CharLocale; - public XStorable xStorable; + private com.sun.star.lang.Locale CharLocale; + private XStorable xStorable; // creates an instance of TextDocument and creates a named frame. No document is actually loaded into this frame. public TextDocument(XMultiServiceFactory xMSF, XTerminateListener listener, String FrameName) diff --git a/wizards/com/sun/star/wizards/text/TextFieldHandler.java b/wizards/com/sun/star/wizards/text/TextFieldHandler.java index eb3b25e63a28..8d3bf6f91c2e 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 XMultiServiceFactory xMSFDoc; /** diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java index bc37487274ad..c4b40eacdc1e 100644 --- a/wizards/com/sun/star/wizards/text/TextTableHandler.java +++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java @@ -44,9 +44,9 @@ public class TextTableHandler { public XTextTablesSupplier xTextTablesSupplier; - public XMultiServiceFactory xMSFDoc; - public XTextDocument xTextDocument; - public XSimpleText xSimpleText; + private XMultiServiceFactory xMSFDoc; + private XTextDocument xTextDocument; + private XSimpleText xSimpleText; private NumberFormatter oNumberFormatter; private Locale aCharLocale; diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 67f17ec39950..9261ee7cc9b0 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -38,25 +38,25 @@ 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; - XButton optDetailQuery; - XButton optSummaryQuery; - String soptDetailQuery; - String soptSummaryQuery; - String slblAggregate; - String slblFieldNames; - String sDuplicateAggregateFunction; - int Count; + private QueryMetaData CurDBMetaData; + private XButton optDetailQuery; + private XButton optSummaryQuery; + private String soptDetailQuery; + private String soptSummaryQuery; + private String slblAggregate; + private String slblFieldNames; + private String sDuplicateAggregateFunction; + private int Count; int iQueryType; - final int SOADDROW = 1; - final int SOREMOVEROW = 2; + private final int SOADDROW = 1; + private final int SOREMOVEROW = 2; final int CONTROLROWDIST = 18; - ArrayList<ControlRow> ControlRowVector; + private ArrayList<ControlRow> ControlRowVector; String OPTIONBUTTONDETAILQUERY_ITEM_CHANGED = "toggleComponent"; String OPTIONBUTTONSUMMARYQUERY_ITEM_CHANGED = "toggleComponent"; String LISTBOXFUNCTIONS_ACTION_PERFORMED; @@ -66,8 +66,8 @@ public class AggregateComponent extends ControlScroller String COMMANDBUTTONPLUS_ACTION_PERFORMED = "addRow"; String COMMANDBUTTONMINUS_ACTION_PERFORMED = "removeRow"; ArrayList<String> ControlRows; - int curHelpID; - int lastHelpIndex; + 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) diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index 0f17303dc95a..bfe0d3e93688 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. @@ -622,7 +622,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener public static class Counter { - public int start, end, max; + private int start, end, max; private Counter(int start_, int end_, int max_) { diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index 7c2193fb6e70..179d787bf391 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -28,31 +28,31 @@ public abstract class ControlScroller { protected WizardDialog CurUnoDialog; - protected XMultiServiceFactory xMSF; + private XMultiServiceFactory xMSF; 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; - protected Integer ICompPosX; + private int nscrollvalue = 0; + private int ntotfieldcount; + private XScrollBar xScrollBar; + private ArrayList<PropertyValue[]> scrollfields; + private Integer ICompPosX; protected int iCompPosX; - protected Integer ICompPosY; + private Integer ICompPosY; protected int iCompPosY; - protected Integer ICompWidth; + private Integer ICompWidth; protected int iCompWidth; protected Integer ICompHeight; 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>(); protected PeerConfig oTitlePeerConfig; diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java index ce2d5383de40..2aad4c6706de 100644 --- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java @@ -30,19 +30,19 @@ import com.sun.star.wizards.common.PropertyNames; public abstract class DBLimitedFieldSelection { - protected XMultiServiceFactory xMSF; + private XMultiServiceFactory xMSF; protected WizardDialog CurUnoDialog; - protected String sNoField; + private String sNoField; protected Integer IStep; - protected Integer ICompPosX; - protected Integer ICompPosY; - protected Integer ICompWidth; + private Integer ICompPosX; + private Integer ICompPosY; + private Integer ICompWidth; protected final int rowcount = 4; - protected final int MAXSELINDEX = rowcount - 1; + private 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 iCompWidth, int _FirstHelpIndex) { diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index f3217bc363b8..3b0a4c6ee188 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -35,10 +35,10 @@ public class FieldSelection protected boolean AppendMode = false; protected Integer IStep; - protected int CompPosX; - protected int CompPosY; - protected int CompHeight; - protected int CompWidth; + private int CompPosX; + private int CompPosY; + private int CompHeight; + private int CompWidth; private XFieldSelectionListener xFieldSelection; private int maxfieldcount = 10000000; diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index c1420c683938..6f5d8358d281 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -59,48 +59,48 @@ public class FilterComponent private String slblFieldNames; private String slblOperators; private String slblValue; - WizardDialog CurUnoDialog; + private WizardDialog CurUnoDialog; private int BaseID = 2300; private String sIncSuffix; private ControlRow[] oControlRows; private String sDuplicateCondition; - final int SOOPTORMODE = 100; - final int SOOPTANDMODE = 101; - QueryMetaData oQueryMetaData; - int iDateTimeFormat; - int iDateFormat; - int iTimeFormat; + private final int SOOPTORMODE = 100; + private final int SOOPTANDMODE = 101; + private QueryMetaData oQueryMetaData; + private int iDateTimeFormat; + private int iDateFormat; + private int iTimeFormat; private PropertyValue[][] filterconditions; private short curtabindex; - XMultiServiceFactory xMSF; - final int SO_FIRSTFIELDNAME = 1; - final int SO_SECONDFIELDNAME = 2; - final int SO_THIRDFIELDNAME = 3; - final int SO_FOURTHFIELDNAME = 4; - int[] SO_FIELDNAMELIST = new int[] + private XMultiServiceFactory xMSF; + private final int SO_FIRSTFIELDNAME = 1; + private final int SO_SECONDFIELDNAME = 2; + private final int SO_THIRDFIELDNAME = 3; + private final int SO_FOURTHFIELDNAME = 4; + private int[] SO_FIELDNAMELIST = new int[] { SO_FIRSTFIELDNAME, SO_SECONDFIELDNAME, SO_THIRDFIELDNAME, SO_FOURTHFIELDNAME }; - final int SO_FIRSTCONDITION = 5; - final int SO_SECONDCONDITION = 6; - final int SO_THIRDCONDITION = 7; - final int SO_FOURTHCONDITION = 8; - int[] SO_CONDITIONLIST = new int[] + private final int SO_FIRSTCONDITION = 5; + private final int SO_SECONDCONDITION = 6; + private final int SO_THIRDCONDITION = 7; + private final int SO_FOURTHCONDITION = 8; + private int[] SO_CONDITIONLIST = new int[] { SO_FIRSTCONDITION, SO_SECONDCONDITION, SO_THIRDCONDITION, SO_FOURTHCONDITION }; - final int SO_FIRSTTEXTFIELD = 1; - final int SO_SECONDTEXTFIELD = 2; - final int SO_THIRDTEXTFIELD = 3; - final int SO_FOURTHTEXTFIELD = 4; - int[] SO_TEXTFIELDLIST = new int[] + private final int SO_FIRSTTEXTFIELD = 1; + private final int SO_SECONDTEXTFIELD = 2; + private final int SO_THIRDTEXTFIELD = 3; + private final int SO_FOURTHTEXTFIELD = 4; + private int[] SO_TEXTFIELDLIST = new int[] { SO_FIRSTTEXTFIELD, SO_SECONDTEXTFIELD, SO_THIRDTEXTFIELD, SO_FOURTHTEXTFIELD }; - final int SO_FIRSTBOOLFIELDNAME = 256 + 1; - final int SO_SECONDBOOLFIELDNAME = 256 + 2; - final int SO_THIRDBOOLFIELDNAME = 256 + 3; - final int SO_FOURTHBOOLFIELDNAME = 256 + 4; + private final int SO_FIRSTBOOLFIELDNAME = 256 + 1; + private final int SO_SECONDBOOLFIELDNAME = 256 + 2; + private final int SO_THIRDBOOLFIELDNAME = 256 + 3; + private final int SO_FOURTHBOOLFIELDNAME = 256 + 4; int SO_BOOLEANLIST[] = @@ -108,9 +108,9 @@ public class FilterComponent SO_FIRSTBOOLFIELDNAME, SO_SECONDBOOLFIELDNAME, SO_THIRDBOOLFIELDNAME, SO_FOURTHBOOLFIELDNAME }; final int SO_OPTQUERYMODE = 5; - int SOI_MATCHALL = 0; - int SOI_MATCHANY = 1; - int curHelpID; + private int SOI_MATCHALL = 0; + private int SOI_MATCHANY = 1; + private int curHelpID; class ItemListenerImpl implements com.sun.star.awt.XItemListener { @@ -514,9 +514,9 @@ public class FilterComponent 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; private ControlRow(int iCompPosX, int iCompPosY, int Index, boolean _bEnabled, int _firstRowHelpID) { diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java index 4ca02a4612d8..0fe4af1b54bd 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.java +++ b/wizards/com/sun/star/wizards/ui/ImageList.java @@ -811,7 +811,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener public static class Counter { - public int start, end, max; + private int start, end, max; private Counter(int start_, int end_, int max_) { diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java index 689c0dd92700..b836221851f6 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 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; private PeerTask(XControl _xControl, String[] propNames_, Object[] propValues_) { @@ -61,9 +61,9 @@ public class PeerConfig implements XWindowListener class ControlTask { - Object oModel; - String propname; - Object propvalue; + private Object oModel; + private String propname; + private Object propvalue; private ControlTask(Object _oModel, String _propName, Object _propValue) { @@ -76,9 +76,9 @@ public class PeerConfig implements XWindowListener class ImageUrlTask { - Object oModel; - Object oResource; - Object oHCResource; + private Object oModel; + private Object oResource; + private Object oHCResource; private ImageUrlTask(Object _oModel, Object _oResource, Object _oHCResource) { diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index 3f55cdc38044..b8d7237d864b 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -26,26 +26,26 @@ import java.util.ArrayList; public class SortingComponent { - com.sun.star.lang.XMultiServiceFactory xMSF; - WizardDialog CurUnoDialog; - int MaxSortIndex = -1; + private com.sun.star.lang.XMultiServiceFactory xMSF; + private WizardDialog CurUnoDialog; + private int MaxSortIndex = -1; public String[][] FieldNames; - static String sNoSorting; - static String sSortCriteriaisduplicate; - static String[] sSortHeader = new String[4]; - static String[] sSortAscend = new String[4]; - static String[] sSortDescend = new String[4]; + 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]; static short[] bOldSortValues = new short[4]; - public int MAXSORTCRITERIAINDEX = 3; - final int SOFIRSTSORTLST = 0; - final int SOSECSORTLST = 1; - final int SOTHIRDSORTLST = 2; - final int SOFOURTHSORTLST = 3; - final int[] SOSORTLST = new int[] + private int MAXSORTCRITERIAINDEX = 3; + private final int SOFIRSTSORTLST = 0; + private final int SOSECSORTLST = 1; + private final int SOTHIRDSORTLST = 2; + private final int SOFOURTHSORTLST = 3; + private 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 { diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java index c279e6f329bd..2e15ebabafe4 100644 --- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java +++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java @@ -29,14 +29,14 @@ import java.util.*; public class TitlesComponent extends ControlScroller { - int iLabelPosX; - final int iRelLabelPosXDist = 6; - public String[] fieldnames; - public Map<String, String> fieldtitleset; - public String[] fieldtitles; + private int iLabelPosX; + private final int iRelLabelPosXDist = 6; + private String[] fieldnames; + private Map<String, String> fieldtitleset; + private String[] fieldtitles; public XTextListener xTextListener; - final String SOLABELPREFIX = "lblColumnName_"; - final String SOTITLEPREFIX = "lblTitleName_"; + private final String SOLABELPREFIX = "lblColumnName_"; + private final String SOTITLEPREFIX = "lblTitleName_"; public TitlesComponent(WizardDialog _CurUnoDialog, int _iStep, int _iCompPosX, int _iCompPosY, int _iCompWidth, int _uitextfieldcount, String _slblColumnNames, String _slblColumnTitles, int _firsthelpindex) { @@ -90,7 +90,7 @@ public class TitlesComponent extends ControlScroller { PropertyValue[] regproperties; - XTextComponent xTextComponent; + private XTextComponent xTextComponent; private 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 c6b82a6ef9fc..4d91bbd3d988 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -40,7 +40,7 @@ public class UnoDialog implements EventNames public XMultiServiceFactory xMSF; public XMultiServiceFactory MSFDialogModel; - public XNameContainer xDlgNames; + private XNameContainer xDlgNames; public XControlContainer xDlgContainer; private XNameAccess m_xDlgNameAccess; public XControl xControl; @@ -49,9 +49,9 @@ public class UnoDialog implements EventNames public XWindow xWindow; public XComponent xComponent; public XInterface xDialogModel; - public XInterface xUnoDialog; - public XPropertySet xPSetDlg; - public XVclWindowPeer xVclWindowPeer; + private XInterface xUnoDialog; + private XPropertySet xPSetDlg; + private XVclWindowPeer xVclWindowPeer; public HashMap<String, Integer> ControlList; public Resource m_oResource; public XWindowPeer xWindowPeer = null; diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index 68c1d3a2da0f..c014dfa605d1 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -55,14 +55,14 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL private int nOldStep = 1; private int nMaxStep = 1; protected XItemListener RoadmapItemListener; - protected XControl xRoadmapControl; - XItemEventBroadcaster xRoadmapBroadcaster; - String[] sRMItemLabels; + private XControl xRoadmapControl; + private XItemEventBroadcaster xRoadmapBroadcaster; + private String[] sRMItemLabels; private Object oRoadmap; private XSingleServiceFactory xSSFRoadmap; public XIndexContainer xIndexContRoadmap; private Resource oWizardResource; - public String sMsgEndAutopilot; + private String sMsgEndAutopilot; private int hid; private boolean bTerminateListenermustberemoved = true; diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java index 6deb0adbb5a0..1ba8db1a13f7 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java @@ -43,12 +43,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. diff --git a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java index 4218c07ffdef..b7e8209ea8a3 100644 --- a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java +++ b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java @@ -33,11 +33,11 @@ import java.lang.reflect.Method; public class MethodInvocation { //the method to invoke. - Method mMethod; + private Method mMethod; //the object to invoke the method on. - Object mObject; + private Object mObject; //with one Parameter / without - boolean mWithParam; + private boolean mWithParam; /** Creates a new instance of MethodInvokation */ public MethodInvocation(String methodName, Object obj) throws NoSuchMethodException diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java index cf21494c4cf9..779c02122900 100644 --- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java @@ -35,11 +35,11 @@ import com.sun.star.wizards.common.PropertyNames; public class UnoDataAware extends DataAware { - protected Object unoControl; - protected Object unoModel; - protected String unoPropName; - protected Object[] disableObjects = new Object[0]; - protected boolean inverse = false; + private Object unoControl; + private Object unoModel; + private String unoPropName; + private Object[] disableObjects = new Object[0]; + private boolean inverse = false; private UnoDataAware(Object dataObject, Value value, Object unoObject_, String unoPropName_) { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java index df9ccfb065b6..fc8303111557 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java @@ -60,19 +60,19 @@ final class PdbHeader { long modificationDate = 0; /** Date last backup. Palm UInt32. */ - long lastBackupDate = 0; + private long lastBackupDate = 0; /** * Incremented every time a <code>Record</code> is * added, deleted or modified. Palm UInt32. */ - long modificationNumber = 0; + private long modificationNumber = 0; /** Optional field. Palm UInt32. Unsignedness should be irrelevant. */ - int appInfoID = 0; + private int appInfoID = 0; /** Optional field. Palm UInt32. Unsignedness should be irrelevant. */ - int sortInfoID = 0; + private int sortInfoID = 0; /** Database type ID. Palm UInt32. Unsignedness should be irrelevant. */ int typeID = 0; @@ -81,10 +81,10 @@ final class PdbHeader { int creatorID = 0; /** ??? */ - int uniqueIDSeed = 0; + private int uniqueIDSeed = 0; /** See numRecords. 4 bytes. */ - int nextRecordListID = 0; + private int nextRecordListID = 0; /** * Number of Records stored in the database header. diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java index 18635b275814..d3b10bf256f9 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java @@ -30,7 +30,7 @@ import org.w3c.dom.Element; public class EmbeddedBinaryObject extends EmbeddedObject { /** The object's binary representation. */ - protected byte[] objData = null; + private byte[] objData = null; /** * Constructor for an embedded object stored using an XML representation. diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java index 7711879006cb..42c6df4fd5ee 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java @@ -49,9 +49,9 @@ import org.xml.sax.SAXException; public class EmbeddedXMLObject extends EmbeddedObject { // Entries for the subdocuments that constitute this object; - protected Document contentDOM = null; - protected Document settingsDOM = null; - protected Document stylesDOM = null; + private Document contentDOM = null; + private Document settingsDOM = null; + private Document stylesDOM = null; private DocumentBuilder builder = null; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java index 78575d6e27ad..815c2b4a8b50 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java @@ -33,7 +33,7 @@ import org.openoffice.xmerge.util.Resources; public final class OfficeDocumentException extends IOException { - StringBuffer message = null; + private StringBuffer message = null; /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java index 529b1cf93dd3..b8527d0332db 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java @@ -164,11 +164,11 @@ public class ParaStyle extends Style implements Cloneable { * Array of flags indicating which attributes are set for this * paragraph <code>Style</code>. */ - protected boolean isSet[] = new boolean[NR_PROPERTIES]; + private boolean isSet[] = new boolean[NR_PROPERTIES]; /** Array of attribute values for this paragraph <code>tyle</code>. */ - protected int value[] = new int[NR_PROPERTIES]; + private int value[] = new int[NR_PROPERTIES]; /** Array of attribute names for this paragraph <code>Style</code>. */ - protected String attrName[] = { + private String attrName[] = { "fo:margin-left", "fo:margin-right", "fo:margin-top", @@ -179,7 +179,7 @@ public class ParaStyle extends Style implements Cloneable { }; /** Array of attribute structures for this paragraph <code>Style</code>. */ - protected Class<?> algor[] = { + private Class<?> algor[] = { horizSize.class, horizSize.class, horizSize.class, diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java index 5024d8ffd827..26b923a4980e 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java @@ -52,18 +52,18 @@ public class TextStyle extends Style implements Cloneable { final protected static int LAST_ATTR = 0x20; /** Values of text attributes. */ - protected int values = 0; + private int values = 0; /** Bitwise mask of text attributes. */ - protected int mask = 0; + private int mask = 0; /** Font size in points. */ - protected int sizeInPoints = 0; + private int sizeInPoints = 0; /** Font name. */ - protected String fontName = null; + private String fontName = null; /** Font <code>Color</code>. */ - protected Color fontColor = null; + private Color fontColor = null; /** Background <code>Color</code>. */ - protected Color bgColor = null; + private Color bgColor = null; /** * Constructor for use when going from DOM to client device format. 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 44e025204485..eb50897291ed 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 @@ -67,14 +67,14 @@ public class Format implements Cloneable { /** Font name. */ private String fontName; /** Font size in points. */ - protected int sizeInPoints; + private int sizeInPoints; private Color foreground, background; /** Values of text attributes. */ - protected int attributes = 0; + private int attributes = 0; /** Bitwise mask of text attributes. */ - protected int mask = 0; + private int mask = 0; /** * Constructor for creating a new <code>Format</code>. |