Author: adietish
Date: 2011-11-30 04:28:11 -0500 (Wed, 30 Nov 2011)
New Revision: 36768
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.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/views/server/extensions/OpenManagementConsoleActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java
Log:
[JBIDE-6828] renamed "Open Management Console" to "Web Management
Console", moved duplicate code in ServerLogActionProvider & OpenManagementConsole
to CommonActionProviderUtils. Made sure "Web Management Console" is only enabled
if the server is started
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-11-30
08:33:48 UTC (rev 36767)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-11-30
09:28:11 UTC (rev 36768)
@@ -223,8 +223,7 @@
public static String ExploreUtils_Action_Text;
public static String ExploreUtils_Description;
- public static String OpenManagementConsole_Action_Text;
- public static String OpenConsole_Action_Description;
+ public static String OpenWebManagementConsole_Action_Text;
public static String Configure;
public static String ConfigureRuntimeMarkerResolution_Description;
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-11-30
08:33:48 UTC (rev 36767)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-11-30
09:28:11 UTC (rev 36768)
@@ -196,7 +196,7 @@
ExploreUtils_Action_Text=Explore
ExploreUtils_Description=Explore deploy directory
-OpenManagementConsole_Action_Text=Open Management Console
+OpenWebManagementConsole_Action_Text=Web Management Console
Configure=Configure...
ConfigureRuntimeMarkerResolution_Description=Configure Targeted Runtimes
ConvertNodeToXPathDialog_DisplayString=Add to XPaths
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java 2011-11-30
09:28:11 UTC (rev 36768)
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.views.server.extensions;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.navigator.CommonViewer;
+import org.eclipse.ui.navigator.ICommonActionExtensionSite;
+import org.eclipse.ui.navigator.ICommonViewerSite;
+import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
+import org.eclipse.wst.server.core.IServer;
+
+/**
+ * @author André Dietisheim
+ */
+public class CommonActionProviderUtils {
+
+ private static final String SHOW_IN_QUICK_MENU_ID =
"org.eclipse.ui.navigate.showInQuickMenu"; //$NON-NLS-1$
+
+ public static ICommonViewerWorkbenchSite
getCommonViewerWorkbenchSite(ICommonActionExtensionSite actionExtensionSite) {
+ ICommonViewerWorkbenchSite wsSite = null;
+ ICommonViewerSite viewSite = actionExtensionSite.getViewSite();
+ if( viewSite instanceof ICommonViewerWorkbenchSite ) {
+ StructuredViewer v = actionExtensionSite.getStructuredViewer();
+ if( v instanceof CommonViewer ) {
+ wsSite = (ICommonViewerWorkbenchSite) viewSite;
+ }
+ }
+ return wsSite;
+ }
+
+ public static IStructuredSelection getSelection(ICommonActionExtensionSite
actionExtensionSite) {
+ IStructuredSelection structuredSelection = null;
+ ICommonViewerWorkbenchSite workbenchSite =
getCommonViewerWorkbenchSite(actionExtensionSite);
+ if (workbenchSite != null) {
+ ISelectionProvider selectionProvider = workbenchSite.getSelectionProvider();
+ if (selectionProvider != null) {
+ ISelection selection = selectionProvider.getSelection();
+ if (selection instanceof IStructuredSelection) {
+ structuredSelection = (IStructuredSelection) selection;
+ }
+ }
+ }
+ return structuredSelection;
+ }
+
+ public static boolean isServerSelected(IStructuredSelection selection) {
+ return selection != null
+ && selection.getFirstElement() instanceof IServer;
+ }
+
+ public static IContributionItem getShowInQuickMenu(IMenuManager menuManager) {
+ IContributionItem item = null;
+ if (menuManager != null) {
+ item = menuManager.find(SHOW_IN_QUICK_MENU_ID);
+ }
+ return item;
+ }
+
+ public static void addToShowInQuickSubMenu(IAction action, IMenuManager menu,
ICommonActionExtensionSite actionSite) {
+ IStructuredSelection selection = CommonActionProviderUtils.getSelection(actionSite);
+ IContributionItem menuItem = CommonActionProviderUtils.getShowInQuickMenu(menu);
+ if (menuItem instanceof MenuManager
+ && CommonActionProviderUtils.isServerSelected(selection)
+ && action != null) {
+ ((MenuManager) menuItem).add(action);
+ }
+
+ }
+
+ public static IWorkbenchPart getWorkbenchPart(String id) {
+ IWorkbenchPart part = null;
+ IWorkbenchPage page = getActiveWorkbenchPage();
+ if (page != null) {
+ part = page.findView(id);
+ }
+ return part;
+ }
+
+ public static IWorkbenchPage getActiveWorkbenchPage() {
+ IWorkbenchPage page = null;
+ IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ if (window != null) {
+ page = window.getActivePage();
+ }
+ return page;
+ }
+
+ public static IWorkbenchPart showView(String partId) throws PartInitException {
+ IWorkbenchPart part = CommonActionProviderUtils.getWorkbenchPart(partId);
+ if (part == null) {
+ part = CommonActionProviderUtils.getActiveWorkbenchPage().showView(partId);
+ }
+ return part;
+ }
+}
Property changes on:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java 2011-11-30
08:33:48 UTC (rev 36767)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java 2011-11-30
09:28:11 UTC (rev 36768)
@@ -6,11 +6,8 @@
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.CommonViewer;
import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonViewerSite;
import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction;
@@ -26,58 +23,40 @@
public class OpenManagementConsoleActionProvider extends CommonActionProvider {
private static final String CONSOLE_URL_PATTERN = "http://{0}:{1}/console";
-
+
private ICommonActionExtensionSite actionSite;
- private OpenManagementConsoleAction openManagementConsoleAction;
- public OpenManagementConsoleActionProvider() {
- super();
- }
-
+ private OpenWebManagementConsoleAction openWebManagementConsoleAction;
+
public void init(ICommonActionExtensionSite site) {
super.init(site);
this.actionSite = site;
createActions(site);
}
- protected void createActions(ICommonActionExtensionSite aSite) {
- ICommonViewerSite viewSite = aSite.getViewSite();
- if( viewSite instanceof ICommonViewerWorkbenchSite ) {
- StructuredViewer v = aSite.getStructuredViewer();
- if( v instanceof CommonViewer ) {
- ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite)viewSite;
- openManagementConsoleAction = new
OpenManagementConsoleAction(wsSite.getSelectionProvider());
- }
+ protected void createActions(ICommonActionExtensionSite site) {
+ ICommonViewerWorkbenchSite commonViewerWorkbenchSite =
+ CommonActionProviderUtils.getCommonViewerWorkbenchSite(site);
+ if (commonViewerWorkbenchSite != null) {
+ openWebManagementConsoleAction =
+ new
OpenWebManagementConsoleAction(commonViewerWorkbenchSite.getSelectionProvider());
}
}
public void fillContextMenu(IMenuManager menu) {
- ICommonViewerSite site = actionSite.getViewSite();
- IStructuredSelection selection = null;
- if (site instanceof ICommonViewerWorkbenchSite) {
- ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site;
- selection = (IStructuredSelection) wsSite.getSelectionProvider()
- .getSelection();
- }
- IContributionItem menuItem =
menu.find("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$
- if( menuItem != null && selection != null && selection.toArray().length
== 1 ) {
- if( selection.getFirstElement() instanceof IServer ) {
- if( menu instanceof MenuManager ) {
- ((MenuManager)menuItem).add(openManagementConsoleAction);
- }
- }
- }
+ CommonActionProviderUtils.addToShowInQuickSubMenu(openWebManagementConsoleAction, menu,
actionSite);
}
-
- private static class OpenManagementConsoleAction extends AbstractServerAction {
- public OpenManagementConsoleAction(ISelectionProvider sp) {
- super(sp, Messages.OpenManagementConsole_Action_Text);
+
+ private static class OpenWebManagementConsoleAction extends AbstractServerAction {
+ public OpenWebManagementConsoleAction(ISelectionProvider sp) {
+ super(sp, Messages.OpenWebManagementConsole_Action_Text);
setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.CONSOLE));
}
public boolean accept(IServer server) {
- return (ServerUtil.isJBoss7(server));
+ return (ServerUtil.isJBoss7(server)
+ && server.getServerState() == IServer.STATE_STARTED);
}
-
+
public void perform(IServer server) {
JBossServer jbossServer;
try {
@@ -86,7 +65,8 @@
int webPort = jbossServer.getJBossWebPort();
String consoleUrl = MessageFormat.format(CONSOLE_URL_PATTERN, host,
String.valueOf(webPort));
BrowserUtil.checkedCreateInternalBrowser(
- consoleUrl, server.getName(), JBossServerUIPlugin.PLUGIN_ID,
JBossServerUIPlugin.getDefault().getLog());
+ consoleUrl, server.getName(), JBossServerUIPlugin.PLUGIN_ID,
JBossServerUIPlugin.getDefault()
+ .getLog());
} catch (CoreException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java 2011-11-30
08:33:48 UTC (rev 36767)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java 2011-11-30
09:28:11 UTC (rev 36768)
@@ -1,36 +1,30 @@
package org.jboss.ide.eclipse.as.ui.views.server.extensions;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.CommonViewer;
import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonViewerSite;
import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
import org.eclipse.ui.views.IViewDescriptor;
import org.eclipse.ui.views.IViewRegistry;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
import org.jboss.ide.eclipse.as.ui.views.ServerLogView;
public class ServerLogActionProvider extends CommonActionProvider {
private ICommonActionExtensionSite actionSite;
private ShowInServerLogAction showInServerLogAction;
+
public ServerLogActionProvider() {
super();
}
-
+
public void init(ICommonActionExtensionSite aSite) {
super.init(aSite);
this.actionSite = aSite;
@@ -38,38 +32,21 @@
}
protected void createActions(ICommonActionExtensionSite aSite) {
- ICommonViewerSite site = aSite.getViewSite();
- if( site instanceof ICommonViewerWorkbenchSite ) {
- StructuredViewer v = aSite.getStructuredViewer();
- if( v instanceof CommonViewer ) {
- ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite)site;
- showInServerLogAction = new ShowInServerLogAction(wsSite.getSelectionProvider());
- }
+ ICommonViewerWorkbenchSite commonViewerWorkbenchSite =
+ CommonActionProviderUtils.getCommonViewerWorkbenchSite(aSite);
+ if (commonViewerWorkbenchSite != null) {
+ showInServerLogAction = new
ShowInServerLogAction(commonViewerWorkbenchSite.getSelectionProvider());
}
}
public void fillContextMenu(IMenuManager menu) {
- ICommonViewerSite site = actionSite.getViewSite();
- IStructuredSelection selection = null;
- if (site instanceof ICommonViewerWorkbenchSite) {
- ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site;
- selection = (IStructuredSelection) wsSite.getSelectionProvider()
- .getSelection();
- }
- IContributionItem quick =
menu.find("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$
- if( quick != null && selection != null && selection.toArray().length ==
1 ) {
- if( selection.getFirstElement() instanceof IServer ) {
- if( menu instanceof MenuManager ) {
- ((MenuManager)quick).add(showInServerLogAction);
- }
- }
- }
+ CommonActionProviderUtils.addToShowInQuickSubMenu(showInServerLogAction, menu,
actionSite);
}
-
+
public class ShowInServerLogAction extends AbstractServerAction {
public ShowInServerLogAction(ISelectionProvider sp) {
super(sp, null);
-
+
IViewRegistry reg = PlatformUI.getWorkbench().getViewRegistry();
IViewDescriptor desc = reg.find(ServerLogView.VIEW_ID);
setText(desc.getLabel());
@@ -77,30 +54,22 @@
}
public boolean accept(IServer server) {
- return (server.getServerType() != null &&
- server.loadAdapter(IDeployableServer.class, new NullProgressMonitor()) != null);
+ return (server.getServerType() != null &&
server.loadAdapter(IDeployableServer.class,
+ new NullProgressMonitor()) != null);
}
public void perform(IServer server) {
- IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow() ;
- if (window != null) {
- IWorkbenchPage page = window.getActivePage();
- if (page != null) {
- IWorkbenchPart part = page.findView(ServerLogView.VIEW_ID);
- if (part == null) {
- try {
- part = page.showView(ServerLogView.VIEW_ID);
- } catch (PartInitException e) {
- }
- }
- if (part != null) {
- ServerLogView view = (ServerLogView) part.getAdapter(ServerLogView.class);
- if (view != null) {
- view.setFocus();
- view.setServer(server);
- }
+ try {
+ IWorkbenchPart part = CommonActionProviderUtils.showView(ServerLogView.VIEW_ID);
+ if (part != null) {
+ ServerLogView view = (ServerLogView) part.getAdapter(ServerLogView.class);
+ if (view != null) {
+ view.setFocus();
+ view.setServer(server);
}
}
+ } catch (PartInitException e) {
+ JBossServerUIPlugin.log("could not show view " + ServerLogView.VIEW_ID,
e);
}
}
}