Author: adietish Date: 2011-07-08 05:40:58 -0400 (Fri, 08 Jul 2011) New Revision: 32747 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java Log: [JBIDE-9215] moved LocalJBossStartLaunchDelegate#preLaunchCheck to superclass AbstractJBossStartLaunchConfiguration so that the same is executed for local and remote launch configs Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-07-08 08:09:58 UTC (rev 32746) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-07-08 09:40:58 UTC (rev 32747) @@ -29,17 +29,34 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; +import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; +import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils; +import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences; /** * @author Rob Stryker */ public abstract class AbstractJBossStartLaunchConfiguration extends AbstractJavaLaunchConfigurationDelegate { - // we have no need to do anything in pre-launch check @Override public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { + DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + if (!jbsBehavior.canStart(mode).isOK()) + throw new CoreException(jbsBehavior.canStart(mode)); + if (LaunchCommandPreferences.isIgnoreLaunchCommand(jbsBehavior.getServer())) { + jbsBehavior.setServerStarting(); + jbsBehavior.setServerStarted(); + return false; + } + boolean started = WebPortPoller.onePing(jbsBehavior.getServer()); + if (started) { + jbsBehavior.setServerStarting(); + jbsBehavior.setServerStarted(); + return false; + } + return true; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2011-07-08 08:09:58 UTC (rev 32746) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2011-07-08 09:40:58 UTC (rev 32747) @@ -56,26 +56,6 @@ actualLaunch(configuration, mode, launch, monitor); } - public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) - throws CoreException { - DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); - if (!jbsBehavior.canStart(mode).isOK()) - throw new CoreException(jbsBehavior.canStart(mode)); - if (LaunchCommandPreferences.isIgnoreLaunchCommand(jbsBehavior.getServer())) { - jbsBehavior.setServerStarting(); - jbsBehavior.setServerStarted(); - return false; - } - boolean started = WebPortPoller.onePing(jbsBehavior.getServer()); - if (started) { - jbsBehavior.setServerStarting(); - jbsBehavior.setServerStarted(); - return false; - } - - return true; - } - public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { try { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java 2011-07-08 08:09:58 UTC (rev 32746) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java 2011-07-08 09:40:58 UTC (rev 32747) @@ -22,11 +22,10 @@ import org.eclipse.rse.services.shells.IHostShellChangeEvent; import org.eclipse.rse.services.shells.IHostShellOutputListener; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; -import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration.IStartLaunchSetupParticipant; -import org.jboss.ide.eclipse.as.core.server.internal.launch.IStartLaunchDelegate; +import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossStartLaunchConfiguration; import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel; -public abstract class AbstractRSELaunchDelegate implements IStartLaunchDelegate, IStartLaunchSetupParticipant { +public abstract class AbstractRSELaunchDelegate extends AbstractJBossStartLaunchConfiguration { protected void executeRemoteCommand(String command, DelegatingServerBehavior behavior) throws CoreException { @@ -42,7 +41,6 @@ sme.getMessage(), sme)); } } - // Only for debugging private void addShellOutputListener(IHostShell shell) { IHostShellOutputListener listener = null;