Creates a specific account registration interface for the desktop application and moves desktop related methods to it.

16 files changed, 83 insertions, 21 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java
index 314ee98..95edf3a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java
@@ -249,7 +249,9 @@ public class AccountRegWizardContainerImpl
     {
         this.currentWizard = wizard;
 
-        summaryPage.setPreferredSize(this.currentWizard.getSize());
+        if (wizard instanceof DesktopAccountRegistrationWizard)
+            summaryPage.setPreferredSize(
+                ((DesktopAccountRegistrationWizard) currentWizard).getSize());
 
         Iterator<WizardPage> i = wizard.getPages();
 
diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
index 02743ec..6c8c62c 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
@@ -22,7 +22,7 @@ import org.osgi.framework.*;
  * @author Yana Stamcheva
  */
 public class AimAccountRegistrationWizard
-    extends AccountRegistrationWizard
+    extends DesktopAccountRegistrationWizard
 {
     /**
      * The logger.
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java
index 9cbad88..a1dea94 100644
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java
@@ -23,7 +23,7 @@ import org.osgi.framework.*;
  * @author LITZELMANN Cedric
  */
 public class DictAccountRegistrationWizard
-    extends AccountRegistrationWizard
+    extends DesktopAccountRegistrationWizard
 {
     private final Logger logger
         = Logger.getLogger(DictAccountRegistrationWizard.class);
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
index b17f951..f4f69d6 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
@@ -23,7 +23,7 @@ import org.osgi.framework.*;
  * @author Emil Ivov
  */
 public class GibberishAccountRegistrationWizard
-    extends AccountRegistrationWizard
+    extends DesktopAccountRegistrationWizard
 {
     private final Logger logger
         = Logger.getLogger(GibberishAccountRegistrationWizard.class);
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
index c27b7a9..c28c21f 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
@@ -22,7 +22,7 @@ import org.osgi.framework.*;
  * @author Yana Stamcheva
  */
 public class IcqAccountRegistrationWizard
-    extends AccountRegistrationWizard
+    extends DesktopAccountRegistrationWizard
 {
     /**
      * The logger.
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
index e1d9708..191638b 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
@@ -23,7 +23,7 @@ import org.osgi.framework.*;
  * @author Lionel Ferreira & Michael Tarantino
  */
 public class IrcAccountRegistrationWizard
-    extends AccountRegistrationWizard
+    extends DesktopAccountRegistrationWizard
 {
     private final Logger logger
         = Logger.getLogger(IrcAccountRegistrationWizard.class);
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
index 5df6b5b..4e1b195 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
@@ -24,7 +24,7 @@ import org.osgi.framework.*;
  * @author Yana Stamcheva
  */
 public class JabberAccountRegistrationWizard
-    extends AccountRegistrationWizard
+    extends DesktopAccountRegistrationWizard
 {
     /**
      * The logger.
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
index 312f4a8..dee438e 100644
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
@@ -22,7 +22,7 @@ import org.osgi.framework.*;
  * @author Yana Stamcheva
  */
 public class MsnAccountRegistrationWizard
-    extends AccountRegistrationWizard
+    extends DesktopAccountRegistrationWizard
 {
     private final Logger logger
         = Logger.getLogger(MsnAccountRegistrationWizard.class);
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
index a20e231..7c15d0f 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
@@ -23,7 +23,7 @@ import org.osgi.framework.*;
  * @author Emil Ivov
  */
 public class RssAccountRegistrationWizard
-    extends AccountRegistrationWizard
+    extends DesktopAccountRegistrationWizard
 {
     private final Logger logger
         = Logger.getLogger(RssAccountRegistrationWizard.class);
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
index fa95226..ee01659 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
@@ -25,7 +25,7 @@ import org.osgi.framework.*;
  * @author Grigorii Balutsel
  */
 public class SIPAccountRegistrationWizard
-    extends ExtendedAccountRegistrationWizard
+    extends ExtendedDesktopAccountRegWizard
 {
     /**
      * The first wizard page.
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
index 73a46df..7e3f4a6 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
@@ -32,7 +32,7 @@ import org.osgi.framework.*;
  * @author Shobhit Jindal
  */
 public class SSHAccountRegistrationWizard
-        extends AccountRegistrationWizard
+        extends DesktopAccountRegistrationWizard
 {
     private final Logger logger
         = Logger.getLogger(SSHAccountRegistrationWizard.class);
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
index 36035fa..fb3482b 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
@@ -22,7 +22,7 @@ import org.osgi.framework.*;
  * @author Yana Stamcheva
  */
 public class YahooAccountRegistrationWizard
-    extends AccountRegistrationWizard
+    extends DesktopAccountRegistrationWizard
 {
     private final Logger logger
         = Logger.getLogger(YahooAccountRegistrationWizard.class);
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
index 71b5da6..5a5ddaa 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
@@ -24,7 +24,7 @@ import org.osgi.framework.*;
  * @author Maxime Catelin
  */
 public class ZeroconfAccountRegistrationWizard
-    extends AccountRegistrationWizard
+    extends DesktopAccountRegistrationWizard
 {
     private Logger logger
         = Logger.getLogger(ZeroconfAccountRegistrationWizard.class);
diff --git a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java
index 9390e3a..6fa9c3c 100644
--- a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java
@@ -6,7 +6,6 @@
  */
 package net.java.sip.communicator.service.gui;
 
-import java.awt.*;
 import java.util.*;
 
 import net.java.sip.communicator.service.gui.internal.*;
@@ -198,13 +197,6 @@ public abstract class AccountRegistrationWizard
     }
 
     /**
-     * Returns the preferred dimensions of this wizard.
-     * 
-     * @return the preferred dimensions of this wizard.
-     */
-    public abstract Dimension getSize();
-
-    /**
      * Returns a simple account registration form that would be the first form
      * shown to the user. Only if the user needs more settings she'll choose
      * to open the advanced wizard, consisted by all pages.
diff --git a/src/net/java/sip/communicator/service/gui/DesktopAccountRegistrationWizard.java b/src/net/java/sip/communicator/service/gui/DesktopAccountRegistrationWizard.java
new file mode 100644
index 0000000..90a917f
--- /dev/null
+++ b/src/net/java/sip/communicator/service/gui/DesktopAccountRegistrationWizard.java
@@ -0,0 +1,39 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.service.gui;
+
+import java.awt.*;
+
+/**
+ * The <tt>DesktopAccountRegistrationWizard</tt> extends the
+ * <tt>AccountRegistrationWizard</tt> to provide a desktop specific account
+ * registration. It is meant to provide a wizard which will guide the user
+ * through a protocol account registration. Each
+ * <tt>AccountRegistrationWizard</tt> should provide a set of
+ * <tt>WizardPage</tt>s, an icon, the name and the description of the
+ * corresponding protocol.
+ * <p>
+ * Note that the <tt>AccountRegistrationWizard</tt> is NOT a real wizard, it
+ * doesn't handle wizard events. Each UI Service implementation should provide
+ * its own wizard UI control, which should manage all the events, panels and
+ * buttons, etc.
+ * <p>
+ * It depends on the wizard implementation in the UI for whether or not a
+ * summary will be shown to the user before "Finish".
+ * 
+ * @author Yana Stamcheva
+ */
+public abstract class DesktopAccountRegistrationWizard
+    extends AccountRegistrationWizard
+{
+    /**
+     * Returns the preferred dimensions of this wizard.
+     * 
+     * @return the preferred dimensions of this wizard.
+     */
+    public abstract Dimension getSize();
+}
diff --git a/src/net/java/sip/communicator/service/gui/ExtendedDesktopAccountRegWizard.java b/src/net/java/sip/communicator/service/gui/ExtendedDesktopAccountRegWizard.java
new file mode 100644
index 0000000..587e742
--- /dev/null
+++ b/src/net/java/sip/communicator/service/gui/ExtendedDesktopAccountRegWizard.java
@@ -0,0 +1,29 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ * 
+ * Distributable under LGPL license. See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.service.gui;
+
+/**
+ * The <tt>ExtendedDesktopAccountRegWizard</tt> allows to specify if a sign up
+ * form is supported for a desktop specific account registration.
+ *
+ * @author Yana Stamcheva
+ */
+public abstract class ExtendedDesktopAccountRegWizard
+    extends DesktopAccountRegistrationWizard
+{
+    /**
+     * Indicates if a sign up form is supported by this wizard.
+     *
+     * @return <tt>true</tt> if a sign up form is supported by this wizard,
+     * <tt>false</tt> - otherwise
+     */
+    public abstract boolean isSignupSupported();
+
+    /**
+     * Sets the create account view of this registration wizard.
+     */
+    public abstract void setCreateAccountView();
+}