git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2049 set Ensembl variant source to ENSEMBL if '.' (not provided) and
[jalview.git]
/
utils
/
getJavaVersion.java
diff --git
a/utils/getJavaVersion.java
b/utils/getJavaVersion.java
index
c751a9a
..
98747f7
100644
(file)
--- a/
utils/getJavaVersion.java
+++ b/
utils/getJavaVersion.java
@@
-1,23
+1,28
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * 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
*
* 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.
*
*
* 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see <http://www.gnu.org/licenses/>.
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
* 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;
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("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);
}
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);
version = (String) versions.get(major + ".0");
}
// System.err.println("Version "+version);
+ if (version == null)
+ {
+ versions.put(major + "." + minor, "Class v" + major + ".0");
+ }
return version;
}
return version;
}