Make sure that the ID inserted has an '@' symbol.

4 files changed, 15 insertions, 7 deletions

diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/Messages.java b/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/Messages.java
index 269473fb5..435ec56ac 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/Messages.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/Messages.java
@@ -27,6 +27,7 @@ public class Messages extends NLS {
 	public static String XMPPConnectWizard_FILE_SAVE_TITLE;
 	public static String XMPPConnectWizard_SEE_DETAILS;
 	public static String XMPPConnectWizardPage_WIZARD_STATUS;
+	public static String XMPPConnectWizardPage_WIZARD_STATUS_INCOMPLETE;
 	public static String XMPPConnectWizardPage_USERID_TEMPLATE;
 	public static String XMPPConnectWizardPage_WIZARD_PASSWORD;
 	public static String XMPPConnectWizard_FILE_RECEIVE_TITLE;
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/XMPPConnectWizardPage.java b/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/XMPPConnectWizardPage.java
index 5df5b051f..77bd1c84c 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/XMPPConnectWizardPage.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/XMPPConnectWizardPage.java
@@ -45,10 +45,13 @@ public class XMPPConnectWizardPage extends WizardPage {
 		connectText.setLayoutData(fillData);
 		connectText.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
-				if (!connectText.getText().equals("")) { //$NON-NLS-1$
-					updateStatus(null);
-				} else {
+				String text = connectText.getText();
+				if (text.equals("")) { //$NON-NLS-1$
 					updateStatus(Messages.XMPPConnectWizardPage_WIZARD_STATUS);
+				} else if (text.indexOf('@') == -1) {
+					updateStatus(Messages.XMPPConnectWizardPage_WIZARD_STATUS_INCOMPLETE);
+				} else {
+					updateStatus(null);
 				}
 			}
 		});
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/XMPPSConnectWizardPage.java b/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/XMPPSConnectWizardPage.java
index 184119586..0aa1f271d 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/XMPPSConnectWizardPage.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/XMPPSConnectWizardPage.java
@@ -34,16 +34,19 @@ final class XMPPSConnectWizardPage extends XMPPConnectWizardPage {
 		GridData endData = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
 
 		Label label = new Label(parent, SWT.LEFT);
-		label.setText(Messages.XMPPSConnectWizardPage_WIZARD_PAGE_USERID);
+		label.setText(Messages.XMPPConnectWizardPage_LABEL_USERID);
 
 		connectText = new Text(parent, SWT.SINGLE | SWT.BORDER);
 		connectText.setLayoutData(fillData);
 		connectText.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
-				if (!connectText.getText().equals("")) { //$NON-NLS-1$
-					updateStatus(null);
-				} else {
+				String text = connectText.getText();
+				if (text.equals("")) { //$NON-NLS-1$
 					updateStatus(Messages.XMPPSConnectWizardPage_WIZARD_PAGE_STATUS);
+				} else if (text.indexOf('@') == -1) {
+					updateStatus(Messages.XMPPConnectWizardPage_WIZARD_STATUS_INCOMPLETE);
+				} else {
+					updateStatus(null);
 				}
 			}
 		});
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/messages.properties b/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/messages.properties
index 1322bb7b1..613204366 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/messages.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/messages.properties
@@ -9,6 +9,7 @@ XMPPConnectWizardPage_LABEL_USERID=User ID:
 XMPPConnectWizard_FILE_SAVE_TITLE=Save File From {0}
 XMPPConnectWizard_SEE_DETAILS=See Details
 XMPPConnectWizardPage_WIZARD_STATUS=An connect ID must be specified.
+XMPPConnectWizardPage_WIZARD_STATUS_INCOMPLETE=The connect ID is malformed.
 XMPPConnectWizardPage_USERID_TEMPLATE=<user>@<xmppserver>[:port]
 XMPPConnectWizardPage_WIZARD_PASSWORD=Password:
 XMPPConnectWizard_FILE_RECEIVE_TITLE=File Receive Request From {0}