X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2FgetJavaVersion.java;h=98747f7e002e76c5150e95cf80c3c3f7198eb22a;hb=ac50f1150202658d9d250d30cd511f0f4e165440;hp=de276733d754b10e86a2d1f67faef92f0b1a7062;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/utils/getJavaVersion.java b/utils/getJavaVersion.java index de27673..98747f7 100644 --- a/utils/getJavaVersion.java +++ b/utils/getJavaVersion.java @@ -1,6 +1,6 @@ /* - * 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. * @@ -18,8 +18,11 @@ * 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; @@ -140,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); @@ -149,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; }