diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-18 10:01:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-11-18 12:44:28 +0200 |
| commit | 0063cf285696951e336b9cec1da8881997b286ce (patch) | |
| tree | be70dfd8127c35f9e4a6d18d4db459a587813bf4 /qadevOOo | |
| parent | 250391009aec9930abcc57930ddd4b6f56f4df9c (diff) | |
java: make fields final where possible
found by PMD
Change-Id: I87780366119c141cd2dafe6ca1bf2d9798b10aec
Diffstat (limited to 'qadevOOo')
99 files changed, 196 insertions, 204 deletions
diff --git a/qadevOOo/runner/base/java_cmp.java b/qadevOOo/runner/base/java_cmp.java index bb94269f985d..86927bc598d6 100644 --- a/qadevOOo/runner/base/java_cmp.java +++ b/qadevOOo/runner/base/java_cmp.java @@ -28,7 +28,7 @@ package base; */ public class java_cmp implements TestBase { - private TestBase mWrappedTestBase = new java_fat(); + private final TestBase mWrappedTestBase = new java_fat(); public boolean executeTest(lib.TestParameters param) { param.put("OfficeProvider", "helper.UnoProvider"); diff --git a/qadevOOo/runner/complexlib/MethodThread.java b/qadevOOo/runner/complexlib/MethodThread.java index 11bdcb61ded1..d30df06609f8 100644 --- a/qadevOOo/runner/complexlib/MethodThread.java +++ b/qadevOOo/runner/complexlib/MethodThread.java @@ -29,11 +29,11 @@ public class MethodThread extends Thread { /** The method that should be executed **/ - private Method mTestMethod = null; + private final Method mTestMethod; /** The object that implements the method **/ - private Object mInvokeClass = null; + private final Object mInvokeClass; /** A PrintWriter for debug Output **/ - private PrintWriter mLog = null; + private final PrintWriter mLog; /** An Error String **/ private String mErrMessage = null; /** Did an Exception happen? **/ diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/runner/convwatch/BorderRemover.java index af7ee46a99bc..dbd933b3ad35 100644 --- a/qadevOOo/runner/convwatch/BorderRemover.java +++ b/qadevOOo/runner/convwatch/BorderRemover.java @@ -26,10 +26,10 @@ import java.lang.reflect.Method; class Rect { - private int x; - private int y; - private int w; - private int h; + private final int x; + private final int y; + private final int w; + private final int h; public Rect(int _x, int _y, int _w, int _h) { diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java index 03128eafa0ba..dc76af3ad9d2 100644 --- a/qadevOOo/runner/convwatch/DBHelper.java +++ b/qadevOOo/runner/convwatch/DBHelper.java @@ -49,8 +49,8 @@ class ShareConnection class MySQLThread extends Thread { - private Connection m_aCon = null; - private String m_sSQL; + private final Connection m_aCon; + private final 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 26cd831a7042..9d322c52fb5e 100644 --- a/qadevOOo/runner/convwatch/DirectoryHelper.java +++ b/qadevOOo/runner/convwatch/DirectoryHelper.java @@ -27,7 +27,7 @@ import java.util.ArrayList; */ public class DirectoryHelper { - private ArrayList<String> m_aFileList = new ArrayList<String>(); + private final ArrayList<String> m_aFileList = new ArrayList<String>(); private boolean m_bRecursiveIsAllowed = true; private void setRecursiveIsAllowed(boolean _bValue) diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index e4dd7c0b6028..d5cc3c4f5800 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -81,15 +81,15 @@ public class GraphicalTestArguments private boolean m_bIncludeSubdirectories; - private TestParameters m_aCurrentParams; + private final TestParameters m_aCurrentParams; - private int m_nMaxPages = 0; // default is 0 (print all pages) - private String m_sOnlyPage = ""; // default is "", there is no page which we want to print only. + private final int m_nMaxPages; // default is 0 (print all pages) + private final String m_sOnlyPage; // default is "", there is no page which we want to print only. private int m_nResolutionInDPI = 0; private boolean m_bStoreFile = true; - private boolean m_bResuseOffice = false; + private final boolean m_bResuseOffice; diff --git a/qadevOOo/runner/convwatch/ImageHelper.java b/qadevOOo/runner/convwatch/ImageHelper.java index 2644223e2ebb..5723c3fc85fb 100644 --- a/qadevOOo/runner/convwatch/ImageHelper.java +++ b/qadevOOo/runner/convwatch/ImageHelper.java @@ -26,9 +26,9 @@ import java.lang.reflect.Method; class ImageHelper { - private Image m_aImage; - private int[] m_aPixels; - private int m_w = 0; + private final Image m_aImage; + private final int[] m_aPixels; + private final int m_w; private ImageHelper(Image _aImage) diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java index 8e1747bf1308..08e9629883ad 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. */ - private String m_sFilename; - private ArrayList<String> m_aList; - private boolean m_bListContainUnsavedChanges = false; + private final String m_sFilename; + private final ArrayList<String> m_aList; + private final boolean m_bListContainUnsavedChanges = false; /** open a ini file by its name diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java index bc542752cc2b..1dac4c8eed97 100644 --- a/qadevOOo/runner/convwatch/PRNCompare.java +++ b/qadevOOo/runner/convwatch/PRNCompare.java @@ -30,7 +30,7 @@ import java.util.ArrayList; public class PRNCompare { - private String fs; + private final String fs; public PRNCompare() { diff --git a/qadevOOo/runner/convwatch/TriState.java b/qadevOOo/runner/convwatch/TriState.java index c72e06c2b913..ec9dfd194336 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); - private int m_nValue; + private final 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 6ba7e6cdfdd6..0d0462795433 100644 --- a/qadevOOo/runner/graphical/DirectoryHelper.java +++ b/qadevOOo/runner/graphical/DirectoryHelper.java @@ -27,7 +27,7 @@ import java.util.ArrayList; */ public class DirectoryHelper { - private ArrayList<String> m_aFileList = new ArrayList<String>(); + private final ArrayList<String> m_aFileList = new ArrayList<String>(); private boolean m_bRecursiveIsAllowed = true; private void setRecursiveIsAllowed(boolean _bValue) diff --git a/qadevOOo/runner/graphical/ImageHelper.java b/qadevOOo/runner/graphical/ImageHelper.java index 8f4249697192..f625b3d95cff 100644 --- a/qadevOOo/runner/graphical/ImageHelper.java +++ b/qadevOOo/runner/graphical/ImageHelper.java @@ -26,9 +26,9 @@ import java.lang.reflect.Method; class ImageHelper { - private Image m_aImage; - private int[] m_aPixels; - private int m_w = 0; + private final Image m_aImage; + private final int[] m_aPixels; + private final int m_w; private ImageHelper(Image _aImage) diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index fe2df6e62878..cc82ce4c86db 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -35,8 +35,8 @@ public class IniFile implements Enumeration<String> * internal representation of the ini file content. * Problem, if ini file changed why other write something difference, we don't realise this. */ - private String m_sFilename; - private ArrayList<String> m_aList; + private final String m_sFilename; + private final ArrayList<String> m_aList; private boolean m_bListContainUnsavedChanges = false; private int m_aEnumerationPos = 0; diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java index f793b527e607..4d07a03d3428 100644 --- a/qadevOOo/runner/graphical/JPEGComparator.java +++ b/qadevOOo/runner/graphical/JPEGComparator.java @@ -88,7 +88,7 @@ class NameDPIPage class CountNotXXXPixelsFromImage extends Thread { - private String m_sFilename; + private final String m_sFilename; protected int m_nValue; CountNotXXXPixelsFromImage(String _sFilename) diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java index a5c1667e7eb1..ba9a7ba25c64 100644 --- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java @@ -32,12 +32,6 @@ import helper.OSHelper; * *.xls as excel * *.ppt as powerpoint */ - -//class ProcessHelper -//{ -// ArrayList m_aArray; -//} - public class MSOfficePostscriptCreator implements IOffice { private String m_sPrinterName; // within Windows the tools need a printer name; @@ -47,11 +41,10 @@ public class MSOfficePostscriptCreator implements IOffice m_sPrinterName = _s; } - private ParameterHelper m_aParameterHelper; + private final ParameterHelper m_aParameterHelper; private String m_sDocumentName; - private String m_sResult; + private final String m_sResult; - // CTor public MSOfficePostscriptCreator(ParameterHelper _aParam, String _sResult) { m_aParameterHelper = _aParam; diff --git a/qadevOOo/runner/graphical/Office.java b/qadevOOo/runner/graphical/Office.java index 0cba0f63fd70..85785b2f3dad 100644 --- a/qadevOOo/runner/graphical/Office.java +++ b/qadevOOo/runner/graphical/Office.java @@ -22,9 +22,9 @@ import java.util.ArrayList; public class Office implements IOffice { - private ParameterHelper m_aParameterHelper; + private final ParameterHelper m_aParameterHelper; private String m_sDocumentName; - private String m_sResult; + private final String m_sResult; private IOffice m_aOffice = null; public Office(ParameterHelper _aParam, String _sResult) diff --git a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java index 96a6d0a69f77..199b169c88af 100644 --- a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java +++ b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java @@ -81,7 +81,7 @@ class PropertySetHelper public class OpenOfficeDatabaseReportExtractor extends Assurance { - private ParameterHelper m_aParameterHelper; + private final ParameterHelper m_aParameterHelper; public OpenOfficeDatabaseReportExtractor(ParameterHelper _aParameter) { diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java index cd0dde453ade..dfbdfd8a648c 100644 --- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java @@ -50,8 +50,8 @@ import java.io.File; */ public class OpenOfficePostscriptCreator implements IOffice { - private ParameterHelper m_aParameterHelper; - private String m_sOutputURL; + private final ParameterHelper m_aParameterHelper; + private final String m_sOutputURL; private String m_sBasename; private String m_sDocumentName; private XComponent m_aDocument; diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java index 0f3c06d8aa83..2c9e95217ed9 100644 --- a/qadevOOo/runner/graphical/ParameterHelper.java +++ b/qadevOOo/runner/graphical/ParameterHelper.java @@ -67,12 +67,12 @@ public class ParameterHelper private String m_sPrinterName = null; - private int m_nResolutionInDPI = 180; + private final int m_nResolutionInDPI = 180; private String m_sInputPath = null; private String m_sOutputPath = null; - private TestParameters m_aCurrentParams; + private final TestParameters m_aCurrentParams; public ParameterHelper(TestParameters param) { diff --git a/qadevOOo/runner/graphical/Tolerance.java b/qadevOOo/runner/graphical/Tolerance.java index 80857168de7d..647dfb750760 100644 --- a/qadevOOo/runner/graphical/Tolerance.java +++ b/qadevOOo/runner/graphical/Tolerance.java @@ -20,7 +20,7 @@ package graphical; public class Tolerance { - private int m_nTolerance; + private final int m_nTolerance; public Tolerance(int _nAccept) { m_nTolerance = _nAccept; diff --git a/qadevOOo/runner/helper/BuildEnvTools.java b/qadevOOo/runner/helper/BuildEnvTools.java index 3cd50a823397..826832276683 100644 --- a/qadevOOo/runner/helper/BuildEnvTools.java +++ b/qadevOOo/runner/helper/BuildEnvTools.java @@ -35,7 +35,7 @@ public class BuildEnvTools { private final boolean mDebug; private final String mPlatform; private final String mShell; - private boolean mCygwin; + private final boolean mCygwin; /** * This constructor creates an instance of BuildEncTools. It is verifying for all neccesarry diff --git a/qadevOOo/runner/helper/ConfigHelper.java b/qadevOOo/runner/helper/ConfigHelper.java index d0fd6c9839c5..2adadaf2e146 100644 --- a/qadevOOo/runner/helper/ConfigHelper.java +++ b/qadevOOo/runner/helper/ConfigHelper.java @@ -85,7 +85,7 @@ import com.sun.star.util.*; */ public class ConfigHelper { - private XHierarchicalNameAccess m_xConfig = null; + private final XHierarchicalNameAccess m_xConfig; public ConfigHelper(XMultiServiceFactory xSMGR , diff --git a/qadevOOo/runner/helper/LoggingThread.java b/qadevOOo/runner/helper/LoggingThread.java index 9869e7885b9d..590a467a7134 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 { - private TestParameters param; - private LogWriter log = null; + private final TestParameters param; + private final LogWriter log; private boolean finished = false; - private boolean debug = false; + private final boolean debug; public LoggingThread(LogWriter log, TestParameters tParam) { this.log = log; diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/runner/helper/OfficeWatcher.java index 624e5c0238d1..60900c0052bd 100644 --- a/qadevOOo/runner/helper/OfficeWatcher.java +++ b/qadevOOo/runner/helper/OfficeWatcher.java @@ -24,14 +24,14 @@ import util.utils; public class OfficeWatcher extends Thread implements share.Watcher { public boolean finish; - private TestParameters params; + private final TestParameters params; private int StoredPing = 0; - private boolean debug = false; + private final boolean debug; public OfficeWatcher(TestParameters param) { - finish = false; + this.finish = false; this.params = param; - debug = params.getBool(util.PropertyName.DEBUG_IS_ACTIVE); + this.debug = params.getBool(util.PropertyName.DEBUG_IS_ACTIVE); } /** diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index fb3ff77e8f28..332eb52f5a83 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -43,11 +43,11 @@ import util.utils; class Pump extends Thread { - private LineNumberReader reader; - private String pref; - private StringBuffer buf = new StringBuffer(256); - private PrintWriter log; - private boolean bOutput; + private final LineNumberReader reader; + private final String pref; + private final StringBuffer buf = new StringBuffer(256); + private final PrintWriter log; + private final boolean bOutput; /** * Creates Pump for specified <code>InputStream</code>. @@ -782,8 +782,8 @@ public class ProcessHandler { private int m_nTimeoutInSec; - private String m_sProcessToStart; - private boolean m_bInterrupt; + private final String m_sProcessToStart; + private final boolean m_bInterrupt; private ProcessWatcher(int _nTimeOut, String _sProcess) { diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java index 0493b4bbf37e..c1f0b308f07b 100644 --- a/qadevOOo/runner/lib/MultiMethodTest.java +++ b/qadevOOo/runner/lib/MultiMethodTest.java @@ -95,7 +95,7 @@ public class MultiMethodTest /** * Contains names of the methods have been already called */ - private ArrayList<String> methCalled = new ArrayList<String>(10); + private final ArrayList<String> methCalled = new ArrayList<String>(10); /** * Disposes the test environment, which was corrupted by the test. diff --git a/qadevOOo/runner/lib/StatusException.java b/qadevOOo/runner/lib/StatusException.java index a4bf07f4703f..328fc4ff1899 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. */ - private Status status; + private final Status status; /** * Constructs a StatusException containing an exception Status. diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java index 69bf9fcd2980..abd1dc29097b 100644 --- a/qadevOOo/runner/lib/TestParameters.java +++ b/qadevOOo/runner/lib/TestParameters.java @@ -51,7 +51,7 @@ public class TestParameters extends HashMap<String,Object> { * Debug information will always be written on standard out.<br> * default is true */ - private boolean DebugIsActive = false; + private final boolean DebugIsActive = false; /** * Wrapper around "get()" with some debug output diff --git a/qadevOOo/runner/stats/DataBaseOutProducer.java b/qadevOOo/runner/stats/DataBaseOutProducer.java index 6ffe9b705c39..f362d7e7e498 100644 --- a/qadevOOo/runner/stats/DataBaseOutProducer.java +++ b/qadevOOo/runner/stats/DataBaseOutProducer.java @@ -24,7 +24,7 @@ import java.util.HashMap; public abstract class DataBaseOutProducer implements LogWriter { protected HashMap<String,Object> mSqlInput = null; - private HashMap<String, String[]> mSqlOutput = null; + private final HashMap<String, String[]> mSqlOutput = null; private String[] mWriteableEntryTypes = null; private SQLExecution mSqlExec; protected boolean m_bDebug = false; diff --git a/qadevOOo/runner/stats/SQLExecution.java b/qadevOOo/runner/stats/SQLExecution.java index 34f8949b7772..487716c0e8c6 100644 --- a/qadevOOo/runner/stats/SQLExecution.java +++ b/qadevOOo/runner/stats/SQLExecution.java @@ -35,10 +35,10 @@ public class SQLExecution { 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 final String mJdbcClass; + private final String mDbURL; + private final String mUser; + private final String mPassword; private boolean m_bConnectionOpen = false; private boolean m_bDebug = false; diff --git a/qadevOOo/runner/util/ControlDsc.java b/qadevOOo/runner/util/ControlDsc.java index e5eb0d2ea62b..736fe01b0351 100644 --- a/qadevOOo/runner/util/ControlDsc.java +++ b/qadevOOo/runner/util/ControlDsc.java @@ -28,7 +28,7 @@ import com.sun.star.uno.UnoRuntime; public class ControlDsc extends InstDescr { - private String name = null; + private String name; static final String ifcName = "com.sun.star.form.XFormComponent"; String service = "com.sun.star.form.component.CommandButton"; diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java index f6e7c815bc81..15aa1d926514 100644 --- a/qadevOOo/runner/util/DBTools.java +++ b/qadevOOo/runner/util/DBTools.java @@ -41,8 +41,8 @@ import java.sql.DriverManager; */ public class DBTools { - private XMultiServiceFactory xMSF = null ; - private XNamingService dbContext = null ; + private final XMultiServiceFactory xMSF; + private XNamingService dbContext; //JDBC driver public final static String TST_JDBC_DRIVER = "org.gjt.mm.mysql.Driver"; @@ -122,7 +122,7 @@ public class DBTools { /** * Representation of <code>'SuppressVersionColumns'</code> property. */ - private Boolean SuppressVersionColumns = null ; + private Boolean SuppressVersionColumns; /** * Representation of <code>'IsReadOnly'</code> property. */ diff --git a/qadevOOo/runner/util/DefaultDsc.java b/qadevOOo/runner/util/DefaultDsc.java index 8090fad5c2a2..9c270007c76d 100644 --- a/qadevOOo/runner/util/DefaultDsc.java +++ b/qadevOOo/runner/util/DefaultDsc.java @@ -23,14 +23,13 @@ import com.sun.star.uno.XInterface; import com.sun.star.uno.UnoRuntime; /** - * Defaultdescriptor: * This descriptor is useful for instances in default values. */ public class DefaultDsc extends InstDescr { - private String name = null; - private String ifcName = null; - private String service = null; + private final String name = null; + private final String ifcName; + private final String service; public DefaultDsc( String Interface, String kind ) { service = kind; diff --git a/qadevOOo/runner/util/InstCreator.java b/qadevOOo/runner/util/InstCreator.java index e1eb8c86ffcf..de40b07c03b1 100644 --- a/qadevOOo/runner/util/InstCreator.java +++ b/qadevOOo/runner/util/InstCreator.java @@ -31,11 +31,11 @@ import com.sun.star.container.XIndexAccess; public class InstCreator implements XInstCreator { - private XInterface xParent; - private XMultiServiceFactory xMSF; - private XInterface xInstance; - private XIndexAccess xIA; - private InstDescr iDsc; + private final XInterface xParent; + private final XMultiServiceFactory xMSF; + private final XInterface xInstance; + private final XIndexAccess xIA; + private final InstDescr iDsc; public InstCreator( XInterface xParent, InstDescr iDsc ) { this.xParent = xParent; diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java index c45fbd6131e0..0150e3c035cb 100644 --- a/qadevOOo/runner/util/SOfficeFactory.java +++ b/qadevOOo/runner/util/SOfficeFactory.java @@ -42,7 +42,7 @@ import com.sun.star.drawing.*; public class SOfficeFactory { private static HashMap<String, SOfficeFactory> lookup = new HashMap<String, SOfficeFactory>(10); - private XComponentLoader oCLoader; + private final 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 9610c3dabdb5..99fdaea84fc8 100644 --- a/qadevOOo/runner/util/ShapeDsc.java +++ b/qadevOOo/runner/util/ShapeDsc.java @@ -28,22 +28,23 @@ import com.sun.star.awt.*; */ public class ShapeDsc extends InstDescr { - private int x = 0; - private int y = 0; - private int height = 0; - private int width = 0; - private String name = null; + private final int x; + private final int y; + private final int height; + private final int width; + private final String name = null; private static final String ifcName = "com.sun.star.drawing.XShape"; - private String service = "com.sun.star.drawing.RectangleShape"; + private final String service; - public ShapeDsc( int nheight, int nwidth, int nx, int ny, String kind ) { - x=nx; - y=ny; - height=nheight; - width=nwidth; - service="com.sun.star.drawing."+kind+"Shape"; + public ShapeDsc(int nheight, int nwidth, int nx, int ny, String kind) { + x = nx; + y = ny; + height = nheight; + width = nwidth; + service = "com.sun.star.drawing." + kind + "Shape"; initShape(); } + @Override public String getName() { return name; diff --git a/qadevOOo/runner/util/StyleFamilyDsc.java b/qadevOOo/runner/util/StyleFamilyDsc.java index c3cf2baae49b..daef8b563401 100644 --- a/qadevOOo/runner/util/StyleFamilyDsc.java +++ b/qadevOOo/runner/util/StyleFamilyDsc.java @@ -27,7 +27,7 @@ import com.sun.star.uno.UnoRuntime; */ public class StyleFamilyDsc extends InstDescr { - private String name = null; + private String name; static final String ifcName = "com.sun.star.style.XStyle"; String service = "com.sun.star.style.CharacterStyle"; diff --git a/qadevOOo/runner/util/XLayerHandlerImpl.java b/qadevOOo/runner/util/XLayerHandlerImpl.java index 2f7dcaf50857..399db9a24358 100644 --- a/qadevOOo/runner/util/XLayerHandlerImpl.java +++ b/qadevOOo/runner/util/XLayerHandlerImpl.java @@ -20,7 +20,7 @@ package util; public class XLayerHandlerImpl implements com.sun.star.configuration.backend.XLayerHandler { private String calls = ""; - private String ls = System.getProperty("line.separator"); + private final 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/XMLTools.java b/qadevOOo/runner/util/XMLTools.java index 64330a10bbf6..bc989da981e6 100644 --- a/qadevOOo/runner/util/XMLTools.java +++ b/qadevOOo/runner/util/XMLTools.java @@ -42,8 +42,8 @@ public class XMLTools { public String Type ; public String Value ; } - private HashMap<String, Attribute> attrByName = new HashMap<String, Attribute>() ; - private ArrayList<Attribute> attributes = new ArrayList<Attribute>() ; + private final HashMap<String, Attribute> attrByName = new HashMap<String, Attribute>() ; + private final ArrayList<Attribute> attributes = new ArrayList<Attribute>() ; private PrintWriter log = null ; /** @@ -342,8 +342,8 @@ public class XMLTools { * appropriate message is output. */ public static class XMLTagsChecker extends XMLWellFormChecker { - private HashMap<String,String> tags = new HashMap<String,String>() ; - private HashMap<String,String> chars = new HashMap<String,String>() ; + private final HashMap<String,String> tags = new HashMap<String,String>() ; + private final HashMap<String,String> chars = new HashMap<String,String>() ; private boolean allOK = true ; public XMLTagsChecker(PrintWriter log) { @@ -455,7 +455,7 @@ public class XMLTools { * name, or attribute value additionally. */ public static class Tag { - private String name = null; + private final String name; private String[][] attrList = new String[0][3] ; /** @@ -594,11 +594,11 @@ public class XMLTools { * character data exists inside any tag specified. */ public static class XMLChecker extends XMLWellFormChecker { - 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>() ; + private final HashSet<String> tagSet = new HashSet<String>() ; + private final ArrayList<Tag[]> tags = new ArrayList<Tag[]>() ; + private final ArrayList<Object[]> chars = new ArrayList<Object[]>() ; + private final ArrayList<String> tagStack = new ArrayList<String>() ; + private final 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 06758014bbc7..cd72fd6ed11d 100644 --- a/qadevOOo/runner/util/XSchemaHandlerImpl.java +++ b/qadevOOo/runner/util/XSchemaHandlerImpl.java @@ -20,7 +20,7 @@ package util; public class XSchemaHandlerImpl implements com.sun.star.configuration.backend.XSchemaHandler { private String calls = ""; - private String ls = System.getProperty("line.separator"); + private final 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 82495a8a9a7d..3e91dd04d280 100644 --- a/qadevOOo/runner/util/compare/GraphicalComparator.java +++ b/qadevOOo/runner/util/compare/GraphicalComparator.java @@ -29,7 +29,7 @@ import convwatch.ConvWatchException; class GraphicalComparator implements DocComparator { - private GraphicalTestArguments m_aArguments; + private final GraphicalTestArguments m_aArguments; protected GraphicalComparator(TestParameters aParams) { diff --git a/qadevOOo/runner/util/db/DataSource.java b/qadevOOo/runner/util/db/DataSource.java index 0ee1775f5be7..5e54a625e9ac 100644 --- a/qadevOOo/runner/util/db/DataSource.java +++ b/qadevOOo/runner/util/db/DataSource.java @@ -138,8 +138,8 @@ public class DataSource } } - private XMultiServiceFactory m_orb = null; - private XDataSource m_dataSource = null; - private XPropertySet m_properties = null; + private final XMultiServiceFactory m_orb; + private final XDataSource m_dataSource; + private final XPropertySet m_properties; private DatabaseDocument m_document = null; } diff --git a/qadevOOo/runner/util/db/DataSourceDescriptor.java b/qadevOOo/runner/util/db/DataSourceDescriptor.java index 6aa9a8f6c28b..f4de986eab7c 100644 --- a/qadevOOo/runner/util/db/DataSourceDescriptor.java +++ b/qadevOOo/runner/util/db/DataSourceDescriptor.java @@ -60,5 +60,5 @@ public class DataSourceDescriptor return new DataSource( m_orb, this ); } - private XMultiServiceFactory m_orb = null; + private final XMultiServiceFactory m_orb; } diff --git a/qadevOOo/runner/util/db/DatabaseDocument.java b/qadevOOo/runner/util/db/DatabaseDocument.java index d620a8248b70..4b8228f316a1 100644 --- a/qadevOOo/runner/util/db/DatabaseDocument.java +++ b/qadevOOo/runner/util/db/DatabaseDocument.java @@ -72,8 +72,8 @@ public class DatabaseDocument m_storeDoc.storeAsURL( _url, new PropertyValue[] { } ); } - private DataSource m_dataSource; - private XOfficeDatabaseDocument m_databaseDocument; - private XModel m_model; - private XStorable m_storeDoc; + private final DataSource m_dataSource; + private final XOfficeDatabaseDocument m_databaseDocument; + private final XModel m_model; + private final XStorable m_storeDoc; } diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java index 54dc72284519..be71e7e65e76 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java @@ -49,7 +49,7 @@ public class _XAccessibleComponent extends MultiMethodTest { public XAccessibleComponent oObj = null; private Rectangle bounds = null; - private ArrayList<Rectangle> KnownBounds = new ArrayList<Rectangle>(); + private final ArrayList<Rectangle> KnownBounds = new ArrayList<Rectangle>(); /** diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java index 63de455e43c6..a7fbc9d70ada 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java @@ -49,7 +49,7 @@ public class _XAccessibleValue extends MultiMethodTest { private double minVal = 0; private double maxVal = 0; - private double curVal = 0; + private final double curVal = 0; private Object val = null; XAccessibleValue anotherFromGroup = null; diff --git a/qadevOOo/tests/java/ifc/awt/_XComboBox.java b/qadevOOo/tests/java/ifc/awt/_XComboBox.java index 89cd9d0337a2..094bcf18c52a 100644 --- a/qadevOOo/tests/java/ifc/awt/_XComboBox.java +++ b/qadevOOo/tests/java/ifc/awt/_XComboBox.java @@ -82,8 +82,8 @@ public class _XComboBox extends MultiMethodTest { } } - private TestActionListener actionListener = new TestActionListener(); - private TestItemListener itemListener = new TestItemListener(); + private final TestActionListener actionListener = new TestActionListener(); + private final TestItemListener itemListener = new TestItemListener(); short lineCount = 0; short itemCount = 0; diff --git a/qadevOOo/tests/java/ifc/awt/_XRadioButton.java b/qadevOOo/tests/java/ifc/awt/_XRadioButton.java index 3b6e0506e7dd..306fed422425 100644 --- a/qadevOOo/tests/java/ifc/awt/_XRadioButton.java +++ b/qadevOOo/tests/java/ifc/awt/_XRadioButton.java @@ -48,7 +48,7 @@ public class _XRadioButton extends MultiMethodTest { protected class TestItemListener implements com.sun.star.awt.XItemListener { public boolean disposingCalled = false ; public boolean itemStateChangedCalled = false ; - private java.io.PrintWriter log = null ; + private final java.io.PrintWriter log; public TestItemListener(java.io.PrintWriter log) { this.log = log ; diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinField.java b/qadevOOo/tests/java/ifc/awt/_XSpinField.java index 8f10dd4833ed..c1f2e0eb3aba 100644 --- a/qadevOOo/tests/java/ifc/awt/_XSpinField.java +++ b/qadevOOo/tests/java/ifc/awt/_XSpinField.java @@ -69,7 +69,7 @@ public class _XSpinField extends MultiMethodTest { public void disposing(EventObject e) {} } - private TestListener listener = new TestListener() ; + private final TestListener listener = new TestListener() ; /** * Just adds a listener. <p> diff --git a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java index 290f4de21670..d82baf23b967 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java +++ b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java @@ -51,7 +51,7 @@ public class _XTopWindow extends MultiMethodTest { * method calls. */ protected class TestListener implements XTopWindowListener { - private PrintWriter log = null ; + private final PrintWriter log; public boolean activated = false ; public boolean deactivated = false ; diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java index ff0102a89ddf..976c8f430351 100644 --- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java +++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java @@ -401,11 +401,11 @@ public class _XUserInputInterception extends MultiMethodTest { * represents an <CODE>EventType</CODE> * @see EventTest.EventTriggerType */ - private int eventType = 0; + private final int eventType; /** * represents a <CODE>XModel</CODE> of a document */ - private XModel xModel = null; + private final XModel xModel; /** * Creates an instacne of this class. The parameter <CODE>eType</CODE> represents diff --git a/qadevOOo/tests/java/ifc/awt/_XWindow.java b/qadevOOo/tests/java/ifc/awt/_XWindow.java index b6258d705fc3..44d3f3646c52 100644 --- a/qadevOOo/tests/java/ifc/awt/_XWindow.java +++ b/qadevOOo/tests/java/ifc/awt/_XWindow.java @@ -191,7 +191,7 @@ public class _XWindow extends MultiMethodTest { } - private TestWindowListener wListener = new TestWindowListener() ; + private final TestWindowListener wListener = new TestWindowListener() ; /** @@ -341,7 +341,7 @@ public class _XWindow extends MultiMethodTest { } - private TestFocusListener fListener = new TestFocusListener(); + private final TestFocusListener fListener = new TestFocusListener(); /** * Test calls the method. Then we change focus and check that listener's @@ -414,7 +414,7 @@ public class _XWindow extends MultiMethodTest { public void init() { pressed = false; released = false; } } - private TestKeyListener kListener = new TestKeyListener(); + private final TestKeyListener kListener = new TestKeyListener(); /** * Test calls the method. <p> @@ -477,7 +477,7 @@ public class _XWindow extends MultiMethodTest { } - private TestMouseListener mListener = new TestMouseListener(); + private final TestMouseListener mListener = new TestMouseListener(); /** * Test calls the method. <p> @@ -528,7 +528,7 @@ public class _XWindow extends MultiMethodTest { } - private TestMouseMotionListener mmListener = new TestMouseMotionListener(); + private final TestMouseMotionListener mmListener = new TestMouseMotionListener(); /** * Test calls the method. <p> @@ -573,7 +573,7 @@ public class _XWindow extends MultiMethodTest { } - private TestPaintListener pListener = new TestPaintListener(); + private final TestPaintListener pListener = new TestPaintListener(); /** * Test calls the method. <p> diff --git a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java index 564f5f1023d3..925b20e9e494 100644 --- a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java @@ -55,7 +55,7 @@ import com.sun.star.uno.UnoRuntime; public class _XFastPropertySet extends MultiMethodTest { public XFastPropertySet oObj = null; - private List<Integer> handles = new ArrayList<Integer>(); + private final List<Integer> handles = new ArrayList<Integer>(); private int handle = -1; private Set<String> exclude = null ; diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java index 1ea2fab40c46..5250e6de62a9 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java @@ -93,7 +93,7 @@ public class _XMultiPropertySet extends MultiMethodTest { public void disposing (EventObject obj) {} } - private XPropertiesChangeListener PClistener = + private final XPropertiesChangeListener PClistener = new MyChangeListener(); /** diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java index bebad0e524f2..d942b6d02f85 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java +++ b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java @@ -66,7 +66,7 @@ public class _XBridgeFactory extends MultiMethodTest { /** * the acceptor */ - private XAcceptor acc = null ; + private final XAcceptor acc; /** * If exception occurred during method call it is * stored in this field. diff --git a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java index d108053e2341..0cb01dd30f88 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java +++ b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java @@ -61,7 +61,7 @@ public class _XUnoUrlResolver extends MultiMethodTest { * * @see com.sun.star.lang.MultiServiceFactory */ - private XMultiServiceFactory xMSF = null; + private final XMultiServiceFactory xMSF; /** * Construct object with a MultiServiceFactory @@ -91,16 +91,15 @@ public class _XUnoUrlResolver extends MultiMethodTest { * Thread for creating a bridge so the resolver can access it */ class BridgeThread extends Thread { - private XBridgeFactory xBrdgFctr = null; - private XInstanceProvider xInstProv = null; - private XAcceptor xAcc = null; - private String connectString = null; + private final XBridgeFactory xBrdgFctr; + private final XInstanceProvider xInstProv; + private final XAcceptor xAcc; + private final String connectString; public XBridge xBridge = null; public BridgeThread(XAcceptor xAcc, XBridgeFactory xBrdgFctr, - XInstanceProvider xInstProv, String connectString - ) { + XInstanceProvider xInstProv, String connectString) { this.xInstProv = xInstProv; this.xBrdgFctr = xBrdgFctr; this.xAcc = xAcc; diff --git a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java index 01d8fdff0cad..f939eb2c0d42 100644 --- a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java +++ b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java @@ -56,7 +56,7 @@ public class _XAcceptor extends MultiMethodTest { * stored in this field. */ public Exception ex = null ; - private XAcceptor acc = null ; + private final XAcceptor acc; /** * If method call returns some value it stores in this field. */ diff --git a/qadevOOo/tests/java/ifc/connection/_XConnector.java b/qadevOOo/tests/java/ifc/connection/_XConnector.java index 16319b34e13f..adc8a044e711 100644 --- a/qadevOOo/tests/java/ifc/connection/_XConnector.java +++ b/qadevOOo/tests/java/ifc/connection/_XConnector.java @@ -50,7 +50,7 @@ public class _XConnector extends MultiMethodTest { /** * the acceptor */ - private XAcceptor acc = null ; + private final XAcceptor acc; /** * If exception occurred during method call it is * stored in this field. diff --git a/qadevOOo/tests/java/ifc/document/_XFilter.java b/qadevOOo/tests/java/ifc/document/_XFilter.java index 991ef40b2af9..3f4779721296 100644 --- a/qadevOOo/tests/java/ifc/document/_XFilter.java +++ b/qadevOOo/tests/java/ifc/document/_XFilter.java @@ -157,8 +157,8 @@ public class _XFilter extends MultiMethodTest { */ protected class FilterThread extends Thread { - public boolean filterRes = true ; - private XFilter Filter = null ; + public boolean filterRes = true; + private final XFilter Filter; public PropertyValue[] mdesc = null; public FilterThread(XFilter Filter) { diff --git a/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java index a0c9185f3071..f02f0251629e 100644 --- a/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java @@ -56,7 +56,7 @@ public class _XApproveActionBroadcaster extends MultiMethodTest { } - private TestListener listener = new TestListener(); + private final TestListener listener = new TestListener(); /** * Test calls the method. <p> diff --git a/qadevOOo/tests/java/ifc/form/_XLoadable.java b/qadevOOo/tests/java/ifc/form/_XLoadable.java index ed7bf18270d9..27729c2b30c1 100644 --- a/qadevOOo/tests/java/ifc/form/_XLoadable.java +++ b/qadevOOo/tests/java/ifc/form/_XLoadable.java @@ -51,7 +51,7 @@ public class _XLoadable extends MultiMethodTest { public boolean reloadingCalled = false ; public boolean unloadedCalled = false ; public boolean unloadingCalled = false ; - private java.io.PrintWriter log = null ; + private final java.io.PrintWriter log; public TestLoadListener(java.io.PrintWriter log) { this.log = log ; diff --git a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java index e8cd10a36c1e..fbd9def90b75 100644 --- a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java @@ -118,7 +118,7 @@ public class _XUpdateBroadcaster extends MultiMethodTest { } } - private TestListener listener = new TestListener(); + private final TestListener listener = new TestListener(); /** * The listener methods calls are checked twice with approving diff --git a/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java b/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java index 498235f450b7..2c0869dc5645 100644 --- a/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java +++ b/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java @@ -83,7 +83,7 @@ public class _XBindableValue extends MultiMethodTest { class MyValueBinding implements XValueBinding { private Type[] TypeArray; - private ArrayList<Type> types = new ArrayList<Type>(); + private final ArrayList<Type> types = new ArrayList<Type>(); public com.sun.star.uno.Type[] getSupportedValueTypes() { return TypeArray; diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatch.java b/qadevOOo/tests/java/ifc/frame/_XDispatch.java index 98ef2463ae10..f686150ab870 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatch.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatch.java @@ -59,7 +59,7 @@ public class _XDispatch extends MultiMethodTest { com.sun.star.frame.XStatusListener { public boolean disposingCalled = false ; public boolean statusChangedCalled = false ; - private java.io.PrintWriter log = null ; + private final java.io.PrintWriter log; public TestStatusListener(java.io.PrintWriter log) { this.log = log ; @@ -89,7 +89,7 @@ public class _XDispatch extends MultiMethodTest { com.sun.star.frame.XDispatchResultListener { public boolean disposingCalled = false ; public boolean finishedDispatch = false ; - private java.io.PrintWriter log = null ; + private final java.io.PrintWriter log; public TestNotificationListener(java.io.PrintWriter log) { this.log = log ; diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java b/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java index 4b72518f8788..b4ab947731e4 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java @@ -49,7 +49,7 @@ public class _XDispatchProviderInterception extends MultiMethodTest { * provider. */ public class TestInterceptor implements XDispatchProviderInterceptor { - private PrintWriter log = null ; + private final PrintWriter log; public XDispatchProvider master = null, slave = null ; public TestInterceptor(PrintWriter log) { diff --git a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java index 2510cfe8fe0a..e250ce2ea4e0 100644 --- a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java +++ b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java @@ -32,7 +32,7 @@ public class _XLayoutManager extends MultiMethodTest { public XLayoutManager oObj = null; private XFrame xFrame = null; - private String sElementName = "private:resource/menubar/myMenu"; + private final String sElementName = "private:resource/menubar/myMenu"; @Override public void before() { diff --git a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java index c570f6531c98..a4a94055c328 100644 --- a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java +++ b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java @@ -57,7 +57,7 @@ public class _XNotifyingDispatch extends MultiMethodTest { com.sun.star.frame.XDispatchResultListener { public boolean disposingCalled = false ; public boolean finishedDispatch = false ; - private java.io.PrintWriter log = null ; + private final java.io.PrintWriter log; public TestNotificationListener(java.io.PrintWriter log) { this.log = log ; diff --git a/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java b/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java index 21a627d7191c..e2c236e4ac2e 100644 --- a/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java +++ b/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java @@ -24,7 +24,7 @@ import lib.MultiMethodTest; public class _XUIControllerRegistration extends MultiMethodTest { public XUIControllerRegistration oObj = null; private String aRegisteredController = null; - private String aController = ".uno:MySecondController"; + private final String aController = ".uno:MySecondController"; @Override public void before() { diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java index c96c8e42f72b..001936927b40 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java +++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java @@ -27,7 +27,7 @@ import lib.MultiMethodTest; */ public class _XExtendedTransliteration extends MultiMethodTest { public XExtendedTransliteration oObj = null; - private Locale loc = new Locale("en", "US", "") ; + private final Locale loc = new Locale("en", "US", "") ; @Override public void before() { diff --git a/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java b/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java index 17991b1429fe..5d8cce2393e8 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java +++ b/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java @@ -48,7 +48,7 @@ import com.sun.star.lang.Locale; public class _XTransliteration extends MultiMethodTest { public XTransliteration oObj = null; - private Locale loc = new Locale("en", "EN", "") ; + private final Locale loc = new Locale("en", "EN", "") ; /** * Gets all available transliteration modules. <p> diff --git a/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java b/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java index 32ce987f6f5d..52952cfd2695 100644 --- a/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java +++ b/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java @@ -88,7 +88,7 @@ public class _XActiveDataControl extends MultiMethodTest { /** * The listener is used to verify results of the methods. */ - private TestStreamListener listener = new TestStreamListener(); + private final TestStreamListener listener = new TestStreamListener(); /** * XStreamListener implementation. Sets variables diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java index c822438d9be0..3506d2a894d4 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java @@ -50,7 +50,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { // oObj filled by MultiMethodTest public XSingleSelectQueryAnalyzer oObj = null ; - private String queryString = "SELECT * FROM \"biblio\""; + private final String queryString = "SELECT * FROM \"biblio\""; private XSingleSelectQueryComposer xComposer = null; diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRow.java b/qadevOOo/tests/java/ifc/sdbc/_XRow.java index 8f1264182f95..dbbad4353a69 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRow.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRow.java @@ -95,7 +95,7 @@ public class _XRow extends MultiMethodTest { // oObj filled by MultiMethodTest public XRow oObj = null ; private List<Object> data = null ; - private boolean notNullRes = true ; + private final boolean notNullRes = true; /** * Retrieves object relation first. diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java b/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java index bf6cd7dc1952..771d51ca062a 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java @@ -53,7 +53,7 @@ public class _XRowSet extends MultiMethodTest { // oObj filled by MultiMethodTest public XRowSet oObj = null ; private _XRowSetApproveBroadcaster.RowSetApproveChecker checker = null ; - private TestListener listener = new TestListener() ; + private final TestListener listener = new TestListener() ; private class TestListener implements XRowSetListener { public boolean cursorMoved = false ; diff --git a/qadevOOo/tests/java/ifc/text/_XDefaultNumberingProvider.java b/qadevOOo/tests/java/ifc/text/_XDefaultNumberingProvider.java index 2872cc6a7b68..6a98f0696e64 100644 --- a/qadevOOo/tests/java/ifc/text/_XDefaultNumberingProvider.java +++ b/qadevOOo/tests/java/ifc/text/_XDefaultNumberingProvider.java @@ -38,7 +38,7 @@ import com.sun.star.text.XDefaultNumberingProvider; public class _XDefaultNumberingProvider extends MultiMethodTest { public static XDefaultNumberingProvider oObj = null; - private Locale loc = new Locale("en", "EN", "") ; + private final Locale loc = new Locale("en", "EN", "") ; /** * Just gets numberings for "en" locale. <p> diff --git a/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java b/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java index 4dd9d6daa1e9..0f07c41ef532 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java +++ b/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java @@ -39,7 +39,7 @@ import com.sun.star.ucb.XDataContainer; public class _XDataContainer extends MultiMethodTest { public static XDataContainer oObj = null; // oObj filled by MultiMethodTest - private byte[] data = new byte[] {34, 35, 36} ; + private final byte[] data = new byte[] {34, 35, 36} ; private String dataURL = null; /** diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java index b67ed2d5a324..09716e50c738 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java @@ -35,8 +35,8 @@ import lib.MultiMethodTest; public class _XUIConfigurationManager extends MultiMethodTest { public XUIConfigurationManager oObj; - private String msResourceUrl = "private:resource/menubar/menubar"; - private String msMyResourceUrl = "private:resource/menubar/mymenubar"; + private final String msResourceUrl = "private:resource/menubar/menubar"; + private final String msMyResourceUrl = "private:resource/menubar/mymenubar"; private XIndexContainer mxSettings = null; private XIndexAccess mxMenuBarSettings = null; private XMultiServiceFactory mxMSF = null; diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java index f4e573174f0f..6cfcc92de4e2 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java @@ -97,8 +97,8 @@ public class _XExecutableDialog extends MultiMethodTest { */ protected class ExecThread extends Thread { - public short execRes = (short) 17 ; - private XExecutableDialog Diag = null ; + public short execRes = (short) 17; + private final XExecutableDialog Diag; public ExecThread(XExecutableDialog Diag) { this.Diag = Diag ; diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java index 23492cb58863..d5fed39c900f 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java @@ -43,7 +43,7 @@ public class _XFilePicker extends MultiMethodTest { public XFilePicker oObj = null; private String dir = null ; - private String fname = "space-metal.jpg" ; + private final String fname = "space-metal.jpg" ; /** * Sets the current directory to the test document directory. <p> diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java index 503baf630a4b..f34dd3e879ec 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java @@ -183,7 +183,7 @@ public class _XFilePickerNotifier extends MultiMethodTest { protected class ExecThread extends Thread { public short execRes = (short) 17 ; - private XExecutableDialog Diag = null ; + private final XExecutableDialog Diag; public ExecThread(XExecutableDialog Diag) { this.Diag = Diag ; diff --git a/qadevOOo/tests/java/ifc/util/_XFlushable.java b/qadevOOo/tests/java/ifc/util/_XFlushable.java index 8cb849b008bb..d96e075e95e5 100644 --- a/qadevOOo/tests/java/ifc/util/_XFlushable.java +++ b/qadevOOo/tests/java/ifc/util/_XFlushable.java @@ -52,7 +52,7 @@ public class _XFlushable extends MultiMethodTest { public boolean wasFlushed() { return called; } } - private MyFlushListener listener1 = new MyFlushListener(), + private final MyFlushListener listener1 = new MyFlushListener(), listener2 = new MyFlushListener() ; /** diff --git a/qadevOOo/tests/java/ifc/util/_XModifyBroadcaster.java b/qadevOOo/tests/java/ifc/util/_XModifyBroadcaster.java index 4e3a3043113d..a8fd74314e6b 100644 --- a/qadevOOo/tests/java/ifc/util/_XModifyBroadcaster.java +++ b/qadevOOo/tests/java/ifc/util/_XModifyBroadcaster.java @@ -51,7 +51,7 @@ public class _XModifyBroadcaster extends MultiMethodTest { } } - private TestModifyListener listener = new TestModifyListener(); + private final TestModifyListener listener = new TestModifyListener(); /** * Just calls the method. <p> diff --git a/qadevOOo/tests/java/ifc/util/_XReplaceable.java b/qadevOOo/tests/java/ifc/util/_XReplaceable.java index ca3cca6ee7c0..c1634a7763ca 100644 --- a/qadevOOo/tests/java/ifc/util/_XReplaceable.java +++ b/qadevOOo/tests/java/ifc/util/_XReplaceable.java @@ -45,7 +45,7 @@ public class _XReplaceable extends MultiMethodTest { public XReplaceable oObj = null; public XReplaceDescriptor Rdesc = null; private String mSearchString = "xTextDoc"; - private String mReplaceString = "** xTextDoc"; + private final String mReplaceString = "** xTextDoc"; private boolean mDispose = false; /** diff --git a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java index 5e31bbc138af..d73f6c3ab155 100644 --- a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java +++ b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java @@ -76,7 +76,7 @@ import com.sun.star.xml.sax.XLocator; public class _XDocumentHandler extends MultiMethodTest { private static class DocumentLocator implements XLocator { - private PrintWriter log = null ; + private final PrintWriter log; public DocumentLocator(PrintWriter log) { this.log = log ; } diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java index 3496c783a97a..e572e3dfa953 100644 --- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java @@ -124,9 +124,9 @@ public class ModuleUIConfigurationManager extends TestCase { */ public static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl { private boolean triggered = false; - private PrintWriter log = null; - private XUIConfigurationManager xUIManager = null; - private XMultiServiceFactory xMSF = null; + private final PrintWriter log; + private final XUIConfigurationManager xUIManager; + private final XMultiServiceFactory xMSF; public ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) { log = _log; diff --git a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java index 787abf174d06..75d78cdc71be 100644 --- a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java @@ -116,9 +116,9 @@ public class UIConfigurationManager extends TestCase { */ public static class ConfigurationListener implements _XUIConfiguration.XUIConfigurationListenerImpl { private boolean triggered = false; - private PrintWriter log = null; - private XUIConfigurationManager xUIManager = null; - private XMultiServiceFactory xMSF = null; + private final PrintWriter log; + private final XUIConfigurationManager xUIManager; + private final XMultiServiceFactory xMSF; private static int iUniqueCounter; public ConfigurationListener(PrintWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) { diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java index 71f7a5af6ec7..438fcbba83cb 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java @@ -66,7 +66,7 @@ public class various extends TestCase { * which is free. */ protected static final int basePort = 50000; - private int curPort = 50000; + private final int curPort = 50000; private XAcceptor xAcctr; private XConnector xCntr; @@ -86,7 +86,7 @@ public class various extends TestCase { * * @see com.sun.star.lang.MultiServiceFactory */ - private XMultiServiceFactory xMSF = null; + private final XMultiServiceFactory xMSF; /** * Construct object with a MultiServiceFactory @@ -124,9 +124,9 @@ public class various extends TestCase { * stored in this field. */ public Exception ex = null ; - private XAcceptor acc = null ; - private XInstanceProvider xInstProv = null ; - private XBridgeFactory xBrdgFctr = null; + private final XAcceptor acc; + private final XInstanceProvider xInstProv; + private final XBridgeFactory xBrdgFctr; /** * If method call returns some value it stores in this field. */ diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java index a3caa518fd05..4983092f37d3 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/various.java @@ -67,7 +67,7 @@ public class various extends TestCase { * which is free. */ protected static final int basePort = 50000; - private int curPort = 50000; + private final int curPort = 50000; private XAcceptor xAcctr; private XConnector xCntr; @@ -87,7 +87,7 @@ public class various extends TestCase { * * @see com.sun.star.lang.MultiServiceFactory */ - private XMultiServiceFactory xMSF = null; + private final XMultiServiceFactory xMSF; /** * Construct object with a MultiServiceFactory @@ -125,7 +125,7 @@ public class various extends TestCase { * stored in this field. */ public Exception ex = null ; - private XAcceptor acc = null ; + private final XAcceptor acc; /** * If method call returns some value it stores in this field. */ diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java index 129504654821..13f53b277378 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java @@ -170,8 +170,8 @@ public class ScAccessibleCsvCell extends TestCase { public class loadThread extends Thread { - private SOfficeFactory SOF = null ; - private PropertyValue[] args = null; + private final SOfficeFactory SOF; + private final PropertyValue[] args; public XComponent xSpreadSheedDoc = null; public loadThread(SOfficeFactory SOF, PropertyValue[] Args) { diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java index 0dc1d8754ff5..1237e9817f11 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java @@ -156,8 +156,8 @@ public class ScAccessibleCsvGrid extends TestCase { public class loadThread extends Thread { - private SOfficeFactory SOF = null ; - private PropertyValue[] args = null; + private final SOfficeFactory SOF; + private final PropertyValue[] args; public XComponent xSpreadSheedDoc = null; public loadThread(SOfficeFactory SOF, PropertyValue[] Args) { diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java index 41f33cc78117..45c3f9e4e16e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java @@ -191,8 +191,8 @@ public class ScAccessibleCsvRuler extends TestCase { public class loadThread extends Thread { - private SOfficeFactory SOF = null ; - private PropertyValue[] args = null; + private final SOfficeFactory SOF; + private final PropertyValue[] args; public XComponent xSpreadSheedDoc = null; public loadThread(SOfficeFactory SOF, PropertyValue[] Args) { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java index 2ac0c175e414..2467ee34b6a1 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java @@ -56,7 +56,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private int mMaxFieldIndex = 6; + private final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java index a815bb2d2518..af23d1e24d15 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java @@ -55,7 +55,7 @@ public class ScDataPilotFieldGroupObj extends TestCase * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private int mMaxFieldIndex = 6; + private final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java index 52a36ed1ad99..5aa809eb50b1 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java @@ -55,7 +55,7 @@ public class ScDataPilotFieldGroupsObj extends TestCase * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private int mMaxFieldIndex = 6; + private final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java index 2c668328a51b..01d49050ef25 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java @@ -69,7 +69,7 @@ public class ScDataPilotFieldObj extends TestCase { * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private int mMaxFieldIndex = 6; + private final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java index 5c01cf02c933..2c6e029fb729 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java @@ -70,7 +70,7 @@ public class ScDataPilotItemObj extends TestCase { * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private int mMaxFieldIndex = 6; + private final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java index b9274917425d..9baca8760aaf 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java @@ -70,7 +70,7 @@ public class ScDataPilotItemsObj extends TestCase { * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private int mMaxFieldIndex = 6; + private final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java index 705457967406..ffc09302a435 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java @@ -72,7 +72,7 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private int mMaxFieldIndex = 6; + private final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java index 7c0645ef4964..1fc6c51fe8c5 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java @@ -256,7 +256,7 @@ public class UnoTreeControl extends TestCase { } private class execurteDialog extends Thread{ - private XDialog mXDialog; + private final XDialog mXDialog; public execurteDialog(XDialog xDialog){ mXDialog = xDialog; |