Author: adietish Date: 2011-07-08 10:12:30 -0400 (Fri, 08 Jul 2011) New Revision: 32759 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java Log: [JBIDE-9215] extracted method #getShutdownCommand Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-08 14:00:43 UTC (rev 32758) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-08 14:12:30 UTC (rev 32759) @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.util.ServerUtil; @@ -34,12 +35,7 @@ @Override protected IStatus gracefullStop() { try { - ILaunchConfiguration config = getServer().getLaunchConfiguration(false, new NullProgressMonitor()); - //DelegatingServerBehavior serverBehavior = ServerUtil.checkedGetServerAdapter(getServer(), DelegatingServerBehavior.class); - //String defaultCmd = serverBehavior.getDefaultArguments(); - String defaultCmd = ServerUtil.checkedGetBehaviorDelegate(getServer()).getDefaultStopArguments(); - String shutdownCommand = config == null ? defaultCmd : - RSELaunchConfigProperties.getShutdownCommand(config, defaultCmd); + String shutdownCommand = getShutdownCommand(getServer()); ServerShellModel model = RSEHostShellModel.getInstance().getModel(getServer()); model.executeRemoteCommand("/", shutdownCommand, new String[]{}, new NullProgressMonitor(), 10000, true); if( model.getStartupShell() != null && model.getStartupShell().isActive()) { @@ -55,6 +51,12 @@ } } + private String getShutdownCommand(IServer server) throws CoreException { + String defaultCommand = ServerUtil.checkedGetBehaviorDelegate(server).getDefaultStopArguments(); + ILaunchConfiguration config = getServer().getLaunchConfiguration(false, new NullProgressMonitor()); + return RSELaunchConfigProperties.getShutdownCommand(config, defaultCommand); + } + public void serverIsStarting() { pollServer(IServerStatePoller.SERVER_UP); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java 2011-07-08 14:00:43 UTC (rev 32758) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java 2011-07-08 14:12:30 UTC (rev 32759) @@ -84,6 +84,9 @@ public static String getShutdownCommand(ILaunchConfiguration launchConfig, String defaultCommand) throws CoreException { + if (launchConfig == null) { + return defaultCommand; + } return launchConfig.getAttribute(RSE_SHUTDOWN_COMMAND, defaultCommand); }