Author: rob.stryker(a)jboss.com Date: 2009-08-07 17:14:15 -0400 (Fri, 07 Aug 2009) New Revision: 17021 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java Log: JBIDE-4726 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java 2009-08-07 17:26:07 UTC (rev 17020) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java 2009-08-07 21:14:15 UTC (rev 17021) @@ -23,6 +23,7 @@ import java.util.ArrayList; +import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.launching.IVMInstall; import org.eclipse.jdt.launching.IVMInstall2; import org.eclipse.jdt.launching.IVMInstallType; @@ -48,7 +49,7 @@ for (int j = 0; j < size2; j++) { if( vmInstalls[j] instanceof IVMInstall2 ) { String version = ((IVMInstall2)vmInstalls[j]).getJavaVersion(); - if( version.startsWith("1.6.")) + if( isValidVersion(version)) valid.add(vmInstalls[j]); } } @@ -56,6 +57,14 @@ return valid; } + protected boolean isValidVersion(String version) { + return !version.equals(JavaCore.VERSION_1_1) && + !version.equals(JavaCore.VERSION_1_2) && + !version.equals(JavaCore.VERSION_1_3) && + !version.equals(JavaCore.VERSION_1_4) && + !version.equals(JavaCore.VERSION_1_5); + } + protected String getErrorString() { if( !shouldIncludeDefaultJRE() && getValidJREs().size() == 0 ) return Messages.rwf_jre6NotFound;