java: make fields final where possible

found by PMD

Change-Id: I87780366119c141cd2dafe6ca1bf2d9798b10aec

14 files changed, 48 insertions, 48 deletions

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