summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-06-12 09:30:14 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-06-15 08:45:19 +0000
commit0c18bedb7328493040c1a20822b345e624d6041f (patch)
tree2f7fb01b21a63ceef52f05035bc047173ea46785
parent8b85838611ed448ef18a9e4982849bbd702981aa (diff)
java: 'final static' to 'static final'
this is the canonical order, and it makes the code easier to read Change-Id: I272e7f1e140296e582702b6dbf77a03eefb65470 Reviewed-on: https://gerrit.libreoffice.org/16242 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org>
-rw-r--r--android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java2
-rw-r--r--bean/qa/complex/bean/WriterFrame.java2
-rw-r--r--connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java4
-rw-r--r--dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java4
-rw-r--r--jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java2
-rw-r--r--odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java14
-rw-r--r--odk/examples/DevelopersGuide/UCB/ChildrenRetriever.java2
-rw-r--r--odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java2
-rw-r--r--qadevOOo/runner/lib/SimpleStatus.java10
-rw-r--r--qadevOOo/runner/util/DBTools.java32
-rw-r--r--qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java6
-rw-r--r--qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java2
-rw-r--r--qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java2
-rw-r--r--qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java2
-rw-r--r--qadevOOo/tests/java/ifc/util/_XURLTransformer.java26
-rw-r--r--qadevOOo/tests/java/mod/_dbaccess/ORowSet.java2
-rw-r--r--qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/GenericModelTest.java4
-rw-r--r--qadevOOo/tests/java/mod/_forms/ODatabaseForm.java2
-rwxr-xr-x[-rw-r--r--]reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java0
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java4
-rw-r--r--scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/ScriptContext.java8
-rw-r--r--sw/qa/complex/accessibility/AccessibleRelationSet.java2
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/Helper.java70
-rw-r--r--toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java4
-rw-r--r--vcl/qa/complex/memCheck/TestDocument.java2
-rw-r--r--wizards/com/sun/star/wizards/db/DBMetaData.java6
-rw-r--r--wizards/com/sun/star/wizards/document/FormHandler.java18
-rw-r--r--wizards/com/sun/star/wizards/form/FormDocument.java4
-rw-r--r--wizards/com/sun/star/wizards/form/StyleApplier.java8
-rw-r--r--wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java2
-rw-r--r--wizards/com/sun/star/wizards/table/ScenarioSelector.java4
-rw-r--r--wizards/com/sun/star/wizards/ui/ButtonList.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/FieldSelection.java16
-rw-r--r--wizards/com/sun/star/wizards/ui/FilterComponent.java6
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java6
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java12
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java22
43 files changed, 167 insertions, 167 deletions
diff --git a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
index eac6b1bb4143..6765928312cc 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
@@ -111,7 +111,7 @@ public class JavaPanZoomController
mTouchEventHandler.destroy();
}
- private final static float easeOut(float t) {
+ private static final float easeOut(float t) {
// ease-out approx.
// -(t-1)^2+1
t = t-1;
diff --git a/bean/qa/complex/bean/WriterFrame.java b/bean/qa/complex/bean/WriterFrame.java
index 77f1959c98f0..eb7e477c7f70 100644
--- a/bean/qa/complex/bean/WriterFrame.java
+++ b/bean/qa/complex/bean/WriterFrame.java
@@ -30,7 +30,7 @@ import com.sun.star.uno.UnoRuntime;
class WriterFrame extends java.awt.Frame
{
private com.sun.star.comp.beans.OOoBean m_bean;
- private final static String m_sDocURL = "private:factory/swriter";
+ private static final String m_sDocURL = "private:factory/swriter";
/**
@param loadBeforeVisible
diff --git a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
index 5d9311882379..12330ff7093a 100644
--- a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
+++ b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
@@ -39,9 +39,9 @@ public class HsqlColumnDescriptor
public final String getForeignColumn() { return ForeignColumn; }
/// determines that a column is required, i.e. not nullable
- public final static int REQUIRED = 1;
+ public static final int REQUIRED = 1;
/// determines that a column is part of the primary key of its table
- public final static int PRIMARY = 2;
+ public static final int PRIMARY = 2;
public HsqlColumnDescriptor( String _Name, String _TypeName )
{
diff --git a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
index 581677c91c57..2d05030b7e83 100644
--- a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
+++ b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
@@ -49,13 +49,13 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
{
private XSingleSelectQueryComposer m_composer = null;
- private final static String COMPLEXFILTER = "( \"ID\" = 1 AND \"Postal\" = '4' )"
+ private static final String COMPLEXFILTER = "( \"ID\" = 1 AND \"Postal\" = '4' )"
+ " OR ( \"ID\" = 2 AND \"Postal\" = '5' )"
+ " OR ( \"ID\" = 3 AND \"Postal\" = '6' AND \"Address\" = '7' )"
+ " OR ( \"Address\" = '8' )"
+ " OR ( \"Postal\" = '9' )"
+ " OR ( NOW( ) = {d '2010-01-01' } )";
- private final static String INNERPRODUCTSQUERY = "products (inner)";
+ private static final String INNERPRODUCTSQUERY = "products (inner)";
private void createQueries() throws Exception
diff --git a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
index 50c82c91bb37..a43cb094cf0d 100644
--- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
+++ b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
@@ -52,7 +52,7 @@ public class BridgeFactory implements XBridgeFactory/*, XEventListener*/ {
* The name of the service, the <code>JavaLoader</code> accesses this through
* reflection.
*/
- public final static String __serviceName = "com.sun.star.bridge.BridgeFactory";
+ public static final String __serviceName = "com.sun.star.bridge.BridgeFactory";
/**
* Gives a factory for creating the service.
diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java
index 27c578ba4270..90ce8a47b9bd 100644
--- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java
+++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java
@@ -55,14 +55,14 @@ public class UnoDialogSample2 extends UnoDialogSample {
// define some constants used to set positions and sizes
// of controls. For further information see
// http://ui.openoffice.org/knowledge/DialogSpecificationandGuidelines.odt
- final static int nFixedTextHeight = 8;
- final static int nControlMargin = 6;
- final static int nDialogWidth = 250;
- final static int nDialogHeight = 140;
+ static final int nFixedTextHeight = 8;
+ static final int nControlMargin = 6;
+ static final int nDialogWidth = 250;
+ static final int nDialogHeight = 140;
// the default roadmap width == 80 MAPs
- final static int nRoadmapWidth = 80;
- final static int nButtonHeight = 14;
- final static int nButtonWidth = 50;
+ static final int nRoadmapWidth = 80;
+ static final int nButtonHeight = 14;
+ static final int nButtonWidth = 50;
public UnoDialogSample2(XComponentContext _xContext, XMultiComponentFactory _xMCF, Object _oUnoObject) {
diff --git a/odk/examples/DevelopersGuide/UCB/ChildrenRetriever.java b/odk/examples/DevelopersGuide/UCB/ChildrenRetriever.java
index 9764718a1751..42f0689f5320 100644
--- a/odk/examples/DevelopersGuide/UCB/ChildrenRetriever.java
+++ b/odk/examples/DevelopersGuide/UCB/ChildrenRetriever.java
@@ -123,7 +123,7 @@ public class ChildrenRetriever {
// Fill argument structure...
OpenCommandArgument2 arg = new OpenCommandArgument2();
arg.Mode = OpenMode.ALL; // FOLDER, DOCUMENTS -> simple filter
- arg.Priority = 32768; // Final static for 32768
+ arg.Priority = 32768; // static final for 32768
arg.Properties = props;
XDynamicResultSet set;
diff --git a/odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java b/odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java
index 95fb3e98413a..f25e6cd0fd56 100644
--- a/odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java
+++ b/odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java
@@ -87,7 +87,7 @@ public class DataStreamRetriever {
// Fill argument structure...
OpenCommandArgument2 arg = new OpenCommandArgument2();
arg.Mode = OpenMode.DOCUMENT;
- arg.Priority = 32768; // Final static for 32768
+ arg.Priority = 32768; // static final for 32768
// Create data sink implementation object.
XActiveDataSink dataSink = new MyActiveDataSink();
diff --git a/qadevOOo/runner/lib/SimpleStatus.java b/qadevOOo/runner/lib/SimpleStatus.java
index 6866d7e7a24d..9526646c7de7 100644
--- a/qadevOOo/runner/lib/SimpleStatus.java
+++ b/qadevOOo/runner/lib/SimpleStatus.java
@@ -29,29 +29,29 @@ class SimpleStatus {
/**
* The constatnt represents PASSED runtime state.
*/
- public final static int PASSED = 0;
+ public static final int PASSED = 0;
/**
* The constant represents EXCEPTION runtime state.
*/
- public final static int EXCEPTION = 3;
+ public static final int EXCEPTION = 3;
/**
* The constant represents SKIPPED runtime state.
*/
- public final static int SKIPPED = 1;
+ public static final int SKIPPED = 1;
/**
* This is a private indicator for a user defined runtime state
*/
- private final static int USER_DEFINED = 4;
+ private static final int USER_DEFINED = 4;
/* Test states */
/**
* The constant represents FAILED state.
*/
- public final static boolean FAILED = false;
+ public static final boolean FAILED = false;
diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java
index e10a896075a3..46af25a99f97 100644
--- a/qadevOOo/runner/util/DBTools.java
+++ b/qadevOOo/runner/util/DBTools.java
@@ -44,30 +44,30 @@ public class DBTools {
private final XMultiServiceFactory xMSF;
private XNamingService dbContext;
//JDBC driver
- public final static String TST_JDBC_DRIVER = "org.gjt.mm.mysql.Driver";
+ public static final String TST_JDBC_DRIVER = "org.gjt.mm.mysql.Driver";
// constants for TestDB table column indexes
- public final static int TST_STRING = 1 ;
- public final static int TST_INT = 2 ;
- private final static int TST_DOUBLE = 5 ;
- private final static int TST_DATE = 6 ;
- private final static int TST_BOOLEAN = 10 ;
- private final static int TST_CHARACTER_STREAM = 11 ;
- private final static int TST_BINARY_STREAM = 12 ;
+ public static final int TST_STRING = 1 ;
+ public static final int TST_INT = 2 ;
+ private static final int TST_DOUBLE = 5 ;
+ private static final int TST_DATE = 6 ;
+ private static final int TST_BOOLEAN = 10 ;
+ private static final int TST_CHARACTER_STREAM = 11 ;
+ private static final int TST_BINARY_STREAM = 12 ;
// constants for TestDB columns names
- public final static String TST_STRING_F = "_TEXT" ;
- public final static String TST_INT_F = "_INT" ;
- public final static String TST_DOUBLE_F = "_DOUBLE" ;
- public final static String TST_DATE_F = "_DATE" ;
- private final static String TST_BOOLEAN_F = "_BOOL" ;
- private final static String TST_CHARACTER_STREAM_F = "_MEMO1" ;
- public final static String TST_BINARY_STREAM_F = "_MEMO2" ;
+ public static final String TST_STRING_F = "_TEXT" ;
+ public static final String TST_INT_F = "_INT" ;
+ public static final String TST_DOUBLE_F = "_DOUBLE" ;
+ public static final String TST_DATE_F = "_DATE" ;
+ private static final String TST_BOOLEAN_F = "_BOOL" ;
+ private static final String TST_CHARACTER_STREAM_F = "_MEMO1" ;
+ public static final String TST_BINARY_STREAM_F = "_MEMO2" ;
/**
* Values for filling test table.
*/
- public final static Object[][] TST_TABLE_VALUES = new Object[][] {
+ public static final Object[][] TST_TABLE_VALUES = new Object[][] {
{"String1", Integer.valueOf(1), null, null, new Double(1.1),
new Date((short) 1,(short) 1, (short) 2001), null, null, null,
Boolean.TRUE, null, null},
diff --git a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
index 16bdfeeb6b6d..98aee0e1e326 100644
--- a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
+++ b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
@@ -36,9 +36,9 @@ import com.sun.star.util.XTimeStamped;
public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider,
XServiceInfo, XTimeStamped, XComponent {
- public final static String __serviceName = "com.sun.star.configuration.backend.PlatformBackend";
- public final static String __implName = "org.openoffice.JavaSystemBackend";
- public final static String testComponent = "org.openoffice.Office.Common";
+ public static final String __serviceName = "com.sun.star.configuration.backend.PlatformBackend";
+ public static final String __implName = "org.openoffice.JavaSystemBackend";
+ public static final String testComponent = "org.openoffice.Office.Common";
protected static XMultiServiceFactory msf = null;
protected XLayer aLayer = null;
diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
index bcc659e57824..2727633ecd9b 100644
--- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
+++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
@@ -60,7 +60,7 @@ public class CheckModuleAPI extends ComplexTestCase
private static String mSRC_ROOT = null;
private static boolean mIsInitialized = false;
- private final static boolean mContinue = true;
+ private static final boolean mContinue = true;
private static BuildEnvTools bet = null;
/**
diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
index afb317ed738c..004b0144eff1 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
@@ -206,7 +206,7 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest {
* for the "getPhoneticCandidate" test. Euivalents are only usable for zh,CN locale.
*/
public static class UnicodeStringPair {
- final static int valCount = 78;
+ static final int valCount = 78;
static final String[] sStringEquivalence = new String[valCount];
static final char[] iUnicodeEquivalence = new char[valCount];
diff --git a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java
index 09ebb1fe92b3..a3c42cc345ed 100644
--- a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java
+++ b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java
@@ -34,7 +34,7 @@ import lib.MultiMethodTest;
*/
public class _XIdlReflection extends MultiMethodTest{
public XIdlReflection oObj = null;
- protected final static String typeName = "com.sun.star.container.XNameAccess";
+ protected static final String typeName = "com.sun.star.container.XNameAccess";
/**
* Test calls the method and checks returned interface
diff --git a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java
index 3955cb9c5cbf..2f541d316318 100644
--- a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java
+++ b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java
@@ -40,21 +40,21 @@ public class _XURLTransformer extends MultiMethodTest {
URL url;
- final static String user = "user";
- final static String invalidUserPrefix = "1";
- final static String password = "password";
- final static String server = "server";
- final static String invalidServerPrefix = "1";
- final static String port = "8080";
- final static String path = "/pub/path";
- final static String name = "file.txt";
- final static String arguments = "a=b";
- final static String mark = "mark";
-
- final static String expectedCompleteHTTP = "http://"
+ static final String user = "user";
+ static final String invalidUserPrefix = "1";
+ static final String password = "password";
+ static final String server = "server";
+ static final String invalidServerPrefix = "1";
+ static final String port = "8080";
+ static final String path = "/pub/path";
+ static final String name = "file.txt";
+ static final String arguments = "a=b";
+ static final String mark = "mark";
+
+ static final String expectedCompleteHTTP = "http://"
+ server + ":" + port + path
+ "/" + name + "?" + arguments + "#" + mark;
- final static String expectedCompleteFTP = "ftp://"
+ static final String expectedCompleteFTP = "ftp://"
+ user + ":" + password + "@" + server + ":" + port + path
+ "/" + name;
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
index 594f0f570b3f..602687e755ed 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
@@ -128,7 +128,7 @@ public class ORowSet extends TestCase {
String tableName = null;
DataSourceDescriptor srcInf = null;
boolean isMySQLDB = false;
- protected final static String dbSourceName = "ORowSetDataSource";
+ protected static final String dbSourceName = "ORowSetDataSource";
public XConnection m_connection = null;
private Object m_rowSet = null;
private DataSource m_dataSource;
diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java
index 105fcbd18f51..a9b80c24c451 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java
@@ -138,7 +138,7 @@ public class OSingleSelectQueryComposer extends TestCase {
String tableName = null;
DBTools.DataSourceInfo srcInf = null;
boolean isMySQLDB = false;
- protected final static String dbSourceName = "OSingleSelectQueryComposerDataSource";
+ protected static final String dbSourceName = "OSingleSelectQueryComposerDataSource";
public XConnection conn = null;
/**
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
index 38d148a3de5d..850f54146fbf 100644
--- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
+++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
@@ -129,8 +129,8 @@ public class GenericModelTest extends TestCase {
/**
* This is the name of the Data Base which the test uses: "APITestDatabase"
*/
- private final static String m_dbSourceName = "APITestDatabase";
- private final static String m_TestDB = "TestDB";
+ private static final String m_dbSourceName = "APITestDatabase";
+ private static final String m_TestDB = "TestDB";
private DBTools m_dbTools = null;
private boolean m_ConnectionColsed = false;
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index d6f7015ee8de..ac1b8e7c06cd 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -215,7 +215,7 @@ import com.sun.star.view.XControlAccess;
* @see ifc.sdbc._RowSet
*/
public class ODatabaseForm extends TestCase {
- protected final static String dbSourceName = "ODatabaseFormDataSource";
+ protected static final String dbSourceName = "ODatabaseFormDataSource";
private static int uniqueSuffix = 0;
private static String origDB = null;
private static String tmpDir = null;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java
index 4797d2ad4f65..4797d2ad4f65 100644..100755
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java
index d4d49fe00c30..1b7e8cb73283 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java
@@ -32,8 +32,8 @@ import org.xml.sax.SAXException;
public class ObjectOleReadHandler extends ElementReadHandler
{
- private final static String RPT_CHART_CLASS_ID = "80243D39-6741-46C5-926E-069164FF87BB";
- private final static String OOO_CHART_CLASS_ID = "12DCAE26-281F-416F-A234-C3086127382E";
+ private static final String RPT_CHART_CLASS_ID = "80243D39-6741-46C5-926E-069164FF87BB";
+ private static final String OOO_CHART_CLASS_ID = "12DCAE26-281F-416F-A234-C3086127382E";
private final ObjectOleElement element;
public ObjectOleReadHandler(final ObjectOleElement element)
diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
index e7c6fdb15236..432d401ac322 100644
--- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
+++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
@@ -44,7 +44,7 @@ import java.util.zip.ZipInputStream;
public class UCBStreamHandler extends URLStreamHandler {
- public final static String separator = "/ucb/";
+ public static final String separator = "/ucb/";
private final XSimpleFileAccess m_xSimpleFileAccess;
private final HashMap<String, InputStream> m_jarStreamMap = new HashMap<String, InputStream>(12);
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
index 94181e7b13d6..d447e66906c5 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
@@ -38,11 +38,11 @@ import com.sun.star.uno.XComponentContext;
public class ScriptContext extends PropertySet implements XScriptContext {
- private final static String HM_DOC_REF = "DocumentReference";
- private final static String HM_DESKTOP = "Desktop";
- private final static String HM_COMPONENT_CONTEXT = "ComponentContext";
+ private static final String HM_DOC_REF = "DocumentReference";
+ private static final String HM_DESKTOP = "Desktop";
+ private static final String HM_COMPONENT_CONTEXT = "ComponentContext";
- private final static String DOC_URI = "SCRIPTING_DOC_URI";
+ private static final String DOC_URI = "SCRIPTING_DOC_URI";
public final XModel m_xModel;
private final XScriptInvocationContext m_xInvocationContext;
diff --git a/sw/qa/complex/accessibility/AccessibleRelationSet.java b/sw/qa/complex/accessibility/AccessibleRelationSet.java
index b1d0b4cc58ea..a2b2e2e506fe 100644
--- a/sw/qa/complex/accessibility/AccessibleRelationSet.java
+++ b/sw/qa/complex/accessibility/AccessibleRelationSet.java
@@ -47,7 +47,7 @@ public class AccessibleRelationSet {
private XAccessible para2 = null;
private XAccessible para3 = null;
private XTextDocument xTextDoc = null;
- private final static String[] types = {"INVALID","CONTENT_FLOWS_FROM","CONTENT_FLOWS_TO","CONTROLLED_BY","CONTROLLER_FOR","LABEL_FOR","LABELED_BY","MEMBER_OF","SUB_WINDOW_OF"};
+ private static final String[] types = {"INVALID","CONTENT_FLOWS_FROM","CONTENT_FLOWS_TO","CONTROLLED_BY","CONTROLLER_FOR","LABEL_FOR","LABELED_BY","MEMBER_OF","SUB_WINDOW_OF"};
@Test public void contents_flows_to() {
XAccessibleRelationSet set = getAccessibleRelation(para1);
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index b2c618d08f03..50750de76963 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -68,45 +68,45 @@ import org.apache.commons.httpclient.methods.PostMethod;
public class Helper
{
- public final static int GENERALSEND_ERROR = 0;
- public final static int NOWIKIFILTER_ERROR = 1;
- public final static int NOURLCONNECTION_ERROR = 2;
- public final static int WRONGLOGIN_ERROR = 3;
- public final static int INVALIDURL_ERROR = 4;
- public final static int NOURL_ERROR = 5;
+ public static final int GENERALSEND_ERROR = 0;
+ public static final int NOWIKIFILTER_ERROR = 1;
+ public static final int NOURLCONNECTION_ERROR = 2;
+ public static final int WRONGLOGIN_ERROR = 3;
+ public static final int INVALIDURL_ERROR = 4;
+ public static final int NOURL_ERROR = 5;
- public final static int DLG_SENDTITLE = 6;
- public final static int DLG_WIKIARTICLE = 7;
+ public static final int DLG_SENDTITLE = 6;
+ public static final int DLG_WIKIARTICLE = 7;
- public final static int DLG_OK = 9;
+ public static final int DLG_OK = 9;
// 11 is reserved
- public final static int DLG_ADDBUTTON = 12;
- public final static int DLG_EDITBUTTON = 13;
- public final static int DLG_SENDBUTTON = 14;
- public final static int DLG_REMOVEBUTTON = 15;
-
- public final static int DLG_EDITSETTING_URLLABEL = 16;
- public final static int DLG_EDITSETTING_USERNAMELABEL = 17;
- public final static int DLG_EDITSETTING_PASSWORDLABEL = 18;
-
- public final static int DLG_SENDTOMEDIAWIKI_LABEL1 = 20;
- public final static int DLG_SENDTOMEDIAWIKI_LABEL2 = 21;
- public final static int DLG_SENDTOMEDIAWIKI_LABEL3 = 22;
- public final static int DLG_SENDTOMEDIAWIKI_MINORCHECK = 23;
- public final static int DLG_SENDTOMEDIAWIKI_BROWSERCHECK = 24;
- public final static int UNKNOWNCERT_ERROR = 25;
- public final static int DLG_MEDIAWIKI_TITLE = 26;
- public final static int DLG_EDITSETTING_ACCOUNTLINE = 27;
- public final static int DLG_EDITSETTING_WIKILINE = 28;
- public final static int DLG_EDITSETTING_SAVEBOX = 29;
- public final static int CANCELSENDING_ERROR = 30;
- public final static int DLG_MEDIAWIKIEXTENSION_STRING = 31;
- public final static int DLG_WIKIPAGEEXISTS_LABEL1 = 32;
-
- private final static int STRINGS_NUM = 33;
-
- private final static String[] m_pEntryNames = { "GeneralSendError",
+ public static final int DLG_ADDBUTTON = 12;
+ public static final int DLG_EDITBUTTON = 13;
+ public static final int DLG_SENDBUTTON = 14;
+ public static final int DLG_REMOVEBUTTON = 15;
+
+ public static final int DLG_EDITSETTING_URLLABEL = 16;
+ public static final int DLG_EDITSETTING_USERNAMELABEL = 17;
+ public static final int DLG_EDITSETTING_PASSWORDLABEL = 18;
+
+ public static final int DLG_SENDTOMEDIAWIKI_LABEL1 = 20;
+ public static final int DLG_SENDTOMEDIAWIKI_LABEL2 = 21;
+ public static final int DLG_SENDTOMEDIAWIKI_LABEL3 = 22;
+ public static final int DLG_SENDTOMEDIAWIKI_MINORCHECK = 23;
+ public static final int DLG_SENDTOMEDIAWIKI_BROWSERCHECK = 24;
+ public static final int UNKNOWNCERT_ERROR = 25;
+ public static final int DLG_MEDIAWIKI_TITLE = 26;
+ public static final int DLG_EDITSETTING_ACCOUNTLINE = 27;
+ public static final int DLG_EDITSETTING_WIKILINE = 28;
+ public static final int DLG_EDITSETTING_SAVEBOX = 29;
+ public static final int CANCELSENDING_ERROR = 30;
+ public static final int DLG_MEDIAWIKIEXTENSION_STRING = 31;
+ public static final int DLG_WIKIPAGEEXISTS_LABEL1 = 32;
+
+ private static final int STRINGS_NUM = 33;
+
+ private static final String[] m_pEntryNames = { "GeneralSendError",
"NoWikiFilter",
"NoConnectionToURL",
"WrongLogin",
diff --git a/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java b/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java
index 822e0945c1f3..a2af0bac4bcd 100644
--- a/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java
+++ b/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java
@@ -435,7 +435,7 @@ public class TMutableGridDataModel
private final XMutableGridDataModel m_dataModel;
private final GridDataListener m_listener;
- private final static Object[][] m_rowValues = new Object[][] {
+ private static final Object[][] m_rowValues = new Object[][] {
new Object[] { 1, 2, "3", 4, 5 },
new Object[] { 2, 3, 4, "5", 6 },
new Object[] { "3", 4, 5, 6, 7 },
@@ -443,7 +443,7 @@ public class TMutableGridDataModel
new Object[] { 5, "6", 7, 8, 9 },
};
- private final static Object[] m_rowHeadings = new Object[] {
+ private static final Object[] m_rowHeadings = new Object[] {
"1", 2, 3.0, "4", (float)5.0
};
}
diff --git a/vcl/qa/complex/memCheck/TestDocument.java b/vcl/qa/complex/memCheck/TestDocument.java
index ab942e0083ae..7e299b8ae75f 100644
--- a/vcl/qa/complex/memCheck/TestDocument.java
+++ b/vcl/qa/complex/memCheck/TestDocument.java
@@ -23,7 +23,7 @@ import org.openoffice.test.OfficeFileUrl;
final class TestDocument
{
- private final static String sPathname = "testdocuments";
+ private static final String sPathname = "testdocuments";
public static String getUrl(String name)
{
return OfficeFileUrl.getAbsolute(new File(sPathname, name));
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 0d5ec2be32e5..d62a547803c4 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -130,9 +130,9 @@ public class DBMetaData
private int iMaxColumnNameLength = -1;
private int iMaxTableNameLength = -1;
private boolean bPasswordIsRequired;
- private final static int NOLIMIT = 9999999;
- protected final static int RID_DB_COMMON = 1000;
- private final static int INVALID = 9999999;
+ private static final int NOLIMIT = 9999999;
+ protected static final int RID_DB_COMMON = 1000;
+ private static final int INVALID = 9999999;
public TypeInspector oTypeInspector;
private NumberFormatter oNumberFormatter = null;
private long lDateCorrection = INVALID;
diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java
index 0c4c976395ed..cae352f2b9ef 100644
--- a/wizards/com/sun/star/wizards/document/FormHandler.java
+++ b/wizards/com/sun/star/wizards/document/FormHandler.java
@@ -67,15 +67,15 @@ public class FormHandler
public String[] sModelServices = new String[8];
public static ControlData[] oControlData;
- public final static int SOLABEL = 0;
- public final static int SOTEXTBOX = 1;
- public final static int SOCHECKBOX = 2;
- public final static int SODATECONTROL = 3;
- public final static int SOTIMECONTROL = 4;
- public final static int SONUMERICCONTROL = 5;
- public final static int SOGRIDCONTROL = 6;
- public final static int SOIMAGECONTROL = 7;
- public final static int SODATETIMECONTROL = 8;
+ public static final int SOLABEL = 0;
+ public static final int SOTEXTBOX = 1;
+ public static final int SOCHECKBOX = 2;
+ public static final int SODATECONTROL = 3;
+ public static final int SOTIMECONTROL = 4;
+ public static final int SONUMERICCONTROL = 5;
+ public static final int SOGRIDCONTROL = 6;
+ public static final int SOIMAGECONTROL = 7;
+ public static final int SODATETIMECONTROL = 8;
public static String SOSIZETEXT = "The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.";
private int iXPixelFactor = -1;
private int iYPixelFactor = -1;
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java
index 4f2489fa2b86..532c979b5f61 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -56,8 +56,8 @@ public class FormDocument extends TextDocument
private int nFormWidth;
private int nFormHeight;
private Point aMainFormPoint;
- private final static String SOMAINFORM = "MainForm";
- private final static String SOSUBFORM = "SubForm";
+ private static final String SOMAINFORM = "MainForm";
+ private static final String SOSUBFORM = "SubForm";
public FormDocument(XMultiServiceFactory xMSF)
{
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 0e33f9271063..b61ce95b1383 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -55,10 +55,10 @@ public class StyleApplier
private short iOldLayoutPos;
private String[] StyleNames;
private String[] FileNames;
- private final static int SOBACKGROUNDCOLOR = 0;
- private final static int SODBTEXTCOLOR = 1;
- private final static int SOLABELTEXTCOLOR = 2;
- private final static int SOBORDERCOLOR = 5;
+ private static final int SOBACKGROUNDCOLOR = 0;
+ private static final int SODBTEXTCOLOR = 1;
+ private static final int SOLABELTEXTCOLOR = 2;
+ private static final int SOBORDERCOLOR = 5;
private Short IBorderValue = Short.valueOf((short) 1);
public StyleApplier(WizardDialog CurUnoDialog, FormDocument _curFormDocument)
diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
index e715a7732b45..0fa3e29888ad 100644
--- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
+++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
@@ -54,7 +54,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener
private String[] fieldnames;
private final TableDescriptor curTableDescriptor;
private final boolean bAutoPrimaryKeysupportsAutoIncrmentation;
- private final static String SAUTOMATICKEYFIELDNAME = "ID";
+ private static final 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 ac650759931f..6cd094c13bc6 100644
--- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
+++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
@@ -45,8 +45,8 @@ import com.sun.star.wizards.ui.event.XItemListenerAdapter;
*/
public class ScenarioSelector extends FieldSelection implements XItemListener, XFieldSelectionListener
{
- private final static int PRIVATE = 0;
- private final static int BUSINESS = 1;
+ private static final int PRIVATE = 0;
+ private static final int BUSINESS = 1;
private final XRadioButton optBusiness;
private XListBox xTableListBox;
diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java
index a1cce5047218..9e6f365fa3fa 100644
--- a/wizards/com/sun/star/wizards/ui/ButtonList.java
+++ b/wizards/com/sun/star/wizards/ui/ButtonList.java
@@ -65,7 +65,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
private IImageRenderer renderer;
private ListModel listModel;
private IRenderer counterRenderer = new SimpleCounterRenderer();
- private final static int LINE_HEIGHT = 8;
+ private static final int LINE_HEIGHT = 8;
public void setName(String _sName)
{
diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index 88dea0fe9f14..3fc1ade50974 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -44,14 +44,14 @@ public class FieldSelection
private boolean bisModified = false;
- private final static int SOCMDMOVESEL = 1;
- private final static int SOCMDMOVEALL = 2;
- private final static int SOCMDREMOVESEL = 3;
- private final static int SOCMDREMOVEALL = 4;
- private final static int SOCMDMOVEUP = 5;
- private final static int SOCMDMOVEDOWN = 6;
- private final static int SOFLDSLST = 7;
- private final static int SOSELFLDSLST = 8;
+ private static final int SOCMDMOVESEL = 1;
+ private static final int SOCMDMOVEALL = 2;
+ private static final int SOCMDREMOVESEL = 3;
+ private static final int SOCMDREMOVEALL = 4;
+ private static final int SOCMDMOVEUP = 5;
+ private static final int SOCMDMOVEDOWN = 6;
+ private static final int SOFLDSLST = 7;
+ private static final int SOSELFLDSLST = 8;
private class ItemListenerImpl implements com.sun.star.awt.XItemListener
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 186dcc4ac0a1..ab6fa7a506cc 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -501,9 +501,9 @@ public class FilterComponent
private final class ControlRow
{
- private final static int SOLSTFIELDNAME = 3;
- private final static int SOLSTOPERATOR = 4;
- private final static int SOTXTVALUE = 5;
+ private static final int SOLSTFIELDNAME = 3;
+ private static final int SOLSTOPERATOR = 4;
+ private static final int SOTXTVALUE = 5;
private XInterface[] ControlElements = new XInterface[6];
private boolean m_bEnabled;
private String[] FieldNames;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
index 765c6f86569c..4c48e3feb71e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
@@ -59,7 +59,7 @@ import java.io.UnsupportedEncodingException;
public final class PalmDB {
/** Number of bytes for the name field in the PDB. */
- public final static int NAME_LENGTH = 32;
+ public static final int NAME_LENGTH = 32;
/** List of {@code Record} objects. */
private Record[] records;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java
index 0d166aac4004..ba32aed20a21 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java
@@ -50,7 +50,7 @@ public final class PdbEncoder {
private final PalmDB db;
/** The pattern for unique_id=0x00BABE(start). */
- private final static int START_UNIQUE_ID = 0x00BABE;
+ private static final int START_UNIQUE_ID = 0x00BABE;
/**
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java
index dd8068d63134..829c1c733295 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java
@@ -24,12 +24,12 @@ package org.openoffice.xmerge.converter.palm;
public final class PdbUtil {
/** Difference in seconds from Jan 01, 1904 to Jan 01, 1970. */
- final static long TIME_DIFF = 2082844800;
+ static final long TIME_DIFF = 2082844800;
/** Encoding scheme used. */
- final static String ENCODING = "8859_1";
+ static final String ENCODING = "8859_1";
/** Size of a PDB header in bytes. */
- final static int HEADER_SIZE = 78;
+ static final int HEADER_SIZE = 78;
} \ No newline at end of file
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
index fdbbbffd319f..0345ac79ef2e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
@@ -40,14 +40,14 @@ import org.openoffice.xmerge.util.Debug;
class OfficeZip {
/** File name of the XML file in a zipped document. */
- private final static String CONTENTXML = "content.xml";
+ private static final String CONTENTXML = "content.xml";
- private final static String STYLEXML = "styles.xml";
- private final static String METAXML = "meta.xml";
- private final static String SETTINGSXML = "settings.xml";
- private final static String MANIFESTXML = "META-INF/manifest.xml";
+ private static final String STYLEXML = "styles.xml";
+ private static final String METAXML = "meta.xml";
+ private static final String SETTINGSXML = "settings.xml";
+ private static final String MANIFESTXML = "META-INF/manifest.xml";
- private final static int BUFFERSIZE = 1024;
+ private static final int BUFFERSIZE = 1024;
private final List<Entry> entryList;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
index 0352ee714a6a..cb7167b1e090 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
@@ -59,7 +59,7 @@ public final class PluginFactoryImpl extends PluginFactory
}
/** ConverterCapabilities object for this type of conversion. */
- private final static ConverterCapabilities converterCap =
+ private static final ConverterCapabilities converterCap =
new ConverterCapabilitiesImpl();
/**
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
index 50a34b2d4e95..4599a0e49c23 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
@@ -39,14 +39,14 @@ import java.util.Properties;
public final class Debug {
/** Informational messages. */
- public final static int INFO = 0x0001;
+ public static final int INFO = 0x0001;
/** Error messages. */
- public final static int ERROR = 0x0002;
+ public static final int ERROR = 0x0002;
/** Trace messages. */
- public final static int TRACE = 0x0004;
+ public static final int TRACE = 0x0004;
/** To set a flag. */
- private final static boolean SET = true;
+ private static final boolean SET = true;
private static int flags = 0;
private static PrintWriter writer = null;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
index 476f047c0d8d..00eaf9d8abbd 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
@@ -34,17 +34,17 @@ import java.net.JarURLConnection;
*/
public class ConverterInfoReader {
- private final static String TAG_CONVERTER = "converter";
- private final static String ATTRIB_OFFICE_TYPE = "type";
- private final static String ATTRIB_VERSION = "version";
- private final static String TAG_NAME = "converter-display-name";
- private final static String TAG_DESC = "converter-description";
- private final static String TAG_VENDOR = "converter-vendor";
- private final static String TAG_CLASS_IMPL = "converter-class-impl";
- private final static String TAG_TARGET = "converter-target";
- private final static String ATTRIB_DEVICE_TYPE = "type";
- private final static String TAG_XSLT_DESERIAL = "converter-xslt-deserialize";
- private final static String TAG_XSLT_SERIAL = "converter-xslt-serialize";
+ private static final String TAG_CONVERTER = "converter";
+ private static final String ATTRIB_OFFICE_TYPE = "type";
+ private static final String ATTRIB_VERSION = "version";
+ private static final String TAG_NAME = "converter-display-name";
+ private static final String TAG_DESC = "converter-description";
+ private static final String TAG_VENDOR = "converter-vendor";
+ private static final String TAG_CLASS_IMPL = "converter-class-impl";
+ private static final String TAG_TARGET = "converter-target";
+ private static final String ATTRIB_DEVICE_TYPE = "type";
+ private static final String TAG_XSLT_DESERIAL = "converter-xslt-deserialize";
+ private static final String TAG_XSLT_SERIAL = "converter-xslt-serialize";
private final String jarfilename;
private final Document document;
private final ArrayList<ConverterInfo> converterInfoList;