New Account configuration forms.

2 files changed, 26 insertions, 2 deletions

diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
index 0c415bc..c48fa66 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
@@ -136,6 +136,10 @@ public class AimAccountRegistrationWizard
      */
     public ProtocolProviderService signin()
     {
+        if (!firstWizardPage.isCommitted())
+            firstWizardPage.commitPage();
+
+        firstWizardPage.commitPage();
         return this.signin(registration.getUin(), registration.getPassword());
     }
 
@@ -354,7 +358,6 @@ public class AimAccountRegistrationWizard
             "initRegistration.psp?sitedomain=www.aim.com&createSn=1");
     }
 
-
     /**
      * Returns <code>true</code> if the web sign up is supported by the current
      * implementation, <code>false</code> - otherwise.
@@ -365,4 +368,11 @@ public class AimAccountRegistrationWizard
     {
         return true;
     }
+
+    public Object getSimpleForm()
+    {
+        firstWizardPage = new FirstWizardPage(this);
+
+        return firstWizardPage.getSimpleForm();
+    }
 }
diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java
index 151beda..7b530e1 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java
@@ -105,6 +105,8 @@ public class FirstWizardPage
 
     private AimAccountRegistrationWizard wizard;
 
+    private boolean isCommitted = false;
+
     /**
      * Creates an instance of <tt>FirstWizardPage</tt>.
      * 
@@ -271,7 +273,7 @@ public class FirstWizardPage
     /**
      * Saves the user input when the "Next" wizard buttons is clicked.
      */
-    public void pageNext()
+    public void commitPage()
     {
         String uin = uinField.getText();
 
@@ -307,6 +309,8 @@ public class FirstWizardPage
                         .getPassword()));
             }
         }
+
+        isCommitted = true;
     }
 
     /**
@@ -447,4 +451,14 @@ public class FirstWizardPage
         }
         return false;
     }
+
+    public Object getSimpleForm()
+    {
+        return uinPassPanel;
+    }
+    
+    public boolean isCommitted()
+    {
+        return isCommitted;
+    }
 }