Author: adietish Date: 2010-10-14 11:41:33 -0400 (Thu, 14 Oct 2010) New Revision: 25833 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java Log: [JBIDE-7329] cleanup 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 15:30:40 UTC (rev 25832) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-10-14 15:41:33 UTC (rev 25833) @@ -16,28 +16,20 @@ import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IActionBars; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; 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.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.InstanceFilter; public class DeltaCloudView extends ViewPart implements ICloudManagerListener, ITabbedPropertySheetPageContributor { @@ -50,36 +42,15 @@ 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 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$ + private static final String HELP_CONTEXTID = "org.jboss.tools.deltacloud.ui.viewer"; + private TreeViewer viewer; -// private Action refreshAction; private Action collapseall; private Action doubleClickAction; -// private Action imageFilterAction; -// private Action instanceFilterAction; - private CloudViewElement selectedElement; - - /** - * The constructor. - */ - public DeltaCloudView() { - } - - /** - * This is a callback that will allow us to create the viewer and initialize - * it. - */ public void createPartControl(Composite parent) { viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); viewer.setContentProvider(new CloudViewContentProvider()); @@ -89,11 +60,10 @@ getSite().setSelectionProvider(viewer); // for tabbed properties // Create the help context id for the viewer's control - PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), "org.jboss.tools.deltacloud.ui.viewer"); + PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), HELP_CONTEXTID); makeActions(); hookContextMenu(); hookDoubleClickAction(); - hookSelection(); contributeToActionBars(); DeltaCloudManager.getDefault().addCloudManagerListener(this); } @@ -104,67 +74,24 @@ super.dispose(); } - private void hookSelection() { - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - @Override - public void selectionChanged(SelectionChangedEvent event) { - handleSelection(); - } - }); - } - private void hookContextMenu() { IMenuManager contextMenu = UIUtils.createContextMenu(viewer.getControl()); - // TODO: replace by declarative commands - fillContextMenu(contextMenu); UIUtils.registerContributionManager(CONTEXT_MENU_ID, contextMenu, viewer.getControl()); } private void contributeToActionBars() { - // IActionBars bars = getViewSite().getActionBars(); - // IMenuManager menuMgr = bars.getMenuManager(); - IToolBarManager toolbarManager = getViewSite().getActionBars().getToolBarManager(); + // TODO: replace by declarative command + fillLocalToolBar(getViewSite().getActionBars().getToolBarManager()); IActionBars actionBars = getViewSite().getActionBars(); IMenuManager menuManager = actionBars.getMenuManager(); UIUtils.registerContributionManager(VIEW_MENU_ID, menuManager, viewer.getControl()); } - private void handleSelection() { - IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); - selectedElement = (CloudViewElement) selection.getFirstElement(); -// refreshAction.setEnabled(selectedElement != null); -// imageFilterAction.setEnabled(selectedElement != null); -// instanceFilterAction.setEnabled(selectedElement != null); - } - - private void fillLocalPullDown(IMenuManager manager) { - manager.removeAll(); -// manager.add(refreshAction); -// manager.add(imageFilterAction); -// manager.add(instanceFilterAction); - } - - private void fillContextMenu(IMenuManager manager) { -// manager.add(imageFilterAction); -// manager.add(instanceFilterAction); - // Other plug-ins can contribute there actions here - // manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); - } - private void fillLocalToolBar(IToolBarManager manager) { manager.add(collapseall); } private void makeActions() { -// refreshAction = createRefreshAction(); - // startAction = createStartAction(); - // stopAction = createStopAction(); - // rebootAction = createRebootAction(); - // destroyAction = createDestroyAction(); - -// imageFilterAction = createImageFilterAction(); -// instanceFilterAction = createInstanceFilterAction(); - collapseall = createCollapseAllAction(); doubleClickAction = new Action() { @@ -189,285 +116,6 @@ return collapseAll; } -// private Action createInstanceFilterAction() { -// Action instanceFilterAction = 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; -// final DeltaCloud cloud = (DeltaCloud) cve.getElement(); -// Display.getDefault().asyncExec(new Runnable() { -// -// @Override -// public void run() { -// Shell shell = viewer.getControl().getShell(); -// IWizard wizard = new InstanceFilter(cloud); -// WizardDialog dialog = new WizardDialog(shell, wizard); -// dialog.create(); -// dialog.open(); -// } -// -// }); -// } -// } -// }; -// instanceFilterAction.setText(CVMessages.getString(INSTANCE_FILTER)); -// instanceFilterAction.setToolTipText(CVMessages.getString(INSTANCE_FILTER)); -// instanceFilterAction.setEnabled(selectedElement != null); -// -// return instanceFilterAction; -// } - -// private Action createImageFilterAction() { -// Action imageFilterAction = 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; -// final DeltaCloud cloud = (DeltaCloud) cve.getElement(); -// Display.getDefault().asyncExec(new Runnable() { -// -// @Override -// public void run() { -// Shell shell = viewer.getControl().getShell(); -// IWizard wizard = new ImageFilter(cloud); -// WizardDialog dialog = new WizardDialog(shell, wizard); -// dialog.create(); -// dialog.open(); -// } -// -// }); -// } -// } -// }; -// imageFilterAction.setText(CVMessages.getString(IMAGE_FILTER)); -// imageFilterAction.setToolTipText(CVMessages.getString(IMAGE_FILTER)); -// imageFilterAction.setEnabled(selectedElement != null); -// 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 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 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() { -// public void run() { -// ISelection selection = viewer.getSelection(); -// Object obj = ((IStructuredSelection) selection).getFirstElement(); -// if (obj instanceof CloudViewElement) { -// CloudViewElement element = (CloudViewElement) obj; -// while (!(element instanceof CVCloudElement)) -// element = (CloudViewElement) element.getParent(); -// CVCloudElement cloud = (CVCloudElement) element; -// cloud.loadChildren(); -// } -// } -// }; -// refreshAction.setText(CVMessages.getString(REFRESH)); -// refreshAction.setToolTipText(CVMessages.getString(REFRESH)); -// refreshAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages(). -// getImageDescriptor(ISharedImages.IMG_TOOL_REDO)); -// refreshAction.setEnabled(selectedElement != null); -// return refreshAction; -// } - - // private Action createEditCloudAction() { - // Action editCloud = 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 cloudElement = (CVCloudElement) element; - // DeltaCloud cloud = (DeltaCloud) cloudElement.getElement(); - // IWizard wizard = new EditCloudConnection(cloud); - // Shell shell = viewer.getControl().getShell(); - // WizardDialog dialog = new WizardDialog(shell, wizard); - // dialog.create(); - // dialog.open(); - // } - // } - // }; - // editCloud.setText(CVMessages.getString(EDIT_CLOUD)); - // editCloud.setToolTipText(CVMessages.getString(EDIT_CLOUD)); - // editCloud.setEnabled(selectedElement != null); - // return editCloud; - // } - - // private Action createDisconnectAction() { - // Action removeCloud = new Action() { - // public void run() { - // DisconnectCloudsDialog dialog = new DisconnectCloudsDialog( - // PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() - // , ((IStructuredSelection) viewer.getSelection()).toList()); - // if (Dialog.OK == dialog.open()) { - // removeCloudViewElements(dialog.getResult()); - // } - // } - // - // private void removeCloudViewElements(Object[] cloudViewerElements) { - // // viewer.remove(cloudViewerElements); - // for (Object cloudViewElement : cloudViewerElements) { - // Assert.isTrue(cloudViewElement instanceof CloudViewElement); - // DeltaCloud deltaCloud = (DeltaCloud) ((CloudViewElement) - // cloudViewElement).getElement(); - // DeltaCloudManager.getDefault().removeCloud(deltaCloud); - // } - // } - // }; - // removeCloud.setText(CVMessages.getString(REMOVE_CLOUD)); - // removeCloud.setToolTipText(CVMessages.getString(REMOVE_CLOUD)); - // removeCloud.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages(). - // getImageDescriptor(ISharedImages.IMG_ELCL_REMOVE)); - // removeCloud.setEnabled(selectedElement != null); - // return removeCloud; - // } - private void hookDoubleClickAction() { viewer.addDoubleClickListener(new IDoubleClickListener() { public void doubleClick(DoubleClickEvent event) { @@ -476,9 +124,6 @@ }); } - /** - * Passing the focus request to the viewer's control. - */ public void setFocus() { viewer.getControl().setFocus(); }