Author: jjohnstn Date: 2010-08-10 10:41:51 -0400 (Tue, 10 Aug 2010) New Revision: 24022 Added: 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/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties 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/CVMessages.properties trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties Log: 2010-08-09 Jeff Johnston <jjohnstn(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java: New file. * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java: New file. * src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java: New file. * plugin.properties: Add new messages for Instances view. * plugin.xml: Add new Instances view. * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add column names for Instances view. Also change menu item from Create Instance to Launch Instance. * src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java (ProfileComposite): Fix formatting for combo box vs spinner size. * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.java: Change Create Instance messages to be Launch Instance. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-10 14:28:26 UTC (rev 24021) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-10 14:41:51 UTC (rev 24022) @@ -1,5 +1,19 @@ 2010-08-09 Jeff Johnston <jjohnstn(a)redhat.com&gt; + * src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java: New file. + * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java: New file. + * src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java: New file. + * plugin.properties: Add new messages for Instances view. + * plugin.xml: Add new Instances view. + * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add column names for + Instances view. Also change menu item from Create Instance to Launch Instance. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java (ProfileComposite): + Fix formatting for combo box vs spinner size. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.java: Change Create Instance + messages to be Launch Instance. + +2010-08-09 Jeff Johnston <jjohnstn(a)redhat.com&gt; + * src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java: New file. * src/org/jboss/tools/deltacloud/ui/preferences/DeltaCloudPreferencePage.java: New file. * src/org/jboss/tools/deltacloud/ui/preferences/PreferenceMessages.java: New file. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties 2010-08-10 14:28:26 UTC (rev 24021) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties 2010-08-10 14:41:51 UTC (rev 24022) @@ -1,5 +1,7 @@ DeltaCloudCategory=Delta Cloud CloudViewerName=Cloud Viewer +InstanceViewer.name=Instances +ImageViewer.name=Images DeltaCloudPerspective.name=Delta Cloud Preferences.name=Delta Cloud Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-08-10 14:28:26 UTC (rev 24021) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-08-10 14:41:51 UTC (rev 24022) @@ -15,6 +15,13 @@ class="org.jboss.tools.deltacloud.ui.views.DeltaCloudView" id="org.jboss.tools.deltacloud.ui.views.CloudView"> </view> + <view + category="org.jboss.tools.deltacloud.ui" + class="org.jboss.tools.deltacloud.ui.views.InstanceView" + icon="icons/delta.gif" + id="org.jboss.tools.deltacloud.ui.views.InstanceView" + name="%InstanceViewer.name"> + </view> </extension> <extension point="org.eclipse.help.contexts"> 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-08-10 14:28:26 UTC (rev 24021) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-08-10 14:41:51 UTC (rev 24022) @@ -16,6 +16,13 @@ CollapseAll.label=Collapse All +CloudSelector.label=Select Cloud: + RemoveCloud.label=Disconnect Cloud Refresh.label=Refresh View -CreateInstance.label=Create Instance \ No newline at end of file +CreateInstance.label=Launch Instance + +NAME=Name +ID=ID +HOSTNAME=Public Hostname +STATUS=State \ No newline at end of file Added: 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 (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceComparator.java 2010-08-10 14:41:51 UTC (rev 24022) @@ -0,0 +1,51 @@ +package org.jboss.tools.deltacloud.ui.views; + +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerComparator; +import org.jboss.tools.deltacloud.core.DeltaCloudInstance; + +public class InstanceComparator extends ViewerComparator { + + private final static int UP = 1; + private final static int DOWN = -1; + + + private int column; + private int direction; + + public InstanceComparator(int column) { + this.column = column; + this.direction = UP; + } + + public void setColumn(int newColumn) { + if (column != newColumn) + direction = UP; + column = newColumn; + } + + public int getColumn() { + return column; + } + + public void reverseDirection() { + direction *= -1; + } + + @Override + public int compare(Viewer viewer, Object e1, Object e2) { + if (!(e1 instanceof DeltaCloudInstance) || !(e2 instanceof DeltaCloudInstance)) + return 0; + + int tmp = compareByColumn(viewer, (DeltaCloudInstance)e1, (DeltaCloudInstance)e2); + return tmp * direction; + } + + private int compareByColumn(Viewer viewer, DeltaCloudInstance e1, DeltaCloudInstance e2) { + InstanceViewLabelAndContentProvider provider = (InstanceViewLabelAndContentProvider)((TableViewer)viewer).getContentProvider(); + String s1 = provider.getColumnText(e1, column); + String s2 = provider.getColumnText(e2, column); + return s1.compareTo(s2); + } +} Added: 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 (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-10 14:41:51 UTC (rev 24022) @@ -0,0 +1,286 @@ +package org.jboss.tools.deltacloud.ui.views; + +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.action.MenuManager; +import org.eclipse.jface.action.Separator; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.layout.TableColumnLayout; +import org.eclipse.jface.viewers.ColumnWeightData; +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.TableViewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.TreeAdapter; +import org.eclipse.swt.events.VerifyEvent; +import org.eclipse.swt.events.VerifyListener; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.ui.IActionBars; +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.DeltaCloudInstance; +import org.jboss.tools.deltacloud.core.DeltaCloudManager; +import org.jboss.tools.deltacloud.core.ICloudManagerListener; + +public class InstanceView extends ViewPart implements ICloudManagerListener { + + private final static String CLOUD_SELECTOR_LABEL = "CloudSelector.label"; //$NON-NLS-1$ + private TableViewer viewer; + private Composite container; + private Combo cloudSelector; + private DeltaCloudInstance selectedElement; + + private DeltaCloud[] clouds; + private DeltaCloud currCloud; + + private Action doubleClickAction; + + public InstanceView() { + // TODO Auto-generated constructor stub + } + + private ModifyListener cloudModifyListener = new ModifyListener() { + + @Override + public void modifyText(ModifyEvent e) { + int index = cloudSelector.getSelectionIndex(); + currCloud = clouds[index]; + viewer.setInput(currCloud); + } + + }; + + private class ColumnListener extends SelectionAdapter { + + private int column; + private TableViewer viewer; + + public ColumnListener(int column, TableViewer viewer) { + this.column = column; + this.viewer = viewer; + } + @Override + 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); + viewer.refresh(); + } + + }; + + @Override + public void createPartControl(Composite parent) { + container = new Composite(parent, SWT.NULL); + FormLayout layout = new FormLayout(); + layout.marginHeight = 0; + layout.marginWidth = 0; + container.setLayout(layout); + + Label cloudSelectorLabel = new Label(container, SWT.NULL); + cloudSelectorLabel.setText(CVMessages.getString(CLOUD_SELECTOR_LABEL)); + + cloudSelector = new Combo(container, SWT.BORDER | SWT.READ_ONLY); + initializeCloudSelector(); + cloudSelector.addModifyListener(cloudModifyListener); + // Following is a kludge so that on Linux the Combo is read-only but + // has a white background. + cloudSelector.addVerifyListener(new VerifyListener() { + @Override + public void verifyText(VerifyEvent e) { + e.doit = false; + } + }); + + Composite tableArea = new Composite(container, SWT.NULL); + TableColumnLayout tableLayout = new TableColumnLayout(); + tableArea.setLayout(tableLayout); + + viewer = new TableViewer(tableArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); + Table table = viewer.getTable(); + table.setHeaderVisible(true); + table.setLinesVisible(true); + viewer.setContentProvider(new InstanceViewLabelAndContentProvider()); + viewer.setLabelProvider(new InstanceViewLabelAndContentProvider()); + InstanceComparator comparator = new InstanceComparator(0); + viewer.setComparator(comparator); + + 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) + table.setSortColumn(tc); + tc.setText(CVMessages.getString(c.name())); + tableLayout.setColumnData(tc, new ColumnWeightData(c.getWeight())); + tc.addSelectionListener(new ColumnListener(i, viewer)); + } + table.setSortDirection(SWT.UP); + + viewer.setInput(clouds[0]); + + FormData f = new FormData(); + f.top = new FormAttachment(0, 8); + f.left = new FormAttachment(0, 30); + cloudSelectorLabel.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(0, 5); + f.left = new FormAttachment(cloudSelectorLabel, 5); + cloudSelector.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(cloudSelector, 8); + f.left = new FormAttachment(0, 0); + f.right = new FormAttachment(100, 0); + f.bottom = new FormAttachment(100, 0); + tableArea.setLayoutData(f); + + // Create the help context id for the viewer's control + PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), "org.jboss.tools.deltacloud.ui.viewer"); + makeActions(); + hookContextMenu(); + hookDoubleClickAction(); + hookSelection(); + contributeToActionBars(); + + DeltaCloudManager.getDefault().addCloudManagerListener(this); + } + + private void hookSelection() { + viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override + public void selectionChanged(SelectionChangedEvent event) { + handleSelection(); + } + }); + } + + 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 contributeToActionBars() { + IActionBars bars = getViewSite().getActionBars(); + fillLocalPullDown(bars.getMenuManager()); + fillLocalToolBar(bars.getToolBarManager()); + } + + private void handleSelection() { + IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); + selectedElement = (DeltaCloudInstance)selection.getFirstElement(); + } + + private void fillLocalPullDown(IMenuManager manager) { + //TODO + } + + private void fillContextMenu(IMenuManager manager) { + //TODO + // Other plug-ins can contribute there actions here + manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); + } + + private void fillLocalToolBar(IToolBarManager manager) { + //TODO + } + + private void makeActions() { + doubleClickAction = new Action() { + public void run() { + ISelection selection = viewer.getSelection(); + Object obj = ((IStructuredSelection)selection).getFirstElement(); + showMessage("Double-click detected on "+obj.toString()); + } + }; + } + + private void hookDoubleClickAction() { + viewer.addDoubleClickListener(new IDoubleClickListener() { + public void doubleClick(DoubleClickEvent event) { + doubleClickAction.run(); + } + }); + } + + private void showMessage(String message) { + MessageDialog.openInformation( + viewer.getControl().getShell(), + CVMessages.getString("CloudViewName"), //$NON-NLS-1$ + message); + } + + + @Override + public void setFocus() { + // TODO Auto-generated method stub + + } + + private void initializeCloudSelector() { + clouds = DeltaCloudManager.getDefault().getClouds(); + String[] cloudNames = new String[clouds.length]; + for (int i = 0; i < clouds.length; ++i) { + cloudNames[i] = clouds[i].getName(); + } + cloudSelector.setItems(cloudNames); + cloudSelector.setText(cloudNames[0]); + currCloud = clouds[0]; + } + + @Override + public void changeEvent(int type) { + String currName = currCloud.getName(); + clouds = DeltaCloudManager.getDefault().getClouds(); + String[] cloudNames = new String[clouds.length]; + int index = 0; + for (int i = 0; i < clouds.length; ++i) { + cloudNames[i] = clouds[i].getName(); + if (currName.equals(cloudNames[i])) + index = i; + } + cloudSelector.removeModifyListener(cloudModifyListener); + cloudSelector.setItems(cloudNames); + cloudSelector.setText(cloudNames[index]); + cloudSelector.addModifyListener(cloudModifyListener); + } + +} Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-08-10 14:41:51 UTC (rev 24022) @@ -0,0 +1,100 @@ +package org.jboss.tools.deltacloud.ui.views; + +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.jface.viewers.BaseLabelProvider; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.deltacloud.core.DeltaCloudInstance; + +public class InstanceViewLabelAndContentProvider extends BaseLabelProvider implements IStructuredContentProvider, ITableLabelProvider { + + private DeltaCloud cloud; + private DeltaCloudInstance[] instances; + + public enum Column { + NAME(0, 30), + ID(1, 20), + STATUS(2, 20), + HOSTNAME(3, 30); + + private int column; + private int weight; + private static final Map<Integer,Column> lookup + = new HashMap<Integer,Column>(); + + static { + for(Column c : EnumSet.allOf(Column.class)) + lookup.put(c.getColumnNumber(), c); + } + + private Column(int column, int weight) { + this.column = column; + this.weight = weight; + } + + public int getColumnNumber() { + return column; + } + + public int getWeight() { + return weight; + } + + public static Column getColumn(int number) { + return lookup.get(number); + } + + public static int getSize() { + return lookup.size(); + } + + }; + + @Override + public Object[] getElements(Object inputElement) { + return instances; + } + + @Override + public void dispose() { + // TODO Auto-generated method stub + + } + + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + if (newInput != null) { + cloud = (DeltaCloud)newInput; + instances = cloud.getInstances(); + } + } + + @Override + public Image getColumnImage(Object element, int columnIndex) { + return null; + } + + @Override + public String getColumnText(Object element, int columnIndex) { + Column c = Column.getColumn(columnIndex); + DeltaCloudInstance i = (DeltaCloudInstance)element; + switch (c) { + case NAME: + return i.getName(); + case ID: + return i.getId(); + case STATUS: + return i.getState(); + case HOSTNAME: + return i.getHostName(); + } + return ""; + } + +} Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java 2010-08-10 14:28:26 UTC (rev 24021) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java 2010-08-10 14:41:51 UTC (rev 24022) @@ -43,6 +43,8 @@ private Combo storageCombo; private int storageDecDigits; + private int cw = 160; + private ModifyListener spinnerListener = new ModifyListener() { @Override @@ -73,7 +75,6 @@ }; - public ProfileComposite(DeltaCloudHardwareProfile p, Composite parent) { this.profile = p; container = new Composite(parent, SWT.NULL); @@ -118,12 +119,13 @@ FormData f = new FormData(); f.width = 80; f.left = new FormAttachment(storageLabel, 50); + f.right = new FormAttachment(storageLabel, cw, SWT.RIGHT); cpuSpinner.setLayoutData(f); cpuControl = cpuSpinner; } else if (cpuProperty.getKind() == DeltaCloudHardwareProperty.Kind.ENUM) { cpuDefaultValue = cpuProperty.getValue(); List<String> values = cpuProperty.getEnums(); - cpuCombo = new Combo(container, SWT.READ_ONLY | SWT.BORDER); + cpuCombo = new Combo(container, SWT.BORDER); String[] items = new String[values.size()]; cpuCombo.setItems(values.toArray(items)); cpuCombo.setText(items[0]); @@ -131,6 +133,7 @@ FormData f = new FormData(); f.width = 80; f.left = new FormAttachment(storageLabel, 50); + f.right = new FormAttachment(storageLabel, cw, SWT.RIGHT); cpuCombo.setLayoutData(f); cpuControl = cpuCombo; } @@ -210,13 +213,14 @@ FormData f = new FormData(); f.width = 80; f.left = new FormAttachment(storageLabel, 50); + f.right = new FormAttachment(storageLabel, cw, SWT.RIGHT); f.top = new FormAttachment(cpuControl, 5); memorySpinner.setLayoutData(f); memoryControl = memorySpinner; } else if (memoryProperty.getKind() == DeltaCloudHardwareProperty.Kind.ENUM) { memoryDefaultValue = memoryProperty.getValue(); List<String> values = memoryProperty.getEnums(); - memoryCombo = new Combo(container, SWT.READ_ONLY | SWT.BORDER); + memoryCombo = new Combo(container, SWT.BORDER | SWT.READ_ONLY); String[] items = new String[values.size()]; memoryCombo.setItems(values.toArray(items)); memoryCombo.setText(items[0]); @@ -224,6 +228,7 @@ FormData f = new FormData(); f.width = 80; f.left = new FormAttachment(storageLabel, 50); + f.right = new FormAttachment(storageLabel, cw, SWT.RIGHT); f.top = new FormAttachment(cpuControl, 5); memoryCombo.setLayoutData(f); memoryControl = memoryCombo; @@ -308,12 +313,13 @@ f.width = 80; f.top = new FormAttachment(memoryControl, 5); f.left = new FormAttachment(storageLabel, 50); + f.right = new FormAttachment(storageLabel, cw, SWT.RIGHT); storageSpinner.setLayoutData(f); storageControl = storageSpinner; } else if (storageProperty.getKind() == DeltaCloudHardwareProperty.Kind.ENUM) { storageDefaultValue = storageProperty.getValue(); List<String> values = storageProperty.getEnums(); - storageCombo = new Combo(container, SWT.READ_ONLY | SWT.BORDER); + storageCombo = new Combo(container, SWT.BORDER | SWT.READ_ONLY); String[] items = new String[values.size()]; storageCombo.setItems(values.toArray(items)); storageCombo.setText(items[0]); @@ -321,6 +327,7 @@ FormData f = new FormData(); f.width = 80; f.left = new FormAttachment(storageLabel, 50); + f.right = new FormAttachment(storageLabel, cw, SWT.RIGHT); f.top = new FormAttachment(memoryControl, 5); storageCombo.setLayoutData(f); storageControl = storageCombo; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-08-10 14:28:26 UTC (rev 24021) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-08-10 14:41:51 UTC (rev 24022) @@ -23,12 +23,12 @@ None.response=None Defaulted=Defaulted -CreateInstanceError.title=Create Instance Failure -CreateInstanceError.msg=The attempt to create instance: name={0}, image={1}, realm={2}, profile={3} -CreateInstanceErrorReason.msg=Server did not create instance +CreateInstanceError.title=Launch Instance Failure +CreateInstanceError.msg=The attempt to launch instance: name={0}, image={1}, realm={2}, profile={3} +CreateInstanceErrorReason.msg=Server did not launch instance -ConfirmCreate.title=Confirm Create Instance -ConfirmCreate.msg=Creating an instance will end up starting it. This may result in financial charges. Do you wish to continue? +ConfirmCreate.title=Confirm Launch Instance +ConfirmCreate.msg=Launching an instance may result in financial charges. Do you wish to continue? DontShowThisAgain.msg=Don't show this dialog again EC2UserNameLink.text=For EC2 use the <a href="https://console.aws.amazon.com/ec2/home">Access ID</a> @@ -38,6 +38,6 @@ ErrorInvalidURL.text=URL specified is invalid ErrorNonCloudURL.text=URL specified is not a valid Delta-cloud address -NewInstance.desc=Specify details for a new instance you wish to create based on an image -NewInstance.title=Create Instance -NewInstance.name=Create Instance \ No newline at end of file +NewInstance.desc=Specify details for a new instance you wish to launch based on an image +NewInstance.title=Launch Instance +NewInstance.name=Launch Instance \ No newline at end of file