Author: jjohnstn
Date: 2010-07-28 17:57:41 -0400 (Wed, 28 Jul 2010)
New Revision: 23784
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.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/WizardMessages.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
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/deltacloud/ui/views/DeltaCloudView.java
Log:
2010-07-28 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java: New file.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java: New
file.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.java: New file.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: New
file.
* plugin.properties: Add messages for connection wizard.
* plugin.xml: Add new connection wizard.
* src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add new messages.
* src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (changeEvent): New method
to make this an ICloudManagerListener.
(makeActions): Add new refresh action.
(fillLocalPullDown): Ditto.
(createPartControl): Register this as DeltaCloudManager listener.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-07-28 19:14:28
UTC (rev 23783)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-07-28 21:57:41
UTC (rev 23784)
@@ -1,3 +1,18 @@
+2010-07-28 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java: New file.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java: New
file.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.java: New file.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: New
file.
+ * plugin.properties: Add messages for connection wizard.
+ * plugin.xml: Add new connection wizard.
+ * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add new messages.
+ * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (changeEvent): New method
+ to make this an ICloudManagerListener.
+ (makeActions): Add new refresh action.
+ (fillLocalPullDown): Ditto.
+ (createPartControl): Register this as DeltaCloudManager listener.
+
2010-07-27 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add new message
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties 2010-07-28
19:14:28 UTC (rev 23783)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties 2010-07-28
21:57:41 UTC (rev 23784)
@@ -1,4 +1,5 @@
DeltaCloudCategory=Delta Cloud
CloudViewerName=Cloud Viewer
-Advanced.label=Advanced
\ No newline at end of file
+Advanced.label=Advanced
+NewWizard.name=Cloud Connection
\ No newline at end of file
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-07-28 19:14:28
UTC (rev 23783)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-07-28 21:57:41
UTC (rev 23784)
@@ -56,5 +56,19 @@
</propertySection>
</propertySections>
</extension>
+ <extension
+ point="org.eclipse.ui.newWizards">
+ <category
+ id="org.jboss.tools.deltacloud.ui.wizard.category"
+ name="%DeltaCloudCategory">
+ </category>
+ <wizard
+ category="org.jboss.tools.deltacloud.ui.wizard.category"
+
class="org.jboss.tools.internal.deltacloud.ui.wizards.NewCloudConnection"
+ icon="icons/delta.gif"
+ id="org.jboss.tools.deltacloud.ui.connection.wizard"
+ name="%NewWizard.name">
+ </wizard>
+ </extension>
</plugin>
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-07-28
19:14:28 UTC (rev 23783)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-07-28
21:57:41 UTC (rev 23784)
@@ -16,4 +16,5 @@
CollapseAll.label=Collapse All
-RemoveCloud.label=Disconnect Cloud
\ No newline at end of file
+RemoveCloud.label=Disconnect Cloud
+Refresh.label=Refresh View
\ No newline at end of file
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-07-28
19:14:28 UTC (rev 23783)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-07-28
21:57:41 UTC (rev 23784)
@@ -26,10 +26,11 @@
import org.eclipse.ui.part.ViewPart;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudManager;
+import org.jboss.tools.deltacloud.core.ICloudManagerListener;
import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
-public class DeltaCloudView extends ViewPart {
+public class DeltaCloudView extends ViewPart implements ICloudManagerListener {
/**
* The ID of the view as specified by the extension.
@@ -37,6 +38,7 @@
public static final String ID =
"org.jboss.tools.deltacloud.ui.views.DeltaCloudView";
private static final String REMOVE_CLOUD = "RemoveCloud.label"; //$NON-NLS-1$
+ private static final String REFRESH = "Refresh.label"; //$NON-NLS-1$
public static final String COLLAPSE_ALL = "CollapseAll.label"; //$NON-NLS-1$
@@ -44,10 +46,10 @@
private Action action1;
private Action action2;
private Action removeCloud;
+ private Action refreshAction;
private Action collapseall;
private Action doubleClickAction;
-
/**
* The constructor.
*/
@@ -73,6 +75,7 @@
hookDoubleClickAction();
hookSelection();
contributeToActionBars();
+ DeltaCloudManager.getDefault().addCloudManagerListener(this);
}
private void hookSelection() {
@@ -113,6 +116,7 @@
manager.add(action1);
manager.add(new Separator());
manager.add(removeCloud);
+ manager.add(refreshAction);
}
private void fillContextMenu(IMenuManager manager) {
@@ -152,7 +156,17 @@
removeCloud.setText(CVMessages.getString(REMOVE_CLOUD));
removeCloud.setToolTipText(CVMessages.getString(REMOVE_CLOUD));
removeCloud.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
- getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
+ getImageDescriptor(ISharedImages.IMG_ELCL_REMOVE));
+
+ refreshAction = new Action() {
+ public void run() {
+ viewer.setInput(getViewSite());
+ }
+ };
+ refreshAction.setText(CVMessages.getString(REFRESH));
+ refreshAction.setToolTipText(CVMessages.getString(REFRESH));
+ refreshAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
+ getImageDescriptor(ISharedImages.IMG_TOOL_REDO));
action1 = new Action() {
public void run() {
@@ -210,4 +224,9 @@
public void setFocus() {
viewer.getControl().setFocus();
}
+
+ @Override
+ public void changeEvent(int type) {
+ viewer.setInput(getViewSite());
+ }
}
\ No newline at end of file
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java
(rev 0)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java 2010-07-28
21:57:41 UTC (rev 23784)
@@ -0,0 +1,56 @@
+package org.jboss.tools.internal.deltacloud.ui.wizards;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudManager;
+import org.jboss.tools.deltacloud.ui.Activator;
+
+public class NewCloudConnection extends Wizard implements INewWizard {
+
+ private static final String MAINPAGE_NAME = "NewCloudConnection.name";
//$NON-NLS-1$
+ private NewCloudConnectionPage mainPage;
+
+ public NewCloudConnection() {
+ super();
+ }
+
+ @Override
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ public void addPages() {
+ // TODO Auto-generated method stub
+ mainPage = new NewCloudConnectionPage(WizardMessages.getString(MAINPAGE_NAME));
+ addPage(mainPage);
+ }
+
+ @Override
+ public boolean canFinish() {
+ return mainPage.isPageComplete();
+ }
+
+ @Override
+ public boolean performFinish() {
+ String name = mainPage.getName();
+ String url = mainPage.getURL();
+ String username = mainPage.getUsername();
+ String password = mainPage.getPassword();
+ try {
+ DeltaCloud newCloud = new DeltaCloud(name, new URL(url), username, password);
+ DeltaCloudManager.getDefault().addCloud(newCloud);
+ } catch (MalformedURLException e) {
+ Activator.log(e);
+ return false;
+ }
+ return true;
+ }
+
+}
Added:
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
(rev 0)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-07-28
21:57:41 UTC (rev 23784)
@@ -0,0 +1,314 @@
+package org.jboss.tools.internal.deltacloud.ui.wizards;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.deltacloud.core.DeltaCloudManager;
+import org.jboss.tools.deltacloud.ui.Activator;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+public class NewCloudConnectionPage extends WizardPage {
+
+ private static final String DESCRIPTION = "NewCloudConnection.desc";
//$NON-NLS-1$
+ private static final String TITLE = "NewCloudConnection.title"; //$NON-NLS-1$
+ private static final String URL_LABEL = "Url.label"; //$NON-NLS-1$
+ private static final String NAME_LABEL = "Name.label"; //$NON-NLS-1$
+ private static final String USERNAME_LABEL = "UserName.label"; //$NON-NLS-1$
+ private static final String TYPE_LABEL = "Type.label"; //$NON-NLS-1$
+ private static final String PASSWORD_LABEL = "Password.label"; //$NON-NLS-1$
+ private static final String UNKNOWN_TYPE_LABEL = "UnknownType.label";
//$NON-NLS-1$
+ private static final String EC2_USER_INFO = "EC2UserNameLink.text";
//$NON-NLS-1$
+ private static final String EC2_PASSWORD_INFO = "EC2PasswordLink.text";
//$NON-NLS-1$
+ private static final String NAME_ALREADY_IN_USE = "ErrorNameInUse.text";
//$NON-NLS-1$
+ private static final String INVALID_URL = "ErrorInvalidURL.text";
//$NON-NLS-1$
+ private static final String NONCLOUD_URL = "ErrorNonCloudURL.text";
//$NON-NLS-1$
+
+ private Label errorLabel;
+
+ private Text nameText;
+ private Text urlText;
+ private Label typeText;
+ private Text usernameText;
+ private Text passwordText;
+
+ private String name;
+ private String url;
+ private String username;
+ private String password;
+
+ private Listener linkListener = new Listener() {
+
+ public void handleEvent(Event event) {
+ try {
+ URL url = new URL(event.text);
+ PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser().openURL(url);
+ } catch (Exception e) {
+ Activator.log(e);
+ }
+ }
+
+ };
+
+ public NewCloudConnectionPage(String pageName) {
+ super(pageName);
+ setDescription(WizardMessages.getString(DESCRIPTION));
+ setTitle(WizardMessages.getString(TITLE));
+ setPageComplete(false);
+ }
+
+ private ModifyListener textListener = new ModifyListener() {
+
+ @Override
+ public void modifyText(ModifyEvent e) {
+ validate();
+ }
+ };
+
+ public String getName() {
+ return name;
+ }
+
+ public String getURL() {
+ return url;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ private void validate() {
+ boolean complete = true;
+ boolean errorFree = true;
+ name = nameText.getText();
+ if (name.length() > 0) {
+ if (DeltaCloudManager.getDefault().findCloud(name) != null) {
+ errorFree = false;
+ setErrorMessage(WizardMessages.getString(NAME_ALREADY_IN_USE));
+ }
+ } else {
+ complete = false;
+ }
+ String oldurl = url;
+ url = urlText.getText();
+ if (url.length() > 0) {
+ if (!url.equals(oldurl)) {
+ try {
+ URL u = new URL(url + ".xml");
+ Object o = u.getContent();
+ if (o instanceof InputStream) {
+ String xml = "";
+ InputStream is = (InputStream)o;
+ try
+ {
+ if (is != null)
+ {
+ StringBuilder sb = new StringBuilder();
+ String line;
+
+ BufferedReader reader = new BufferedReader(new InputStreamReader(is,
"UTF-8"));
+ while ((line = reader.readLine()) != null)
+ {
+ sb.append(line).append("\n");
+ }
+ xml = sb.toString();
+ }
+ }
+ finally
+ {
+ is.close();
+ }
+
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ Document document = db.parse(new InputSource(new StringReader(xml)));
+
+ NodeList elements = document.getElementsByTagName("api"); //$NON-NLS-1$
+ if (elements.getLength() > 0) {
+ Node n = elements.item(0);
+ Node driver = n.getAttributes().getNamedItem("driver"); //$NON-NLS-1$
+ if (driver != null) {
+ String driverValue = driver.getNodeValue();
+ typeText.setText(driverValue.toUpperCase());
+ }
+ }
+ }
+ } catch (MalformedURLException e) {
+ errorFree = false;
+ setErrorMessage(WizardMessages.getString(INVALID_URL));
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ errorFree = false;
+ setErrorMessage(WizardMessages.getString(NONCLOUD_URL));
+ } catch (ParserConfigurationException e) {
+ errorFree = false;
+ setErrorMessage(WizardMessages.getString(NONCLOUD_URL));
+ } catch (SAXException e) {
+ errorFree = false;
+ setErrorMessage(WizardMessages.getString(NONCLOUD_URL));
+ }
+ }
+ } else {
+ complete = false;
+ }
+ username = usernameText.getText();
+ if (username.length() <= 0) {
+ complete = false;
+ }
+ password = passwordText.getText();
+ if (password.length() <= 0) {
+ complete = false;
+ }
+ if (errorFree)
+ setErrorMessage(null);
+ setPageComplete(complete & errorFree);
+ }
+
+ @Override
+ public void createControl(Composite parent) {
+ // TODO Auto-generated method stub
+ final Composite container = new Composite(parent, SWT.NULL);
+ FormLayout layout = new FormLayout();
+ layout.marginHeight = 5;
+ layout.marginWidth = 5;
+ container.setLayout(layout);
+
+ errorLabel = new Label(container, SWT.NULL);
+ //
errorLabel.setForeground(JFaceResources.getColorRegistry().get(JFacePreferences.ERROR_COLOR));
+
+ Label nameLabel = new Label(container, SWT.NULL);
+ nameLabel.setText(WizardMessages.getString(NAME_LABEL));
+ nameText = new Text(container, SWT.BORDER | SWT.SINGLE);
+ nameText.addModifyListener(textListener);
+
+ Label urlLabel = new Label(container, SWT.NULL);
+ urlLabel.setText(WizardMessages.getString(URL_LABEL));
+
+ urlText = new Text(container, SWT.BORDER | SWT.SINGLE);
+ urlText.addModifyListener(textListener);
+
+ Label typeLabel = new Label(container, SWT.NULL);
+ typeLabel.setText(WizardMessages.getString(TYPE_LABEL));
+
+ typeText = new Label(container, SWT.NULL);
+ typeText.setText(WizardMessages.getString(UNKNOWN_TYPE_LABEL));
+
+ Label usernameLabel = new Label(container, SWT.NULL);
+ usernameLabel.setText(WizardMessages.getString(USERNAME_LABEL));
+
+ usernameText = new Text(container, SWT.BORDER | SWT.SINGLE);
+ usernameText.addModifyListener(textListener);
+
+ Label passwordLabel = new Label(container, SWT.NULL);
+ passwordLabel.setText(WizardMessages.getString(PASSWORD_LABEL));
+
+ passwordText = new Text(container, SWT.BORDER | SWT.PASSWORD | SWT.SINGLE);
+ passwordText.addModifyListener(textListener);
+
+ Link ec2userLink = new Link(container, SWT.NULL);
+ ec2userLink.setText(WizardMessages.getString(EC2_USER_INFO));
+ ec2userLink.addListener(SWT.Selection, linkListener);
+
+ Link ec2pwLink = new Link(container, SWT.NULL);
+ ec2pwLink.setText(WizardMessages.getString(EC2_PASSWORD_INFO));
+ ec2pwLink.addListener(SWT.Selection, linkListener);
+
+ FormData f = new FormData();
+ f.left = new FormAttachment(0, 0);
+ f.right = new FormAttachment(100, 0);
+ errorLabel.setLayoutData(f);
+
+ f = new FormData();
+ f.top = new FormAttachment(errorLabel, 8);
+ nameLabel.setLayoutData(f);
+
+ f = new FormData();
+ f.top = new FormAttachment(errorLabel, 8);
+ f.left = new FormAttachment(usernameLabel, 5);
+ f.right = new FormAttachment(100, 0);
+ nameText.setLayoutData(f);
+
+ f = new FormData();
+ f.top = new FormAttachment(nameText, 8);
+ urlLabel.setLayoutData(f);
+
+ f = new FormData();
+ f.left = new FormAttachment(nameText, 0, SWT.LEFT);
+ f.top = new FormAttachment(nameText, 5);
+ f.right = new FormAttachment(100, 0);
+ urlText.setLayoutData(f);
+
+ f = new FormData();
+ f.top = new FormAttachment(urlText, 8);
+ typeLabel.setLayoutData(f);
+
+ f = new FormData();
+ f.left = new FormAttachment(urlText, 0, SWT.LEFT);
+ f.top = new FormAttachment(urlText, 5);
+ f.right = new FormAttachment(100, 0);
+ typeText.setLayoutData(f);
+
+ f = new FormData();
+ f.top = new FormAttachment(typeText, 8);
+ usernameLabel.setLayoutData(f);
+
+ f = new FormData();
+ f.left = new FormAttachment(typeText, 0, SWT.LEFT);
+ f.top = new FormAttachment(typeText, 5);
+ f.right = new FormAttachment(100, 0);
+ usernameText.setLayoutData(f);
+
+ f = new FormData();
+ f.left = new FormAttachment(usernameText, 0, SWT.LEFT);
+ f.top = new FormAttachment(usernameText, 5);
+ ec2userLink.setLayoutData(f);
+
+ f = new FormData();
+ f.top = new FormAttachment(ec2userLink, 8);
+ passwordLabel.setLayoutData(f);
+
+ f = new FormData();
+ f.left = new FormAttachment(usernameText, 0, SWT.LEFT);
+ f.top = new FormAttachment(ec2userLink, 5);
+ f.right = new FormAttachment(100, 0);
+ passwordText.setLayoutData(f);
+
+ f = new FormData();
+ f.left = new FormAttachment(passwordText, 0, SWT.LEFT);
+ f.top = new FormAttachment(passwordText, 5);
+ ec2pwLink.setLayoutData(f);
+
+ setControl(container);
+}
+
+}
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.java
(rev 0)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.java 2010-07-28
21:57:41 UTC (rev 23784)
@@ -0,0 +1,20 @@
+package org.jboss.tools.internal.deltacloud.ui.wizards;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class WizardMessages {
+
+ private static final String BUNDLE_NAME = WizardMessages.class.getName();
+
+ public static String getString(String key) {
+ try {
+ return ResourceBundle.getBundle(BUNDLE_NAME).getString(key);
+ } catch (MissingResourceException e) {
+ return '!' + key + '!';
+ } catch (NullPointerException e) {
+ return '#' + key + '#';
+ }
+ }
+
+}
Added:
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
(rev 0)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-07-28
21:57:41 UTC (rev 23784)
@@ -0,0 +1,18 @@
+NewCloudConnection.desc=Specify connection details for a cloud you wish to access
+NewCloudConnection.title=Cloud Connection
+NewCloudConnection.name=Cloud Connection
+
+Url.label=URL:
+Name.label=Name:
+Type.label=Type:
+UserName.label=Username:
+Password.label=Password:
+TestButton.label=Test
+UnknownType.label=Unknown
+
+EC2UserNameLink.text=For EC2 use the <a
href="https://console.aws.amazon.com/ec2/home">Access ID</a>
+EC2PasswordLink.text=For EC2 use the <a
href="https://console.aws.amazon.com/ec2/home">Access Secret Key</a>
+
+ErrorNameInUse.text=Error: the name chosen is already in use
+ErrorInvalidURL.text=Error: the URL specified is invalid
+ErrorNonCloudURL.text=Error: the URL specified is not a valid cloud address
\ No newline at end of file