From f1d6fcefb2eb30c5933158d11ef7914141b61f79 Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Fri, 29 Feb 2008 10:20:00 +0000 Subject: Fix disabled server for new account wizards. --- .../impl/gui/main/account/AccountRegFirstPage.java | 2 ++ .../account/AccountRegWizardContainerImpl.java | 2 ++ .../AimAccountRegistrationWizard.java | 12 +++++++++++ .../GibberishAccountRegistrationWizard.java | 11 ++++++++++ .../IcqAccountRegistrationWizard.java | 11 ++++++++++ .../IrcAccountRegistrationWizard.java | 12 +++++++++++ .../JabberAccountRegistrationWizard.java | 11 ++++++++++ .../MsnAccountRegistrationWizard.java | 11 ++++++++++ .../RssAccountRegistrationWizard.java | 25 +++++++++++++++++++++- .../SIPAccountRegistrationWizard.java | 11 ++++++++++ .../SSHAccountRegistrationWizard.java | 17 +++++++++++++++ .../YahooAccountRegistrationWizard.java | 11 ++++++++++ .../ZeroconfAccountRegistrationWizard.java | 11 ++++++++++ .../service/gui/AccountRegistrationWizard.java | 18 ++++++++++++++++ 14 files changed, 164 insertions(+), 1 deletion(-) (limited to 'src/net/java') diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegFirstPage.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegFirstPage.java index f0e8662..e2b6794 100644 --- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegFirstPage.java +++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegFirstPage.java @@ -268,6 +268,8 @@ public class AccountRegFirstPage extends JPanel break; } + wizard.setModification(false); + this.wizardContainer.setCurrentWizard(wizard); } 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 226ab3a..5b7c76f 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 @@ -273,6 +273,8 @@ public class AccountRegWizardContainerImpl this.setCurrentWizard(wizard); + wizard.setModification(true); + Iterator i = wizard.getPages(); Object identifier = null; diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java index 29b14e6..64df19c 100644 --- a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java @@ -297,4 +297,16 @@ public class AimAccountRegistrationWizard { return firstWizardPage.getIdentifier(); } + + /** + * Sets the modification property to indicate if this wizard is opened for + * a modification. + * + * @param isModification indicates if this wizard is opened for modification + * or for creating a new account. + */ + public void setModification(boolean isModification) + { + this.isModification = isModification; + } } diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java index 53e3f9e..b2f2ef2 100644 --- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java @@ -273,4 +273,15 @@ public class GibberishAccountRegistrationWizard return firstWizardPage.getIdentifier(); } + /** + * Sets the modification property to indicate if this wizard is opened for + * a modification. + * + * @param isModification indicates if this wizard is opened for modification + * or for creating a new account. + */ + public void setModification(boolean isModification) + { + this.isModification = isModification; + } } diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java index b89101a..97b2424 100644 --- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java @@ -307,4 +307,15 @@ public class IcqAccountRegistrationWizard return firstWizardPage.getIdentifier(); } + /** + * Sets the modification property to indicate if this wizard is opened for + * a modification. + * + * @param isModification indicates if this wizard is opened for modification + * or for creating a new account. + */ + public void setModification(boolean isModification) + { + this.isModification = isModification; + } } diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java index 6cfbeef..334126b 100644 --- a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java @@ -299,4 +299,16 @@ public class IrcAccountRegistrationWizard { return firstWizardPage.getIdentifier(); } + + /** + * Sets the modification property to indicate if this wizard is opened for + * a modification. + * + * @param isModification indicates if this wizard is opened for modification + * or for creating a new account. + */ + public void setModification(boolean isModification) + { + this.isModification = isModification; + } } diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java index 647c2f4..10f21a4 100644 --- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java @@ -298,4 +298,15 @@ public class JabberAccountRegistrationWizard return firstWizardPage.getIdentifier(); } + /** + * Sets the modification property to indicate if this wizard is opened for + * a modification. + * + * @param isModification indicates if this wizard is opened for modification + * or for creating a new account. + */ + public void setModification(boolean isModification) + { + this.isModification = isModification; + } } diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java index 56db0ff..7a574d8 100644 --- a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java @@ -275,4 +275,15 @@ public class MsnAccountRegistrationWizard return firstWizardPage.getIdentifier(); } + /** + * Sets the modification property to indicate if this wizard is opened for + * a modification. + * + * @param isModification indicates if this wizard is opened for modification + * or for creating a new account. + */ + public void setModification(boolean isModification) + { + this.isModification = isModification; + } } diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java index 9bc8d79..042d260 100644 --- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java @@ -24,7 +24,6 @@ import net.java.sip.communicator.service.protocol.*; public class RssAccountRegistrationWizard implements AccountRegistrationWizard { - /** * The first page of the rss account registration wizard. */ @@ -217,6 +216,7 @@ public class RssAccountRegistrationWizard /** * Returns the identifier of the page to show last in the wizard. + * * @return the identifier of the page to show last in the wizard. */ public Object getLastPageIdentifier() @@ -224,4 +224,27 @@ public class RssAccountRegistrationWizard return firstWizardPage.getIdentifier(); } + /** + * Indicates if this wizard is modifying an existing account or is creating + * a new one. + * + * @return true to indicate that this wizard is currently in + * modification mode, false - otherwise. + */ + public boolean isModification() + { + return isModification; + } + + /** + * Sets the modification property to indicate if this wizard is opened for + * a modification. + * + * @param isModification indicates if this wizard is opened for modification + * or for creating a new account. + */ + public void setModification(boolean isModification) + { + this.isModification = isModification; + } } diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java index 91eb7b1..64046c9 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java @@ -335,4 +335,15 @@ public class SIPAccountRegistrationWizard return firstWizardPage.getIdentifier(); } + /** + * Sets the modification property to indicate if this wizard is opened for + * a modification. + * + * @param isModification indicates if this wizard is opened for modification + * or for creating a new account. + */ + public void setModification(boolean isModification) + { + this.isModification = isModification; + } } diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java index e120468..44af3b8 100644 --- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java @@ -226,4 +226,21 @@ public class SSHAccountRegistrationWizard public Object getLastPageIdentifier() { return firstWizardPage.getIdentifier(); } + + public boolean isModification() + { + return isModification; + } + + /** + * Sets the modification property to indicate if this wizard is opened for + * a modification. + * + * @param isModification indicates if this wizard is opened for modification + * or for creating a new account. + */ + public void setModification(boolean isModification) + { + this.isModification = isModification; + } } diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java index 6864110..23ecab0 100644 --- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java @@ -276,4 +276,15 @@ public class YahooAccountRegistrationWizard return firstWizardPage.getIdentifier(); } + /** + * Sets the modification property to indicate if this wizard is opened for + * a modification. + * + * @param isModification indicates if this wizard is opened for modification + * or for creating a new account. + */ + public void setModification(boolean isModification) + { + this.isModification = isModification; + } } diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java index 060b5ae..75d514c 100644 --- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java @@ -280,4 +280,15 @@ public class ZeroconfAccountRegistrationWizard return firstWizardPage.getIdentifier(); } + /** + * Sets the modification property to indicate if this wizard is opened for + * a modification. + * + * @param isModification indicates if this wizard is opened for modification + * or for creating a new account. + */ + public void setModification(boolean isModification) + { + this.isModification = isModification; + } } diff --git a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java index 8c39e60..0f74b47 100644 --- a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java @@ -120,4 +120,22 @@ public interface AccountRegistrationWizard { * @return the preferred dimensions of this wizard. */ public Dimension getSize(); + + /** + * Sets the modification property to indicate if this wizard is opened for + * a modification. + * + * @param isModification indicates if this wizard is opened for modification + * or for creating a new account. + */ + public void setModification(boolean isModification); + + /** + * Indicates if this wizard is modifying an existing account or is creating + * a new one. + * + * @return true to indicate that this wizard is currently in + * modification mode, false - otherwise. + */ + public boolean isModification(); } -- cgit v1.1