diff options
43 files changed, 64 insertions, 64 deletions
diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java index 347eb749b56f..6899b2945ba6 100644 --- a/framework/qa/complex/desktop/DesktopTerminate.java +++ b/framework/qa/complex/desktop/DesktopTerminate.java @@ -38,7 +38,7 @@ public class DesktopTerminate { private XMultiServiceFactory xMSF; - private final int iOfficeCloseTime = 1000; + private static final int iOfficeCloseTime = 1000; /** * Test if all available document types change the diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java index d8f5740eb32a..38dff3762789 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java @@ -31,7 +31,7 @@ public final class XOutputStreamToByteArrayAdapter extends ComponentBase implements XOutputStream { - private final int initialSize = 100240; // 10 kb + private static final int initialSize = 100240; // 10 kb private int size = 0; private int position = 0; private boolean externalBuffer = false; diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java index c40f2c1ec258..b6387bfb8a96 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java @@ -35,7 +35,7 @@ import net.adaptivebox.problem.*; import net.adaptivebox.space.*; public class DEGTBehavior extends AbsGTBehavior implements ILibEngine { - private final int DVNum = 2; //Number of differential vectors, normally be 1 or 2 + private static final int DVNum = 2; //Number of differential vectors, normally be 1 or 2 public double FACTOR = 0.5; //scale constant: (0, 1.2], normally be 0.5 public double CR = 0.9; //crossover constant: [0, 1], normally be 0.1 or 0.9 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java index 1ad1adefd08c..823479de556a 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java @@ -25,7 +25,7 @@ import net.adaptivebox.global.*; public class EvalElement { //The weight for each response (target) - private final double weight = 1; + private static final double weight = 1; /** * The expected range of the response value, forms the following objective: * diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java index 2d9f55fc2ac4..6b4fd614330c 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java @@ -39,15 +39,15 @@ public class ACRComparator implements IGoodnessCompareEngine, IUpdateCycleEngine private final Library socialPool; private double epsilon_t = 0; - private final double RU = 0.75; - private final double RL = 0.25; - private final double BETAF = 0.618; - private final double BETAL = 0.618; - private final double BETAU = 1.382; + private static final double RU = 0.75; + private static final double RL = 0.25; + private static final double BETAF = 0.618; + private static final double BETAL = 0.618; + private static final double BETAU = 1.382; private final double T; - private final double TthR = 0.5; + private static final double TthR = 0.5; public ACRComparator(Library lib, int T) { socialPool = lib; diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java index b473ae0a3807..882613d2e8c3 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java @@ -48,9 +48,9 @@ public class SCAgent { private IGoodnessCompareEngine specComparator; //the coefficients of SCAgent - private final int TaoB = 2; + private static final int TaoB = 2; //The early version set TaoW as the size of external library (NL), but 4 is often enough - private final int TaoW = 4; + private static final int TaoW = 4; //The referred external library private Library externalLib; diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java index e510d7ddf70d..70bab16fff3f 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java @@ -57,7 +57,7 @@ public class FlatXml implements XImportFilter, XExportFilter, XServiceName, */ private final XMultiServiceFactory m_xServiceFactory; private XExtendedDocumentHandler m_xHandler; - private final boolean m_bPrettyPrint = true; + private static final boolean m_bPrettyPrint = true; static private final String __serviceName = "devguide.officedev.samples.filter.FlatXmlJava"; static private final String __implName = "FlatXml"; diff --git a/odk/examples/DevelopersGuide/Text/TextDocuments.java b/odk/examples/DevelopersGuide/Text/TextDocuments.java index e70e5a640f34..be749f033702 100644 --- a/odk/examples/DevelopersGuide/Text/TextDocuments.java +++ b/odk/examples/DevelopersGuide/Text/TextDocuments.java @@ -110,7 +110,7 @@ public class TextDocuments { // adjust these constant to your local printer! private static String sOutputDir; - private final String aPrinterName = "\\\\so-print\\xml3sof"; + private static final String aPrinterName = "\\\\so-print\\xml3sof"; private XComponentContext mxRemoteContext = null; private XMultiComponentFactory mxRemoteServiceManager = null; diff --git a/odk/examples/java/ConverterServlet/ConverterServlet.java b/odk/examples/java/ConverterServlet/ConverterServlet.java index 6a22837a7f0b..6f68bf03fb0d 100644 --- a/odk/examples/java/ConverterServlet/ConverterServlet.java +++ b/odk/examples/java/ConverterServlet/ConverterServlet.java @@ -72,11 +72,11 @@ public class ConverterServlet extends HttpServlet { /** Specifies the host for the office server. */ - private final String stringHost = "localhost"; + private static final String stringHost = "localhost"; /** Specifies the port for the office server. */ - private final String stringPort = "2083"; + private static final String stringPort = "2083"; /** Called by the server (via the service method) to allow a servlet to handle * a POST request. The file from the client will be uploaded to the web server diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java index 2c9e95217ed9..30d5aa89dd90 100644 --- a/qadevOOo/runner/graphical/ParameterHelper.java +++ b/qadevOOo/runner/graphical/ParameterHelper.java @@ -67,7 +67,7 @@ public class ParameterHelper private String m_sPrinterName = null; - private final int m_nResolutionInDPI = 180; + private static final int m_nResolutionInDPI = 180; private String m_sInputPath = null; private String m_sOutputPath = null; diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java index abd1dc29097b..1ca6a5c5b638 100644 --- a/qadevOOo/runner/lib/TestParameters.java +++ b/qadevOOo/runner/lib/TestParameters.java @@ -51,7 +51,7 @@ public class TestParameters extends HashMap<String,Object> { * Debug information will always be written on standard out.<br> * default is true */ - private final boolean DebugIsActive = false; + private static final boolean DebugIsActive = false; /** * Wrapper around "get()" with some debug output diff --git a/qadevOOo/runner/util/ShapeDsc.java b/qadevOOo/runner/util/ShapeDsc.java index 99fdaea84fc8..e47128172178 100644 --- a/qadevOOo/runner/util/ShapeDsc.java +++ b/qadevOOo/runner/util/ShapeDsc.java @@ -32,7 +32,7 @@ public class ShapeDsc extends InstDescr { private final int y; private final int height; private final int width; - private final String name = null; + private static final String name = null; private static final String ifcName = "com.sun.star.drawing.XShape"; private final String service; diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java index a7fbc9d70ada..a11b868615c2 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java @@ -49,7 +49,7 @@ public class _XAccessibleValue extends MultiMethodTest { private double minVal = 0; private double maxVal = 0; - private final double curVal = 0; + private static final double curVal = 0; private Object val = null; XAccessibleValue anotherFromGroup = null; diff --git a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java index e250ce2ea4e0..ce2641498da8 100644 --- a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java +++ b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java @@ -32,7 +32,7 @@ public class _XLayoutManager extends MultiMethodTest { public XLayoutManager oObj = null; private XFrame xFrame = null; - private final String sElementName = "private:resource/menubar/myMenu"; + private static final String sElementName = "private:resource/menubar/myMenu"; @Override public void before() { diff --git a/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java b/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java index e2c236e4ac2e..e42b9be240e1 100644 --- a/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java +++ b/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java @@ -24,7 +24,7 @@ import lib.MultiMethodTest; public class _XUIControllerRegistration extends MultiMethodTest { public XUIControllerRegistration oObj = null; private String aRegisteredController = null; - private final String aController = ".uno:MySecondController"; + private static final String aController = ".uno:MySecondController"; @Override public void before() { diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java index 3506d2a894d4..43724fd84f9c 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java @@ -50,7 +50,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { // oObj filled by MultiMethodTest public XSingleSelectQueryAnalyzer oObj = null ; - private final String queryString = "SELECT * FROM \"biblio\""; + private static final String queryString = "SELECT * FROM \"biblio\""; private XSingleSelectQueryComposer xComposer = null; diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRow.java b/qadevOOo/tests/java/ifc/sdbc/_XRow.java index dbbad4353a69..70a60b0cf34c 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRow.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRow.java @@ -95,7 +95,7 @@ public class _XRow extends MultiMethodTest { // oObj filled by MultiMethodTest public XRow oObj = null ; private List<Object> data = null ; - private final boolean notNullRes = true; + private static final boolean notNullRes = true; /** * Retrieves object relation first. diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java index 09716e50c738..0c57bc23b374 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java @@ -35,8 +35,8 @@ import lib.MultiMethodTest; public class _XUIConfigurationManager extends MultiMethodTest { public XUIConfigurationManager oObj; - private final String msResourceUrl = "private:resource/menubar/menubar"; - private final String msMyResourceUrl = "private:resource/menubar/mymenubar"; + private static final String msResourceUrl = "private:resource/menubar/menubar"; + private static final String msMyResourceUrl = "private:resource/menubar/mymenubar"; private XIndexContainer mxSettings = null; private XIndexAccess mxMenuBarSettings = null; private XMultiServiceFactory mxMSF = null; diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java index d5fed39c900f..afc5ad8581eb 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java @@ -43,7 +43,7 @@ public class _XFilePicker extends MultiMethodTest { public XFilePicker oObj = null; private String dir = null ; - private final String fname = "space-metal.jpg" ; + private static final String fname = "space-metal.jpg" ; /** * Sets the current directory to the test document directory. <p> diff --git a/qadevOOo/tests/java/ifc/util/_XReplaceable.java b/qadevOOo/tests/java/ifc/util/_XReplaceable.java index c1634a7763ca..98c9e4fb1e03 100644 --- a/qadevOOo/tests/java/ifc/util/_XReplaceable.java +++ b/qadevOOo/tests/java/ifc/util/_XReplaceable.java @@ -45,7 +45,7 @@ public class _XReplaceable extends MultiMethodTest { public XReplaceable oObj = null; public XReplaceDescriptor Rdesc = null; private String mSearchString = "xTextDoc"; - private final String mReplaceString = "** xTextDoc"; + private static final String mReplaceString = "** xTextDoc"; private boolean mDispose = false; /** diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java index 438fcbba83cb..7c132745cd9d 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java @@ -66,7 +66,7 @@ public class various extends TestCase { * which is free. */ protected static final int basePort = 50000; - private final int curPort = 50000; + private static final int curPort = 50000; private XAcceptor xAcctr; private XConnector xCntr; diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java index cccbe77d7de5..0bd2b95e7107 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/various.java @@ -67,7 +67,7 @@ public class various extends TestCase { * which is free. */ protected static final int basePort = 50000; - private final int curPort = 50000; + private static final int curPort = 50000; private XAcceptor xAcctr; private XConnector xCntr; diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java index 2467ee34b6a1..5a58ab6a6730 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java @@ -56,7 +56,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private final int mMaxFieldIndex = 6; + private static final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java index af23d1e24d15..148f81aa71ce 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java @@ -55,7 +55,7 @@ public class ScDataPilotFieldGroupObj extends TestCase * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private final int mMaxFieldIndex = 6; + private static final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java index 5aa809eb50b1..da08d525ef62 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java @@ -55,7 +55,7 @@ public class ScDataPilotFieldGroupsObj extends TestCase * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private final int mMaxFieldIndex = 6; + private static final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java index 01d49050ef25..89164816c6c0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java @@ -69,7 +69,7 @@ public class ScDataPilotFieldObj extends TestCase { * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private final int mMaxFieldIndex = 6; + private static final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java index 2c6e029fb729..1d29fede2287 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java @@ -70,7 +70,7 @@ public class ScDataPilotItemObj extends TestCase { * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private final int mMaxFieldIndex = 6; + private static final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java index 9baca8760aaf..3c4708a60cdf 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java @@ -70,7 +70,7 @@ public class ScDataPilotItemsObj extends TestCase { * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private final int mMaxFieldIndex = 6; + private static final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java index ffc09302a435..f190da8f9ea0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java @@ -72,7 +72,7 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private final int mMaxFieldIndex = 6; + private static final int mMaxFieldIndex = 6; /** * Creates Spreadsheet document. diff --git a/sc/qa/complex/dataPilot/CheckDataPilot.java b/sc/qa/complex/dataPilot/CheckDataPilot.java index 9d8b7fdfe9c9..c3f5263e3af3 100644 --- a/sc/qa/complex/dataPilot/CheckDataPilot.java +++ b/sc/qa/complex/dataPilot/CheckDataPilot.java @@ -69,7 +69,7 @@ public class CheckDataPilot { * A field is filled some values. This integer determines the size of the * field in x and y direction. */ - private final int mMaxFieldIndex = 6; + private static final int mMaxFieldIndex = 6; /** * The test parameters diff --git a/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java b/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java index ee6888613de4..fe537e0f1292 100644 --- a/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java +++ b/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java @@ -55,7 +55,7 @@ public class _XDataPilotDescriptor { private final XDataPilotDescriptor oObj; private final CellRangeAddress CRA = new CellRangeAddress((short)1, 0, 0, 5, 5); - private final String sTag = "XDataPilotDescriptor_Tag"; + private static final String sTag = "XDataPilotDescriptor_Tag"; private String fieldsNames[]; private int tEnvFieldsAmount = 0; diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index edca57b23286..95f91d566fed 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -38,7 +38,7 @@ import java.util.StringTokenizer; public class ScriptMetaData extends ScriptEntry { private boolean hasSource = false; - private final String locationPlaceHolder = ""; + private static final String locationPlaceHolder = ""; private String source; private final Parcel parent; diff --git a/sw/qa/complex/writer/LoadSaveTest.java b/sw/qa/complex/writer/LoadSaveTest.java index 77ec2a79f5d4..e6027b6a7e94 100644 --- a/sw/qa/complex/writer/LoadSaveTest.java +++ b/sw/qa/complex/writer/LoadSaveTest.java @@ -65,10 +65,10 @@ public class LoadSaveTest private XMultiServiceFactory m_xMSF = null; private XGlobalEventBroadcaster m_xGEB = null; - private final String m_fileURL = "file://"; + private static final String m_fileURL = "file://"; // these should be parameters or something? - private final String m_SourceDir = "FIXME"; - private final String m_TargetDir = "/tmp/out"; + private static final String m_SourceDir = "FIXME"; + private static final String m_TargetDir = "/tmp/out"; @Before public void before() throws Exception { diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java index 847172d83e93..1589013a7747 100644 --- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java +++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java @@ -99,7 +99,7 @@ public class CheckMemoryUsage /* extends ComplexTestCase */ TempDir m_aTempDir; private String[][] sDocTypeExportFilter; private String[][] sDocuments; - private final int iAllowMemoryIncrease = 10; + private static final int iAllowMemoryIncrease = 10; private int iExportDocCount = 25; /** * The test parameters 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; |