Fixes raw type warnings

14 files changed, 57 insertions, 46 deletions

diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
index a978754..070a1f9 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
@@ -105,14 +105,15 @@ public class AimAccountRegistrationWizard
     /**
      * Returns the set of data that user has entered through this wizard.
      */
-    public Iterator<Map.Entry> getSummary()
+    public Iterator<Map.Entry<String, String>> getSummary()
     {
-        Hashtable summaryTable = new Hashtable();
+        Hashtable<String, String> summaryTable 
+            = new Hashtable<String, String>();
 
         summaryTable.put(Resources.getString("plugin.aimaccregwizz.USERNAME"),
             registration.getUin());
         summaryTable.put(Resources.getString("service.gui.REMEMBER_PASSWORD"),
-                new Boolean(registration.isRememberPassword()));
+                Boolean.toString(registration.isRememberPassword()));
 
         if (registration.getProxy() != null)
             summaryTable.put(Resources.getString("plugin.aimaccregwizz.PROXY"),
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java
index b468cf9..9185788 100644
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java
@@ -120,7 +120,7 @@ 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<Map.Entry> getSummary()
+    public Iterator<Map.Entry<String, String>> getSummary()
     {
         Map<String, String> summaryTable = new LinkedHashMap<String, String>();
 
@@ -128,7 +128,7 @@ public class DictAccountRegistrationWizard
         summaryTable.put("Port", String.valueOf(registration.getPort()));
         summaryTable.put("Strategy", registration.getStrategy().getName());
 
-        return ((Map) summaryTable).entrySet().iterator();
+        return summaryTable.entrySet().iterator();
     }
 
     /**
@@ -176,7 +176,8 @@ public class DictAccountRegistrationWizard
         String strategy)
         throws OperationFailedException
     {
-        Hashtable accountProperties = new Hashtable();
+        Hashtable<String, String> accountProperties 
+            = new Hashtable<String, String>();
         
         // Set this property to indicate that Dict account does not require 
         // authentication.
@@ -372,12 +373,13 @@ public class DictAccountRegistrationWizard
         ProtocolProviderFactory factory =
             DictAccRegWizzActivator.getDictProtocolProviderFactory();
 
-        ArrayList registeredAccounts = factory.getRegisteredAccounts();
+        ArrayList<AccountID> registeredAccounts 
+            = factory.getRegisteredAccounts();
         int total = 0;
 
         for (int i = 0; i < registeredAccounts.size(); i++)
         {
-            AccountID accountID = (AccountID) registeredAccounts.get(i);
+            AccountID accountID = registeredAccounts.get(i);
 
             // The host is always stored at the start
             if (accountID.getUserID().startsWith(host.toLowerCase()))
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
index f5d59ac..5fec80a 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
@@ -117,9 +117,9 @@ public class GibberishAccountRegistrationWizard
      * Returns the set of data that user has entered through this wizard.
      * @return Iterator
      */
-    public Iterator<Map.Entry> getSummary()
+    public Iterator<Map.Entry<String, String>> getSummary()
     {
-        Map summaryTable = new Hashtable();
+        Map<String, String> summaryTable = new Hashtable<String, String>();
 
         summaryTable.put("User ID", registration.getUserID());
 
@@ -164,7 +164,8 @@ public class GibberishAccountRegistrationWizard
         throws OperationFailedException
     {
 
-        Hashtable accountProperties = new Hashtable();
+        Hashtable<String, String> accountProperties 
+            = new Hashtable<String, String>();
 
         if (registration.isRememberPassword())
         {
diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java
index 9288921..0155185 100644
--- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java
@@ -119,9 +119,10 @@ public class GoogleTalkAccountRegistrationWizard
      * Returns the set of data that user has entered through this wizard.

      * @return Iterator

      */

-    public Iterator<Map.Entry> getSummary()

+    public Iterator<Map.Entry<String, String>> getSummary()

     {

-        Hashtable summaryTable = new Hashtable();

+        Hashtable<String, String> summaryTable 

+            = new Hashtable<String, String>();

 

         summaryTable.put(

             Resources.getString("plugin.googletalkaccregwizz.USERNAME"),

@@ -129,7 +130,7 @@ public class GoogleTalkAccountRegistrationWizard
 

         summaryTable.put(

             Resources.getString("service.gui.REMEMBER_PASSWORD"),

-            new Boolean(registration.isRememberPassword()));

+            Boolean.toString(registration.isRememberPassword()));

 

         summaryTable.put(

             Resources.getString("plugin.jabberaccregwizz.SERVER"),

diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
index 5d83959..df89a5b 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
@@ -105,15 +105,15 @@ public class IcqAccountRegistrationWizard
     /**
      * Returns the set of data that user has entered through this wizard.
      */
-    public Iterator<Map.Entry> getSummary()
+    public Iterator<Map.Entry<String,String>> getSummary()
     {
-        Map<String, Object> summaryTable
-            = new LinkedHashMap<String, Object>();
+        Map<String, String> summaryTable
+            = new LinkedHashMap<String, String>();
 
         summaryTable.put(Resources.getString("service.gui.USER_IDENTIFIER"),
                         registration.getUin());
         summaryTable.put(Resources.getString("service.gui.REMEMBER_PASSWORD"),
-                new Boolean(registration.isRememberPassword()));
+                Boolean.toString(registration.isRememberPassword()));
 
         if (registration.getProxy() != null)
             summaryTable.put(Resources.getString("plugin.icqaccregwizz.PROXY"),
@@ -135,7 +135,7 @@ public class IcqAccountRegistrationWizard
             summaryTable.put(Resources.getString("proxyPassword"),
                 registration.getProxyPassword());
 
-        return ((Map) summaryTable).entrySet().iterator();
+        return 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 14b42f2..5da20a9 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
@@ -117,9 +117,9 @@ public class IrcAccountRegistrationWizard
      * Returns the set of data that user has entered through this wizard.
      * @return Iterator
      */
-    public Iterator<Map.Entry> getSummary()
+    public Iterator<Map.Entry<String,String>> getSummary()
     {
-        Hashtable summaryTable = new Hashtable();
+        Hashtable<String,String> summaryTable = new Hashtable<String,String>();
         String pass = new String();
         String port = 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 478598c..f70973b 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
@@ -116,9 +116,9 @@ public class JabberAccountRegistrationWizard
      * Returns the set of data that user has entered through this wizard.
      * @return Iterator
      */
-    public Iterator<Map.Entry> getSummary()
+    public Iterator<Map.Entry<String,String>> getSummary()
     {
-        Hashtable summaryTable = new Hashtable();
+        Hashtable<String,String> summaryTable = new Hashtable<String,String>();
 
         summaryTable.put(
             Resources.getString("plugin.jabberaccregwizz.USERNAME"),
@@ -126,7 +126,7 @@ public class JabberAccountRegistrationWizard
 
         summaryTable.put(
             Resources.getString("service.gui.REMEMBER_PASSWORD"),
-            new Boolean(registration.isRememberPassword()));
+            Boolean.toString(registration.isRememberPassword()));
 
         summaryTable.put(
             Resources.getString("plugin.jabberaccregwizz.SERVER"),
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
index 2b5af8c..1ae4d35 100644
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
@@ -115,14 +115,14 @@ public class MsnAccountRegistrationWizard
      * 
      * @return Iterator
      */
-    public Iterator<Map.Entry> getSummary()
+    public Iterator<Map.Entry<String, String>> getSummary()
     {
-        Hashtable summaryTable = new Hashtable();
+        Hashtable<String,String> summaryTable = new Hashtable<String,String>();
 
-        summaryTable.put(   Resources.getString("plugin.msnaccregwizz.USERNAME"),
-                            registration.getId());
-        summaryTable.put(   Resources.getString("service.gui.REMEMBER_PASSWORD"),
-                            new Boolean(registration.isRememberPassword()));
+        summaryTable.put( Resources.getString("plugin.msnaccregwizz.USERNAME"),
+                          registration.getId());
+        summaryTable.put( Resources.getString("service.gui.REMEMBER_PASSWORD"),
+                          Boolean.toString(registration.isRememberPassword()));
 
         return summaryTable.entrySet().iterator();
     }
@@ -173,7 +173,8 @@ public class MsnAccountRegistrationWizard
         throws OperationFailedException
     {
 
-        Hashtable accountProperties = new Hashtable();
+        Hashtable<String,String> accountProperties 
+            = new Hashtable<String,String>();
 
         if (registration.isRememberPassword())
         {
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
index e1783c1..643e9f4 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
@@ -118,9 +118,10 @@ public class RssAccountRegistrationWizard
      * Returns the set of data that user has entered through this wizard.
      * @return Iterator
      */
-    public Iterator<Map.Entry> getSummary()
+    public Iterator<Map.Entry<String, String>> getSummary()
     {
-        Hashtable summaryTable = new Hashtable();
+        Hashtable<String, String> summaryTable 
+            = new Hashtable<String, String>();
 
         summaryTable.put("User ID", registration.getUserID());
 
@@ -166,11 +167,12 @@ public class RssAccountRegistrationWizard
         throws OperationFailedException
     {
 
-        Hashtable accountProperties = new Hashtable();
+        Hashtable<String, String> accountProperties 
+            = new Hashtable<String, String>();
 
         accountProperties.put(
             ProtocolProviderFactory.NO_PASSWORD_REQUIRED,
-            new Boolean(true).toString());
+            Boolean.toString(true));
 
         try
         {
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
index 9de5d44..fb0abc1 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
@@ -108,7 +108,8 @@ public class SIPAccountRegistrationWizard
      * Returns the set of data that user has entered through this wizard.
      * @return Iterator
      */
-    public Iterator<Map.Entry> getSummary() {
+    public Iterator<Map.Entry<String, String>> getSummary() 
+    {
         Map<String, String> summaryTable = new Hashtable<String, String>();
         boolean rememberPswd = registration.isRememberPassword();
         String rememberPswdString = Resources.getString(
@@ -189,7 +190,7 @@ public class SIPAccountRegistrationWizard
             Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL"),
             registration.getKeepAliveInterval());
 
-        return ((Map) summaryTable).entrySet().iterator();
+        return 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 efbdf00..e034cca 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
@@ -123,8 +123,8 @@ public class SSHAccountRegistrationWizard
      * Returns the set of data that user has entered through this wizard.
      * @return Iterator
      */
-    public Iterator<Map.Entry> getSummary() {
-        Hashtable summaryTable = new Hashtable();
+    public Iterator<Map.Entry<String, String>> getSummary() {
+        Hashtable<String, String> summaryTable = new Hashtable<String, String>();
         
         /*
          * Hashtable arranges the entries alphabetically so the order 
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
index 478a96e..0d16985 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
@@ -117,16 +117,17 @@ public class YahooAccountRegistrationWizard
      * 
      * @return Iterator
      */
-    public Iterator<Map.Entry> getSummary()
+    public Iterator<Map.Entry<String, String>> getSummary()
     {
-        Hashtable summaryTable = new Hashtable();
+        Hashtable<String, String> summaryTable 
+            = new Hashtable<String, String>();
 
         summaryTable.put(
             Resources.getString("plugin.yahooaccregwizz.USERNAME"),
             registration.getUin());
         summaryTable.put(
             Resources.getString("service.gui.REMEMBER_PASSWORD"),
-            new Boolean(registration.isRememberPassword()));
+            Boolean.toString(registration.isRememberPassword()));
 
         return summaryTable.entrySet().iterator();
     }
@@ -174,7 +175,8 @@ public class YahooAccountRegistrationWizard
         ProtocolProviderFactory providerFactory, String user, String passwd)
         throws OperationFailedException
     {
-        Hashtable accountProperties = new Hashtable();
+        Hashtable<String, String> accountProperties 
+            = new Hashtable<String, String>();
 
         if (registration.isRememberPassword())
         {
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
index a80202d..a49561e 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
@@ -119,9 +119,9 @@ public class ZeroconfAccountRegistrationWizard
      * Returns the set of data that user has entered through this wizard.
      * @return Iterator
      */
-    public Iterator<Map.Entry> getSummary()
+    public Iterator<Map.Entry<String, String>> getSummary()
     {
-        Hashtable summaryTable = new Hashtable();
+        Hashtable<String, String> summaryTable = new Hashtable<String, String>();
 
         summaryTable.put("User ID", registration.getUserID());
         summaryTable.put("First Name", registration.getFirst());
diff --git a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java
index acad689..481e729 100644
--- a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java
@@ -113,7 +113,7 @@ public interface AccountRegistrationWizard
      * @return a set of key-value pairs that will represent the summary for
      * this wizard. 
      */
-    public Iterator<Map.Entry> getSummary();
+    public Iterator<Map.Entry<String, String>> getSummary();
 
     /**
      * Defines the operations that will be executed when the user clicks on