Author: adietish Date: 2010-11-09 09:39:37 -0500 (Tue, 09 Nov 2010) New Revision: 26374 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java Log: [JBIDE-7518] loading images and instances from server after editing -> update the tree if you edited the url Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-09 14:36:48 UTC (rev 26373) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-09 14:39:37 UTC (rev 26374) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench"> <booleanAttribute key="append.args" value="true"/> -<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="askclear" value="true"/> <booleanAttribute key="automaticAdd" value="true"/> <booleanAttribute key="automaticValidate" value="false"/> <stringAttribute key="bootstrap" value=""/> @@ -11,9 +11,9 @@ <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Deltacloud Tools"/> <booleanAttribute key="default" value="false"/> -<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests"/> +<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.deltacloud.test,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.mozilla.xulrunner.carbon.macosx,org.eclipse.epp.usagedata.ui,org.mozilla.xpcom,org.jboss.tools.tests,org.jruby.jruby"/> <booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration(1)"/> +<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration"/> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> <listEntry value="org.eclipse.debug.ui.launchGroup.run"/> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> @@ -23,8 +23,8 @@ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.sdk.ide"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.help.ui@default:default,org.eclipse.team.core@default:default,org.apache.lucene.analysis@default:default,org.jboss.tools.common@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.wst.validation@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.security@default:default,org.eclipse.core.runtime@default:true,org.eclipse.compare@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.ecf@default:default,org.eclipse.jface@default:default,org.eclipse.ui.ide.application@default:defau! lt,org.eclipse.core.variables@default:default,org.eclipse.wst.common.uriresolver@default:default,javax.xml@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.commands@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.swt@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.emf.common@default:default,org.apache.lucene@default:default,org.eclipse.ui.ide@default:default,org.junit4@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ui.editors@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.wst.common.core@default:default,javax.servlet.jsp@default:default,org.eclipse.! jem.util@default:default,org.eclipse.jdt.core.manipulation@def! ault:def ault,org.apache.commons.el@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jface.text@default:default,org.eclipse.rse.services@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.help.appserver@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.help.webapp@default:default,org.eclipse.core.net@default:default,org.eclipse.osgi@-1:true,org.eclipse.wst.common.emf@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.team.ui@default:default,org.eclipse.ui.views@default:default,com.ibm.icu@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.osgi.services@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.wst.xml.core@default:default,org.eclipse.sw! t.gtk.linux.x86_64@default:false,org.eclipse.core.databinding@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.xml.resolver@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui@default:default,org.eclipse.rse.core@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jdt.launching@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.forms@default:default,org.mortbay.jetty.util@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.help@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.app@! default:default,org.eclipse.jdt.debug@default:default,org.ecli! pse.core .jobs@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.expressions@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.core.databinding.property@default:default,org.apache.ant@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.wst.sse.core@default:default,org.apache.xml.serializer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.equinox.p2.repository@default:default,javax.servlet@default:default,org.apache.xerces@default:default,org.eclipse.core.resources@default:default! ,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.sdk@default:default,org.apache.jasper@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.text@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.search@default:default,org.eclipse.update.configurator@3:true,org.eclipse.jface.databinding@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.debug.core@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.docs@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.deltacloud.test@default:default,org.jruby.jruby@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.expressions@default:default,org.eclipse.text@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.security@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ui@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.help.ui@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.update.configurator@3:true,org.apache.xml.serializer@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jem.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.commands@de! fault:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.swt@default:default,org.eclipse.equinox.common@2:true,javax.xml@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.osgi.util@default:default,org.eclipse.debug.core@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.equinox.http.jetty@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.compare.core@default:default,org.mortbay.jetty.util@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.filesyst! em@default:default,org.junit4@default:default,org.eclipse.ltk.! core.ref actoring@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.rse.core@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.apache.ant@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.help@default:default,javax.servlet@default:default,org.apache.commons.el@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.editors@default:default,org.eclipse.search@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.security.ui@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.meta! data.repository@default:default,org.eclipse.debug.ui@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,javax.servlet.jsp@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.net@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.console@default:default,org.hamcrest.core@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.wst.common.environment@default:default,com.ibm.icu@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.sdk@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ecf@default:default! ,org.apache.lucene.analysis@default:default,org.eclipse.compar! e@defaul t:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.jface@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.help.base@default:default,org.eclipse.rse.services@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.apache.lucene@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.wst.validation@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.wst.sse.core@default:default,org.apache.xerces@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.ecore! .change@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@-1:true,org.apache.jasper@default:default,org.eclipse.ant.core@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.equinox.app@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> <booleanAttribute key="tracing" value="false"/> Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java 2010-11-09 14:36:48 UTC (rev 26373) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java 2010-11-09 14:39:37 UTC (rev 26374) @@ -13,11 +13,13 @@ import java.util.Collection; import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.ListSelectionDialog; +import org.jboss.tools.deltacloud.core.DeltaCloudInstance; import org.jboss.tools.deltacloud.ui.views.CVInstanceElement; /** @@ -29,12 +31,11 @@ private static class DeltaCloudInstanceProvider implements IStructuredContentProvider { - @SuppressWarnings("unchecked") @Override - public Object[] getElements(Object cvInstanceElements) { - Assert.isTrue(cvInstanceElements instanceof Collection); - Collection<CVInstanceElement> instances = (Collection<CVInstanceElement>) cvInstanceElements; - return instances.toArray(new CVInstanceElement[instances.size()]); + public Object[] getElements(Object deltaCloudInstances) { + Assert.isTrue(deltaCloudInstances instanceof Collection); + Collection<?> instances = (Collection<?>) deltaCloudInstances; + return instances.toArray(new Object[instances.size()]); } @Override @@ -48,6 +49,11 @@ private static class CloudElementNameProvider extends LabelProvider { public String getText(Object element) { + Assert.isTrue(element instanceof IAdaptable); + DeltaCloudInstance deltaCloudInstance = (DeltaCloudInstance) ((IAdaptable) element).getAdapter(DeltaCloudInstance.class); + if (deltaCloudInstance != null) { + return deltaCloudInstance.getName(); + } return ((CVInstanceElement) element).getName(); } }; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java 2010-11-09 14:36:48 UTC (rev 26373) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java 2010-11-09 14:39:37 UTC (rev 26374) @@ -11,6 +11,7 @@ package org.jboss.tools.deltacloud.ui.views; import org.eclipse.ui.views.properties.IPropertySource; +import org.jboss.tools.deltacloud.core.DeltaCloudInstance; public class CVInstanceElement extends CloudViewElement { @@ -22,4 +23,17 @@ public IPropertySource getPropertySource() { return new InstancePropertySource(this, getElement()); } + + @SuppressWarnings("rawtypes") + @Override + public Object getAdapter(Class adapter) { + System.err.println("CVInstanceElement#getAdapter: adapter = " + adapter); + Object adapted = super.getAdapter(adapter); + if (adapted == null && adapter == DeltaCloudInstance.class) { + adapted = getElement(); + } + + return adapted; + } + } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-11-09 14:36:48 UTC (rev 26373) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-11-09 14:39:37 UTC (rev 26374) @@ -318,7 +318,7 @@ @Override public void run() { if (currCloud != null) { - currCloud.getImages(); + currCloud.loadImages(); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-09 14:36:48 UTC (rev 26373) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-09 14:39:37 UTC (rev 26374) @@ -20,11 +20,8 @@ import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; -import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.action.Separator; import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ColumnWeightData; @@ -55,15 +52,14 @@ import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.ui.IActionBars; import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; @@ -76,6 +72,7 @@ import org.jboss.tools.deltacloud.ui.Activator; import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; 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; import org.osgi.service.prefs.Preferences; @@ -86,8 +83,8 @@ */ public static final String ID = "org.jboss.tools.deltacloud.ui.views.InstanceView"; -// private static final String CONTEXT_MENU_ID = "popup:" + ID; -// private static final String VIEW_MENU_ID = "menu:" + ID; + private static final String CONTEXT_MENU_ID = "popup:" + ID; + private static final String VIEW_MENU_ID = "menu:" + ID; private final static String CLOUD_SELECTOR_LABEL = "CloudSelector.label"; //$NON-NLS-1$ private final static String START_LABEL = "Start.label"; //$NON-NLS-1$ @@ -122,7 +119,7 @@ private IAction refreshAction; private IAction filterAction; - private IAction startAction; +// private IAction startAction; private IAction stopAction; private IAction destroyAction; private IAction rebootAction; @@ -146,8 +143,6 @@ } currCloud = clouds[index]; storeSelectedCloud(); -// viewer.setInput(new DeltaCloudInstance[0]); -// viewer.refresh(); Display.getCurrent().asyncExec(new Runnable() { @Override @@ -168,7 +163,6 @@ // do nothing } } - }; private class ColumnListener extends SelectionAdapter { @@ -221,7 +215,7 @@ filterLabel.setToolTipText(CVMessages.getString(FILTERED_TOOLTIP)); Composite tableArea = new Composite(container, SWT.NULL); - createTableViewer(tableArea); + viewer = createTableViewer(tableArea); if (currCloud != null) { currCloud.removeInstanceListListener(parentView); @@ -260,18 +254,19 @@ // Create the help context id for the viewer's control PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), "org.jboss.tools.deltacloud.ui.viewer"); makeActions(); - hookContextMenu(); + hookContextMenu(viewer.getTable()); hookSelection(); contributeToActionBars(); + getSite().setSelectionProvider(viewer); DeltaCloudManager.getDefault().addCloudManagerListener(this); } - private void createTableViewer(Composite tableArea) { + private TableViewer createTableViewer(Composite tableArea) { TableColumnLayout tableLayout = new TableColumnLayout(); tableArea.setLayout(tableLayout); - viewer = new TableViewer(tableArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.MULTI); + TableViewer viewer = new TableViewer(tableArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.MULTI); Table table = viewer.getTable(); table.setHeaderVisible(true); table.setLinesVisible(true); @@ -280,18 +275,24 @@ viewer.setLabelProvider(contentProvider); InstanceComparator comparator = new InstanceComparator(0); viewer.setComparator(comparator); + createColumns(tableLayout, table); + table.setSortDirection(SWT.NONE); + return viewer; + + } + private void createColumns(TableColumnLayout tableLayout, Table table) { for (int i = 0; i < InstanceViewLabelAndContentProvider.Column.getSize(); ++i) { InstanceViewLabelAndContentProvider.Column c = InstanceViewLabelAndContentProvider.Column.getColumn(i); TableColumn tc = new TableColumn(table, SWT.NONE); - if (i == 0) + if (i == 0) { table.setSortColumn(tc); + } tc.setText(CVMessages.getString(c.name())); tableLayout.setColumnData(tc, new ColumnWeightData(c.getWeight(), true)); tc.addSelectionListener(new ColumnListener(i, viewer)); } - table.setSortDirection(SWT.NONE); } private Label createCloudSelector() { @@ -317,21 +318,25 @@ @Override public void selectionChanged(SelectionChangedEvent event) { handleSelection(); + System.err.println(event.getSelection()); } }); } - private void hookContextMenu() { - MenuManager menuMgr = new MenuManager("#PopupMenu"); - menuMgr.setRemoveAllWhenShown(true); - menuMgr.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager manager) { - InstanceView.this.fillContextMenu(manager); - } - }); - Menu menu = menuMgr.createContextMenu(viewer.getControl()); - viewer.getControl().setMenu(menu); - getSite().registerContextMenu(menuMgr, viewer); + private void hookContextMenu(Control control) { + IMenuManager contextMenu = UIUtils.createContextMenu(control); + UIUtils.registerContributionManager(CONTEXT_MENU_ID, contextMenu, control); + +// MenuManager menuMgr = new MenuManager("#PopupMenu"); +// menuMgr.setRemoveAllWhenShown(true); +// menuMgr.addMenuListener(new IMenuListener() { +// public void menuAboutToShow(IMenuManager manager) { +// InstanceView.this.fillContextMenu(manager); +// } +// }); +// Menu menu = menuMgr.createContextMenu(viewer.getControl()); +// viewer.getControl().setMenu(menu); +// getSite().registerContextMenu(menuMgr, viewer); } private void contributeToActionBars() { @@ -343,15 +348,12 @@ private void handleSelection() { IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); selectedElement = (DeltaCloudInstance) selection.getFirstElement(); - instanceActions.get(DeltaCloudInstance.START).setEnabled(false); +// instanceActions.get(DeltaCloudInstance.START).setEnabled(false); instanceActions.get(DeltaCloudInstance.STOP).setEnabled(false); instanceActions.get(DeltaCloudInstance.REBOOT).setEnabled(false); instanceActions.get(DeltaCloudInstance.DESTROY).setEnabled(false); if (selectedElement != null) { - List<String> actions = selectedElement.getActions(); - for (String action : actions) { - instanceActions.get(action).setEnabled(true); - } + enableActions(selectedElement.getActions()); } } @@ -361,32 +363,39 @@ } private void fillContextMenu(IMenuManager manager) { - List<String> actions = selectedElement.getActions(); - manager.add(instanceActions.get(DeltaCloudInstance.START)); - instanceActions.get(DeltaCloudInstance.START).setEnabled(false); - manager.add(instanceActions.get(DeltaCloudInstance.STOP)); - instanceActions.get(DeltaCloudInstance.STOP).setEnabled(false); - manager.add(instanceActions.get(DeltaCloudInstance.REBOOT)); - instanceActions.get(DeltaCloudInstance.REBOOT).setEnabled(false); - manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); - manager.add(instanceActions.get(DeltaCloudInstance.DESTROY)); - instanceActions.get(DeltaCloudInstance.DESTROY).setEnabled(false); - for (String action : actions) { - instanceActions.get(action).setEnabled(true); +// List<String> actions = selectedElement.getActions(); +// manager.add(instanceActions.get(DeltaCloudInstance.START)); +// instanceActions.get(DeltaCloudInstance.START).setEnabled(false); +// manager.add(instanceActions.get(DeltaCloudInstance.STOP)); +// instanceActions.get(DeltaCloudInstance.STOP).setEnabled(false); +// manager.add(instanceActions.get(DeltaCloudInstance.REBOOT)); +// instanceActions.get(DeltaCloudInstance.REBOOT).setEnabled(false); +// manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); +// manager.add(instanceActions.get(DeltaCloudInstance.DESTROY)); +// instanceActions.get(DeltaCloudInstance.DESTROY).setEnabled(false); +// enableActions(actions); +// manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); +// manager.add(rseAction); +// if (selectedElement.getState().equals(DeltaCloudInstance.RUNNING) || +// selectedElement.getState().equals(DeltaCloudInstance.STOPPED)) +// rseAction.setEnabled(true); +// else +// rseAction.setEnabled(false); +// // Other plug-ins can contribute there actions here +// manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); + } + + private void enableActions(List<String> actions) { + for (String actionId : actions) { + IAction action = instanceActions.get(actionId); + if (action != null) { + action.setEnabled(true); + } } - manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); - manager.add(rseAction); - if (selectedElement.getState().equals(DeltaCloudInstance.RUNNING) || - selectedElement.getState().equals(DeltaCloudInstance.STOPPED)) - rseAction.setEnabled(true); - else - rseAction.setEnabled(false); - // Other plug-ins can contribute there actions here - manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); } private void fillLocalToolBar(IToolBarManager manager) { - manager.add(instanceActions.get(DeltaCloudInstance.START)); +// manager.add(instanceActions.get(DeltaCloudInstance.START)); manager.add(instanceActions.get(DeltaCloudInstance.STOP)); manager.add(instanceActions.get(DeltaCloudInstance.REBOOT)); manager.add(instanceActions.get(DeltaCloudInstance.DESTROY)); @@ -395,14 +404,19 @@ private void makeActions() { this.refreshAction = createRefreshAction(); this.filterAction = createFilterAction(); - this.startAction = createStartAction(); + + IActionBars actionBars = getViewSite().getActionBars(); + IMenuManager menuManager = actionBars.getMenuManager(); + UIUtils.registerContributionManager(VIEW_MENU_ID, menuManager, viewer.getControl()); + +// this.startAction = createStartAction(); this.stopAction = createStopAction(); this.rebootAction = createRebootAction(); this.destroyAction = createDestroyAction(); this.rseAction = createRseAction(); instanceActions = new HashMap<String, IAction>(); - instanceActions.put(DeltaCloudInstance.START, startAction); +// instanceActions.put(DeltaCloudInstance.START, startAction); instanceActions.put(DeltaCloudInstance.STOP, stopAction); instanceActions.put(DeltaCloudInstance.REBOOT, rebootAction); instanceActions.put(DeltaCloudInstance.DESTROY, destroyAction); @@ -610,7 +624,7 @@ @Override public void run() { if (currCloud != null) { - currCloud.getInstances(); + currCloud.loadInstances(); } } @@ -625,10 +639,6 @@ return refreshAction; } - @Override - public void setFocus() { - viewer.getControl().setFocus(); - } private void initializeCloudSelector() { int defaultIndex = 0; @@ -699,4 +709,8 @@ } } + @Override + public void setFocus() { + viewer.getControl().setFocus(); + } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java 2010-11-09 14:36:48 UTC (rev 26373) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java 2010-11-09 14:39:37 UTC (rev 26374) @@ -31,7 +31,7 @@ String archRule = mainPage.getArchRule(); String descRule = mainPage.getDescRule(); - cloud.createImageFilter(nameRule + ";" + //$NON-NLS-1$ + cloud.updateImageFilter(nameRule + ";" + //$NON-NLS-1$ idRule + ";" + //$NON-NLS-1$ archRule + ";" + //$NON-NLS-1$ descRule); //$NON-NLS-1$ Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java 2010-11-09 14:36:48 UTC (rev 26373) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java 2010-11-09 14:39:37 UTC (rev 26374) @@ -34,7 +34,7 @@ String realmRule = mainPage.getRealmRule(); String profileRule = mainPage.getProfileRule(); - cloud.createInstanceFilter(nameRule + ";" + //$NON-NLS-1$ + cloud.updateInstanceFilter(nameRule + ";" + //$NON-NLS-1$ idRule + ";" + //$NON-NLS-1$ imageIdRule + ";" + //$NON-NLS-1$ ownerIdRule + ";" + //$NON-NLS-1$