X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2FgetJavaVersion.java;h=d7877c1243df7390b49282e87f3fc7a199ff71bd;hb=f6bde21f2fba3f12afedd6486bc8326a63f1373f;hp=f3b12d4b1c934f8fe2dadb67855867d6ee81d6cc;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git
diff --git a/utils/getJavaVersion.java b/utils/getJavaVersion.java
index f3b12d4..d7877c1 100644
--- a/utils/getJavaVersion.java
+++ b/utils/getJavaVersion.java
@@ -1,23 +1,28 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
-import java.io.*;
-import java.util.*;
+import java.io.DataInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
@@ -138,6 +143,9 @@ public class getJavaVersion
versions.put("48.0", "1.4");
versions.put("49.0", "1.5");
versions.put("50.0", "1.6");
+ versions.put("51.0", "1.7");
+ versions.put("52.0", "1.8");
+
}
String version = (String) versions.get(major + "."
+ minor);
@@ -147,6 +155,10 @@ public class getJavaVersion
version = (String) versions.get(major + ".0");
}
// System.err.println("Version "+version);
+ if (version == null)
+ {
+ versions.put(major + "." + minor, "Class v" + major + ".0");
+ }
return version;
}