diff options
39 files changed, 82 insertions, 82 deletions
diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java index 849c5597e12d..6c1366a1d168 100644 --- a/chart2/qa/TestCaseOldAPI.java +++ b/chart2/qa/TestCaseOldAPI.java @@ -45,7 +45,7 @@ import com.sun.star.uno.AnyConverter; public class TestCaseOldAPI extends ComplexTestCase { // The name of the tested service - private final String testedServiceName = + private static final String testedServiceName = "com.sun.star.chart.ChartDocument"; // The first of the mandatory functions: diff --git a/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java b/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java index 471cf8a8c9c3..85975b481674 100644 --- a/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java +++ b/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java @@ -28,7 +28,7 @@ import complex.connectivity.SubTestCase; public class DBaseDateFunctions extends SubTestCase { - private final String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'"; + private static final String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'"; private final XMultiServiceFactory m_xORB; public DBaseDateFunctions(final XMultiServiceFactory _xORB, final TestCase i_testCase) diff --git a/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java index 4006910d64ea..218f02b0af86 100644 --- a/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java +++ b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java @@ -27,7 +27,7 @@ import complex.connectivity.TestCase; public class DBaseNumericFunctions extends SubTestCase { - private final String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'"; + private static final String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'"; private final XMultiServiceFactory m_xORB; public DBaseNumericFunctions(final XMultiServiceFactory _xORB, final TestCase i_testCase) diff --git a/extensions/qa/integration/extensions/ObjectInspector.java b/extensions/qa/integration/extensions/ObjectInspector.java index 197f746b92a0..5e34e7226fa3 100644 --- a/extensions/qa/integration/extensions/ObjectInspector.java +++ b/extensions/qa/integration/extensions/ObjectInspector.java @@ -34,7 +34,7 @@ public class ObjectInspector extends complexlib.ComplexTestCase private XMultiServiceFactory m_orb; private Frame m_desktop; - final private String m_inspectorFrameName = "ObjectInspector"; + static final private String m_inspectorFrameName = "ObjectInspector"; /* ------------------------------------------------------------------ */ @Override diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java index b02dc564a5fb..f697bc70b7f4 100644 --- a/forms/qa/integration/forms/FormControlTest.java +++ b/forms/qa/integration/forms/FormControlTest.java @@ -58,7 +58,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE private String m_sImageURL; private SQLErrorEvent m_mostRecentErrorEvent; - private final String m_dataSourceName = "integration.forms.FormControlTest"; + private static final String m_dataSourceName = "integration.forms.FormControlTest"; /* ------------------------------------------------------------------ */ @Override diff --git a/forms/qa/integration/forms/ListBox.java b/forms/qa/integration/forms/ListBox.java index 96a9d72a4a42..fc60b48376e9 100644 --- a/forms/qa/integration/forms/ListBox.java +++ b/forms/qa/integration/forms/ListBox.java @@ -44,7 +44,7 @@ import connectivity.tools.sdb.Connection; public class ListBox extends TestCase { HsqlDatabase m_database = null; - private final String m_foreignKeyTableName = "foreign_keys"; + private static final String m_foreignKeyTableName = "foreign_keys"; public ListBox() { diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java index 24a78cb13711..350a2216e5d1 100644 --- a/framework/qa/complex/XUserInputInterception/EventTest.java +++ b/framework/qa/complex/XUserInputInterception/EventTest.java @@ -85,7 +85,7 @@ public class EventTest { * define the miliseconds to wait until a <CODE>EventTrigger</CODE> thread should * be finished with its work */ - final int m_threadWait = 3000; + static final int m_threadWait = 3000; // test environment diff --git a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java index 0f222d7d3506..783c1d0cfcc2 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java @@ -27,7 +27,7 @@ import com.sun.star.uno.Type; */ public class ComponentBase extends WeakBase implements XComponent { - private final boolean DEBUG= false; + private static final boolean DEBUG= false; protected MultiTypeInterfaceContainer listenerContainer; protected boolean bInDispose= false; protected boolean bDisposed= false; diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java index c867cad5d439..c51475e4cd12 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java @@ -87,7 +87,7 @@ import com.sun.star.uno.UnoRuntime; */ public class InterfaceContainer implements Cloneable { - final boolean DEBUG= false; + static final boolean DEBUG= false; /** * The array buffer into which the elements of the ArrayList are stored. * The capacity of the ArrayList is the length of this array buffer. diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java index aa9f46d1f3ad..024e90978205 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java @@ -67,7 +67,7 @@ public class EvolutionarySolverStatusUno extends BaseDialog private final ResourceManager resourceManager; - private final int COLOR_RED = 0xFF0000; + private static final int COLOR_RED = 0xFF0000; public EvolutionarySolverStatusUno(XComponentContext xContext) { super(xContext, "Solver Status", -1, -1, 170, 95); //center the dialog on the parent diff --git a/odk/examples/DevelopersGuide/Charts/CalcHelper.java b/odk/examples/DevelopersGuide/Charts/CalcHelper.java index ca9ea94438d3..50364bdc0fbd 100644 --- a/odk/examples/DevelopersGuide/Charts/CalcHelper.java +++ b/odk/examples/DevelopersGuide/Charts/CalcHelper.java @@ -339,8 +339,8 @@ public class CalcHelper // __________ private members and methods __________ - private final String msDataSheetName = "Data"; - private final String msChartSheetName = "Chart"; + private static final String msDataSheetName = "Data"; + private static final String msChartSheetName = "Chart"; private XSpreadsheetDocument maSpreadSheetDoc; diff --git a/odk/examples/DevelopersGuide/Charts/ChartHelper.java b/odk/examples/DevelopersGuide/Charts/ChartHelper.java index 19d1ede85c45..043635fe169e 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartHelper.java +++ b/odk/examples/DevelopersGuide/Charts/ChartHelper.java @@ -235,7 +235,7 @@ public class ChartHelper // __________ private members and methods __________ - private final String msChartClassID = "12dcae26-281f-416f-a234-c3086127382e"; + private static final String msChartClassID = "12dcae26-281f-416f-a234-c3086127382e"; private XModel maContainerDocument; } diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java index f814deb16193..e184400d8fb9 100644 --- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java +++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java @@ -165,9 +165,9 @@ public class DialogComponent { "Event Object = " + aEventObject ); } - private final String aHandlerMethod1 = "doit1"; - private final String aHandlerMethod2 = "doit2"; - private final String aHandlerMethod3 = "doit3"; + private static final String aHandlerMethod1 = "doit1"; + private static final String aHandlerMethod2 = "doit2"; + private static final String aHandlerMethod3 = "doit3"; //XDialogEventHandler public boolean callHandlerMethod( /*IN*/XDialog xDialog, /*IN*/Object EventObject, /*IN*/String MethodName ) { diff --git a/odk/examples/DevelopersGuide/OfficeDev/Clipboard/TextTransferable.java b/odk/examples/DevelopersGuide/OfficeDev/Clipboard/TextTransferable.java index 8ce14f408a92..f919ff308996 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Clipboard/TextTransferable.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Clipboard/TextTransferable.java @@ -81,5 +81,5 @@ public class TextTransferable implements XTransferable // members private final String text; - private final String UNICODE_CONTENT_TYPE = "text/plain;charset=utf-16"; + private static final String UNICODE_CONTENT_TYPE = "text/plain;charset=utf-16"; } diff --git a/qadevOOo/tests/java/ifc/document/_XActionLockable.java b/qadevOOo/tests/java/ifc/document/_XActionLockable.java index f8952ee578c5..8276eb62ad8d 100644 --- a/qadevOOo/tests/java/ifc/document/_XActionLockable.java +++ b/qadevOOo/tests/java/ifc/document/_XActionLockable.java @@ -82,7 +82,7 @@ public class _XActionLockable extends MultiMethodTest { tRes.tested("setActionLocks()", true); } - final short nLock = 8; + static final short nLock = 8; /** * Calls the method and checks returned value.<p> diff --git a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java index 63daab6f2619..c6bcbd886071 100644 --- a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java +++ b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java @@ -52,7 +52,7 @@ public class _XEventAttacherManager extends MultiMethodTest { */ public XEventAttacherManager oObj = null; - private final int index = 0; + private static final int index = 0; /** * Test calls the method and stores index of new entry. <p> diff --git a/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java b/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java index f7ea1453c80e..d8b0bf69e234 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java @@ -206,9 +206,9 @@ public class _XDatabaseRange extends MultiMethodTest { oldVal == valBeforeRefresh); } - final short COL = 0; - final short STARTROW = 0; - final short ENDROW = 5; + static final short COL = 0; + static final short STARTROW = 0; + static final short ENDROW = 5; /** * Test creates new cell range address and calls the method. <p> diff --git a/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java b/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java index 963cbf7aaa8e..c70719babe53 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java @@ -38,7 +38,7 @@ import com.sun.star.sheet.XViewSplitable; public class _XViewSplitable extends MultiMethodTest { public XViewSplitable oObj = null; - protected final int posX = 101, posY = 51; + protected static final int posX = 101, posY = 51; /** * Test just calls the method. <p> diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java index 86eeeadcb357..d3cfde832908 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java @@ -52,7 +52,7 @@ public class OQueryDesign extends TestCase { private static XDesktop xDesk; private static XFrame xFrame; - private final String sDataSourceName = "Bibliography"; + private static final String sDataSourceName = "Bibliography"; private static XConnection xConn; private static XTextDocument xTextDoc; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java index ff0aca9a308f..977c96e0a221 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java @@ -34,8 +34,8 @@ public final class SOFormulaOpCodeMapper extends WeakBase private static final String __serviceName = "org.libreoffice.report.pentaho.SOFormulaOpCodeMapper"; private final SOFormulaParser parser; // attributes - final private int m_OpCodeExternal = 0; - final private int m_OpCodeUnknown = 0; + static final private int m_OpCodeExternal = 0; + static final private int m_OpCodeUnknown = 0; public SOFormulaOpCodeMapper(SOFormulaParser parser) { diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java index 514af0001e03..d639e3669433 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java @@ -145,7 +145,7 @@ public class PlainSourceView extends JScrollPane implements class GlyphGutter extends JComponent { private PlainSourceView view; - private final String DUMMY_STRING = "99"; + private static final String DUMMY_STRING = "99"; GlyphGutter(PlainSourceView view) { this.view = view; diff --git a/sot/qa/complex/olesimplestorage/Test01.java b/sot/qa/complex/olesimplestorage/Test01.java index c4359d7c1415..c07eb2283803 100644 --- a/sot/qa/complex/olesimplestorage/Test01.java +++ b/sot/qa/complex/olesimplestorage/Test01.java @@ -30,8 +30,8 @@ public class Test01 implements OLESimpleStorageTest { XMultiServiceFactory m_xMSF = null; TestHelper m_aTestHelper = null; - final int pStreamCnt = 5; - final int pBytesCnt = 10; + static final int pStreamCnt = 5; + static final int pBytesCnt = 10; public Test01 ( XMultiServiceFactory xMSF ) { diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java index aa95ea4a6016..2e262fb37356 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java @@ -35,7 +35,7 @@ import com.sun.star.uno.XComponentContext; public class WikiEditSettingDialog extends WikiDialog { - private final String sOKMethod = "OK"; + private static final String sOKMethod = "OK"; private String[] Methods = {sOKMethod }; private Map<String,String> setting; diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java index a9df95282b51..22d8e3d0a439 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java @@ -29,10 +29,10 @@ public class WikiPropDialog extends WikiDialog{ private WikiEditorImpl m_aWikiEditor; - private final String sSendMethod = "Send"; - private final String sWikiListMethod = "WikiListChange"; - private final String sArticleTextMethod = "ArticleTextChange"; - private final String sAddWikiMethod = "AddWiki"; + private static final String sSendMethod = "Send"; + private static final String sWikiListMethod = "WikiListChange"; + private static final String sArticleTextMethod = "ArticleTextChange"; + private static final String sAddWikiMethod = "AddWiki"; private String[] m_pMethods = {sSendMethod, sWikiListMethod, sArticleTextMethod, sAddWikiMethod}; diff --git a/toolkit/test/accessibility/OfficeConnection.java b/toolkit/test/accessibility/OfficeConnection.java index 51e185c50be7..77b471e228f8 100644 --- a/toolkit/test/accessibility/OfficeConnection.java +++ b/toolkit/test/accessibility/OfficeConnection.java @@ -96,7 +96,7 @@ public class OfficeConnection } private int mnDefaultPort = 5678; - private final String msDefaultHost = "localhost"; + private static final String msDefaultHost = "localhost"; private XMultiServiceFactory maServiceManager = null; /** A value of true just indicates that it has been tried to establish a connection, diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java index 613469e4f78b..4cb92c2ed7f0 100644 --- a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java +++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java @@ -51,8 +51,8 @@ import static org.junit.Assert.*; */ public class CheckTransientDocumentsDocumentContent { // TODO: document doesn't exists - private final String testDocuments = "sForm.sxw"; - private final String folderName = "TestFolder"; + private static final String testDocuments = "sForm.sxw"; + private static final String folderName = "TestFolder"; private XMultiServiceFactory xMSF = null; private XTextDocument xTextDoc = null; diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java index ad0e249b4cdf..77d4acfdf78b 100644 --- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java +++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java @@ -93,9 +93,9 @@ public class CheckMemoryUsage /* extends ComplexTestCase */ { - private final String sWriterDoc = "sxw,writer_pdf_Export"; - private final String sCalcDoc = "sxc,calc_pdf_Export"; - private final String sImpressDoc = "sxi,impress_pdf_Export"; + private static final String sWriterDoc = "sxw,writer_pdf_Export"; + private static final String sCalcDoc = "sxc,calc_pdf_Export"; + private static final String sImpressDoc = "sxi,impress_pdf_Export"; TempDir m_aTempDir; private String[][] sDocTypeExportFilter; private String[][] sDocuments; 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) { |