Fixes warnings

2 files changed, 20 insertions, 23 deletions

diff --git a/test/net/java/sip/communicator/slick/contactlist/TestMetaContact.java b/test/net/java/sip/communicator/slick/contactlist/TestMetaContact.java
index b49a59a..a803362 100644
--- a/test/net/java/sip/communicator/slick/contactlist/TestMetaContact.java
+++ b/test/net/java/sip/communicator/slick/contactlist/TestMetaContact.java
@@ -90,7 +90,7 @@ public class TestMetaContact extends TestCase
      */
     public void testGetContacts()
     {
-        Iterator childContacts = metaContact.getContacts();
+        Iterator<Contact> childContacts = metaContact.getContacts();
 
         assertNotNull("getContacts() returned a null iterator."
                       , childContacts);
@@ -110,8 +110,8 @@ public class TestMetaContact extends TestCase
      */
     public void testGetContactsForProvider()
     {
-        Iterator childContacts = metaContact.getContactsForProvider(
-                                                        fixture.mockProvider);
+        Iterator<Contact> childContacts
+            = metaContact.getContactsForProvider(fixture.mockProvider);
 
         assertNotNull("getContactsForProvider() returned a null iterator."
                       , childContacts);
@@ -124,7 +124,6 @@ public class TestMetaContact extends TestCase
                    +")did not contain the "
                    +"right mock contact"
                    , mockContact, childContacts.next());
-
     }
 
     /**
@@ -184,23 +183,22 @@ public class TestMetaContact extends TestCase
                                 MetaContactGroup group)
     {
         //first check order of contacts in this group
-        Iterator contacts = group.getChildContacts();
+        Iterator<MetaContact> contacts = group.getChildContacts();
 
         MetaContact previousContact = null;
         int previousContactIsOnlineStatus = 0;
 
         while(contacts.hasNext())
         {
-            MetaContact currentContact  = (MetaContact)contacts.next();
+            MetaContact currentContact  = contacts.next();
 
             //calculate the total status for this contact
-            Iterator protoContacts = currentContact.getContacts();
+            Iterator<Contact> protoContacts = currentContact.getContacts();
             int currentContactIsOnlineStatus = 0;
 
             while(protoContacts.hasNext())
             {
-                if (((Contact)protoContacts.next())
-                        .getPresenceStatus().isOnline())
+                if (protoContacts.next().getPresenceStatus().isOnline())
                 {
                     currentContactIsOnlineStatus = 1;
                 }
@@ -231,12 +229,12 @@ public class TestMetaContact extends TestCase
         }
 
         //now go over the subgroups
-        Iterator subgroups = group.getSubgroups();
+        Iterator<MetaContactGroup> subgroups = group.getSubgroups();
 
         while(subgroups.hasNext())
         {
             verifyCompareToForAllContactsInGroupAndSubgroups(
-                    (MetaContactGroup)subgroups.next());
+                    subgroups.next());
         }
     }
 
@@ -251,7 +249,7 @@ public class TestMetaContact extends TestCase
         String detail_3 = "detail_3";
         
         metaContact.addDetail(name, detail_1);
-        List ds = metaContact.getDetails(name);
+        List<String> ds = metaContact.getDetails(name);
         assertTrue( "Must contain one detail",
                        1 == ds.size());
         assertTrue("The result details does not contain the desired",
diff --git a/test/net/java/sip/communicator/slick/contactlist/TestMetaContactListPersistence.java b/test/net/java/sip/communicator/slick/contactlist/TestMetaContactListPersistence.java
index fdfbee7..9682fac 100644
--- a/test/net/java/sip/communicator/slick/contactlist/TestMetaContactListPersistence.java
+++ b/test/net/java/sip/communicator/slick/contactlist/TestMetaContactListPersistence.java
@@ -214,11 +214,11 @@ public class TestMetaContactListPersistence extends TestCase
         //verify that all contacts in the replacement provider are unresolved
         //as otherwise this would mean that the meta contact list has not
         //used the createUnresolvedContact() when creating them.
-        Iterator subgroups = newProtoRoot.subgroups();
+        Iterator<ContactGroup> subgroups = newProtoRoot.subgroups();
 
         while(subgroups.hasNext())
         {
-            assertUnresolvedContents( (MockContactGroup) subgroups.next() );
+            assertUnresolvedContents( subgroups.next() );
         }
     }
 
@@ -273,19 +273,18 @@ public class TestMetaContactListPersistence extends TestCase
         //verify that all contacts in the replacement providers are unresolved
         //as otherwise this would mean that the meta contact list has not
         //used the createUnresolvedContact() when creating them.
-        Iterator subgroups = newProtoMockP1Root.subgroups();
+        Iterator<ContactGroup> subgroups = newProtoMockP1Root.subgroups();
         while(subgroups.hasNext())
         {
-            assertUnresolvedContents( (MockContactGroup) subgroups.next() );
+            assertUnresolvedContents( subgroups.next() );
         }
 
 
         subgroups = newProtoMockP2Root.subgroups();
         while(subgroups.hasNext())
         {
-            assertUnresolvedContents( (MockContactGroup) subgroups.next() );
+            assertUnresolvedContents( subgroups.next() );
         }
-
     }
 
 
@@ -295,26 +294,26 @@ public class TestMetaContactListPersistence extends TestCase
      *
      * @param root the contact group where the recursive assertion should begin
      */
-    private void assertUnresolvedContents(MockContactGroup root)
+    private void assertUnresolvedContents(ContactGroup root)
     {
         assertEquals("isResolved for grp:" + root.getGroupName()
                      , false, root.isResolved());
 
         // verify all contacts
-        Iterator contacts = root.contacts();
+        Iterator<Contact> contacts = root.contacts();
 
         while(contacts.hasNext())
         {
-            Contact contact = (Contact)contacts.next();
+            Contact contact = contacts.next();
             assertEquals("isResolved for contact:" + contact.getDisplayName()
                      , false, contact.isResolved());
         }
 
         //recurse all subgroups
-        Iterator subgroups = root.subgroups();
+        Iterator<ContactGroup> subgroups = root.subgroups();
 
         while(subgroups.hasNext()){
-            assertUnresolvedContents((MockContactGroup)subgroups.next());
+            assertUnresolvedContents(subgroups.next());
         }
     }