[Libreoffice-commits] core.git: xmerge/source

[Noel Grandin]

 xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java                     |   10 +-----
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java |   16 +++-------
 2 files changed, 7 insertions(+), 19 deletions(-)

New commits:
commit 17f9b92414d04e49151f6d8818d458d9afa679a4
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Aug 1 09:05:12 2014 +0200

    xmerge: simplify static final constructors
    
    Change-Id: I40f98c77c5f922fdce8242dac402feaf534da6bf

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java
index af82a66..27c2519 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java
@@ -26,15 +26,9 @@ package org.openoffice.xmerge;
  */
 public final class Version {
 
-    private static final Package pkg;
+    private static final Version version = new Version();
 
-    private static final Version version;
-
-    static {
-
-        version = new Version();
-        pkg = version.getClass().getPackage();
-    }
+    private static final Package pkg = version.getClass().getPackage();
 
     /**
      *  Private constructor to provide a singleton instance.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
index 6458290..116ec08 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
@@ -37,19 +37,13 @@ public class ConverterInfo {
     /**
      *  Keep track of the valid Office mime types
      */
-    private static String[] validOfficeTypes;
-    public static String SxwType = "staroffice/sxw";
-    public static String SxcType = "staroffice/sxc";
+    private static final String[] validOfficeTypes = new String[] {
+        // This needs to be updated to reflect all valid office types.
+        "staroffice/sxw",
+        "staroffice/sxc"
+    };
 
 
-    static {
-       // This needs to be updated to reflect all valid office types.
-
-       validOfficeTypes = new String[2];
-       validOfficeTypes[0] = SxwType;
-       validOfficeTypes[1] = SxcType;
-    }
-
     private String           piJarName;
     private String           piOfficeMime;
     private ArrayList<String>        piDeviceMime;