[jbosstools-commits] JBoss Tools SVN: r25828 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views and 1 other directory.

Author: adietish Date: 2010-10-14 08:57:51 -0400 (Thu, 14 Oct 2010) New Revision: 25828 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java Log: [JBIDE-7329] added commands to the view menu Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-10-14 12:24:18 UTC (rev 25827) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-10-14 12:57:51 UTC (rev 25828) @@ -102,7 +102,7 @@ name="%Preferences.name"> </page> </extension> - <!-- connection command handlers --> + <!-- connection command handlers --> <extension point="org.eclipse.ui.handlers"> <handler @@ -137,7 +137,7 @@ </with> </activeWhen> </handler> - <!-- instance command handlers --> + <!-- instance command handlers --> <handler class="org.jboss.tools.deltacloud.ui.commands.StartInstanceHandler" commandId="org.jboss.tools.deltacloud.ui.startinstance"> @@ -212,9 +212,11 @@ </extension> <extension point="org.eclipse.ui.menus"> + <!-- DeltaCloudView context menu --> <menuContribution - allPopups="false" - locationURI="popup:org.jboss.tools.deltacloud.menus.cloudviewer"> + allPopups="true" + locationURI="popup:org.jboss.tools.deltacloud.ui.views.DeltaCloudView"> + <!-- connection commands --> <command commandId="org.eclipse.ui.edit.delete" label="Disconnect Cloud" @@ -312,9 +314,9 @@ </command> <command commandId="org.jboss.tools.deltacloud.ui.destroyinstance" - hoverIcon="Destroy" label="Destroy" - style="push"> + style="push" + tooltip="Destroy"> <visibleWhen checkEnabled="true"> <with @@ -328,8 +330,126 @@ </visibleWhen> </command> </menuContribution> - </extension> - <extension + <!-- DeltaCloudView local menu --> + <menuContribution + allPopups="true" + locationURI="menu:org.jboss.tools.deltacloud.ui.views.DeltaCloudView"> + <!-- connection commands --> + <command + commandId="org.eclipse.ui.edit.delete" + label="Disconnect Cloud" + style="push" + tooltip="Disconnect Cloud"> + </command> + <command + commandId="org.jboss.tools.deltacloud.ui.newconnection" + label="New Connection" + style="push" + tooltip="New Connection"> + </command> + <command + commandId="org.jboss.tools.deltacloud.ui.editconnection" + label="Edit Connection" + style="push" + tooltip="Edit Conncetion"> + </command> + <!-- image commands --> + <command + commandId="org.jboss.tools.deltacloud.ui.createinstance" + icon="icons/instance.gif" + label="Launch Instance" + style="push" + tooltip="Launch Instance"> + <visibleWhen + checkEnabled="true"> + <with + variable="selection"> + <iterate> + <instanceof + value="org.jboss.tools.deltacloud.ui.views.CVImageElement"> + </instanceof> + </iterate> + </with> + </visibleWhen> + </command> + <!-- instance commands --> + <command + commandId="org.jboss.tools.deltacloud.ui.startinstance" + disabledIcon="icons/runningd.gif" + icon="icons/running.gif" + label="Start" + style="push" + tooltip="Start"> + <visibleWhen + checkEnabled="true"> + <with + variable="selection"> + <iterate> + <instanceof + value="org.jboss.tools.deltacloud.ui.views.CVInstanceElement"> + </instanceof> + </iterate> + </with> + </visibleWhen> + </command> + <command + commandId="org.jboss.tools.deltacloud.ui.stopinstance" + disabledIcon="icons/stoppedd.gif" + icon="icons/stopped.gif" + label="Stop" + style="push" + tooltip="Stop"> + <visibleWhen + checkEnabled="true"> + <with + variable="selection"> + <iterate> + <instanceof + value="org.jboss.tools.deltacloud.ui.views.CVInstanceElement"> + </instanceof> + </iterate> + </with> + </visibleWhen> + </command> + <command + commandId="org.jboss.tools.deltacloud.ui.rebootinstance" + disabledIcon="icons/rebootd.gif" + icon="icons/reboot.gif" + label="Reboot" + style="push" + tooltip="Reboot"> + <visibleWhen + checkEnabled="true"> + <with + variable="selection"> + <iterate> + <instanceof + value="org.jboss.tools.deltacloud.ui.views.CVInstanceElement"> + </instanceof> + </iterate> + </with> + </visibleWhen> + </command> + <command + commandId="org.jboss.tools.deltacloud.ui.destroyinstance" + label="Destroy" + style="push" + tooltip="Destroy"> + <visibleWhen + checkEnabled="true"> + <with + variable="selection"> + <iterate> + <instanceof + value="org.jboss.tools.deltacloud.ui.views.CVInstanceElement"> + </instanceof> + </iterate> + </with> + </visibleWhen> + </command> + </menuContribution> + </extension> + <extension point="org.eclipse.ui.commands"> <command description="Creates a new cloud connection" Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-10-14 12:24:18 UTC (rev 25827) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-10-14 12:57:51 UTC (rev 25828) @@ -10,15 +10,9 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.ui.views; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelection; @@ -40,32 +34,30 @@ import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor; import org.jboss.tools.deltacloud.core.DeltaCloud; -import org.jboss.tools.deltacloud.core.DeltaCloudImage; -import org.jboss.tools.deltacloud.core.DeltaCloudInstance; import org.jboss.tools.deltacloud.core.DeltaCloudManager; import org.jboss.tools.deltacloud.core.ICloudManagerListener; import org.jboss.tools.deltacloud.ui.SWTImagesFactory; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; import org.jboss.tools.internal.deltacloud.ui.wizards.ImageFilter; import org.jboss.tools.internal.deltacloud.ui.wizards.InstanceFilter; -import org.jboss.tools.internal.deltacloud.ui.wizards.NewInstance; public class DeltaCloudView extends ViewPart implements ICloudManagerListener, ITabbedPropertySheetPageContributor { - private static final String CONTEXT_MENU_ID = "popup:org.jboss.tools.deltacloud.menus.cloudviewer"; - /** * The ID of the view as specified by the extension. */ public static final String ID = "org.jboss.tools.deltacloud.ui.views.DeltaCloudView"; + private static final String CONTEXT_MENU_ID = "popup:" + ID; + private static final String VIEW_MENU_ID = "menu:" + ID; + private static final String REFRESH = "Refresh.label"; //$NON-NLS-1$ private static final String CREATE_INSTANCE = "CreateInstance.label"; //$NON-NLS-1$ -// private final static String START_LABEL = "Start.label"; //$NON-NLS-1$ -// private final static String STOP_LABEL = "Stop.label"; //$NON-NLS-1$ -// private final static String REBOOT_LABEL = "Reboot.label"; //$NON-NLS-1$ -// private final static String DESTROY_LABEL = "Destroy.label"; //$NON-NLS-1$ + // private final static String START_LABEL = "Start.label"; //$NON-NLS-1$ + // private final static String STOP_LABEL = "Stop.label"; //$NON-NLS-1$ + // private final static String REBOOT_LABEL = "Reboot.label"; //$NON-NLS-1$ + // private final static String DESTROY_LABEL = "Destroy.label"; //$NON-NLS-1$ private final static String IMAGE_FILTER = "ImageFilter.label"; //$NON-NLS-1$ private final static String INSTANCE_FILTER = "InstanceFilter.label"; //$NON-NLS-1$ public static final String COLLAPSE_ALL = "CollapseAll.label"; //$NON-NLS-1$ @@ -131,15 +123,19 @@ } private void contributeToActionBars() { - IActionBars bars = getViewSite().getActionBars(); - IMenuManager menuMgr = bars.getMenuManager(); - menuMgr.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager manager) { - DeltaCloudView.this.fillLocalPullDown(manager); - } - }); - fillLocalPullDown(menuMgr); - fillLocalToolBar(bars.getToolBarManager()); + // IActionBars bars = getViewSite().getActionBars(); + // IMenuManager menuMgr = bars.getMenuManager(); + IToolBarManager toolbarManager = getViewSite().getActionBars().getToolBarManager(); + IActionBars actionBars = getViewSite().getActionBars(); + IMenuManager menuManager = actionBars.getMenuManager(); + UIUtils.registerContributionManager(VIEW_MENU_ID, menuManager, viewer.getControl()); + // menuMgr.addMenuListener(new IMenuListener() { + // public void menuAboutToShow(IMenuManager manager) { + // DeltaCloudView.this.fillLocalPullDown(manager); + // } + // }); + // fillLocalPullDown(menuMgr); + // fillLocalToolBar(bars.getToolBarManager()); } private void handleSelection() { @@ -170,10 +166,10 @@ private void makeActions() { refreshAction = createRefreshAction(); -// startAction = createStartAction(); -// stopAction = createStopAction(); -// rebootAction = createRebootAction(); -// destroyAction = createDestroyAction(); + // startAction = createStartAction(); + // stopAction = createStopAction(); + // rebootAction = createRebootAction(); + // destroyAction = createDestroyAction(); imageFilterAction = createImageFilterAction(); instanceFilterAction = createInstanceFilterAction(); @@ -267,127 +263,141 @@ return imageFilterAction; } -// private Action createDestroyAction() { -// Action destroyAction = new Action() { -// public void run() { -// ISelection selection = viewer.getSelection(); -// Object obj = ((IStructuredSelection) selection).getFirstElement(); -// if (obj instanceof CVInstanceElement) { -// CVInstanceElement cvinstance = (CVInstanceElement) obj; -// DeltaCloudInstance instance = (DeltaCloudInstance) cvinstance.getElement(); -// CloudViewElement element = (CloudViewElement) obj; -// while (!(element instanceof CVCloudElement)) -// element = (CloudViewElement) element.getParent(); -// CVCloudElement cvcloud = (CVCloudElement) element; -// DeltaCloud cloud = (DeltaCloud) cvcloud.getElement(); -// PerformDestroyInstanceActionThread t = new PerformDestroyInstanceActionThread(cloud, instance, -// CVMessages.getString(DESTROYING_INSTANCE_TITLE), -// CVMessages.getFormattedString(DESTROYING_INSTANCE_MSG, new String[] { instance.getName() })); -// t.setUser(true); -// t.schedule(); -// } -// } -// }; -// destroyAction.setText(CVMessages.getString(DESTROY_LABEL)); -// destroyAction.setToolTipText(CVMessages.getString(DESTROY_LABEL)); -// ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages(); -// ImageDescriptor delete = ImageDescriptor.createFromImage(sharedImages.getImage(ISharedImages.IMG_ETOOL_DELETE)); -// ImageDescriptor delete_disabled = ImageDescriptor.createFromImage(sharedImages -// .getImage(ISharedImages.IMG_ETOOL_DELETE_DISABLED)); -// destroyAction.setImageDescriptor(delete); -// destroyAction.setDisabledImageDescriptor(delete_disabled); -// return destroyAction; -// } + // private Action createDestroyAction() { + // Action destroyAction = new Action() { + // public void run() { + // ISelection selection = viewer.getSelection(); + // Object obj = ((IStructuredSelection) selection).getFirstElement(); + // if (obj instanceof CVInstanceElement) { + // CVInstanceElement cvinstance = (CVInstanceElement) obj; + // DeltaCloudInstance instance = (DeltaCloudInstance) + // cvinstance.getElement(); + // CloudViewElement element = (CloudViewElement) obj; + // while (!(element instanceof CVCloudElement)) + // element = (CloudViewElement) element.getParent(); + // CVCloudElement cvcloud = (CVCloudElement) element; + // DeltaCloud cloud = (DeltaCloud) cvcloud.getElement(); + // PerformDestroyInstanceActionThread t = new + // PerformDestroyInstanceActionThread(cloud, instance, + // CVMessages.getString(DESTROYING_INSTANCE_TITLE), + // CVMessages.getFormattedString(DESTROYING_INSTANCE_MSG, new String[] { + // instance.getName() })); + // t.setUser(true); + // t.schedule(); + // } + // } + // }; + // destroyAction.setText(CVMessages.getString(DESTROY_LABEL)); + // destroyAction.setToolTipText(CVMessages.getString(DESTROY_LABEL)); + // ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages(); + // ImageDescriptor delete = + // ImageDescriptor.createFromImage(sharedImages.getImage(ISharedImages.IMG_ETOOL_DELETE)); + // ImageDescriptor delete_disabled = + // ImageDescriptor.createFromImage(sharedImages + // .getImage(ISharedImages.IMG_ETOOL_DELETE_DISABLED)); + // destroyAction.setImageDescriptor(delete); + // destroyAction.setDisabledImageDescriptor(delete_disabled); + // return destroyAction; + // } -// private Action createRebootAction() { -// Action rebootAction = new Action() { -// public void run() { -// ISelection selection = viewer.getSelection(); -// Object obj = ((IStructuredSelection) selection).getFirstElement(); -// if (obj instanceof CVInstanceElement) { -// CVInstanceElement cvinstance = (CVInstanceElement) obj; -// DeltaCloudInstance instance = (DeltaCloudInstance) cvinstance.getElement(); -// CloudViewElement element = (CloudViewElement) obj; -// while (!(element instanceof CVCloudElement)) -// element = (CloudViewElement) element.getParent(); -// CVCloudElement cvcloud = (CVCloudElement) element; -// DeltaCloud cloud = (DeltaCloud) cvcloud.getElement(); -// PerformInstanceActionThread t = new PerformInstanceActionThread(cloud, instance, -// DeltaCloudInstance.REBOOT, -// CVMessages.getString(REBOOTING_INSTANCE_TITLE), -// CVMessages.getFormattedString(REBOOTING_INSTANCE_MSG, new String[] { instance.getName() }), -// DeltaCloudInstance.RUNNING); -// t.setUser(true); -// t.schedule(); -// } -// } -// }; -// rebootAction.setText(CVMessages.getString(REBOOT_LABEL)); -// rebootAction.setToolTipText(CVMessages.getString(REBOOT_LABEL)); -// rebootAction.setImageDescriptor(SWTImagesFactory.DESC_REBOOT); -// rebootAction.setDisabledImageDescriptor(SWTImagesFactory.DESC_REBOOTD); -// return rebootAction; -// } + // private Action createRebootAction() { + // Action rebootAction = new Action() { + // public void run() { + // ISelection selection = viewer.getSelection(); + // Object obj = ((IStructuredSelection) selection).getFirstElement(); + // if (obj instanceof CVInstanceElement) { + // CVInstanceElement cvinstance = (CVInstanceElement) obj; + // DeltaCloudInstance instance = (DeltaCloudInstance) + // cvinstance.getElement(); + // CloudViewElement element = (CloudViewElement) obj; + // while (!(element instanceof CVCloudElement)) + // element = (CloudViewElement) element.getParent(); + // CVCloudElement cvcloud = (CVCloudElement) element; + // DeltaCloud cloud = (DeltaCloud) cvcloud.getElement(); + // PerformInstanceActionThread t = new PerformInstanceActionThread(cloud, + // instance, + // DeltaCloudInstance.REBOOT, + // CVMessages.getString(REBOOTING_INSTANCE_TITLE), + // CVMessages.getFormattedString(REBOOTING_INSTANCE_MSG, new String[] { + // instance.getName() }), + // DeltaCloudInstance.RUNNING); + // t.setUser(true); + // t.schedule(); + // } + // } + // }; + // rebootAction.setText(CVMessages.getString(REBOOT_LABEL)); + // rebootAction.setToolTipText(CVMessages.getString(REBOOT_LABEL)); + // rebootAction.setImageDescriptor(SWTImagesFactory.DESC_REBOOT); + // rebootAction.setDisabledImageDescriptor(SWTImagesFactory.DESC_REBOOTD); + // return rebootAction; + // } -// private Action createStopAction() { -// Action stopAction = new Action() { -// public void run() { -// ISelection selection = viewer.getSelection(); -// Object obj = ((IStructuredSelection) selection).getFirstElement(); -// if (obj instanceof CVInstanceElement) { -// CVInstanceElement cvinstance = (CVInstanceElement) obj; -// DeltaCloudInstance instance = (DeltaCloudInstance) cvinstance.getElement(); -// CloudViewElement element = (CloudViewElement) obj; -// while (!(element instanceof CVCloudElement)) -// element = (CloudViewElement) element.getParent(); -// CVCloudElement cvcloud = (CVCloudElement) element; -// DeltaCloud cloud = (DeltaCloud) cvcloud.getElement(); -// PerformInstanceActionThread t = new PerformInstanceActionThread(cloud, instance, -// DeltaCloudInstance.STOP, -// CVMessages.getString(STOPPING_INSTANCE_TITLE), -// CVMessages.getFormattedString(STOPPING_INSTANCE_MSG, new String[] { instance.getName() }), -// DeltaCloudInstance.STOPPED); -// t.setUser(true); -// t.schedule(); -// } -// } -// }; -// stopAction.setText(CVMessages.getString(STOP_LABEL)); -// stopAction.setToolTipText(CVMessages.getString(STOP_LABEL)); -// stopAction.setImageDescriptor(SWTImagesFactory.DESC_STOP); -// stopAction.setDisabledImageDescriptor(SWTImagesFactory.DESC_STOPD); -// return stopAction; -// } + // private Action createStopAction() { + // Action stopAction = new Action() { + // public void run() { + // ISelection selection = viewer.getSelection(); + // Object obj = ((IStructuredSelection) selection).getFirstElement(); + // if (obj instanceof CVInstanceElement) { + // CVInstanceElement cvinstance = (CVInstanceElement) obj; + // DeltaCloudInstance instance = (DeltaCloudInstance) + // cvinstance.getElement(); + // CloudViewElement element = (CloudViewElement) obj; + // while (!(element instanceof CVCloudElement)) + // element = (CloudViewElement) element.getParent(); + // CVCloudElement cvcloud = (CVCloudElement) element; + // DeltaCloud cloud = (DeltaCloud) cvcloud.getElement(); + // PerformInstanceActionThread t = new PerformInstanceActionThread(cloud, + // instance, + // DeltaCloudInstance.STOP, + // CVMessages.getString(STOPPING_INSTANCE_TITLE), + // CVMessages.getFormattedString(STOPPING_INSTANCE_MSG, new String[] { + // instance.getName() }), + // DeltaCloudInstance.STOPPED); + // t.setUser(true); + // t.schedule(); + // } + // } + // }; + // stopAction.setText(CVMessages.getString(STOP_LABEL)); + // stopAction.setToolTipText(CVMessages.getString(STOP_LABEL)); + // stopAction.setImageDescriptor(SWTImagesFactory.DESC_STOP); + // stopAction.setDisabledImageDescriptor(SWTImagesFactory.DESC_STOPD); + // return stopAction; + // } -// private Action createStartAction() { -// Action startAction = new Action() { -// public void run() { -// ISelection selection = viewer.getSelection(); -// Object obj = ((IStructuredSelection) selection).getFirstElement(); -// if (obj instanceof CVInstanceElement) { -// CVInstanceElement cvinstance = (CVInstanceElement) obj; -// DeltaCloudInstance instance = (DeltaCloudInstance) cvinstance.getElement(); -// CloudViewElement element = (CloudViewElement) obj; -// while (!(element instanceof CVCloudElement)) -// element = (CloudViewElement) element.getParent(); -// CVCloudElement cvcloud = (CVCloudElement) element; -// DeltaCloud cloud = (DeltaCloud) cvcloud.getElement(); -// PerformInstanceActionThread t = new PerformInstanceActionThread(cloud, instance, -// DeltaCloudInstance.START, -// CVMessages.getString(STARTING_INSTANCE_TITLE), -// CVMessages.getFormattedString(STARTING_INSTANCE_MSG, new String[] { instance.getName() }), -// DeltaCloudInstance.RUNNING); -// t.setUser(true); -// t.schedule(); -// } -// } -// }; -// startAction.setText(CVMessages.getString(START_LABEL)); -// startAction.setToolTipText(CVMessages.getString(START_LABEL)); -// startAction.setImageDescriptor(SWTImagesFactory.DESC_START); -// startAction.setDisabledImageDescriptor(SWTImagesFactory.DESC_STARTD); -// return startAction; -// } + // private Action createStartAction() { + // Action startAction = new Action() { + // public void run() { + // ISelection selection = viewer.getSelection(); + // Object obj = ((IStructuredSelection) selection).getFirstElement(); + // if (obj instanceof CVInstanceElement) { + // CVInstanceElement cvinstance = (CVInstanceElement) obj; + // DeltaCloudInstance instance = (DeltaCloudInstance) + // cvinstance.getElement(); + // CloudViewElement element = (CloudViewElement) obj; + // while (!(element instanceof CVCloudElement)) + // element = (CloudViewElement) element.getParent(); + // CVCloudElement cvcloud = (CVCloudElement) element; + // DeltaCloud cloud = (DeltaCloud) cvcloud.getElement(); + // PerformInstanceActionThread t = new PerformInstanceActionThread(cloud, + // instance, + // DeltaCloudInstance.START, + // CVMessages.getString(STARTING_INSTANCE_TITLE), + // CVMessages.getFormattedString(STARTING_INSTANCE_MSG, new String[] { + // instance.getName() }), + // DeltaCloudInstance.RUNNING); + // t.setUser(true); + // t.schedule(); + // } + // } + // }; + // startAction.setText(CVMessages.getString(START_LABEL)); + // startAction.setToolTipText(CVMessages.getString(START_LABEL)); + // startAction.setImageDescriptor(SWTImagesFactory.DESC_START); + // startAction.setDisabledImageDescriptor(SWTImagesFactory.DESC_STARTD); + // return startAction; + // } private Action createRefreshAction() { Action refreshAction = new Action() { @@ -467,7 +477,6 @@ // return removeCloud; // } - private void hookDoubleClickAction() { viewer.addDoubleClickListener(new IDoubleClickListener() { public void doubleClick(DoubleClickEvent event) {