Author: rob.stryker(a)jboss.com Date: 2011-07-19 04:35:26 -0400 (Tue, 19 Jul 2011) New Revision: 33036 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java Log: JBIDE-9349 - as7 select jre Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java 2011-07-19 08:15:43 UTC (rev 33035) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java 2011-07-19 08:35:26 UTC (rev 33036) @@ -38,20 +38,7 @@ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { - DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); - if( LaunchCommandPreferences.isIgnoreLaunchCommand(jbsBehavior.getServer())) { - jbsBehavior.setServerStarting(); - jbsBehavior.setServerStarted(); - return false; - } - // TODO: use the configured poller - boolean started = WebPortPoller.onePing(jbsBehavior.getServer()); - if( started ) { - jbsBehavior.setServerStarting(); - jbsBehavior.setServerStarted(); - return false; - } - return true; + return super.preLaunchCheck(configuration, mode, monitor); } public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java 2011-07-19 08:15:43 UTC (rev 33035) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java 2011-07-19 08:35:26 UTC (rev 33036) @@ -6,6 +6,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; @@ -13,6 +14,7 @@ import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IRuntimeWorkingCopy; import org.eclipse.wst.server.core.TaskModel; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType; import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; import org.jboss.ide.eclipse.as.ui.Messages; @@ -26,7 +28,7 @@ @Override protected void updateModels() { - // Do nothing + updateJREs(); } @Override @@ -34,6 +36,7 @@ createExplanation(main); createNameComposite(main); createHomeComposite(main); + createJREComposite(main); } protected void fillWidgets() { @@ -42,6 +45,7 @@ try { fillNameWidgets(rt); fillHomeDir(rt); + fillJREWidgets(getRuntime()); } catch (Exception e) { IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, MessageFormat.format(Messages.JBoss7ServerWizardFragment_could_not_create_ui, rt.getName()), e); JBossServerUIPlugin.getDefault().getLog().log(status); @@ -51,7 +55,12 @@ @Override protected void updatePage() { - // Do Nothing + int sel = jreCombo.getSelectionIndex(); + int offset = -1; + if( sel + offset >= 0 ) + selectedVM = installedJREs.get(sel + offset); + else // if sel < 0 or sel == 0 and offset == -1 + selectedVM = null; updateErrorMessage(); } @@ -108,6 +117,10 @@ runtimeWC.setName(name); runtimeWC.setLocation(new Path(homeDir)); + IJBossServerRuntime srt = (IJBossServerRuntime) runtimeWC.loadAdapter( + IJBossServerRuntime.class, new NullProgressMonitor()); + srt.setVM(selectedVM); + getTaskModel().putObject(TaskModel.TASK_RUNTIME, runtimeWC); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-07-19 08:15:43 UTC (rev 33035) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-07-19 08:35:26 UTC (rev 33036) @@ -221,8 +221,9 @@ if (jbsrt.isUsingDefaultJRE()) { jreCombo.select(0); } else { - IVMInstall install = jbsrt.getVM(); + IVMInstall install = jbsrt.getHardVM(); if( install != null ) { + selectedVM = install; String vmName = install.getName(); String[] jres = jreCombo.getItems(); for (int i = 0; i < jres.length; i++) {