Author: xcoulon Date: 2012-05-23 10:48:13 -0400 (Wed, 23 May 2012) New Revision: 41299 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/AbstractServerViewerActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/TailServerLogActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractOpenShiftExplorerViewerActionProvider.java Removed: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateApplicationActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateOrEditDomainActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateServerAdapterActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteApplicationActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteConnectionActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteDomainActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/EditCartridgesActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ImportApplicationActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/OpenInWebBrowserActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RefreshElementActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowDetailsActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowEnvironmentActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowPropertiesActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/TailServerLogActionProvider.java Log: In progress - JBIDE-11841 Make OpenShift Explorer actions available from Server Adapter Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-05-23 14:48:13 UTC (rev 41299) @@ -162,16 +162,16 @@ <viewerActionBinding viewerId="org.eclipse.wst.server.ui.ServersView"> <includes> <actionExtension - pattern="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.tailServerLogActionProvider"/> + pattern="org.jboss.tools.openshift.express.internal.ui.serverviewer.actionDelegate.*"/> </includes> </viewerActionBinding> </extension> - + <!-- Extensions to Server View to provide 'tail' of the remote server.log file --> <extension point="org.eclipse.ui.navigator.navigatorContent"> <actionProvider - class="org.jboss.tools.openshift.express.internal.ui.console.TailServerLogActionProvider" - id="org.jboss.tools.openshift.express.ui.internal.ui.console.tailServerLogActionProvider"> + class="org.jboss.tools.openshift.express.internal.ui.serverviewer.actionDelegate.TailServerLogActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.serverviewer.actionDelegate.tailServerLogActionProvider"> <enablement> <and> <instanceof @@ -183,17 +183,6 @@ </actionProvider> </extension> - <extension point="org.eclipse.ui.navigator.viewer"> - <viewerContentBinding viewerId="org.eclipse.wst.server.ui.ServersView"> - </viewerContentBinding> - <viewerActionBinding viewerId="org.eclipse.wst.server.ui.ServersView"> - <includes> - <actionExtension - pattern="org.jboss.tools.openshift.express.ui.internal.ui.console.tailServerLogActionProvider"/> - </includes> - </viewerActionBinding> - </extension> - <extension point="org.eclipse.ui.console.consolePageParticipants"> <consolePageParticipant @@ -358,7 +347,7 @@ <enablement> <and> <instanceof - value=" org.jboss.tools.openshift.express.internal.core.console.UserDelegate"> + value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate"> </instanceof> </and> </enablement> Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -1,8 +1,8 @@ package org.jboss.tools.openshift.express.internal.core.portforward; -import org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.AbstractActionProvider; +import org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.AbstractOpenShiftExplorerViewerActionProvider; -public class ApplicationPortForwardingActionProvider extends AbstractActionProvider { +public class ApplicationPortForwardingActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public ApplicationPortForwardingActionProvider() { super(new ApplicationPortForwardingAction(), "group.showIn"); Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -1,42 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.console; - -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.navigator.ICommonViewerSite; -import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.ui.views.server.extensions.CommonActionProviderUtils; -import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; -import org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.AbstractActionProvider; - -public class TailServerLogActionProvider extends AbstractActionProvider { - - public TailServerLogActionProvider() { - super(new TailServerLogAction(), "group.showIn"); - } - - @Override - public void fillContextMenu(IMenuManager menu) { - if (action != null && action.isEnabled()) { - Object sel = getSelection(); - if( sel instanceof IServer ) { - IServer server = (IServer)sel; - if (ExpressServerUtils.isOpenShiftRuntime(server) || ExpressServerUtils.isInOpenshiftBehaviourMode(server)) { - CommonActionProviderUtils.addToShowInQuickSubMenu(action, menu, actionExtensionSite); - } - } - } - } - - protected Object getSelection() { - ICommonViewerSite site = actionExtensionSite.getViewSite(); - IStructuredSelection selection = null; - if (site instanceof ICommonViewerWorkbenchSite) { - ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site; - selection = (IStructuredSelection) wsSite.getSelectionProvider().getSelection(); - Object first = selection.getFirstElement(); - return first; - } - return null; - } -} Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/AbstractServerViewerActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/AbstractServerViewerActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/AbstractServerViewerActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -0,0 +1,77 @@ +/******************************************************************************* + * 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.tools.openshift.express.internal.ui.serverviewer.actionDelegate; + +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.navigator.CommonActionProvider; +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.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; +import org.jboss.tools.openshift.express.internal.ui.action.AbstractAction; + +/** + * @author Xavier Coulon + */ +public abstract class AbstractServerViewerActionProvider extends CommonActionProvider { + + protected final AbstractAction action; + + protected ICommonActionExtensionSite actionExtensionSite; + + public AbstractServerViewerActionProvider(AbstractAction action) { + this.action = action; + } + + public void init(ICommonActionExtensionSite actionExtensionSite) { + super.init(actionExtensionSite); + this.actionExtensionSite = actionExtensionSite; + ICommonViewerSite site = actionExtensionSite.getViewSite(); + if (site instanceof ICommonViewerWorkbenchSite) { + action.setViewer(actionExtensionSite.getStructuredViewer()); + action.setSelection(actionExtensionSite.getStructuredViewer().getSelection()); + actionExtensionSite.getStructuredViewer().addSelectionChangedListener(action); + } + } + + @Override + public void fillContextMenu(IMenuManager menu) { + Object sel = getSelection(); + if (sel instanceof IServer) { + IServer server = (IServer) sel; + if (ExpressServerUtils.isOpenShiftRuntime(server) || ExpressServerUtils.isInOpenshiftBehaviourMode(server)) { + action.validate(); + if (action != null/* && action.isEnabled() */) { + MenuManager openshiftMenu = new MenuManager("Openshift...", + "org.jboss.tools.openshift.express.serverviewer.menu"); + openshiftMenu.add(action); + menu.add(openshiftMenu); + } + } + } + } + + protected Object getSelection() { + ICommonViewerSite site = actionExtensionSite.getViewSite(); + IStructuredSelection selection = null; + if (site instanceof ICommonViewerWorkbenchSite) { + ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site; + selection = (IStructuredSelection) wsSite.getSelectionProvider().getSelection(); + Object first = selection.getFirstElement(); + return first; + } + return null; + } + +} \ No newline at end of file Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/AbstractServerViewerActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/TailServerLogActionProvider.java (from rev 41272, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/TailServerLogActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/TailServerLogActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -0,0 +1,11 @@ +package org.jboss.tools.openshift.express.internal.ui.serverviewer.actionDelegate; + +import org.jboss.tools.openshift.express.internal.ui.console.TailServerLogAction; + +public class TailServerLogActionProvider extends AbstractServerViewerActionProvider { + + public TailServerLogActionProvider() { + super(new TailServerLogAction()); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/TailServerLogActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -1,55 +0,0 @@ -/******************************************************************************* - * 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.tools.openshift.express.internal.ui.viewer.actionProvider; - -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.ui.navigator.CommonActionProvider; -import org.eclipse.ui.navigator.ICommonActionExtensionSite; -import org.eclipse.ui.navigator.ICommonViewerSite; -import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; -import org.jboss.tools.openshift.express.internal.ui.action.AbstractAction; - -/** - * @author Xavier Coulon - */ -public abstract class AbstractActionProvider extends CommonActionProvider { - - protected final AbstractAction action; - - protected ICommonActionExtensionSite actionExtensionSite; - - private final String group; - - public AbstractActionProvider(AbstractAction action, String group) { - this.action = action; - this.group = group; - } - - public void init(ICommonActionExtensionSite actionExtensionSite) { - super.init(actionExtensionSite); - this.actionExtensionSite = actionExtensionSite; - ICommonViewerSite site = actionExtensionSite.getViewSite(); - if (site instanceof ICommonViewerWorkbenchSite) { - action.setViewer(actionExtensionSite.getStructuredViewer()); - action.setSelection(actionExtensionSite.getStructuredViewer().getSelection()); - actionExtensionSite.getStructuredViewer().addSelectionChangedListener(action); - } - } - - @Override - public void fillContextMenu(IMenuManager menu) { - action.validate(); - if (action != null/* && action.isEnabled()*/) { - menu.appendToGroup(group, action); - } - } - -} \ No newline at end of file Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractOpenShiftExplorerViewerActionProvider.java (from rev 41272, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractOpenShiftExplorerViewerActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractOpenShiftExplorerViewerActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -0,0 +1,55 @@ +/******************************************************************************* + * 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.tools.openshift.express.internal.ui.viewer.actionProvider; + +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.navigator.ICommonViewerSite; +import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; +import org.jboss.tools.openshift.express.internal.ui.action.AbstractAction; + +/** + * @author Xavier Coulon + */ +public abstract class AbstractOpenShiftExplorerViewerActionProvider extends CommonActionProvider { + + protected final AbstractAction action; + + protected ICommonActionExtensionSite actionExtensionSite; + + private final String group; + + public AbstractOpenShiftExplorerViewerActionProvider(AbstractAction action, String group) { + this.action = action; + this.group = group; + } + + public void init(ICommonActionExtensionSite actionExtensionSite) { + super.init(actionExtensionSite); + this.actionExtensionSite = actionExtensionSite; + ICommonViewerSite site = actionExtensionSite.getViewSite(); + if (site instanceof ICommonViewerWorkbenchSite) { + action.setViewer(actionExtensionSite.getStructuredViewer()); + action.setSelection(actionExtensionSite.getStructuredViewer().getSelection()); + actionExtensionSite.getStructuredViewer().addSelectionChangedListener(action); + } + } + + @Override + public void fillContextMenu(IMenuManager menu) { + action.validate(); + if (action != null/* && action.isEnabled()*/) { + menu.appendToGroup(group, action); + } + } + +} \ No newline at end of file Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateApplicationActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateApplicationActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateApplicationActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -16,7 +16,7 @@ /** * @author Xavier Coulon */ -public class CreateApplicationActionProvider extends AbstractActionProvider { +public class CreateApplicationActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public CreateApplicationActionProvider() { super(new CreateApplicationAction(), "group.edition"); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateOrEditDomainActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateOrEditDomainActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateOrEditDomainActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -15,7 +15,7 @@ /** * @author Xavier Coulon */ -public class CreateOrEditDomainActionProvider extends AbstractActionProvider { +public class CreateOrEditDomainActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public CreateOrEditDomainActionProvider() { super(new CreateOrEditDomainAction(), "group.edition"); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateServerAdapterActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateServerAdapterActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateServerAdapterActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -15,7 +15,7 @@ /** * @author Xavier Coulon */ -public class CreateServerAdapterActionProvider extends AbstractActionProvider { +public class CreateServerAdapterActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public CreateServerAdapterActionProvider() { super(new CreateServerAdapterAction(), "group.server"); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteApplicationActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteApplicationActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteApplicationActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -15,7 +15,7 @@ /** * @author Xavier Coulon */ -public class DeleteApplicationActionProvider extends AbstractActionProvider { +public class DeleteApplicationActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public DeleteApplicationActionProvider() { super(new DeleteApplicationAction(), "group.edition"); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteConnectionActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteConnectionActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteConnectionActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -17,7 +17,7 @@ /** * @author Rob Stryker */ -public class DeleteConnectionActionProvider extends AbstractActionProvider { +public class DeleteConnectionActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteDomainActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteDomainActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteDomainActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -12,7 +12,7 @@ import org.jboss.tools.openshift.express.internal.ui.action.DeleteDomainAction; -public class DeleteDomainActionProvider extends AbstractActionProvider { +public class DeleteDomainActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public DeleteDomainActionProvider() { super(new DeleteDomainAction(), "group.edition"); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/EditCartridgesActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/EditCartridgesActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/EditCartridgesActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -15,7 +15,7 @@ /** * @author Xavier Coulon */ -public class EditCartridgesActionProvider extends AbstractActionProvider { +public class EditCartridgesActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public EditCartridgesActionProvider() { super(new EditCartridgesAction(), "group.edition"); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ImportApplicationActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ImportApplicationActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ImportApplicationActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -15,7 +15,7 @@ /** * @author Xavier Coulon */ -public class ImportApplicationActionProvider extends AbstractActionProvider { +public class ImportApplicationActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public ImportApplicationActionProvider() { super(new ImportApplicationAction(), "group.server"); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/OpenInWebBrowserActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/OpenInWebBrowserActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/OpenInWebBrowserActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -15,7 +15,7 @@ /** * @author Xavier Coulon */ -public class OpenInWebBrowserActionProvider extends AbstractActionProvider { +public class OpenInWebBrowserActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public OpenInWebBrowserActionProvider() { super(new OpenInWebBrowserAction(), "group.showIn"); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RefreshElementActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RefreshElementActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RefreshElementActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -15,7 +15,7 @@ /** * @author Xavier Coulon */ -public class RefreshElementActionProvider extends AbstractActionProvider { +public class RefreshElementActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public RefreshElementActionProvider() { super(new RefreshElementAction(), "group.properties"); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowDetailsActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowDetailsActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowDetailsActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -15,7 +15,7 @@ /** * @author Xavier Coulon */ -public class ShowDetailsActionProvider extends AbstractActionProvider { +public class ShowDetailsActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public ShowDetailsActionProvider() { super(new ShowDetailsAction(), "group.properties"); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowEnvironmentActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowEnvironmentActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowEnvironmentActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -15,7 +15,7 @@ /** * @author Xavier Coulon */ -public class ShowEnvironmentActionProvider extends AbstractActionProvider { +public class ShowEnvironmentActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public ShowEnvironmentActionProvider() { super(new ShowEnvironmentAction(), "group.properties"); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowPropertiesActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowPropertiesActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowPropertiesActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -15,7 +15,7 @@ /** * @author Xavier Coulon */ -public class ShowPropertiesActionProvider extends AbstractActionProvider { +public class ShowPropertiesActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public ShowPropertiesActionProvider() { super(new ShowPropertiesAction(), "group.properties"); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/TailServerLogActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/TailServerLogActionProvider.java 2012-05-23 14:23:03 UTC (rev 41298) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/TailServerLogActionProvider.java 2012-05-23 14:48:13 UTC (rev 41299) @@ -15,7 +15,7 @@ /** * @author Xavier Coulon */ -public class TailServerLogActionProvider extends AbstractActionProvider { +public class TailServerLogActionProvider extends AbstractOpenShiftExplorerViewerActionProvider { public TailServerLogActionProvider() { super(new TailServerLogAction(), "group.showIn");