Changeset 467

Timestamp:

05/23/13 20:02:38 (11 years ago)

Author:

davidb

Message:

Java 1.6 test improved to allow version greater than this value as well

File:

• trunk/src/org/expeditee/gui/Browser.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/Browser.java

@@ -65 +65 @@
         private boolean _isExiting = false;
 
-        private boolean _version6 = false;
-
-        public boolean isVersion6() {
-                return _version6;
+        private boolean _minimum_version6 = false;
+
+        public boolean isMinimumVersion6() {
+                return _minimum_version6;
         }
 
@@ -232 +232 @@
                 EntitySaveManager.getInstance().addSaveStateChangedEventListener(this);
 
-                String version = System.getProperty("java.version");
-
-                if (version.startsWith("1.6")) {
-                        // Set the drag and drop handler
-                        _version6 = true;
-                        setTransferHandler(FrameDNDTransferHandler.getInstance());
-                } else {
-                        System.out.println("Upgrade to Java 1.6 to enable drag and drop");
-                }
+                String full_version = System.getProperty("java.version");
+                String[] version_parts = full_version.split("\\.");
+                if (version_parts.length>=2) {
+                        String version_str = version_parts[0] + "." + version_parts[1];
+                        double version = Double.parseDouble(version_str);
+                        
+                        if (version >= 1.6) {
+                                // Set the drag and drop handler
+                                _minimum_version6 = true;
+                                setTransferHandler(FrameDNDTransferHandler.getInstance());
+                        } else {
+                                System.err.println("Upgrade to a (minimum) of Java 1.6 to enable drag and drop support in Expeditee");
+                        }
+                }
+                else {
+                        System.err.println("Unable to parse Java version number " + full_version + " to determin if Drag and Drop supported");
+                        
+                }
+                
 
                 try {