diff --git a/src/net/java/sip/communicator/impl/gui/main/account/EmptyAccountRegistrationWizardPage.java b/src/net/java/sip/communicator/impl/gui/main/account/EmptyAccountRegistrationWizardPage.java index 158a86ef2..7eb04b659 100644 --- a/src/net/java/sip/communicator/impl/gui/main/account/EmptyAccountRegistrationWizardPage.java +++ b/src/net/java/sip/communicator/impl/gui/main/account/EmptyAccountRegistrationWizardPage.java @@ -16,7 +16,7 @@ /** * The EmptyAccountRegistrationWizardPage is the page that users - * would seen in the NewAccountDialog as a default choice which would make them + * would see in the NewAccountDialog as a default choice which would make them * pick a new option. * * @author Emil Ivov @@ -110,13 +110,14 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier. In this case it's null because this is the first + * wizard page. * - * @return Returns the identifier of the previous page of the wizard. + * @return the identifier of the previous page of the wizard */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizardPage2.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizardPage2.java index 65cf92cab..8f3c22f4c 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizardPage2.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizardPage2.java @@ -37,7 +37,7 @@ public CreateChatRoomWizardPage2(WizardContainer wizard, { this.newChatRoom = newChatRoom; - namePanel = new ChatRoomNamePanel(wizard); + namePanel = new ChatRoomNamePanel(wizard); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizardPage1.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizardPage1.java index 4df4d5d3b..2be9b19e3 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizardPage1.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizardPage1.java @@ -23,7 +23,9 @@ public class AddContactWizardPage1 implements WizardPage, ListSelectionListener { - + /** + * The identifier of this page. + */ public static final String IDENTIFIER = "SELECT_ACCOUNT_PANEL"; private SelectAccountPanel selectAccountPanel; @@ -32,7 +34,8 @@ public class AddContactWizardPage1 /** * Creates an instance of AddContactWizardPage1. - * + * + * @param wizard the parent wizard * @param newContact An object that collects all user choices through the * wizard. * @param providerList The list of available @@ -83,40 +86,58 @@ public void valueChanged(ListSelectionEvent e) setNextButtonAccordingToCheckBox(); } + /** + * Returns the identifier of this wizard page. + * @return the identifier of this wizard page + */ public Object getIdentifier() { return IDENTIFIER; } + /** + * Implements the WizardPage.getNextPageIdentifier to return + * the next identifier. + * + * @return the identifier of the next wizard page. + */ public Object getNextPageIdentifier() { return AddContactWizardPage2.IDENTIFIER; } + /** + * Implements the WizardPage.getBackPageIdentifier to return + * the back identifier. In this case it's null because this is the first + * wizard page. + * + * @return the identifier of the previous wizard page. + */ public Object getBackPageIdentifier() { - return IDENTIFIER; + return null; } + /** + * Returns the graphical component corresponding to this wizard page. + * @return the graphical component corresponding to this wizard page + */ public Object getWizardForm() { return selectAccountPanel; } - public void pageHiding() - { - } - - public void pageShown() - { - } - + /** + * Commits all data from the form before going to the next page. + */ public void commitPage() { selectAccountPanel.initSelectedAccount(); } - public void pageBack() - { - } + public void pageHiding() {} + + public void pageShown() {} + + public void pageBack() {} } diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java index e20bdc6a1..ad4641e7e 100644 --- a/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java @@ -229,7 +229,7 @@ public Object getIdentifier() /** * Implements the WizardPage.getNextPageIdentifier to return - * the next page identifier - the summary page. + * the next identifier - the summary page. */ public Object getNextPageIdentifier() { @@ -238,11 +238,12 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier, which is null as this is the first wizard page. + * @return the identifier of the previous page */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java index 4e848f5af..8004e1845 100644 --- a/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java @@ -276,13 +276,13 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier, which is null as this is the first wizard page. * - * @return Returns the identifier of the previous page of the wizard. + * @return the identifier of the previous page of the wizard. */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/facebookaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/facebookaccregwizz/FirstWizardPage.java index d8352503e..be65b68bf 100644 --- a/src/net/java/sip/communicator/plugin/facebookaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/facebookaccregwizz/FirstWizardPage.java @@ -203,13 +203,14 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier. In this case it's null because this is the first + * wizard page. * - * @return the identifier of the default wizard page. + * @return the identifier of the previous wizard page. */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java index f2727ec72..74e4848b3 100644 --- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java @@ -145,13 +145,14 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier. In this case it's null because this is the first + * wizard page. * - * @return the identifier of the default wizard page. + * @return the identifier of the previous wizard page. */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java index f61e84833..6249ecfea 100644 --- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java @@ -294,13 +294,14 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier. In this case it's null because this is the first + * wizard page. * - * @return the id of the default wizard page. + * @return the id of the previous wizard page. */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java index 3c295bf9b..391fd2d4d 100644 --- a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java @@ -231,11 +231,13 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier. In this case it's null because this is the first + * wizard page. + * @return the identifier of the previous wizard page */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/iptelaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/iptelaccregwizz/FirstWizardPage.java index a0284147e..80022e4ca 100644 --- a/src/net/java/sip/communicator/plugin/iptelaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/iptelaccregwizz/FirstWizardPage.java @@ -430,12 +430,13 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. - * @return the back page identifier + * the back identifier. In this case it's null because this is the first + * wizard page. + * @return the identifier of the previous wizard page */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java index e6f2dfae8..4d25b451e 100644 --- a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java @@ -256,13 +256,14 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier. In this case it's null because this is the first + * wizard page. * - * @return the identifier of the default wizard page. + * @return the identifier of the previous wizard page */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java index 4b9d5166b..ab9e749ab 100644 --- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java @@ -308,13 +308,14 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier. In this case it's null because this is the first + * wizard page. * - * @return the id of the default wizard page. + * @return the identifier of the previous wizard page */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java index 96cde1bcf..1e7d1c994 100644 --- a/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java @@ -146,11 +146,13 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier. In this case it's null because this is the first + * wizard page. + * @return the identifier of the previous wizard page */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java index 859dfbafa..2d4848ff5 100644 --- a/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java @@ -151,13 +151,14 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier. In this case it's null because this is the first + * wizard page. * - * @return the identifier of the default wizard page. + * @return the identifier of the previous wizard page */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java index 7cca7905d..682baae70 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java @@ -374,11 +374,13 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier. In this case it's null because this is the first + * wizard page. + * @return the identifier of the previous wizard page */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java index 3401f04a9..443555943 100644 --- a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java @@ -300,13 +300,14 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier. In this case it's null because this is the first + * wizard page. * - * @return the identifier of the default wizard page. + * @return the identifier of the previous wizard page */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java index 574e71081..a519bd8aa 100644 --- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java @@ -148,11 +148,13 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier. In this case it's null because this is the first + * wizard page. + * @return the identifier of the previous wizard page */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java index 5cd4f3009..6875068e6 100644 --- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java @@ -189,13 +189,14 @@ public Object getNextPageIdentifier() /** * Implements the WizardPage.getBackPageIdentifier to return - * the next back identifier - the default page. + * the back identifier. In this case it's null because this is the first + * wizard page. * - * @return the identifier of the default wizard page. + * @return the identifier of the previous wizard page */ public Object getBackPageIdentifier() { - return WizardPage.DEFAULT_PAGE_IDENTIFIER; + return null; } /** diff --git a/src/net/java/sip/communicator/service/gui/WizardPage.java b/src/net/java/sip/communicator/service/gui/WizardPage.java index ab91a2349..2c2bfcc29 100644 --- a/src/net/java/sip/communicator/service/gui/WizardPage.java +++ b/src/net/java/sip/communicator/service/gui/WizardPage.java @@ -42,12 +42,11 @@ public interface WizardPage * The identifier of the default wizard page. *

* At the time of this writing, it seems from its current uses that the - * constant indicates a null back page. + * constant indicates a null back page. *

*/ String DEFAULT_PAGE_IDENTIFIER = "DEFAULT"; - /** * Returns the identifier of this WizardPage. *