java: final fields that can be static

Change-Id: I8c06be7bc0b8a38c662209f0de72a00550e25447

12 files changed, 42 insertions, 42 deletions

diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java
index f3ab2ddf7be8..336df758b752 100644
--- a/wizards/com/sun/star/wizards/db/TypeInspector.java
+++ b/wizards/com/sun/star/wizards/db/TypeInspector.java
@@ -46,7 +46,7 @@ public class TypeInspector
     {
         DataType.INTEGER, DataType.FLOAT, DataType.REAL, DataType.DOUBLE, DataType.NUMERIC, DataType.DECIMAL
     };
-    final int INVALID = 999999;
+    static final int INVALID = 999999;
     XResultSet xResultSet;
 
     public class TypeInfo
diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java
index 0403895b704b..e07b784850c8 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -49,10 +49,10 @@ public class Control extends Shape
     GridControl oGridControl;
     String sServiceName;
     XNamed xNamed;
-    final int SOMAXTEXTSIZE = 50;
+    static final int SOMAXTEXTSIZE = 50;
     private int icontroltype;
     protected XNameContainer xFormName;
-    protected final int IIMGFIELDWIDTH = 3000;
+    protected static final int IIMGFIELDWIDTH = 3000;
 
     public Control()
     {
diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java
index ab78017c397b..5d25a74f253e 100644
--- a/wizards/com/sun/star/wizards/document/GridControl.java
+++ b/wizards/com/sun/star/wizards/document/GridControl.java
@@ -40,7 +40,7 @@ public class GridControl extends Shape
     public XGridColumnFactory xGridColumnFactory;
     public XPropertySet xPropertySet;
     XNameAccess xNameAccess;
-    final String SODEFAULTNAME = "Grid1";
+    static final String SODEFAULTNAME = "Grid1";
     XControlModel xControlModel;
     public XComponent xComponent;
 
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java
index 7b133b5f8601..ae59f843595d 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -49,7 +49,7 @@ public class FormDocument extends TextDocument
     private ViewHandler oViewHandler;
     private TextStyleHandler oTextStyleHandler;
     private XPropertySet xPropPageStyle;
-    private final int SOFORMGAP = 2000;
+    private static final int SOFORMGAP = 2000;
     private boolean bhasSubForm;
     private UIControlArranger curUIControlArranger;
     private StyleApplier curStyleApplier;
diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java
index ffb3cc277dd7..b19c957f17ed 100644
--- a/wizards/com/sun/star/wizards/form/UIControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java
@@ -45,9 +45,9 @@ public class UIControlArranger
     private String[] HelpTexts = new String[4];
     private ArrangeButtonList[] m_aArrangeList = new ArrangeButtonList[2];
     private Integer IControlStep;
-    private final int SOBASEIMAGEYPOSITION = 66;
-    private final int SOIMAGELISTHEIGHT = 60;
-    private final String SOALIGNMETHOD = "alignLabelControls";
+    private static final int SOBASEIMAGEYPOSITION = 66;
+    private static final int SOIMAGELISTHEIGHT = 60;
+    private static final String SOALIGNMETHOD = "alignLabelControls";
 
     public UIControlArranger(FormWizard _CurUnoDialog, FormDocument _curFormDocument)
     {
diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java
index 47dc89fa2432..120bef2933cd 100644
--- a/wizards/com/sun/star/wizards/query/QuerySummary.java
+++ b/wizards/com/sun/star/wizards/query/QuerySummary.java
@@ -29,8 +29,8 @@ import com.sun.star.wizards.ui.FilterComponent;
 public class QuerySummary extends QueryMetaData
 {
 
-    final protected int RID_QUERY = 2300;
-    final protected int RID_REPORT = 2400;
+    static final protected int RID_QUERY = 2300;
+    static final protected int RID_REPORT = 2400;
     String sSummary;
     Resource oResource;
     private String sSeparator;
diff --git a/wizards/com/sun/star/wizards/table/CGCategory.java b/wizards/com/sun/star/wizards/table/CGCategory.java
index bdcad65db0f2..05d3d6cd03a2 100644
--- a/wizards/com/sun/star/wizards/table/CGCategory.java
+++ b/wizards/com/sun/star/wizards/table/CGCategory.java
@@ -32,7 +32,7 @@ public class CGCategory
 
     public String Name;
     public int Index;
-    private final String CGROOTPATH = "/org.openoffice.Office.TableWizard/TableWizard/";
+    private static final String CGROOTPATH = "/org.openoffice.Office.TableWizard/TableWizard/";
     XMultiServiceFactory xMSF;
     XNameAccess xNameAccessTablesNode;
     XNameAccess xNameAccessCurBusinessNode;
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 31eb46a948f3..308b61874733 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -53,9 +53,9 @@ public class AggregateComponent extends ControlScroller
     String sDuplicateAggregateFunction;
     int Count;
     int iQueryType;
-    final int SOADDROW = 1;
-    final int SOREMOVEROW = 2;
-    final int CONTROLROWDIST = 18;
+    static final int SOADDROW = 1;
+    static final int SOREMOVEROW = 2;
+    static final int CONTROLROWDIST = 18;
     ArrayList<ControlRow> ControlRowVector;
     String OPTIONBUTTONDETAILQUERY_ITEM_CHANGED = "toggleComponent";
     String OPTIONBUTTONSUMMARYQUERY_ITEM_CHANGED = "toggleComponent";
diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
index 0131414a2584..355b8776e29e 100644
--- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
@@ -37,7 +37,7 @@ public abstract class DBLimitedFieldSelection
     protected Integer ICompPosX;
     protected Integer ICompPosY;
     protected Integer ICompWidth;
-    protected final int rowcount = 4;
+    protected static final int rowcount = 4;
     protected final int MAXSELINDEX = rowcount - 1;
     protected short curtabindex;
     protected int iCurPosY;
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 0d40397992b5..072cafd715eb 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -64,8 +64,8 @@ public class FilterComponent
     private String sIncSuffix;
     private ControlRow[] oControlRows;
     private String sDuplicateCondition;
-    final int SOOPTORMODE = 100;
-    final int SOOPTANDMODE = 101;
+    static final int SOOPTORMODE = 100;
+    static final int SOOPTANDMODE = 101;
     QueryMetaData oQueryMetaData;
     int iDateTimeFormat;
     int iDateFormat;
@@ -73,41 +73,41 @@ public class FilterComponent
     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;
+    static final int SO_FIRSTFIELDNAME = 1;
+    static final int SO_SECONDFIELDNAME = 2;
+    static final int SO_THIRDFIELDNAME = 3;
+    static final int SO_FOURTHFIELDNAME = 4;
     int[] SO_FIELDNAMELIST = new int[]
     {
         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;
+    static final int SO_FIRSTCONDITION = 5;
+    static final int SO_SECONDCONDITION = 6;
+    static final int SO_THIRDCONDITION = 7;
+    static final int SO_FOURTHCONDITION = 8;
     int[] SO_CONDITIONLIST = new int[]
     {
         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;
+    static final int SO_FIRSTTEXTFIELD = 1;
+    static final int SO_SECONDTEXTFIELD = 2;
+    static final int SO_THIRDTEXTFIELD = 3;
+    static final int SO_FOURTHTEXTFIELD = 4;
     int[] SO_TEXTFIELDLIST = new int[]
     {
         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;
+    static final int SO_FIRSTBOOLFIELDNAME = 256 + 1;
+    static final int SO_SECONDBOOLFIELDNAME = 256 + 2;
+    static final int SO_THIRDBOOLFIELDNAME = 256 + 3;
+    static final int SO_FOURTHBOOLFIELDNAME = 256 + 4;
     int SO_BOOLEANLIST[] =
 
 
     {
         SO_FIRSTBOOLFIELDNAME, SO_SECONDBOOLFIELDNAME, SO_THIRDBOOLFIELDNAME, SO_FOURTHBOOLFIELDNAME
     };
-    final int SO_OPTQUERYMODE = 5;
+    static final int SO_OPTQUERYMODE = 5;
     int SOI_MATCHALL = 0;
     int SOI_MATCHANY = 1;
     int curHelpID;
diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index 3eea88f11ed3..1d8c3c5057d2 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -38,11 +38,11 @@ public class SortingComponent
     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[]
+    static final int SOFIRSTSORTLST = 0;
+    static final int SOSECSORTLST = 1;
+    static final int SOTHIRDSORTLST = 2;
+    static final int SOFOURTHSORTLST = 3;
+    static final int[] SOSORTLST = new int[]
     {
         SOFIRSTSORTLST, SOSECSORTLST, SOTHIRDSORTLST, SOFOURTHSORTLST
     };
diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
index 1cdca6fbe608..14a78155ad95 100644
--- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java
+++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
@@ -30,13 +30,13 @@ public class TitlesComponent extends ControlScroller
 {
 
     int iLabelPosX;
-    final int iRelLabelPosXDist = 6;
+    static final int iRelLabelPosXDist = 6;
     public String[] fieldnames;
     public Map<String, String> fieldtitleset;
     public String[] fieldtitles;
     public XTextListener xTextListener;
-    final String SOLABELPREFIX = "lblColumnName_";
-    final String SOTITLEPREFIX = "lblTitleName_";
+    static final String SOLABELPREFIX = "lblColumnName_";
+    static final String SOTITLEPREFIX = "lblTitleName_";
 
     public TitlesComponent(WizardDialog _CurUnoDialog, int _iStep, int _iCompPosX, int _iCompPosY, int _iCompWidth, int _uitextfieldcount, String _slblColumnNames, String _slblColumnTitles, int _firsthelpindex)
     {