X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=srcjar%2Fnet%2Fmiginfocom%2Fswing%2FSwingComponentWrapper.java;fp=srcjar%2Fnet%2Fmiginfocom%2Fswing%2FSwingComponentWrapper.java;h=2b6f1aaf145c731c6ea57af0cb7e0a6c4b80afec;hb=ce2ac269a3e9b6e52f1e1c4df24f8d5a59ad6933;hp=46a78fdc67b00a11b49740b5e2c457e70a948e9a;hpb=2c8206939dd208b7f3c228214ae434d966d19940;p=jalview.git

diff --git a/srcjar/net/miginfocom/swing/SwingComponentWrapper.java b/srcjar/net/miginfocom/swing/SwingComponentWrapper.java
index 46a78fd..2b6f1aa 100644
--- a/srcjar/net/miginfocom/swing/SwingComponentWrapper.java
+++ b/srcjar/net/miginfocom/swing/SwingComponentWrapper.java
@@ -136,17 +136,17 @@ public class SwingComponentWrapper implements ComponentWrapper
 		}
 	}
 
-	private static boolean isJava9orLater;
-	static {
-		try {
-			// Java 9 version-String Scheme: http://openjdk.java.net/jeps/223
-			StringTokenizer st = new StringTokenizer(System.getProperty("java.version"), "._-+");
-			int majorVersion = Integer.parseInt(st.nextToken());
-			isJava9orLater = majorVersion >= 9;
-		} catch (Exception e) {
-			// Java 8 or older
-		}
-	}
+	private static boolean isJava9orLater = true;
+//	static {
+//		try {
+//			// Java 9 version-String Scheme: http://openjdk.java.net/jeps/223
+//			StringTokenizer st = new StringTokenizer(System.getProperty("java.version"), "._-+");
+//			int majorVersion = Integer.parseInt(st.nextToken());
+//			isJava9orLater = majorVersion >= 9;
+//		} catch (Exception e) {
+//			// Java 8 or older
+//		}
+//	}
 
 //	/** Cache.
 //	 */
@@ -226,6 +226,7 @@ public class SwingComponentWrapper implements ComponentWrapper
 			c.getPreferredSize(); // To defeat a bug where the minimum size is different before and after the first call to getPreferredSize();
 			prefCalled = true;
 		}
+		
 		return c.getMinimumSize().width;
 	}
 	@Override