X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2FgetJavaVersion.java;h=98747f7e002e76c5150e95cf80c3c3f7198eb22a;hb=930957c979c02fb620083ae1f972216d5f5050fa;hp=8b2e628f005c27dfb2fc62ec3d13c4e383ca8405;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git
diff --git a/utils/getJavaVersion.java b/utils/getJavaVersion.java
index 8b2e628..98747f7 100644
--- a/utils/getJavaVersion.java
+++ b/utils/getJavaVersion.java
@@ -1,22 +1,28 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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;
@@ -137,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);
@@ -146,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;
}