[jbosstools-commits] JBoss Tools SVN: r23923 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/internal/deltacloud/ui/wizards and 1 other directory.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed Aug 4 12:45:54 EDT 2010
Author: jjohnstn
Date: 2010-08-04 12:45:53 -0400 (Wed, 04 Aug 2010)
New Revision: 23923
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
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.properties
Log:
2010-08-04 Jeff Johnston <jjohnstn at redhat.com>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java (addPages):
(performTest): New method to test connection.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (checkURL):
(NewCloudConnectionPage): Pass in calling wizard.
(.widgetSelected): New method for test button.
(createControl): Add test button and refine format layout.
(validate): Clear the message area each time.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: Add new
messages for connection testing purposes.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-04 16:40:23 UTC (rev 23922)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-04 16:45:53 UTC (rev 23923)
@@ -1,3 +1,15 @@
+2010-08-04 Jeff Johnston <jjohnstn at redhat.com>
+
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java (addPages):
+ (performTest): New method to test connection.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (checkURL):
+ (NewCloudConnectionPage): Pass in calling wizard.
+ (.widgetSelected): New method for test button.
+ (createControl): Add test button and refine format layout.
+ (validate): Clear the message area each time.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: Add new
+ messages for connection testing purposes.
+
2010-08-03 Jeff Johnston <jjohnstn at redhat.com>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java: New file.
Modified: 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 2010-08-04 16:40:23 UTC (rev 23922)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java 2010-08-04 16:45:53 UTC (rev 23923)
@@ -8,6 +8,7 @@
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudImage;
import org.jboss.tools.deltacloud.core.DeltaCloudManager;
import org.jboss.tools.deltacloud.ui.Activator;
@@ -28,7 +29,7 @@
@Override
public void addPages() {
// TODO Auto-generated method stub
- mainPage = new NewCloudConnectionPage(WizardMessages.getString(MAINPAGE_NAME));
+ mainPage = new NewCloudConnectionPage(WizardMessages.getString(MAINPAGE_NAME), this);
addPage(mainPage);
}
@@ -37,6 +38,20 @@
return mainPage.isPageComplete();
}
+ public boolean performTest() {
+ 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);
+ return newCloud.testConnection();
+ } catch (MalformedURLException e) {
+ Activator.log(e);
+ return false;
+ }
+ }
+
@Override
public boolean performFinish() {
String name = mainPage.getName();
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-04 16:40:23 UTC (rev 23922)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-08-04 16:45:53 UTC (rev 23923)
@@ -14,13 +14,19 @@
import org.eclipse.core.runtime.ISafeRunnable;
import org.eclipse.core.runtime.SafeRunner;
+import org.eclipse.jface.dialogs.IDialogConstants;
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.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
@@ -45,6 +51,7 @@
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 TESTBUTTON_LABEL = "TestButton.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$
@@ -52,7 +59,13 @@
private static final String INVALID_URL = "ErrorInvalidURL.text"; //$NON-NLS-1$
private static final String NONCLOUD_URL = "ErrorNonCloudURL.text"; //$NON-NLS-1$
+ private static final String TEST_SUCCESSFUL = "NewCloudConnectionTest.success"; //$NON-NLS-1$
+ private static final String TEST_FAILURE = "NewCloudConnectionTest.failure"; //$NON-NLS-1$
+
+ private NewCloudConnection wizard;
+
private Label errorLabel;
+ private Button testButton;
private Text nameText;
private Text urlText;
@@ -80,9 +93,26 @@
}
};
+
+ private SelectionListener buttonListener = new SelectionAdapter() {
+
+ public void widgetSelected(SelectionEvent event) {
+ boolean successful = false;
+ if (getURLValid()) {
+ successful = wizard.performTest();
+ }
+ if (successful) {
+ setMessage(WizardMessages.getString(TEST_SUCCESSFUL));
+ } else {
+ setErrorMessage(WizardMessages.getString(TEST_FAILURE));
+ }
+ }
+
+ };
- public NewCloudConnectionPage(String pageName) {
+ public NewCloudConnectionPage(String pageName, NewCloudConnection wizard) {
super(pageName);
+ this.wizard= wizard;
setDescription(WizardMessages.getString(DESCRIPTION));
setTitle(WizardMessages.getString(TITLE));
setPageComplete(false);
@@ -115,6 +145,9 @@
private void validate() {
boolean complete = true;
boolean errorFree = true;
+
+ setMessage(null);
+
name = nameText.getText();
if (name.length() > 0) {
if (DeltaCloudManager.getDefault().findCloud(name) != null) {
@@ -172,7 +205,7 @@
// Method to check the URL for validity as Delta-cloud API specifier.
// Since this is run in thread, it does not use the setErrorMessage()
// method and instead writes error messages to the typeText label.
- private synchronized void checkURL() {
+ private synchronized boolean checkURL() {
boolean valid = false;
String oldurl = url;
url = urlText.getText();
@@ -232,8 +265,10 @@
}
setURLValid(valid);
}
- typeText.setText(cloudType);
+ if (!typeText.getText().equals(cloudType))
+ typeText.setText(cloudType);
}
+ return valid;
}
/**
@@ -295,6 +330,10 @@
passwordText = new Text(container, SWT.BORDER | SWT.PASSWORD | SWT.SINGLE);
passwordText.addModifyListener(textListener);
+ testButton = new Button(container, SWT.NULL);
+ testButton.setText(WizardMessages.getString(TESTBUTTON_LABEL));
+ testButton.addSelectionListener(buttonListener);
+
Link ec2userLink = new Link(container, SWT.NULL);
ec2userLink.setText(WizardMessages.getString(EC2_USER_INFO));
ec2userLink.addListener(SWT.Selection, linkListener);
@@ -309,7 +348,7 @@
errorLabel.setLayoutData(f);
f = new FormData();
- f.top = new FormAttachment(errorLabel, 8);
+ f.top = new FormAttachment(errorLabel, 11);
nameLabel.setLayoutData(f);
f = new FormData();
@@ -339,13 +378,13 @@
typeText.setLayoutData(f);
f = new FormData();
- f.top = new FormAttachment(typeText, 8);
+ f.top = new FormAttachment(typeText, 16);
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);
+ f.top = new FormAttachment(typeText, 13);
+ f.right = new FormAttachment(100, -70);
usernameText.setLayoutData(f);
f = new FormData();
@@ -360,10 +399,19 @@
f = new FormData();
f.left = new FormAttachment(usernameText, 0, SWT.LEFT);
f.top = new FormAttachment(ec2userLink, 5);
- f.right = new FormAttachment(100, 0);
+ f.right = new FormAttachment(100, -70);
passwordText.setLayoutData(f);
f = new FormData();
+ int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
+ Point minSize = testButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+ f.width = Math.max(widthHint, minSize.x);
+ f.left = new FormAttachment(usernameText, 10);
+ f.top = new FormAttachment(usernameText, 0);
+ f.right = new FormAttachment(100, 0);
+ testButton.setLayoutData(f);
+
+ f = new FormData();
f.left = new FormAttachment(passwordText, 0, SWT.LEFT);
f.top = new FormAttachment(passwordText, 5);
ec2pwLink.setLayoutData(f);
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-04 16:40:23 UTC (rev 23922)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-08-04 16:45:53 UTC (rev 23923)
@@ -1,6 +1,8 @@
NewCloudConnection.desc=Specify connection details for a cloud you wish to access
NewCloudConnection.title=Cloud Connection
NewCloudConnection.name=Cloud Connection
+NewCloudConnectionTest.success=Connection Test successful
+NewCloudConnectionTest.failure=Connection Test failed
Url.label=URL:
Name.label=Name:
More information about the jbosstools-commits
mailing list