Author: jjohnstn Date: 2010-07-27 17:01:19 -0400 (Tue, 27 Jul 2010) New Revision: 23755 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java Log: 2010-07-27 Jeff Johnston <jjohnstn(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add new message for disconnect cloud action. * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (makeActions): Add new cloud disconnect action. (fillLocalPullDown): Ditto. (.run): New action to disconnect from cloud and remove from tree viewer. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-07-27 20:27:48 UTC (rev 23754) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-07-27 21:01:19 UTC (rev 23755) @@ -1,5 +1,14 @@ 2010-07-27 Jeff Johnston <jjohnstn(a)redhat.com&gt; + * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add new message + for disconnect cloud action. + * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (makeActions): Add + new cloud disconnect action. + (fillLocalPullDown): Ditto. + (.run): New action to disconnect from cloud and remove from tree viewer. + +2010-07-27 Jeff Johnston <jjohnstn(a)redhat.com&gt; + * src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java (createElements): Add viewer argument and use this when creating a CVCloudElement. (inputChanged): Pass the viewer to createElements. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-07-27 20:27:48 UTC (rev 23754) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-07-27 21:01:19 UTC (rev 23755) @@ -14,4 +14,6 @@ PropertyURL.title=URL PropertyUsername.title=User -CollapseAll.label=Collapse All \ No newline at end of file +CollapseAll.label=Collapse All + +RemoveCloud.label=Disconnect Cloud \ No newline at end of file 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-07-27 20:27:48 UTC (rev 23754) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-07-27 21:01:19 UTC (rev 23755) @@ -24,6 +24,8 @@ import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; +import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.deltacloud.core.DeltaCloudManager; import org.jboss.tools.deltacloud.ui.SWTImagesFactory; @@ -34,11 +36,14 @@ */ public static final String ID = "org.jboss.tools.deltacloud.ui.views.DeltaCloudView"; - public static final String COLLAPSE_ALL = "CollapseAll.label"; + private static final String REMOVE_CLOUD = "RemoveCloud.label"; //$NON-NLS-1$ + + public static final String COLLAPSE_ALL = "CollapseAll.label"; //$NON-NLS-1$ private TreeViewer viewer; private Action action1; private Action action2; + private Action removeCloud; private Action collapseall; private Action doubleClickAction; @@ -107,7 +112,7 @@ private void fillLocalPullDown(IMenuManager manager) { manager.add(action1); manager.add(new Separator()); - manager.add(action2); + manager.add(removeCloud); } private void fillContextMenu(IMenuManager manager) { @@ -122,6 +127,33 @@ } private void makeActions() { + removeCloud = new Action() { + public void run() { + IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); + CloudViewElement element = (CloudViewElement)selection.getFirstElement(); + while (element != null && !(element instanceof CVCloudElement)) { + element = (CloudViewElement)element.getParent(); + } + if (element != null) { + CVCloudElement cve = (CVCloudElement)element; + DeltaCloudManager.getDefault().removeCloud((DeltaCloud)element.getElement()); + CloudViewContentProvider p = (CloudViewContentProvider)viewer.getContentProvider(); + Object[] elements = p.getElements(getViewSite()); + int index = -1; + for (int i = 0; i < elements.length; ++i) { + if (elements[i] == cve) + index = i; + } + if (index >= 0) + ((TreeViewer)cve.getViewer()).remove(getViewSite(), index); + } + } + }; + removeCloud.setText(CVMessages.getString(REMOVE_CLOUD)); + removeCloud.setToolTipText(CVMessages.getString(REMOVE_CLOUD)); + removeCloud.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages(). + getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK)); + action1 = new Action() { public void run() { showMessage("Action 1 executed");