diff options
Diffstat (limited to 'src/net')
23 files changed, 115 insertions, 130 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/event/PluginComponentEvent.java b/src/net/java/sip/communicator/impl/gui/event/PluginComponentEvent.java index 3063875..3cff100 100644 --- a/src/net/java/sip/communicator/impl/gui/event/PluginComponentEvent.java +++ b/src/net/java/sip/communicator/impl/gui/event/PluginComponentEvent.java @@ -17,8 +17,7 @@ import net.java.sip.communicator.service.gui.*; public class PluginComponentEvent extends EventObject { - - private int eventID = -1; + private final int eventID; /** * Indicates that the PluginComponentEvent instance was triggered by @@ -43,6 +42,7 @@ public class PluginComponentEvent int eventID) { super(pluginComponent); + this.eventID = eventID; } diff --git a/src/net/java/sip/communicator/impl/gui/event/PluginComponentListener.java b/src/net/java/sip/communicator/impl/gui/event/PluginComponentListener.java index fc4d2c4..515a9bd 100644 --- a/src/net/java/sip/communicator/impl/gui/event/PluginComponentListener.java +++ b/src/net/java/sip/communicator/impl/gui/event/PluginComponentListener.java @@ -7,13 +7,15 @@ package net.java.sip.communicator.impl.gui.event; import java.util.*; + /** * Listens for all events caused by adding or removing of a plugin component. * * @author Yana Stamcheva */ public interface PluginComponentListener - extends EventListener { + extends EventListener +{ /** * Indicates that a plugin component has been successfully added @@ -22,7 +24,7 @@ public interface PluginComponentListener * plugin component */ public void pluginComponentAdded(PluginComponentEvent event); - + /** * Indicates that a plugin component has been successfully removed * from the container. diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java index 663c984..1ebb9f9 100755 --- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java @@ -54,28 +54,24 @@ public class MainFrame implements ExportedWindow, PluginComponentListener { - private Logger logger = Logger.getLogger(MainFrame.class.getName()); + private final Logger logger = Logger.getLogger(MainFrame.class); - private TransparentPanel mainPanel + private final TransparentPanel mainPanel = new TransparentPanel(new BorderLayout(0, 8)); - private TransparentPanel statusBarPanel + private final TransparentPanel statusBarPanel = new TransparentPanel(new BorderLayout()); - private ImageIcon moreActionsIcon = new ImageIcon(ImageLoader + private final ImageIcon moreActionsIcon = new ImageIcon(ImageLoader .getImage(ImageLoader.MORE_ACTIONS_BUTTON)); - private ImageIcon moreActionsRolloverIcon = new ImageIcon(ImageLoader + private final ImageIcon moreActionsRolloverIcon = new ImageIcon(ImageLoader .getImage(ImageLoader.MORE_ACTIONS_ROLLOVER_BUTTON)); - private JLabel moreActionsLabel = new JLabel(moreActionsIcon); - private MainMenu menu; private MainCallPanel mainCallPanel; - private JComponent quickMenu; - private final HashMap<ProtocolProviderService, Integer> protocolProviders = new LinkedHashMap<ProtocolProviderService, Integer>(); @@ -90,10 +86,10 @@ public class MainFrame private final Map<PluginComponent, Component> nativePluginsTable = new Hashtable<PluginComponent, Component>(); - private JPanel pluginPanelNorth = new JPanel(); - private JPanel pluginPanelSouth = new JPanel(); - private JPanel pluginPanelWest = new JPanel(); - private JPanel pluginPanelEast = new JPanel(); + private final JPanel pluginPanelNorth = new JPanel(); + private final JPanel pluginPanelSouth = new JPanel(); + private final JPanel pluginPanelWest = new JPanel(); + private final JPanel pluginPanelEast = new JPanel(); private ContactListPane contactListPanel; @@ -179,9 +175,7 @@ public class MainFrame if (isToolBarExtended) { - quickMenu = new ExtendedQuickMenu(this); - - menusPanel.add(quickMenu, BorderLayout.SOUTH); + menusPanel.add(new ExtendedQuickMenu(this), BorderLayout.SOUTH); } this.setJMenuBar(menu); @@ -192,15 +186,15 @@ public class MainFrame northPanel.add(menusPanel, BorderLayout.CENTER); northPanel.add(accountStatusPanel, BorderLayout.SOUTH); - TransparentPanel moreActionsPanel - = new TransparentPanel(new FlowLayout(FlowLayout.CENTER, 0, 0)); - - moreActionsPanel.add(moreActionsLabel); + JLabel moreActionsLabel = new JLabel(moreActionsIcon); moreActionsLabel.setToolTipText(GuiActivator.getResources() .getI18NString("service.gui.OPEN_TOOLS")); - moreActionsLabel.addMouseListener(new ActionMenuMouseListener()); + TransparentPanel moreActionsPanel + = new TransparentPanel(new FlowLayout(FlowLayout.CENTER, 0, 0)); + moreActionsPanel.add(moreActionsLabel); + centerPanel.add(moreActionsPanel, BorderLayout.NORTH); centerPanel.add(contactListPanel, BorderLayout.CENTER); centerPanel.add(mainCallPanel, BorderLayout.SOUTH); @@ -297,7 +291,7 @@ public class MainFrame public void addProtocolSupportedOperationSets( ProtocolProviderService protocolProvider) { - Map supportedOperationSets + Map<String, OperationSet> supportedOperationSets = protocolProvider.getSupportedOperationSets(); String ppOpSetClassName = OperationSetPersistentPresence @@ -629,7 +623,6 @@ public class MainFrame } public void providerStatusMessageChanged(PropertyChangeEvent evt) { - } } @@ -637,10 +630,9 @@ public class MainFrame * Returns the list of all groups. * @return The list of all groups. */ - public Iterator getAllGroups() + public Iterator<MetaContactGroup> getAllGroups() { - return getContactListPanel() - .getContactList().getAllGroups(); + return getContactListPanel().getContactList().getAllGroups(); } /** @@ -840,7 +832,9 @@ public class MainFrame */ private class RenameAction extends AbstractAction { - public void actionPerformed(ActionEvent e) + private static final long serialVersionUID = 0L; + + public void actionPerformed(ActionEvent e) { Object selectedObject = getContactListPanel().getContactList().getSelectedValue(); @@ -1152,10 +1146,10 @@ public class MainFrame * The logo bar is positioned on the top of the window and is meant to * contain the application logo. */ - private class LogoBar + private static class LogoBar extends JPanel { - private TexturePaint texture; + private final TexturePaint texture; /** * Creates the logo bar and specify the size. @@ -1477,6 +1471,8 @@ public class MainFrame { public void mouseEntered(MouseEvent e) { + JLabel moreActionsLabel = (JLabel) e.getComponent(); + moreActionsLabel.setIcon(moreActionsRolloverIcon); moreActionsLabel.revalidate(); moreActionsLabel.repaint(); @@ -1484,6 +1480,8 @@ public class MainFrame public void mouseExited(MouseEvent e) { + JLabel moreActionsLabel = (JLabel) e.getComponent(); + moreActionsLabel.setIcon(moreActionsIcon); moreActionsLabel.revalidate(); moreActionsLabel.repaint(); diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java index 2a43bbb..7a2e32e 100644 --- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java +++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java @@ -36,17 +36,8 @@ public class AccountRegSummaryPage private final JPanel valuesPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10)); - private final JPanel mainPanel - = new TransparentPanel(new BorderLayout(10, 10)); - - private final JPanel wrapPanel = new TransparentPanel(new BorderLayout()); - private AccountRegWizardContainerImpl wizardContainer; - private JLabel pageTitleLabel = new JLabel( - GuiActivator.getResources().getI18NString("service.gui.SUMMARY"), - JLabel.CENTER); - /** * Creates an <tt>AccountRegSummaryPage</tt>. * @@ -57,13 +48,18 @@ public class AccountRegSummaryPage { this.wizardContainer = wizardContainer; - this.pageTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18f)); + JLabel pageTitleLabel = new JLabel( + GuiActivator.getResources().getI18NString("service.gui.SUMMARY"), + JLabel.CENTER); + pageTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18f)); - this.mainPanel.add(pageTitleLabel, BorderLayout.NORTH); - this.mainPanel.add(keysPanel, BorderLayout.WEST); - this.mainPanel.add(valuesPanel, BorderLayout.CENTER); + JPanel mainPanel = new TransparentPanel(new BorderLayout(10, 10)); + mainPanel.add(pageTitleLabel, BorderLayout.NORTH); + mainPanel.add(keysPanel, BorderLayout.WEST); + mainPanel.add(valuesPanel, BorderLayout.CENTER); - this.wrapPanel.add(mainPanel, BorderLayout.NORTH); + JPanel wrapPanel = new TransparentPanel(new BorderLayout()); + wrapPanel.add(mainPanel, BorderLayout.NORTH); this.setViewportView(wrapPanel); @@ -75,11 +71,11 @@ public class AccountRegSummaryPage * * @param summaryData The data to insert in the summary page. */ - private void init(Iterator summaryData) + private void init(Iterator<Map.Entry> summaryData) { while (summaryData.hasNext()) { - Map.Entry entry = (Map.Entry) summaryData.next(); + Map.Entry entry = summaryData.next(); JLabel keyLabel = new JLabel(entry.getKey().toString() + ":"); JLabel valueLabel = new JLabel(entry.getValue().toString()); 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 9406f0a..1cd400a 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 @@ -41,7 +41,8 @@ public class AccountRegWizardContainerImpl ConfigurationService configService = GuiActivator.getConfigurationService(); - private Hashtable registeredWizards = new Hashtable(); + private final Map<String, AccountRegistrationWizard> registeredWizards = + new Hashtable<String, AccountRegistrationWizard>(); public AccountRegWizardContainerImpl(MainFrame mainFrame) { @@ -145,23 +146,20 @@ public class AccountRegWizardContainerImpl public void modifyAccount(ProtocolProviderService protocolProvider) { AccountRegistrationWizard wizard - = (AccountRegistrationWizard) registeredWizards - .get(protocolProvider.getProtocolDisplayName()); + = registeredWizards.get(protocolProvider.getProtocolDisplayName()); this.setCurrentWizard(wizard); wizard.setModification(true); - Iterator i = wizard.getPages(); + Iterator<WizardPage> i = wizard.getPages(); - Object identifier = null; boolean firstPage = true; while (i.hasNext()) { - WizardPage page = (WizardPage) i.next(); - - identifier = page.getIdentifier(); + WizardPage page = i.next(); + Object identifier = page.getIdentifier(); this.registerWizardPage(identifier, page); @@ -256,11 +254,11 @@ public class AccountRegWizardContainerImpl summaryPage.setPreferredSize(wizardSize); - Iterator i = wizard.getPages(); + Iterator<WizardPage> i = wizard.getPages(); while(i.hasNext()) { - WizardPage page = (WizardPage)i.next(); + WizardPage page = i.next(); this.registerWizardPage(page.getIdentifier(), page); } @@ -281,17 +279,13 @@ public class AccountRegWizardContainerImpl */ public void unregisterWizardPages() { - Iterator i = this.getCurrentWizard().getPages(); - - Object identifier = null; + Iterator<WizardPage> i = this.getCurrentWizard().getPages(); while (i.hasNext()) { - WizardPage page = (WizardPage) i.next(); - - identifier = page.getIdentifier(); + WizardPage page = i.next(); - this.unregisterWizardPage(identifier); + this.unregisterWizardPage(page.getIdentifier()); } } @@ -320,16 +314,16 @@ public class AccountRegWizardContainerImpl AccountRegistrationWizard wizard = (AccountRegistrationWizard) sService; - if (event.getType() == ServiceEvent.REGISTERED) - { + switch (event.getType()) { + case ServiceEvent.REGISTERED: logger .info("Handling registration of a new Account Wizard."); this.addAccountRegistrationWizard(protocolName, wizard); - } - else if (event.getType() == ServiceEvent.UNREGISTERING) - { + break; + case ServiceEvent.UNREGISTERING: this.removeAccountRegistrationWizard(protocolName, wizard); + break; } } } diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java index 6c7e059..5066e8e 100644 --- a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java @@ -19,7 +19,6 @@ import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.configuration.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.util.*;
import net.java.sip.communicator.util.swing.*;
import org.osgi.framework.*;
@@ -33,9 +32,6 @@ public class AccountsConfigurationPanel ServiceListener,
ProviderPresenceStatusListener
{
- private final Logger logger =
- Logger.getLogger(AccountsConfigurationPanel.class.getName());
-
private final JPanel accountsPanel = new TransparentPanel();
private final JButton newButton =
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java index a9cda79..54c4737 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java @@ -356,7 +356,7 @@ public class ContactList * * @return The list of all groups. */ - public Iterator getAllGroups() + public Iterator<MetaContactGroup> getAllGroups() { return contactListService.getRoot().getSubgroups(); } diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java index 2f91f1e..b206d49 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java @@ -217,7 +217,7 @@ public class ContactRightButtonMenu } //Initialize moveTo menu. - Iterator groups = this.mainFrame.getAllGroups(); + Iterator<MetaContactGroup> groups = this.mainFrame.getAllGroups(); if(groups.hasNext()) { @@ -234,7 +234,7 @@ public class ContactRightButtonMenu while (groups.hasNext()) { - MetaContactGroup group = (MetaContactGroup)groups.next(); + MetaContactGroup group = groups.next(); JMenuItem menuItem = new JMenuItem(group.getGroupName()); @@ -245,7 +245,7 @@ public class ContactRightButtonMenu } //Initialize removeContact menu. - Iterator contacts = contactItem.getContacts(); + Iterator<Contact> contacts = contactItem.getContacts(); if (contactItem.getContactCount() > 1) { @@ -266,7 +266,7 @@ public class ContactRightButtonMenu while (contacts.hasNext()) { - Contact contact = (Contact)contacts.next(); + Contact contact = contacts.next(); ProtocolProviderService protocolProvider = contact.getProtocolProvider(); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java index dea8be9..e8693d3 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java @@ -106,7 +106,7 @@ public class SelectGroupPanel Object lastSelectedGroup = null; - Iterator groupsList = wizard.getMainFrame().getAllGroups(); + Iterator<MetaContactGroup> groupsList = wizard.getMainFrame().getAllGroups(); if (groupsList.hasNext()) { @@ -119,8 +119,7 @@ public class SelectGroupPanel while(groupsList.hasNext()) { - MetaContactGroup group - = (MetaContactGroup)groupsList.next(); + MetaContactGroup group = groupsList.next(); GroupWrapper gr = new GroupWrapper(group); diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java index efdeae4..a978754 100644 --- a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java @@ -92,9 +92,9 @@ public class AimAccountRegistrationWizard /** * Returns the set of pages contained in this wizard. */ - public Iterator getPages() + public Iterator<WizardPage> getPages() { - ArrayList pages = new ArrayList(); + java.util.List<WizardPage> pages = new ArrayList<WizardPage>(); firstWizardPage = new FirstWizardPage(this); pages.add(firstWizardPage); @@ -105,7 +105,7 @@ public class AimAccountRegistrationWizard /** * Returns the set of data that user has entered through this wizard. */ - public Iterator getSummary() + public Iterator<Map.Entry> getSummary() { Hashtable summaryTable = new Hashtable(); diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java index 9506b47..b468cf9 100644 --- a/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java @@ -108,9 +108,9 @@ public class DictAccountRegistrationWizard * * @return Returns the set of pages contained in this wizard. */ - public Iterator getPages() + public Iterator<WizardPage> getPages() { - ArrayList pages = new ArrayList(); + java.util.List<WizardPage> pages = new ArrayList<WizardPage>(); this.firstWizardPage = new FirstWizardPage(this); pages.add(this.firstWizardPage); return pages.iterator(); @@ -120,15 +120,15 @@ public class DictAccountRegistrationWizard * Returns the set of data that user has entered through this wizard. * @return Returns the set of data that user has entered through this wizard. */ - public Iterator getSummary() + public Iterator<Map.Entry> getSummary() { - LinkedHashMap<String, String> summaryTable = new LinkedHashMap<String, String>(); + Map<String, String> summaryTable = new LinkedHashMap<String, String>(); summaryTable.put("Host", registration.getHost()); summaryTable.put("Port", String.valueOf(registration.getPort())); summaryTable.put("Strategy", registration.getStrategy().getName()); - return summaryTable.entrySet().iterator(); + return ((Map) summaryTable).entrySet().iterator(); } /** diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java index 36b087b..cb28d6b 100644 --- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java @@ -106,9 +106,9 @@ public class GibberishAccountRegistrationWizard * Returns the set of pages contained in this wizard. * @return Iterator */ - public Iterator getPages() + public Iterator<WizardPage> getPages() { - ArrayList pages = new ArrayList(); + java.util.List<WizardPage> pages = new ArrayList<WizardPage>(); firstWizardPage = new FirstWizardPage(this); pages.add(firstWizardPage); @@ -120,9 +120,9 @@ public class GibberishAccountRegistrationWizard * Returns the set of data that user has entered through this wizard. * @return Iterator */ - public Iterator getSummary() + public Iterator<Map.Entry> getSummary() { - Hashtable summaryTable = new Hashtable(); + Map summaryTable = new Hashtable(); summaryTable.put("User ID", registration.getUserID()); diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java index 7249d3e..9288921 100644 --- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java @@ -105,9 +105,9 @@ public class GoogleTalkAccountRegistrationWizard * Returns the set of pages contained in this wizard.
* @return Iterator
*/
- public Iterator getPages()
+ public Iterator<WizardPage> getPages()
{
- ArrayList pages = new ArrayList();
+ java.util.List<WizardPage> pages = new ArrayList<WizardPage>();
firstWizardPage = new FirstWizardPage(this);
pages.add(firstWizardPage);
@@ -119,7 +119,7 @@ public class GoogleTalkAccountRegistrationWizard * Returns the set of data that user has entered through this wizard.
* @return Iterator
*/
- public Iterator getSummary()
+ public Iterator<Map.Entry> getSummary()
{
Hashtable summaryTable = new Hashtable();
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java index 44bd0bb..5d83959 100644 --- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java @@ -92,9 +92,9 @@ public class IcqAccountRegistrationWizard /** * Returns the set of pages contained in this wizard. */ - public Iterator getPages() + public Iterator<WizardPage> getPages() { - ArrayList pages = new ArrayList(); + java.util.List<WizardPage> pages = new ArrayList<WizardPage>(); firstWizardPage = new FirstWizardPage(this); pages.add(firstWizardPage); @@ -105,9 +105,9 @@ public class IcqAccountRegistrationWizard /** * Returns the set of data that user has entered through this wizard. */ - public Iterator getSummary() + public Iterator<Map.Entry> getSummary() { - LinkedHashMap<String, Object> summaryTable + Map<String, Object> summaryTable = new LinkedHashMap<String, Object>(); summaryTable.put(Resources.getString("service.gui.USER_IDENTIFIER"), @@ -135,7 +135,7 @@ public class IcqAccountRegistrationWizard summaryTable.put(Resources.getString("proxyPassword"), registration.getProxyPassword()); - return summaryTable.entrySet().iterator(); + return ((Map) summaryTable).entrySet().iterator(); } /** diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java index fae412f..14b42f2 100644 --- a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java @@ -103,9 +103,9 @@ public class IrcAccountRegistrationWizard * Returns the set of pages contained in this wizard. * @return Iterator */ - public Iterator getPages() + public Iterator<WizardPage> getPages() { - ArrayList pages = new ArrayList(); + java.util.List<WizardPage> pages = new ArrayList<WizardPage>(); firstWizardPage = new FirstWizardPage(this); pages.add(firstWizardPage); @@ -117,7 +117,7 @@ public class IrcAccountRegistrationWizard * Returns the set of data that user has entered through this wizard. * @return Iterator */ - public Iterator getSummary() + public Iterator<Map.Entry> getSummary() { Hashtable summaryTable = new Hashtable(); String pass = new String(); diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java index 68b6177..8b1fbdb 100644 --- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java @@ -105,9 +105,9 @@ public class JabberAccountRegistrationWizard * Returns the set of pages contained in this wizard. * @return Iterator */ - public Iterator getPages() + public Iterator<WizardPage> getPages() { - ArrayList pages = new ArrayList(); + java.util.List<WizardPage> pages = new ArrayList<WizardPage>(); firstWizardPage = new FirstWizardPage(this); pages.add(firstWizardPage); @@ -119,7 +119,7 @@ public class JabberAccountRegistrationWizard * Returns the set of data that user has entered through this wizard. * @return Iterator */ - public Iterator getSummary() + public Iterator<Map.Entry> getSummary() { Hashtable summaryTable = new Hashtable(); diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java index a94c72c..4a23470 100644 --- a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java @@ -103,9 +103,9 @@ public class MsnAccountRegistrationWizard * * @return Iterator */ - public Iterator getPages() + public Iterator<WizardPage> getPages() { - ArrayList pages = new ArrayList(); + java.util.List<WizardPage> pages = new ArrayList<WizardPage>(); firstWizardPage = new FirstWizardPage(this); pages.add(firstWizardPage); @@ -118,7 +118,7 @@ public class MsnAccountRegistrationWizard * * @return Iterator */ - public Iterator getSummary() + public Iterator<Map.Entry> getSummary() { Hashtable summaryTable = new Hashtable(); diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java index de3853d..b119d84 100644 --- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java @@ -107,9 +107,9 @@ public class RssAccountRegistrationWizard * Returns the set of pages contained in this wizard. * @return Iterator */ - public Iterator getPages() + public Iterator<WizardPage> getPages() { - ArrayList pages = new ArrayList(); + java.util.List<WizardPage> pages = new ArrayList<WizardPage>(); firstWizardPage = new FirstWizardPage(registration, wizardContainer); pages.add(firstWizardPage); @@ -121,7 +121,7 @@ public class RssAccountRegistrationWizard * Returns the set of data that user has entered through this wizard. * @return Iterator */ - public Iterator getSummary() + public Iterator<Map.Entry> getSummary() { Hashtable summaryTable = new Hashtable(); diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java index 1c7bee1..e5648a9 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java @@ -98,8 +98,8 @@ public class SIPAccountRegistrationWizard * Returns the set of pages contained in this wizard. * @return Iterator */ - public Iterator getPages() { - ArrayList pages = new ArrayList(); + public Iterator<WizardPage> getPages() { + java.util.List<WizardPage> pages = new ArrayList<WizardPage>(); firstWizardPage = new FirstWizardPage(this); pages.add(firstWizardPage); @@ -111,7 +111,7 @@ public class SIPAccountRegistrationWizard * Returns the set of data that user has entered through this wizard. * @return Iterator */ - public Iterator getSummary() { + public Iterator<Map.Entry> getSummary() { Hashtable<String, String> summaryTable = new Hashtable<String, String>(); boolean rememberPswd = new Boolean(registration.isRememberPassword()) @@ -198,7 +198,7 @@ public class SIPAccountRegistrationWizard Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL"), registration.getKeepAliveInterval()); - return summaryTable.entrySet().iterator(); + return ((Map) summaryTable).entrySet().iterator(); } /** diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java index b662703..0771963 100644 --- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java @@ -113,8 +113,8 @@ public class SSHAccountRegistrationWizard * Returns the set of pages contained in this wizard. * @return Iterator */ - public Iterator getPages() { - ArrayList pages = new ArrayList(); + public Iterator<WizardPage> getPages() { + java.util.List<WizardPage> pages = new ArrayList<WizardPage>(); firstWizardPage = new FirstWizardPage(registration, wizardContainer); pages.add(firstWizardPage); @@ -126,7 +126,7 @@ public class SSHAccountRegistrationWizard * Returns the set of data that user has entered through this wizard. * @return Iterator */ - public Iterator getSummary() { + public Iterator<Map.Entry> getSummary() { Hashtable summaryTable = new Hashtable(); /* diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java index 00c6995..35f31b8 100644 --- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java @@ -105,9 +105,9 @@ public class YahooAccountRegistrationWizard * * @return Iterator */ - public Iterator getPages() + public Iterator<WizardPage> getPages() { - ArrayList pages = new ArrayList(); + java.util.List<WizardPage> pages = new ArrayList<WizardPage>(); firstWizardPage = new FirstWizardPage(this); pages.add(firstWizardPage); @@ -120,7 +120,7 @@ public class YahooAccountRegistrationWizard * * @return Iterator */ - public Iterator getSummary() + public Iterator<Map.Entry> getSummary() { Hashtable summaryTable = new Hashtable(); diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java index ca0cdfa..36e645a 100644 --- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java @@ -108,9 +108,9 @@ public class ZeroconfAccountRegistrationWizard * Returns the set of pages contained in this wizard. * @return Iterator */ - public Iterator getPages() + public Iterator<WizardPage> getPages() { - ArrayList pages = new ArrayList(); + java.util.List<WizardPage> pages = new ArrayList<WizardPage>(); firstWizardPage = new FirstWizardPage(this); pages.add(firstWizardPage); @@ -122,7 +122,7 @@ public class ZeroconfAccountRegistrationWizard * Returns the set of data that user has entered through this wizard. * @return Iterator */ - public Iterator getSummary() + public Iterator<Map.Entry> getSummary() { Hashtable summaryTable = new Hashtable(); diff --git a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java index 7a9b949..acad689 100644 --- a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java @@ -86,7 +86,7 @@ public interface AccountRegistrationWizard * @return the set of <tt>WizardPage</tt>-s for this * wizard. */ - public Iterator getPages(); + public Iterator<WizardPage> getPages(); /** * Returns the identifier of the first account registration wizard page. @@ -113,7 +113,7 @@ public interface AccountRegistrationWizard * @return a set of key-value pairs that will represent the summary for * this wizard. */ - public Iterator getSummary(); + public Iterator<Map.Entry> getSummary(); /** * Defines the operations that will be executed when the user clicks on |