summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-11-18 15:20:11 +0200
committerNoel Grandin <noelgrandin@gmail.com>2014-11-25 06:06:48 +0000
commit58eab57648e222e5a3e488087afd44eea6efd591 (patch)
tree190af535c3871f3931a3b29dea55493751a01d03 /wizards
parent1658c017a27ac2cccb2af89f88a4cde8ffdbe531 (diff)
java: final fields that can be static
found by PMD Change-Id: I2b48f35d252d6e914c2a18a2c175b075a9d3ac0f Reviewed-on: https://gerrit.libreoffice.org/13099 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/common/NumberFormatter.java2
-rw-r--r--wizards/com/sun/star/wizards/db/RelationController.java16
-rw-r--r--wizards/com/sun/star/wizards/report/ReportLayouter.java6
-rw-r--r--wizards/com/sun/star/wizards/table/ScenarioSelector.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/ButtonList.java4
-rw-r--r--wizards/com/sun/star/wizards/ui/CommandFieldSelection.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/FilterComponent.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/ImageList.java4
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.java2
9 files changed, 20 insertions, 20 deletions
diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java
index cd9b2b232d32..b906eedabf98 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.java
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java
@@ -47,7 +47,7 @@ public class NumberFormatter
public XNumberFormats xNumberFormats;
public XNumberFormatTypes xNumberFormatTypes;
public XPropertySet xNumberFormatSettings;
- private final boolean bNullDateCorrectionIsDefined = false;
+ private static final boolean bNullDateCorrectionIsDefined = false;
private final Locale aLocale;
diff --git a/wizards/com/sun/star/wizards/db/RelationController.java b/wizards/com/sun/star/wizards/db/RelationController.java
index a25b7961dd08..1a2922615fec 100644
--- a/wizards/com/sun/star/wizards/db/RelationController.java
+++ b/wizards/com/sun/star/wizards/db/RelationController.java
@@ -33,14 +33,14 @@ import com.sun.star.wizards.common.PropertyNames;
public class RelationController extends CommandName
{
- private final int PKTABLE_CAT = 1;
- private final int PKTABLE_SCHEM = 2;
- private final int PKTABLE_NAME = 3;
- private final int PKCOLUMN_NAME = 4;
- private final int FKTABLE_CAT = 5;
- private final int FKTABLE_SCHEM = 6;
- private final int FKTABLE_NAME = 7;
- private final int FKCOLUMN_NAME = 8;
+ private static final int PKTABLE_CAT = 1;
+ private static final int PKTABLE_SCHEM = 2;
+ private static final int PKTABLE_NAME = 3;
+ private static final int PKCOLUMN_NAME = 4;
+ private static final int FKTABLE_CAT = 5;
+ private static final int FKTABLE_SCHEM = 6;
+ private static final int FKTABLE_NAME = 7;
+ private static final int FKCOLUMN_NAME = 8;
public RelationController(CommandMetaData _CommandMetaData, String _CatalogName, String _SchemaName, String _TableName, boolean _baddQuotation)
{
diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java
index b62cf1c6f5cb..49c3c25f326a 100644
--- a/wizards/com/sun/star/wizards/report/ReportLayouter.java
+++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java
@@ -37,11 +37,11 @@ public class ReportLayouter
{
UnoDialog CurUnoDialog;
- final int SOTXTTITLE = 28;
- final int SOCONTENTLST = 29;
+ static final int SOTXTTITLE = 28;
+ static final int SOCONTENTLST = 29;
final static public int SOOPTLANDSCAPE = 30;
final static public int SOOPTPORTRAIT = 31;
- final int SOLAYOUTLST = 32;
+ static final int SOLAYOUTLST = 32;
XListBox xContentListBox;
XListBox xLayoutListBox;
int iOldContentPos;
diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
index dd39e3e18c95..f966df4ffc11 100644
--- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
+++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
@@ -53,7 +53,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
private final TableDescriptor curtabledescriptor;
private final CGCategory oCGCategory;
protected CGTable oCGTable;
- private final String SELECTCATEGORY = "selectCategory";
+ private static final String SELECTCATEGORY = "selectCategory";
protected boolean bcolumnnameislimited;
private final int imaxcolumnchars;
private final String smytable;
diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java
index 73a1cae141ee..81069ec0079d 100644
--- a/wizards/com/sun/star/wizards/ui/ButtonList.java
+++ b/wizards/com/sun/star/wizards/ui/ButtonList.java
@@ -56,8 +56,8 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
private Size selectionGap = new Size(2, 2);
private boolean showButtons = true;
private Short step;
- private final boolean refreshOverNull = true;
- private final int imageTextLines = 1;
+ private static final boolean refreshOverNull = true;
+ private static final int imageTextLines = 1;
private boolean rowSelect = false;
public int tabIndex;
public Boolean scaleImages = Boolean.TRUE;
diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
index 48e01d0f1967..904ce6c1ba48 100644
--- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
@@ -39,7 +39,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator<
private String sTablePrefix;
private short m_iSelPos = -1;
private short iOldSelPos = -1;
- private final boolean bpreselectCommand = true;
+ private static final boolean bpreselectCommand = true;
private boolean bgetQueries;
private final WizardDialog oWizardDialog;
private Collator aCollator = null;
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 52b4f5652d13..b7975e27f7f4 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -60,7 +60,7 @@ public class FilterComponent
private final String slblOperators;
private final String slblValue;
WizardDialog CurUnoDialog;
- private final int BaseID = 2300;
+ private static final int BaseID = 2300;
private final String sIncSuffix;
private final ControlRow[] oControlRows;
private final String sDuplicateCondition;
diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java
index 3a0ec886ce35..0ae99b776218 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.java
+++ b/wizards/com/sun/star/wizards/ui/ImageList.java
@@ -61,8 +61,8 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
private boolean showButtons = true;
private Short step;
private final static Short NO_BORDER = Short.valueOf((short) 0);
- private final boolean refreshOverNull = true;
- private final int imageTextLines = 1;
+ private static final boolean refreshOverNull = true;
+ private static final int imageTextLines = 1;
private boolean rowSelect = false;
public int tabIndex;
public Boolean scaleImages = Boolean.TRUE;
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 662c98aeb15a..8b8e079c6550 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -48,7 +48,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
private static final String CANCEL_ACTION_PERFORMED = "cancelWizard_1";
private static final String HELP_ACTION_PERFORMED = "callHelp";
public VetoableChangeSupport vetos = new VetoableChangeSupport(this);
- private final int iButtonWidth = 50;
+ private static final int iButtonWidth = 50;
private int nNewStep = 1;
private int nOldStep = 1;
private int nMaxStep = 1;