[jbosstools-commits] JBoss Tools SVN: r24169 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: icons and 3 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Aug 13 18:42:45 EDT 2010
Author: jjohnstn
Date: 2010-08-13 18:42:44 -0400 (Fri, 13 Aug 2010)
New Revision: 24169
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/delta-large.gif
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java
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/InstanceComparator.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/NewCloudConnectionPage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
Log:
2010-08-13 Jeff Johnston <jjohnstn at redhat.com>
* icons/delta-large.gif: New file.
* src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java: New file.
* src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java: New file.
* src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java: Add large delta image.
* src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java (getElements): Changed
to just get the root element's children.
(getChildren): Changed to always return the parent element's children.
(inputChanged): Assumes the new input is a CVRootElement and saves it for
later. No longer creates clouds and categories here.
* src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java (clearChildren): New method
to clear all children.
* src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java (getChildren): Remove
Instances logic since it has its own element class now.
* src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java (hasChildren): New method
that always returns true.
(getChildren): New method to add the category elements.
* src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (changeEvent): Set the input
to a new CVRootElement.
(createPartControl): Ditto
(.run): Ditto.
(makeActions): Remove bogus action1 and action2.
(fillLocalPullDown): Ditto.
* src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java (compareByColumn): Make
comparison ignore case.
* src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (ColumnListener.widgetSelected): Don't
set sort column indicator i.e. set it to SWT.NONE.
(createPartControl): Ditto.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (NewCloudConnectionPage): Set
title image to new delta-large icon.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (NewInstancePage): Ditto.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-13 19:54:13 UTC (rev 24168)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-13 22:42:44 UTC (rev 24169)
@@ -1,5 +1,38 @@
2010-08-13 Jeff Johnston <jjohnstn at redhat.com>
+ * icons/delta-large.gif: New file.
+ * src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java: New file.
+ * src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java: New file.
+ * src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java: Add large delta image.
+ * src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java (getElements): Changed
+ to just get the root element's children.
+ (getChildren): Changed to always return the parent element's children.
+ (inputChanged): Assumes the new input is a CVRootElement and saves it for
+ later. No longer creates clouds and categories here.
+ * src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java (clearChildren): New method
+ to clear all children.
+ * src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java (getChildren): Remove
+ Instances logic since it has its own element class now.
+ * src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java (hasChildren): New method
+ that always returns true.
+ (getChildren): New method to add the category elements.
+ * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (changeEvent): Set the input
+ to a new CVRootElement.
+ (createPartControl): Ditto
+ (.run): Ditto.
+ (makeActions): Remove bogus action1 and action2.
+ (fillLocalPullDown): Ditto.
+ * src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java (compareByColumn): Make
+ comparison ignore case.
+ * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (ColumnListener.widgetSelected): Don't
+ set sort column indicator i.e. set it to SWT.NONE.
+ (createPartControl): Ditto.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (NewCloudConnectionPage): Set
+ title image to new delta-large icon.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (NewInstancePage): Ditto.
+
+2010-08-13 Jeff Johnston <jjohnstn at redhat.com>
+
* src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (changeEvent): Set the
currCloud variable.
(createPartControl): Ditto.
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/delta-large.gif
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/delta-large.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java 2010-08-13 19:54:13 UTC (rev 24168)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java 2010-08-13 22:42:44 UTC (rev 24169)
@@ -30,12 +30,14 @@
public static final String IMG_IMAGE= NAME_PREFIX + "image.gif"; //$NON-NLS-1$
public static final String IMG_COLLAPSE_ALL= NAME_PREFIX + "collapseall.gif"; //$NON-NLS-1$
public static final String IMG_DELTA= NAME_PREFIX + "delta.gif"; //$NON-NLS-1$
- public static final ImageDescriptor DESC_CLOUD= createManaged("", IMG_CLOUD);
+ public static final String IMG_DELTA_LARGE= NAME_PREFIX + "delta-large.gif"; //$NON-NLS-1$
+ public static final ImageDescriptor DESC_CLOUD= createManaged("", IMG_CLOUD);
public static final ImageDescriptor DESC_FOLDER= createManaged("", IMG_FOLDER);
public static final ImageDescriptor DESC_INSTANCE= createManaged("", IMG_INSTANCE);
public static final ImageDescriptor DESC_IMAGE= createManaged("", IMG_IMAGE);
public static final ImageDescriptor DESC_COLLAPSE_ALL= createManaged("", IMG_COLLAPSE_ALL);
public static final ImageDescriptor DESC_DELTA= createManaged("", IMG_DELTA);
+ public static final ImageDescriptor DESC_DELTA_LARGE= createManaged("", IMG_DELTA_LARGE);
private static ImageDescriptor createManaged(String prefix, String name) {
return createManaged(imageRegistry, prefix, name);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java 2010-08-13 19:54:13 UTC (rev 24168)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java 2010-08-13 22:42:44 UTC (rev 24169)
@@ -10,8 +10,8 @@
public final static int INSTANCES = 0;
public final static int IMAGES = 1;
- private int type;
- private boolean initialized;
+ protected int type;
+ protected boolean initialized;
public CVCategoryElement(Object element, String name, int type) {
super(element, name);
@@ -22,15 +22,7 @@
public Object[] getChildren() {
if (!initialized) {
DeltaCloud cloud = (DeltaCloud)getElement();
- if (type == INSTANCES) {
- DeltaCloudInstance[] instances = cloud.getInstances();
- for (int i = 0; i < instances.length; ++i) {
- DeltaCloudInstance d = instances[i];
- CVInstanceElement element = new CVInstanceElement(d, d.getName());
- addChild(element);
- }
- initialized = true;
- } else if (type == IMAGES) {
+ if (type == IMAGES) {
DeltaCloudImage[] images = cloud.getImages();
for (int i = 0; i < images.length; ++i) {
DeltaCloudImage d = images[i];
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java 2010-08-13 19:54:13 UTC (rev 24168)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java 2010-08-13 22:42:44 UTC (rev 24169)
@@ -2,10 +2,15 @@
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.ui.views.properties.IPropertySource;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
public class CVCloudElement extends CloudViewElement {
+ private static final String INSTANCE_CATEGORY_NAME = "InstanceCategoryName"; //$NON-NLS-1$
+ private static final String IMAGE_CATEGORY_NAME = "ImageCategoryName"; //$NON-NLS-1$
+
private Viewer viewer;
+ private boolean initialized;
public CVCloudElement(Object element, String name, Viewer viewer) {
super(element, name);
@@ -15,8 +20,28 @@
public Viewer getViewer() {
return viewer;
}
+
+ @Override
+ public boolean hasChildren() {
+ return true;
+ }
@Override
+ public Object[] getChildren() {
+ if (!initialized) {
+ DeltaCloud cloud = (DeltaCloud)getElement();
+ CVCategoryElement c1 = new CVInstancesCategoryElement(cloud, CVMessages.getString(INSTANCE_CATEGORY_NAME),
+ viewer);
+ CVCategoryElement c2 = new CVCategoryElement(cloud, CVMessages.getString(IMAGE_CATEGORY_NAME),
+ CVCategoryElement.IMAGES);
+ addChild(c1);
+ addChild(c2);
+ }
+ initialized = true;
+ return super.getChildren();
+ }
+
+ @Override
public IPropertySource getPropertySource() {
return new CloudPropertySource(getElement());
}
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java 2010-08-13 22:42:44 UTC (rev 24169)
@@ -0,0 +1,57 @@
+package org.jboss.tools.deltacloud.ui.views;
+
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
+import org.jboss.tools.deltacloud.core.IInstanceListListener;
+
+public class CVInstancesCategoryElement extends CVCategoryElement implements IInstanceListListener {
+
+ private Viewer viewer;
+ private CVInstancesCategoryElement category;
+
+ public CVInstancesCategoryElement(Object element, String name, Viewer viewer) {
+ super(element, name, CVCategoryElement.INSTANCES);
+ this.viewer = viewer;
+ DeltaCloud cloud = (DeltaCloud)getElement();
+ cloud.addInstanceListListener(this);
+ this.category = this;
+ }
+
+ @Override
+ public Object[] getChildren() {
+ if (!initialized) {
+ DeltaCloud cloud = (DeltaCloud)getElement();
+ cloud.removeInstanceListListener(this);
+ DeltaCloudInstance[] instances = cloud.getInstances();
+ for (int i = 0; i < instances.length; ++i) {
+ DeltaCloudInstance d = instances[i];
+ CVInstanceElement element = new CVInstanceElement(d, d.getName());
+ addChild(element);
+ }
+ initialized = true;
+ cloud.addInstanceListListener(this);
+ }
+ return super.getChildren();
+ }
+
+ @Override
+ public void listChanged(DeltaCloudInstance[] instances) {
+ clearChildren();
+ for (int i = 0; i < instances.length; ++i) {
+ DeltaCloudInstance d = instances[i];
+ CVInstanceElement element = new CVInstanceElement(d, d.getName());
+ addChild(element);
+ }
+ initialized = true;
+ Display.getCurrent().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ ((TreeViewer)viewer).refresh(category, false);
+ }
+ });
+ }
+
+}
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java 2010-08-13 22:42:44 UTC (rev 24169)
@@ -0,0 +1,63 @@
+package org.jboss.tools.deltacloud.ui.views;
+
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.views.properties.IPropertySource;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudManager;
+import org.jboss.tools.deltacloud.core.ICloudManagerListener;
+
+public class CVRootElement extends CloudViewElement implements ICloudManagerListener {
+
+ private boolean initialized;
+ private Viewer viewer;
+
+ public CVRootElement(Viewer viewer) {
+ super(DeltaCloudManager.getDefault(), "root"); //$NON-NLS-1$
+ this.viewer = viewer;
+ }
+
+ @Override
+ public IPropertySource getPropertySource() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Object[] getChildren() {
+ if (!initialized) {
+ DeltaCloudManager m = DeltaCloudManager.getDefault();
+ DeltaCloud[] clouds = m.getClouds();
+ for (int i = 0; i < clouds.length; ++i) {
+ DeltaCloud cloud = clouds[i];
+ CVCloudElement e = new CVCloudElement(cloud, cloud.getName(), viewer);
+ addChild(e);
+ }
+ m.addCloudManagerListener(this);
+ initialized = true;
+ }
+ return super.getChildren();
+ }
+
+ @Override
+ public void changeEvent(int type) {
+ DeltaCloudManager m = DeltaCloudManager.getDefault();
+ m.removeCloudManagerListener(this);
+ DeltaCloud[] clouds = m.getClouds();
+ for (int i = 0; i < clouds.length; ++i) {
+ DeltaCloud cloud = clouds[i];
+ CVCloudElement e = new CVCloudElement(cloud, cloud.getName(), viewer);
+ addChild(e);
+ }
+ initialized = true;
+ m.addCloudManagerListener(this);
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ ((TreeViewer)viewer).refresh(this, false);
+ }
+ });
+ }
+
+}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java 2010-08-13 19:54:13 UTC (rev 24168)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java 2010-08-13 22:42:44 UTC (rev 24169)
@@ -1,23 +1,14 @@
package org.jboss.tools.deltacloud.ui.views;
-import java.util.ArrayList;
-
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.IViewSite;
-import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.DeltaCloudManager;
public class CloudViewContentProvider implements ITreeContentProvider {
- private CloudViewElement[] elements;
- private static final String INSTANCE_CATEGORY_NAME = "InstanceCategoryName"; //$NON-NLS-1$
- private static final String IMAGE_CATEGORY_NAME = "ImageCategoryName"; //$NON-NLS-1$
+ private CloudViewElement root;
@Override
public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof IViewSite)
- return elements;
CloudViewElement e = (CloudViewElement)parentElement;
return e.getChildren();
}
@@ -36,7 +27,7 @@
@Override
public Object[] getElements(Object inputElement) {
- return elements;
+ return root.getChildren();
}
@Override
@@ -45,27 +36,9 @@
}
- private void createElements(Viewer viewer) {
- ArrayList<CloudViewElement> list = new ArrayList<CloudViewElement>();
- DeltaCloudManager m = DeltaCloudManager.getDefault();
- DeltaCloud[] clouds = m.getClouds();
- for (int i = 0; i < clouds.length; ++i) {
- DeltaCloud cloud = clouds[i];
- CVCloudElement e = new CVCloudElement(cloud, cloud.getName(), viewer);
- CVCategoryElement c1 = new CVCategoryElement(cloud, CVMessages.getString(INSTANCE_CATEGORY_NAME),
- CVCategoryElement.INSTANCES);
- CVCategoryElement c2 = new CVCategoryElement(cloud, CVMessages.getString(IMAGE_CATEGORY_NAME),
- CVCategoryElement.IMAGES);
- e.addChild(c1);
- e.addChild(c2);
- list.add(e);
- }
- elements = list.toArray(new CloudViewElement[list.size()]);
- }
-
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- createElements(viewer);
+ root = (CloudViewElement)newInput;
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java 2010-08-13 19:54:13 UTC (rev 24168)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewElement.java 2010-08-13 22:42:44 UTC (rev 24169)
@@ -18,6 +18,10 @@
return children.toArray();
}
+ protected void clearChildren() {
+ children.clear();
+ }
+
public boolean hasChildren() {
return children.size() > 0;
}
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-08-13 19:54:13 UTC (rev 24168)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-08-13 22:42:44 UTC (rev 24169)
@@ -7,7 +7,6 @@
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelection;
@@ -49,8 +48,6 @@
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 refreshAction;
private Action collapseall;
@@ -73,7 +70,7 @@
viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
viewer.setContentProvider(new CloudViewContentProvider());
viewer.setLabelProvider(new CloudViewLabelProvider());
- viewer.setInput(getViewSite());
+ viewer.setInput(new CVRootElement(viewer));
viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
getSite().setSelectionProvider(viewer); // for tabbed properties
@@ -121,8 +118,6 @@
}
private void fillLocalPullDown(IMenuManager manager) {
- manager.add(action1);
- manager.add(new Separator());
manager.add(removeCloud);
manager.add(refreshAction);
}
@@ -193,7 +188,7 @@
refreshAction = new Action() {
public void run() {
- viewer.setInput(getViewSite());
+ viewer.setInput(new CVRootElement(viewer));
}
};
refreshAction.setText(CVMessages.getString(REFRESH));
@@ -201,30 +196,11 @@
refreshAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
getImageDescriptor(ISharedImages.IMG_TOOL_REDO));
- action1 = new Action() {
- public void run() {
- showMessage("Action 1 executed");
- }
- };
- action1.setText("Action 1");
- action1.setToolTipText("Action 1 tooltip");
- action1.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
- getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
-
- action2 = new Action() {
- public void run() {
- showMessage("Action 2 executed");
- }
- };
- action2.setText("Action 2");
- action2.setToolTipText("Action 2 tooltip");
- action2.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
- getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
doubleClickAction = new Action() {
public void run() {
ISelection selection = viewer.getSelection();
+ @SuppressWarnings("unused")
Object obj = ((IStructuredSelection)selection).getFirstElement();
- showMessage("Double-click detected on "+obj.toString());
}
};
collapseall = new Action() {
@@ -244,12 +220,6 @@
}
});
}
- private void showMessage(String message) {
- MessageDialog.openInformation(
- viewer.getControl().getShell(),
- CVMessages.getString("CloudViewName"), //$NON-NLS-1$
- message);
- }
/**
* Passing the focus request to the viewer's control.
@@ -260,6 +230,6 @@
@Override
public void changeEvent(int type) {
- viewer.setInput(getViewSite());
+ viewer.setInput(new CVRootElement(viewer));
}
}
\ No newline at end of file
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java 2010-08-13 19:54:13 UTC (rev 24168)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java 2010-08-13 22:42:44 UTC (rev 24169)
@@ -44,6 +44,6 @@
InstanceViewLabelAndContentProvider provider = (InstanceViewLabelAndContentProvider)((TableViewer)viewer).getContentProvider();
String s1 = provider.getColumnText(e1, column);
String s2 = provider.getColumnText(e2, column);
- return s1.compareTo(s2);
+ return s1.compareToIgnoreCase(s2);
}
}
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-08-13 19:54:13 UTC (rev 24168)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-13 22:42:44 UTC (rev 24169)
@@ -119,16 +119,13 @@
public void widgetSelected(SelectionEvent e) {
InstanceComparator comparator = (InstanceComparator)viewer.getComparator();
Table t = viewer.getTable();
- int direction = SWT.UP;
if (comparator.getColumn() == column) {
comparator.reverseDirection();
- if (t.getSortDirection() == SWT.UP)
- direction = SWT.DOWN;
}
comparator.setColumn(column);
TableColumn tc = (TableColumn)e.getSource();
t.setSortColumn(tc);
- t.setSortDirection(direction);
+ t.setSortDirection(SWT.NONE);
viewer.refresh();
}
@@ -181,7 +178,7 @@
tableLayout.setColumnData(tc, new ColumnWeightData(c.getWeight()));
tc.addSelectionListener(new ColumnListener(i, viewer));
}
- table.setSortDirection(SWT.UP);
+ table.setSortDirection(SWT.NONE);
currCloud = clouds[0];
currCloud.removeInstanceListListener(parentView);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-08-13 19:54:13 UTC (rev 24168)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-08-13 22:42:44 UTC (rev 24169)
@@ -37,6 +37,7 @@
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.deltacloud.core.DeltaCloudManager;
import org.jboss.tools.deltacloud.ui.Activator;
+import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -127,6 +128,7 @@
this.wizard= wizard;
setDescription(WizardMessages.getString(DESCRIPTION));
setTitle(WizardMessages.getString(TITLE));
+ setImageDescriptor(SWTImagesFactory.DESC_DELTA_LARGE);
setPageComplete(false);
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-08-13 19:54:13 UTC (rev 24168)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-08-13 22:42:44 UTC (rev 24169)
@@ -19,6 +19,7 @@
import org.jboss.tools.deltacloud.core.DeltaCloudHardwareProfile;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
import org.jboss.tools.deltacloud.core.DeltaCloudRealm;
+import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
public class NewInstancePage extends WizardPage {
@@ -76,6 +77,7 @@
getPossibleProfiles();
setDescription(WizardMessages.getString(DESCRIPTION));
setTitle(WizardMessages.getString(TITLE));
+ setImageDescriptor(SWTImagesFactory.DESC_DELTA_LARGE);
setPageComplete(false);
}
More information about the jbosstools-commits
mailing list