Author: rob.stryker(a)jboss.com Date: 2010-01-29 01:14:59 -0500 (Fri, 29 Jan 2010) New Revision: 20007 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ShowConsoleServerStateListener.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java Log: JBIDE-5739 - show in console on server startup (with a 3second delay) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2010-01-29 06:11:28 UTC (rev 20006) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2010-01-29 06:14:59 UTC (rev 20007) @@ -30,11 +30,11 @@ import org.eclipse.ui.IDecoratorManager; import org.eclipse.ui.IStartup; import org.eclipse.ui.internal.WorkbenchPlugin; -import org.eclipse.ui.internal.decorators.DecoratorDefinition; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.wst.server.ui.internal.ServerUIPlugin; import org.eclipse.wst.server.ui.internal.ServerUIPreferences; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.server.UnitedServerListenerManager; +import org.jboss.ide.eclipse.as.ui.console.ShowConsoleServerStateListener; import org.osgi.framework.BundleContext; /** @@ -78,14 +78,15 @@ new ServerUIPreferences().setShowOnActivity(false); prefs.setValue(IPreferenceKeys.DISABLE_SHOW_SERVER_VIEW, true); } - savePluginPreferences(); + UnitedServerListenerManager.getDefault().addListener(ShowConsoleServerStateListener.getDefault()); } /** * This method is called when the plug-in is stopped */ public void stop(BundleContext context) throws Exception { + UnitedServerListenerManager.getDefault().removeListener(ShowConsoleServerStateListener.getDefault()); JBossServerUISharedImages.instance().cleanup(); super.stop(context); } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ShowConsoleServerStateListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ShowConsoleServerStateListener.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ShowConsoleServerStateListener.java 2010-01-29 06:14:59 UTC (rev 20007) @@ -0,0 +1,74 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.ui.console; + +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.swt.widgets.Display; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.ServerEvent; +import org.eclipse.wst.server.ui.internal.view.servers.ShowInConsoleAction; +import org.jboss.ide.eclipse.as.core.server.UnitedServerListener; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; + +public class ShowConsoleServerStateListener extends UnitedServerListener { + private static ShowConsoleServerStateListener instance; + public static ShowConsoleServerStateListener getDefault() { + if( instance == null ) + instance = new ShowConsoleServerStateListener(); + return instance; + } + public void serverChanged(ServerEvent event) { + final IServer server = event.getServer(); + JBossServer jbs = (JBossServer)server.loadAdapter(JBossServer.class, new NullProgressMonitor()); + if( jbs != null ) { + int eventKind = event.getKind(); + if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) { + // server change event + if ((eventKind & ServerEvent.STATE_CHANGE) != 0) { + if( event.getServer().getServerState() == IServer.STATE_STARTING ) { + new Thread() { + public void run() { + try { + // delay to insure the server gets a chance to actually launch + Thread.sleep(3000); + } catch(InterruptedException ie) {} + Display.getDefault().asyncExec(new Runnable() { + public void run() { + new ShowInConsoleAction(getNullSelectionProvider()).perform(server); + } + }); + } + }.start(); + } + } + } + } + } + + protected ISelectionProvider getNullSelectionProvider() { + return new ISelectionProvider() { + public void addSelectionChangedListener( + ISelectionChangedListener listener) { + } + public ISelection getSelection() { + return null; + } + public void removeSelectionChangedListener( + ISelectionChangedListener listener) { + } + public void setSelection(ISelection selection) { + } + }; + } +}