Author: bobtarling Date: 2008-04-26 03:46:55-0700 New Revision: 14477 Modified: trunk/src/argouml-app/src/org/argouml/application/Main.java trunk/src/argouml-app/src/org/argouml/util/JavaRuntimeUtility.java
Log: Make use of new JRE utility Modified: trunk/src/argouml-app/src/org/argouml/application/Main.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/application/Main.java?view=diff&rev=14477&p1=trunk/src/argouml-app/src/org/argouml/application/Main.java&p2=trunk/src/argouml-app/src/org/argouml/application/Main.java&r1=14476&r2=14477 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/application/Main.java (original) +++ trunk/src/argouml-app/src/org/argouml/application/Main.java 2008-04-26 03:46:55-0700 @@ -81,6 +81,7 @@ import org.argouml.uml.reveng.java.JavaImport; import org.argouml.uml.ui.InitUmlUI; import org.argouml.util.ArgoFrame; +import org.argouml.util.JavaRuntimeUtility; import org.argouml.util.logging.SimpleTimer; import org.tigris.gef.util.Util; @@ -580,16 +581,12 @@ */ private static void checkJVMVersion() { // check if we are using a supported java version - String javaVersion = System.getProperty("java.version", ""); - // exit if unsupported java version. - if (javaVersion.startsWith("1.4") - || javaVersion.startsWith("1.3") - || javaVersion.startsWith("1.2") - || javaVersion.startsWith("1.1")) { - - System.err.println("You are using Java " + javaVersion + ", " - + "Please use Java 5 (aka 1.5) or later" - + " with ArgoUML"); + if (JavaRuntimeUtility.isJreSupported()) { + + System.err.println("You are using Java " + + JavaRuntimeUtility.getJreVersion() + + ", Please use Java 5 (aka 1.5) or later" + + " with ArgoUML"); System.exit(0); } } Modified: trunk/src/argouml-app/src/org/argouml/util/JavaRuntimeUtility.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/util/JavaRuntimeUtility.java?view=diff&rev=14477&p1=trunk/src/argouml-app/src/org/argouml/util/JavaRuntimeUtility.java&p2=trunk/src/argouml-app/src/org/argouml/util/JavaRuntimeUtility.java&r1=14476&r2=14477 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/util/JavaRuntimeUtility.java (original) +++ trunk/src/argouml-app/src/org/argouml/util/JavaRuntimeUtility.java 2008-04-26 03:46:55-0700 @@ -56,4 +56,12 @@ String javaVersion = System.getProperty("java.version", ""); return (javaVersion.startsWith("1.5")); } + + /** + * Get the JRE version described in system properties + * @return the JRE version + */ + public static String getJreVersion() { + return System.getProperty("java.version", ""); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
