summaryrefslogtreecommitdiff
path: root/xmerge
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 /xmerge
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>
Diffstat (limited to 'xmerge')
-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
7 files changed, 27 insertions, 27 deletions
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;