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-2945 failing test for structure mapping
[jalview.git]
/
utils
/
getJavaVersion.java
diff --git
a/utils/getJavaVersion.java
b/utils/getJavaVersion.java
index
98747f7
..
8496f8b
100644
(file)
--- a/
utils/getJavaVersion.java
+++ b/
utils/getJavaVersion.java
@@
-28,28
+28,32
@@
import java.util.jar.JarInputStream;
public class getJavaVersion
{
public class getJavaVersion
{
-/**
- * Takes a set of Jars and/or class files as arguments. Reports the java version for the classes
- */
+ /**
+ * Takes a set of Jars and/or class files as arguments. Reports the java
+ * version for the classes
+ */
public static void main(String[] args) throws IOException
{
public static void main(String[] args) throws IOException
{
- Hashtable observed=new Hashtable();
+ Hashtable observed = new Hashtable();
for (int i = 0; i < args.length; i++)
for (int i = 0; i < args.length; i++)
- {
- checkClassVersion(args[i], observed);
- }
+ {
+ checkClassVersion(args[i], observed);
+ }
printVersions(observed, System.out);
}
printVersions(observed, System.out);
}
- public static void printVersions(Hashtable observed, java.io.PrintStream outs)
+
+ public static void printVersions(Hashtable observed,
+ java.io.PrintStream outs)
{
{
- if (observed.size()>0)
+ if (observed.size() > 0)
{
{
- int space=0;
- String key=null;
- for (Enumeration keys = observed.keys(); keys.hasMoreElements(); ) {
+ int space = 0;
+ String key = null;
+ for (Enumeration keys = observed.keys(); keys.hasMoreElements();)
+ {
key = (String) keys.nextElement();
key = (String) keys.nextElement();
- if (space++>0)
+ if (space++ > 0)
{
outs.print(" ");
}
{
outs.print(" ");
}
@@
-65,13
+69,13
@@
public class getJavaVersion
String version = checkClassVersion(filename);
if (version == null)
{
String version = checkClassVersion(filename);
if (version == null)
{
-// System.err.println("Reading "+filename+" as jar:");
+ // System.err.println("Reading "+filename+" as jar:");
try
{
JarInputStream jis = new JarInputStream(new FileInputStream(
filename));
JarEntry entry;
try
{
JarInputStream jis = new JarInputStream(new FileInputStream(
filename));
JarEntry entry;
- Hashtable perjar=new Hashtable();
+ Hashtable perjar = new Hashtable();
while ((entry = jis.getNextJarEntry()) != null)
{
if (entry != null)
while ((entry = jis.getNextJarEntry()) != null)
{
if (entry != null)
@@
-93,8
+97,8
@@
public class getJavaVersion
}
}
}
}
}
}
- System.err.println("Jar : "+filename);
- printVersions(perjar,System.err);
+ System.err.println("Jar : " + filename);
+ printVersions(perjar, System.err);
} catch (Exception e)
{
} catch (Exception e)
{
@@
-110,12
+114,11
@@
public class getJavaVersion
{
if (version != null)
{
{
if (version != null)
{
-// System.err.println("Version is '"+version+"'");
+ // System.err.println("Version is '"+version+"'");
int[] vrs = (int[]) observed.get(version);
if (vrs == null)
{
int[] vrs = (int[]) observed.get(version);
if (vrs == null)
{
- vrs = new int[]
- { 0 };
+ vrs = new int[] { 0 };
}
vrs[0]++;
observed.put(version, vrs);
}
vrs[0]++;
observed.put(version, vrs);
@@
-147,14
+150,13
@@
public class getJavaVersion
versions.put("52.0", "1.8");
}
versions.put("52.0", "1.8");
}
- String version = (String) versions.get(major + "."
- + minor);
+ String version = (String) versions.get(major + "." + minor);
if (version == null)
{
// get nearest known version
version = (String) versions.get(major + ".0");
}
if (version == null)
{
// get nearest known version
version = (String) versions.get(major + ".0");
}
-// System.err.println("Version "+version);
+ // System.err.println("Version "+version);
if (version == null)
{
versions.put(major + "." + minor, "Class v" + major + ".0");
if (version == null)
{
versions.put(major + "." + minor, "Class v" + major + ".0");
@@
-171,7
+173,7
@@
public class getJavaVersion
}
int minor = in.readUnsignedShort();
int major = in.readUnsignedShort();
}
int minor = in.readUnsignedShort();
int major = in.readUnsignedShort();
-// System.err.println("Version "+major+"."+minor);
+ // System.err.println("Version "+major+"."+minor);
return parseVersions(minor, major);
}
return parseVersions(minor, major);
}