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 /wizards | |
parent | Move pFlyOnly into properties container (diff) | |
download | core-0063cf285696951e336b9cec1da8881997b286ce.tar.gz core-0063cf285696951e336b9cec1da8881997b286ce.zip |
java: make fields final where possible
found by PMD
Change-Id: I87780366119c141cd2dafe6ca1bf2d9798b10aec
Diffstat (limited to 'wizards')
43 files changed, 133 insertions, 133 deletions
diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.java b/wizards/com/sun/star/wizards/common/ConfigSet.java index 9b8b6478d8ad..75705c09fd21 100644 --- a/wizards/com/sun/star/wizards/common/ConfigSet.java +++ b/wizards/com/sun/star/wizards/common/ConfigSet.java @@ -28,9 +28,9 @@ import org.w3c.dom.*; public class ConfigSet implements ConfigNode, XMLProvider, ListModel { - private Class<?> childClass; - private Map<String, Object> childrenMap = new HashMap<String, Object>(); - private List<Object> childrenList = new ArrayList<Object>(); + private final Class<?> childClass; + private final Map<String, Object> childrenMap = new HashMap<String, Object>(); + private final List<Object> childrenList = new ArrayList<Object>(); public Object root; /** * After reading the configuration set items, diff --git a/wizards/com/sun/star/wizards/common/Helper.java b/wizards/com/sun/star/wizards/common/Helper.java index 9b62dd081b26..9d6b79aaa4d6 100644 --- a/wizards/com/sun/star/wizards/common/Helper.java +++ b/wizards/com/sun/star/wizards/common/Helper.java @@ -291,10 +291,10 @@ public class Helper public static class DateUtils { - private long docNullTime; - private XNumberFormatter formatter; - private XNumberFormatsSupplier formatSupplier; - private Calendar calendar; + private final long docNullTime; + private final XNumberFormatter formatter; + private final XNumberFormatsSupplier formatSupplier; + private final Calendar calendar; public DateUtils(XMultiServiceFactory xmsf, Object document) throws Exception { diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java index c8086716f760..cd9b2b232d32 100644 --- a/wizards/com/sun/star/wizards/common/NumberFormatter.java +++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java @@ -47,8 +47,8 @@ public class NumberFormatter public XNumberFormats xNumberFormats; public XNumberFormatTypes xNumberFormatTypes; public XPropertySet xNumberFormatSettings; - private boolean bNullDateCorrectionIsDefined = false; - private Locale aLocale; + private final boolean bNullDateCorrectionIsDefined = false; + private final Locale aLocale; public NumberFormatter(XMultiServiceFactory _xMSF, XNumberFormatsSupplier _xNumberFormatsSupplier, Locale _aLocale) throws Exception diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index 2c93b0c876b1..557b31bb377c 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -1188,7 +1188,7 @@ public class NumericalHelper private static class TransformNumToHex { - private StringBuffer val; + private final StringBuffer val; public TransformNumToHex(long number) { diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java index 7e612916fca5..e7500a62910b 100644 --- a/wizards/com/sun/star/wizards/common/UCB.java +++ b/wizards/com/sun/star/wizards/common/UCB.java @@ -48,8 +48,8 @@ import com.sun.star.uno.UnoRuntime; public class UCB { - private Object ucb; - private FileAccess fa; + private final Object ucb; + private final FileAccess fa; public UCB(XMultiServiceFactory xmsf) throws Exception { diff --git a/wizards/com/sun/star/wizards/db/RelationController.java b/wizards/com/sun/star/wizards/db/RelationController.java index b37457ef9986..d08a13a60d76 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 int PKTABLE_CAT = 1; - private int PKTABLE_SCHEM = 2; - private int PKTABLE_NAME = 3; - private int PKCOLUMN_NAME = 4; - private int FKTABLE_CAT = 5; - private int FKTABLE_SCHEM = 6; - private int FKTABLE_NAME = 7; - private int FKCOLUMN_NAME = 8; + 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; public RelationController(CommandMetaData _CommandMetaData, String _CatalogName, String _SchemaName, String _TableName, boolean _baddQuotation) { diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java index 6d37a675a5f0..68b2e95317ea 100644 --- a/wizards/com/sun/star/wizards/db/TableDescriptor.java +++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java @@ -64,8 +64,8 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen private XAppend xKeyAppend; private XDrop xKeyDrop; private String[] sTableFilters = null; - private ArrayList<ColumnDescriptor> columncontainer; - private ArrayList<XPropertySet> keycolumncontainer; + private final ArrayList<ColumnDescriptor> columncontainer; + private final ArrayList<XPropertySet> keycolumncontainer; public XHierarchicalNameAccess xTableHierarchicalNameAccess; private CommandName ComposedTableName; private XAppend xKeyColAppend; @@ -73,8 +73,8 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen private XPropertySet xKey; private boolean bIDFieldisInserted = false; private String IDFieldName = PropertyNames.EMPTY_STRING; - private String sColumnAlreadyExistsMessage = PropertyNames.EMPTY_STRING; - private XWindow xWindow; + private final String sColumnAlreadyExistsMessage; + private final XWindow xWindow; public TableDescriptor(XMultiServiceFactory xMSF, XWindow _xWindow, String _sColumnAlreadyExistsMessage) { diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java index 277c72158103..d992d3477dcc 100644 --- a/wizards/com/sun/star/wizards/db/TypeInspector.java +++ b/wizards/com/sun/star/wizards/db/TypeInspector.java @@ -42,7 +42,7 @@ public class TypeInspector private boolean[] bisAutoIncrementableInfos; private int[] nMinScaleInfos; private int[] nMaxScaleInfos; - private int[] nNumericFallBackList = new int[] + private final int[] nNumericFallBackList = new int[] { DataType.INTEGER, DataType.FLOAT, DataType.REAL, DataType.DOUBLE, DataType.NUMERIC, DataType.DECIMAL }; diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java b/wizards/com/sun/star/wizards/form/CallFormWizard.java index 4445937f1506..8adbfe389acb 100644 --- a/wizards/com/sun/star/wizards/form/CallFormWizard.java +++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java @@ -86,7 +86,7 @@ public class CallFormWizard private static final String __serviceName = "com.sun.star.wizards.form.CallFormWizard"; /** The service manager, that gives access to all registered services. */ - private com.sun.star.lang.XMultiServiceFactory m_serviceFactory; + private final com.sun.star.lang.XMultiServiceFactory m_serviceFactory; /** This method is a member of the interface for initializing an object * directly after its creation. diff --git a/wizards/com/sun/star/wizards/form/DataEntrySetter.java b/wizards/com/sun/star/wizards/form/DataEntrySetter.java index e7787e58c5c1..f21817f529cc 100644 --- a/wizards/com/sun/star/wizards/form/DataEntrySetter.java +++ b/wizards/com/sun/star/wizards/form/DataEntrySetter.java @@ -30,10 +30,10 @@ import com.sun.star.wizards.common.PropertyNames; public class DataEntrySetter { - private XRadioButton optDisplayAllData; - private XCheckBox chknomodification; - private XCheckBox chknodeletion; - private XCheckBox chknoaddition; + private final XRadioButton optDisplayAllData; + private final XCheckBox chknomodification; + private final XCheckBox chknodeletion; + private final XCheckBox chknoaddition; public DataEntrySetter(WizardDialog CurUnoDialog) { diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java b/wizards/com/sun/star/wizards/form/FormControlArranger.java index 5d16a3c19aba..b2ac659bb504 100644 --- a/wizards/com/sun/star/wizards/form/FormControlArranger.java +++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java @@ -40,11 +40,11 @@ public class FormControlArranger public static final String LABELCONTROL = "LabelControl"; protected DatabaseControl[] DBControlList = null; - private XNameContainer xFormName; - private XMultiServiceFactory xMSF; + private final XNameContainer xFormName; + private final XMultiServiceFactory xMSF; private Control[] LabelControlList = null; - private XStatusIndicator xProgressBar; - private FieldColumn[] FieldColumns; + private final XStatusIndicator xProgressBar; + private final FieldColumn[] FieldColumns; // Control curLabelControl; private int icurArrangement; private boolean bIsFirstRun; @@ -56,7 +56,7 @@ public class FormControlArranger private static final int cHoriDistance = 300; private static final int cLabelGap = 100; private static final double CMAXREDUCTION = 0.7; - private FormHandler oFormHandler; + private final FormHandler oFormHandler; private int iReduceWidth; private int m_currentLabelPosX; private int m_currentLabelPosY; diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java index d7ae4181fd2b..699d202dc7d3 100644 --- a/wizards/com/sun/star/wizards/form/StyleApplier.java +++ b/wizards/com/sun/star/wizards/form/StyleApplier.java @@ -43,12 +43,12 @@ import com.sun.star.wizards.ui.*; public class StyleApplier { - private XPropertySet xPageStylePropertySet; - private XMultiServiceFactory xMSF; - private XRadioButton optNoBorder; - private XRadioButton opt3DLook; - private XListBox lstStyles; - private FormDocument curFormDocument; + private final XPropertySet xPageStylePropertySet; + private final XMultiServiceFactory xMSF; + private final XRadioButton optNoBorder; + private final XRadioButton opt3DLook; + private final XListBox lstStyles; + private final FormDocument curFormDocument; private short iOldLayoutPos; private static final String SCHANGELAYOUT = "changeLayout"; private static final String SCHANGEBORDERTYPE = "changeBorderLayouts"; diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java index b19c957f17ed..9c77005cb51c 100644 --- a/wizards/com/sun/star/wizards/form/UIControlArranger.java +++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java @@ -36,15 +36,15 @@ import javax.swing.ListModel; public class UIControlArranger { - private FormWizard CurUnoDialog; - private FormDocument curFormDocument; + private final FormWizard CurUnoDialog; + private final FormDocument curFormDocument; private short curtabindex; - private XRadioButton optAlignLeft; - private XRadioButton optAlignRight; - private XControl flnLabelPlacement; - private String[] HelpTexts = new String[4]; - private ArrangeButtonList[] m_aArrangeList = new ArrangeButtonList[2]; - private Integer IControlStep; + private final XRadioButton optAlignLeft; + private final XRadioButton optAlignRight; + private final XControl flnLabelPlacement; + private final String[] HelpTexts = new String[4]; + private final ArrangeButtonList[] m_aArrangeList = new ArrangeButtonList[2]; + private final Integer IControlStep; private static final int SOBASEIMAGEYPOSITION = 66; private static final int SOIMAGELISTHEIGHT = 60; private static final String SOALIGNMETHOD = "alignLabelControls"; @@ -182,8 +182,8 @@ public class UIControlArranger private class ArrangeButtonList implements XItemListener { - private int formindex; - private ButtonList m_aButtonList = null; // new ImageList(); + private final int formindex; + private final ButtonList m_aButtonList; public ArrangeButtonList(int _formindex, ListModel model, String _sArrangementHeader) { diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java index 204fe281dd66..181b67def1b8 100644 --- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java +++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java @@ -91,7 +91,7 @@ public class CallQueryWizard private static final String __serviceName = "com.sun.star.wizards.query.CallQueryWizard"; /** The service manager, that gives access to all registered services. */ - private com.sun.star.lang.XMultiServiceFactory m_serviceFactory; + private final com.sun.star.lang.XMultiServiceFactory m_serviceFactory; /** This method is a member of the interface for initializing an object * directly after its creation. diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java index c91f2eb69472..6cf03b67f251 100644 --- a/wizards/com/sun/star/wizards/query/Finalizer.java +++ b/wizards/com/sun/star/wizards/query/Finalizer.java @@ -34,11 +34,11 @@ import java.util.logging.Logger; public class Finalizer { - private QueryWizard m_queryWizard; - private String resQuery; - private XTextComponent m_aTxtTitle; - private XRadioButton xRadioDisplayQuery; - private QuerySummary CurDBMetaData; + private final QueryWizard m_queryWizard; + private final String resQuery; + private final XTextComponent m_aTxtTitle; + private final XRadioButton xRadioDisplayQuery; + private final QuerySummary CurDBMetaData; public Finalizer( QueryWizard i_queryWizard, QuerySummary _CurDBMetaData ) { diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java index 120bef2933cd..f7fb1cdce48a 100644 --- a/wizards/com/sun/star/wizards/query/QuerySummary.java +++ b/wizards/com/sun/star/wizards/query/QuerySummary.java @@ -33,10 +33,10 @@ public class QuerySummary extends QueryMetaData static final protected int RID_REPORT = 2400; String sSummary; Resource oResource; - private String sSeparator; - private String sReturnChar; - private String sAnd; - private String sOr; + private final String sSeparator; + private final String sReturnChar; + private final String sAnd; + private final String sOr; public QuerySummary(XMultiServiceFactory _xMSF, Resource _oResource) { diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java index 70c418ad24ca..c64f9dea3833 100644 --- a/wizards/com/sun/star/wizards/report/CallReportWizard.java +++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java @@ -117,7 +117,7 @@ public class CallReportWizard private static final String __serviceName = "com.sun.star.wizards.report.CallReportWizard"; /** The service manager, that gives access to all registered services. */ - private com.sun.star.lang.XMultiServiceFactory xmultiservicefactory; + private final com.sun.star.lang.XMultiServiceFactory xmultiservicefactory; /** This method is a member of the interface for initializing an object * directly after its creation. diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java index 7bd6138a83b9..cbadd8205d5a 100644 --- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java +++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java @@ -31,7 +31,7 @@ public class GroupFieldHandler extends FieldSelection { private IReportDocument CurReportDocument; - private ArrayList<String> GroupFieldVector = new ArrayList<String>(); + private final ArrayList<String> GroupFieldVector = new ArrayList<String>(); private QueryMetaData CurDBMetaData; private static final short MAXSELFIELDS = 4; diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index 524ce2e1184d..415b7f5fda89 100644 --- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java +++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java @@ -44,7 +44,7 @@ public class ReportFinalizer public static final int SOCREATEDOCUMENT = 1; public static final int SOCREATETEMPLATE = 2; public static final int SOUSETEMPLATE = 3; - private XMultiServiceFactory m_xMSF; + private final XMultiServiceFactory m_xMSF; public ReportFinalizer(XMultiServiceFactory _xMSF, IReportDocument _CurReportDocument, WizardDialog _CurUnoDialog) { m_xMSF = _xMSF; diff --git a/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java b/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java index 765d85eb92a3..54b0bac36831 100644 --- a/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java +++ b/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java @@ -24,7 +24,7 @@ public class ReportImplementationHelper { private RecordParser m_aCurDBMetaData; - private XMultiServiceFactory m_xMSF; + private final XMultiServiceFactory m_xMSF; protected int m_nDefaultPageOrientation; public ReportImplementationHelper(XMultiServiceFactory _aMSF, int _nOrientation) diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index 953e532c4e81..b62cf1c6f5cb 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -50,11 +50,11 @@ public class ReportLayouter public String[][] LayoutFiles; public String[][] ContentFiles; Object aOrientationImage; - private XMultiServiceFactory m_xMSF; + private final XMultiServiceFactory m_xMSF; private XTextRange trTitleconst, trAuthorconst, trDateconst, trPageconst; private TextElement teTitleconst, teAuthorconst, teDateconst, tePageconst; private List<XTextRange> constRangeList = new ArrayList<XTextRange>(); - private boolean isBuilderInstalled; + private final boolean isBuilderInstalled; public ReportLayouter(XMultiServiceFactory _xMSF, IReportDocument _CurReportDocument, UnoDialog _CurUnoDialog, boolean _isBuilderInstalled) { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java index 77b1791310c9..60d14dd68b9a 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java @@ -74,7 +74,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter { private IReportDefinitionReadAccess m_xReportDefinitionReadAccess; - private Resource m_aResource; + private final Resource m_aResource; private String[][] m_aSortNames; /** diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java index 40aff48a1cd5..5c4e35d7e9b1 100644 --- a/wizards/com/sun/star/wizards/table/CallTableWizard.java +++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java @@ -92,7 +92,7 @@ public class CallTableWizard private static final String __serviceName = "com.sun.star.wizards.table.CallTableWizard"; /** The service manager, that gives access to all registered services. */ - private com.sun.star.lang.XMultiServiceFactory m_serviceFactory; + private final com.sun.star.lang.XMultiServiceFactory m_serviceFactory; /** This method is a member of the interface for initializing an object * directly after its creation. diff --git a/wizards/com/sun/star/wizards/table/FieldDescription.java b/wizards/com/sun/star/wizards/table/FieldDescription.java index d7ae9693d0c8..3979199c5787 100644 --- a/wizards/com/sun/star/wizards/table/FieldDescription.java +++ b/wizards/com/sun/star/wizards/table/FieldDescription.java @@ -33,7 +33,7 @@ public class FieldDescription { private String tablename = PropertyNames.EMPTY_STRING; private XPropertySet xPropertySet; - private ArrayList<PropertyValue> aPropertyValues; + private final ArrayList<PropertyValue> aPropertyValues; private String Name; public FieldDescription(XMultiServiceFactory _xMSF, Locale _aLocale, ScenarioSelector _curscenarioselector, String _fieldname, String keyname, int _nmaxcharCount) diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java index ffbce45d52c7..7ec9e5b5fa7e 100644 --- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java +++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java @@ -37,20 +37,20 @@ import com.sun.star.wizards.ui.XFieldSelectionListener; public class PrimaryKeyHandler implements XFieldSelectionListener { - private TableWizard CurUnoDialog; + private final TableWizard CurUnoDialog; private final static String SPRIMEKEYMODE = "togglePrimeKeyFields"; - private XRadioButton optAddAutomatically; - private XRadioButton optUseExisting; - private XRadioButton optUseSeveral; - private XCheckBox chkcreatePrimaryKey; - private XCheckBox chkApplyAutoValueExisting; - private XCheckBox chkApplyAutoValueAutomatic; - private XListBox lstSinglePrimeKey; - private XFixedText lblPrimeFieldName; - private FieldSelection curPrimaryKeySelection; + private final XRadioButton optAddAutomatically; + private final XRadioButton optUseExisting; + private final XRadioButton optUseSeveral; + private final XCheckBox chkcreatePrimaryKey; + private final XCheckBox chkApplyAutoValueExisting; + private final XCheckBox chkApplyAutoValueAutomatic; + private final XListBox lstSinglePrimeKey; + private final XFixedText lblPrimeFieldName; + private final FieldSelection curPrimaryKeySelection; private String[] fieldnames; - private TableDescriptor curTableDescriptor; - private boolean bAutoPrimaryKeysupportsAutoIncrmentation; + private final TableDescriptor curTableDescriptor; + private final boolean bAutoPrimaryKeysupportsAutoIncrmentation; private final static String SAUTOMATICKEYFIELDNAME = "ID"; public PrimaryKeyHandler(TableWizard _CurUnoDialog, TableDescriptor _curTableDescriptor) diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index 886549de8b9e..3d13ad939c4d 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -48,18 +48,18 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X final static int PRIVATE = 0; final static int BUSINESS = 1; - private XRadioButton optBusiness; + private final XRadioButton optBusiness; private XListBox xTableListBox; - private TableWizard CurTableWizardUnoDialog; - private TableDescriptor curtabledescriptor; - private CGCategory oCGCategory; + private final TableWizard CurTableWizardUnoDialog; + private final TableDescriptor curtabledescriptor; + private final CGCategory oCGCategory; protected CGTable oCGTable; - private String SELECTCATEGORY = "selectCategory"; + private final String SELECTCATEGORY = "selectCategory"; protected boolean bcolumnnameislimited; - private int imaxcolumnchars; - private String smytable; - private Locale aLocale; - private XMultiServiceFactory xMSF; + private final int imaxcolumnchars; + private final String smytable; + private final Locale aLocale; + private final XMultiServiceFactory xMSF; public ScenarioSelector(TableWizard _CurUnoDialog, TableDescriptor _curtabledescriptor, String _reslblFields, String _reslblSelFields) { diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java index 8898fcc172f5..e836a818656f 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.java +++ b/wizards/com/sun/star/wizards/text/TextDocument.java @@ -132,7 +132,7 @@ public class TextDocument public static class ModuleIdentifier { - private String m_identifier; + private final String m_identifier; protected final String getIdentifier() { diff --git a/wizards/com/sun/star/wizards/text/TextFieldHandler.java b/wizards/com/sun/star/wizards/text/TextFieldHandler.java index e4fdb0915402..f98e37abcf55 100644 --- a/wizards/com/sun/star/wizards/text/TextFieldHandler.java +++ b/wizards/com/sun/star/wizards/text/TextFieldHandler.java @@ -46,7 +46,7 @@ public class TextFieldHandler { public XTextFieldsSupplier xTextFieldsSupplier; - private XMultiServiceFactory xMSFDoc; + private final XMultiServiceFactory xMSFDoc; /** * Creates a new instance of TextFieldHandler diff --git a/wizards/com/sun/star/wizards/text/TextSectionHandler.java b/wizards/com/sun/star/wizards/text/TextSectionHandler.java index bdfea587ec24..d8bc579c6112 100644 --- a/wizards/com/sun/star/wizards/text/TextSectionHandler.java +++ b/wizards/com/sun/star/wizards/text/TextSectionHandler.java @@ -40,8 +40,8 @@ public class TextSectionHandler { public XTextSectionsSupplier xTextSectionsSupplier; - private XMultiServiceFactory xMSFDoc; - private XText xText; + private final XMultiServiceFactory xMSFDoc; + private final XText xText; /** Creates a new instance of TextSectionHandler */ public TextSectionHandler(XMultiServiceFactory xMSF, XTextDocument xTextDocument) diff --git a/wizards/com/sun/star/wizards/text/ViewHandler.java b/wizards/com/sun/star/wizards/text/ViewHandler.java index c0a92184b63f..11134f13caaf 100644 --- a/wizards/com/sun/star/wizards/text/ViewHandler.java +++ b/wizards/com/sun/star/wizards/text/ViewHandler.java @@ -39,9 +39,9 @@ import com.sun.star.wizards.common.Helper; public class ViewHandler { - private XTextViewCursorSupplier xTextViewCursorSupplier; - private XStyleFamiliesSupplier xStyleFamiliesSupplier; - private XViewSettingsSupplier xViewSettingsSupplier; + private final XTextViewCursorSupplier xTextViewCursorSupplier; + private final XStyleFamiliesSupplier xStyleFamiliesSupplier; + private final XViewSettingsSupplier xViewSettingsSupplier; /** Creates a new instance of View */ public ViewHandler(XMultiServiceFactory xMSF, XTextDocument xTextDocument) diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index 60cf7f77a4a8..73a1cae141ee 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 boolean refreshOverNull = true; - private int imageTextLines = 1; + private final boolean refreshOverNull = true; + private 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 f7ded90df20a..48e01d0f1967 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -39,9 +39,9 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< private String sTablePrefix; private short m_iSelPos = -1; private short iOldSelPos = -1; - private boolean bpreselectCommand = true; + private final boolean bpreselectCommand = true; private boolean bgetQueries; - private WizardDialog oWizardDialog; + private final WizardDialog oWizardDialog; private Collator aCollator = null; class ItemListenerImpl implements com.sun.star.awt.XItemListener diff --git a/wizards/com/sun/star/wizards/ui/DocumentPreview.java b/wizards/com/sun/star/wizards/ui/DocumentPreview.java index d5f2e9653a99..d989b10224fc 100644 --- a/wizards/com/sun/star/wizards/ui/DocumentPreview.java +++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.java @@ -41,7 +41,7 @@ public class DocumentPreview * The content component of the frame. */ private XComponent xComponent; - private XControl xControl; + private final XControl xControl; private PropertyValue[] loadArgs; private String url; public static final int PREVIEW_MODE = 1; diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index f306314dc9c3..155a0c12ff97 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -52,18 +52,18 @@ import java.util.logging.Logger; public class FilterComponent { - private Integer IStep; - private int RowCount; + private final Integer IStep; + private final int RowCount; private static String[] sLogicOperators; - private XRadioButton optMatchAny; - private String slblFieldNames; - private String slblOperators; - private String slblValue; + private final XRadioButton optMatchAny; + private final String slblFieldNames; + private final String slblOperators; + private final String slblValue; WizardDialog CurUnoDialog; - private int BaseID = 2300; - private String sIncSuffix; - private ControlRow[] oControlRows; - private String sDuplicateCondition; + private final int BaseID = 2300; + private final String sIncSuffix; + private final ControlRow[] oControlRows; + private final String sDuplicateCondition; static final int SOOPTORMODE = 100; static final int SOOPTANDMODE = 101; QueryMetaData oQueryMetaData; diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java index def1e0bee8ef..9b3bfd3bcde0 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 boolean refreshOverNull = true; - private int imageTextLines = 1; + private final boolean refreshOverNull = true; + private final int imageTextLines = 1; private boolean rowSelect = false; public int tabIndex; public Boolean scaleImages = Boolean.TRUE; @@ -70,7 +70,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener private int selected = -1; private int pageStart = 0; public int helpURL = 0; - private CommonListener uiEventListener = new CommonListener(); + private final CommonListener uiEventListener = new CommonListener(); private IImageRenderer renderer; private ListModel listModel; public IRenderer counterRenderer = new SimpleCounterRenderer(); diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java index 8b2615a780d6..e82e287170d3 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.java +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java @@ -32,7 +32,7 @@ import com.sun.star.wizards.common.PropertyNames; public class PeerConfig implements XWindowListener { - private ArrayList<PeerTask> m_aPeerTasks = new ArrayList<PeerTask>(); + private final ArrayList<PeerTask> m_aPeerTasks = new ArrayList<PeerTask>(); ArrayList<ControlTask> aControlTasks = new ArrayList<ControlTask>(); ArrayList<ImageUrlTask> aImageUrlTasks = new ArrayList<ImageUrlTask>(); UnoDialog oUnoDialog = null; diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index 4fe8221d5a2c..81d05e722140 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -49,7 +49,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 int iButtonWidth = 50; + private final int iButtonWidth = 50; private int nNewStep = 1; private int nOldStep = 1; private int nMaxStep = 1; @@ -60,9 +60,9 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL private Object oRoadmap; private XSingleServiceFactory xSSFRoadmap; public XIndexContainer xIndexContRoadmap; - private Resource oWizardResource; + private final Resource oWizardResource; public String sMsgEndAutopilot; - private int hid; + private final int hid; private boolean bTerminateListenermustberemoved = true; /** Creates a new instance of WizardDialog diff --git a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java index cfbd831c6d1c..488c9fd4c580 100644 --- a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java +++ b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java @@ -41,7 +41,7 @@ import java.util.HashMap; public class AbstractListener { - private HashMap<String,MethodInvocation> mHashtable = new HashMap<String,MethodInvocation>(); + private final HashMap<String,MethodInvocation> mHashtable = new HashMap<String,MethodInvocation>(); public void add(String componentName, String eventName, String methodName, Object target) { diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java index 057cf6d7cc24..b7cf05eed905 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java @@ -252,11 +252,11 @@ public abstract class DataAware { /** * the get method of the JavaBean-style property */ - private Method getMethod; + private final Method getMethod; /** * the set method of the JavaBean-style property */ - private Method setMethod; + private final Method setMethod; /** * creates a PropertyValue for the property with diff --git a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java index 0863ac10c49d..f10df1748420 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java @@ -98,7 +98,7 @@ public class DataAwareFields private static class BooleanFieldValue extends FieldValue { - private Class<?> convertTo; + private final Class<?> convertTo; public BooleanFieldValue(Field f, Class<?> convertTo_) { @@ -158,7 +158,7 @@ public class DataAwareFields private static class IntFieldValue extends FieldValue { - private Class<?> convertTo; + private final Class<?> convertTo; public IntFieldValue(Field f, Class<?> convertTo_) { @@ -218,7 +218,7 @@ public class DataAwareFields private static class DoubleFieldValue extends FieldValue { - private Class<?> convertTo; + private final Class<?> convertTo; public DoubleFieldValue(Field f, Class<?> convertTo_) { @@ -278,7 +278,7 @@ public class DataAwareFields private static class ConvertedStringValue extends FieldValue { - private Class<?> convertTo; + private final Class<?> convertTo; public ConvertedStringValue(Field f, Class<?> convertTo_) { diff --git a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java index d2b4b98f149a..f290312abd9b 100644 --- a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java +++ b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java @@ -30,10 +30,10 @@ import com.sun.star.wizards.common.PropertyNames; public class ListModelBinder implements ListDataListener { - private XListBox unoList; - private Object unoListModel; + private final XListBox unoList; + private final Object unoListModel; private ListModel listModel; - private Renderer renderer = new Renderer() + private final Renderer renderer = new Renderer() { public String render(Object item) diff --git a/wizards/com/sun/star/wizards/ui/event/Task.java b/wizards/com/sun/star/wizards/ui/event/Task.java index b142e2444094..50ba5d6a158b 100644 --- a/wizards/com/sun/star/wizards/ui/event/Task.java +++ b/wizards/com/sun/star/wizards/ui/event/Task.java @@ -26,8 +26,8 @@ public class Task private int successful = 0; private int failed = 0; private int max = 0; - private String taskName; - private List<TaskListener> listeners = new ArrayList<TaskListener>(); + private final String taskName; + private final List<TaskListener> listeners = new ArrayList<TaskListener>(); private String subtaskName; public Task(String taskName_, String subtaskName_, int max_) diff --git a/wizards/com/sun/star/wizards/ui/event/TaskEvent.java b/wizards/com/sun/star/wizards/ui/event/TaskEvent.java index 1c98cffdfae3..40f6f5d49e78 100644 --- a/wizards/com/sun/star/wizards/ui/event/TaskEvent.java +++ b/wizards/com/sun/star/wizards/ui/event/TaskEvent.java @@ -27,7 +27,7 @@ public class TaskEvent extends EventObject public static final int TASK_STATUS_CHANGED = 3; public static final int SUBTASK_NAME_CHANGED = 4; public static final int TASK_FAILED = 5; - private int type; + private final int type; public TaskEvent(Task source, int type_) { |