Fixed an incompatibility with Java 9

git-svn-id: https://svn.code.sf.net/p/jailer/code/trunk@1125 3dd849cd-670e-4645-a7cd-dd197c8d0e81

releasenotes-dbeauty.txt

@@ -1,3 +1,6 @@
+2.8.1
+  - Fixed an incompatibility with Java 9.
+
 2.8
   - Data browser tables are now sortable.
 

releasenotes.txt

@@ -1,3 +1,6 @@
+6.3.1
+  - Fixed an incompatibility with Java 9.
+
 6.3
   - Data browser tables are now sortable.
   - Multithreaded import.

src/main/net/sf/jailer/Jailer.java

@@ -108,7 +108,7 @@ public class Jailer {
 	/**
 	 * The Jailer version.
 	 */
-	public static final String VERSION = "6.3";
+	public static final String VERSION = "6.3.1";
 
 	/**
 	 * The Jailer application name.

src/main/net/sf/jailer/ui/ExtractionModelFrame.java

@@ -46,7 +46,6 @@
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
 
-import jsyntaxpane.DefaultSyntaxKit;
 import net.sf.jailer.CommandLineParser;
 import net.sf.jailer.Configuration;
 import net.sf.jailer.DDLCreator;
@@ -1642,11 +1641,7 @@ public void run() {
     		    	customizeNimbus();
     			} catch (Exception x) {
     			}
-            	try {
-        	    	DefaultSyntaxKit.initKit();
-            	} catch (Throwable x) {
-            		x.printStackTrace();
-    			}
+            	UIUtil.initSyntaxKit();
 
             	String file = null;
                 try {

src/main/net/sf/jailer/ui/UIUtil.java

@@ -59,6 +59,8 @@
 import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
 
+import jsyntaxpane.DefaultSyntaxKit;
+
 import net.sf.jailer.CommandLineParser;
 import net.sf.jailer.Jailer;
 import net.sf.jailer.database.Session;
@@ -841,5 +843,15 @@ public static void checkTermination() {
 		}
 		System.exit(0);
 	}
+
+	public static void initSyntaxKit() {
+		try {
+			if (Integer.parseInt(System.getProperty("java.version", "1.7.0").split("\\.")[1]) < 9) {
+				DefaultSyntaxKit.initKit();
+			}
+		} catch (Throwable e) {
+			e.printStackTrace();
+		}
+	}
 
 }

src/main/net/sf/jailer/ui/databrowser/DataBrowser.java

@@ -74,7 +74,6 @@
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 
-import jsyntaxpane.DefaultSyntaxKit;
 import net.sf.jailer.CommandLineParser;
 import net.sf.jailer.Jailer;
 import net.sf.jailer.database.Session;
@@ -1388,11 +1387,7 @@ public static void main(final String args[]) {
 		}
 		java.awt.EventQueue.invokeLater(new Runnable() {
 			public void run() {
-				try {
-					DefaultSyntaxKit.initKit();
-				} catch (Throwable e) {
-					e.printStackTrace();
-				}
+				UIUtil.initSyntaxKit();
 				try {
 					CommandLineParser.parse(args, true);
 					try {

src/main/net/sf/jailer/ui/databrowser/DataBrowserContext.java

@@ -28,7 +28,7 @@
 public class DataBrowserContext {
 
 	private static String STANDALONE_APP_NAME = "DBeauty";
-	private static String STANDALONE_APP_VERSION = "2.8";
+	private static String STANDALONE_APP_VERSION = "2.8.1";
 
 	private static boolean supportsDataModelUpdates = true;
 	private static Boolean standAlone = null;