Author: rob.stryker(a)jboss.com Date: 2011-08-05 04:05:16 -0400 (Fri, 05 Aug 2011) New Revision: 33623 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerAlreadyStartedHandler.java 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.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ServerAlreadyStartedDialog.java Log: JBIDE-9243 - adding polling messages to the dialog Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerAlreadyStartedHandler.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerAlreadyStartedHandler.java 2011-08-05 07:38:39 UTC (rev 33622) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerAlreadyStartedHandler.java 2011-08-05 08:05:16 UTC (rev 33623) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.server; +import org.eclipse.core.runtime.IStatus; import org.eclipse.wst.server.core.IServer; public interface IServerAlreadyStartedHandler { @@ -28,7 +29,8 @@ * Handle the prompt for this server * * @param server + * @param startedStatus * @return One of the constants of this interface */ - public int promptForBehaviour(IServer server); + public int promptForBehaviour(IServer server, IStatus startedStatus); } 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-08-05 07:38:39 UTC (rev 33622) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-08-05 08:05:16 UTC (rev 33623) @@ -70,10 +70,11 @@ } Trace.trace(Trace.STRING_FINEST, "Checking if similar server is already up on the same ports."); //$NON-NLS-1$ - boolean started = isServerStarted(jbsBehavior); + IStatus startedStatus = isServerStarted(jbsBehavior); + boolean started = startedStatus.isOK(); if (started) { Trace.trace(Trace.STRING_FINEST, "A server is already started. Now handling the already started scenario."); //$NON-NLS-1$ - return handleAlreadyStartedScenario(jbsBehavior); + return handleAlreadyStartedScenario(jbsBehavior, startedStatus); } Trace.trace(Trace.STRING_FINEST, "A full launch will now proceed."); //$NON-NLS-1$ @@ -85,7 +86,7 @@ * Should ideally use the poller that the server says is its poller, * but some pollers such as timeout poller */ - protected boolean isServerStarted(DelegatingServerBehavior jbsBehavior) { + protected IStatus isServerStarted(DelegatingServerBehavior jbsBehavior) { IServerStatePoller poller = PollThreadUtils.getPoller(IServerStatePoller.SERVER_UP, jbsBehavior.getServer()); // Need to be able to FORCE the poller to poll immediately @@ -95,13 +96,13 @@ // Trace Trace.trace(Trace.STRING_FINER, "Checking if a server is already started: " + started.getMessage()); //$NON-NLS-1$ - return started.isOK(); + return started; } - protected boolean handleAlreadyStartedScenario( DelegatingServerBehavior jbsBehavior) { + protected boolean handleAlreadyStartedScenario( DelegatingServerBehavior jbsBehavior, IStatus startedStatus) { IServerAlreadyStartedHandler handler = ExtensionManager.getDefault().getAlreadyStartedHandler(jbsBehavior.getServer()); if( handler != null ) { - int handlerResult = handler.promptForBehaviour(jbsBehavior.getServer()); + int handlerResult = handler.promptForBehaviour(jbsBehavior.getServer(), startedStatus); if( handlerResult == IServerAlreadyStartedHandler.CONTINUE_STARTUP) { return true; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-08-05 07:38:39 UTC (rev 33622) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-08-05 08:05:16 UTC (rev 33623) @@ -227,6 +227,6 @@ ServerAlreadyStartedDialog_Message=An application server may already be running on host {0}. ServerAlreadyStartedDialog_Title=Server already running on {0} -ServerAlreadyStartedDialog_Desc=Launching an additional server when one is already running may \nmake some parts of the tools not function properly. \n\n Would you like to: +ServerAlreadyStartedDialog_Desc=Launching an additional server when one is already running may \nmake some parts of the tools not function properly. \n\n{0}\n\n Would you like to: ServerAlreadyStartedDialog_Connect=Set the server adapter to 'started', but do not launch ServerAlreadyStartedDialog_Launch=Launch a new instance anyway Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ServerAlreadyStartedDialog.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ServerAlreadyStartedDialog.java 2011-08-05 07:38:39 UTC (rev 33622) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ServerAlreadyStartedDialog.java 2011-08-05 08:05:16 UTC (rev 33623) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.ui.dialogs; +import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.window.Window; @@ -35,11 +36,12 @@ public boolean accepts(IServer server) { return true; } - public int promptForBehaviour(final IServer server) { + public int promptForBehaviour(final IServer server, final IStatus status) { final int[] result = new int[1]; Display.getDefault().syncExec(new Runnable() { public void run() { - ServerAlreadyStartedDialog d = new ServerAlreadyStartedDialog(server,Display.getDefault().getActiveShell()); + ServerAlreadyStartedDialog d = new ServerAlreadyStartedDialog(server, status, + Display.getDefault().getActiveShell()); int dResult = d.open(); if( dResult == Window.CANCEL ) { result[0] = IServerAlreadyStartedHandler.CANCEL; @@ -53,10 +55,12 @@ } private IServer server; + private IStatus status; private boolean launch; - public ServerAlreadyStartedDialog(IServer server, Shell parentShell) { + public ServerAlreadyStartedDialog(IServer server, IStatus status, Shell parentShell) { super(parentShell); this.server = server; + this.status = status; } @Override protected Control createContents(Composite parent) { @@ -78,7 +82,7 @@ main.setLayout(new FormLayout()); Label desc = new Label(main, SWT.NONE); - desc.setText(Messages.ServerAlreadyStartedDialog_Desc); + desc.setText(NLS.bind(Messages.ServerAlreadyStartedDialog_Desc, status.getMessage())); Button connectButton = new Button(main, SWT.RADIO); connectButton.setText(Messages.ServerAlreadyStartedDialog_Connect); Button launchButton = new Button(main, SWT.RADIO);