geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r527290 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
Date Tue, 10 Apr 2007 20:42:43 GMT
Author: sppatel
Date: Tue Apr 10 13:42:42 2007
New Revision: 527290

URL: http://svn.apache.org/viewvc?view=rev&rev=527290
Log:
only show jvm warning on 1.x versions

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java?view=diff&rev=527290&r1=527289&r2=527290
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
Tue Apr 10 13:42:42 2007
@@ -413,11 +413,14 @@
 	}
 
 	private boolean isValidVM() {
-		String javaVersion = null;
-		IVMInstall vmInstall = getRuntimeDelegate().getVMInstall();
-		if (vmInstall instanceof IVMInstall2)
-			javaVersion = ((IVMInstall2) vmInstall).getJavaVersion();
-		return javaVersion != null && javaVersion.startsWith("1.4");
+		if(getRuntimeDelegate().getRuntime().getRuntimeType().getVersion().startsWith("1")) {
+			IVMInstall vmInstall = getRuntimeDelegate().getVMInstall();
+			if (vmInstall instanceof IVMInstall2) {
+				String javaVersion = ((IVMInstall2) vmInstall).getJavaVersion();
+				return javaVersion != null && javaVersion.startsWith("1.4");
+			}
+		}
+		return true;
 	}
 
 	/*



Mime
View raw message