diff options
Diffstat (limited to 'src/net/java/sip/communicator/impl/protocol/ssh')
5 files changed, 15 insertions, 15 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ContactGroupSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/ContactGroupSSHImpl.java index 7552e01..3555b6a 100644 --- a/src/net/java/sip/communicator/impl/protocol/ssh/ContactGroupSSHImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/ssh/ContactGroupSSHImpl.java @@ -36,12 +36,12 @@ public class ContactGroupSSHImpl /** * The list of this group's members. */ - private Vector contacts = new Vector(); + private Vector<Contact> contacts = new Vector<Contact>(); /** * The list of sub groups belonging to this group. */ - private Vector subGroups = new Vector(); + private Vector<ContactGroup> subGroups = new Vector<ContactGroup>(); /** * The group that this group belongs to (or null if this is the root group). @@ -119,7 +119,7 @@ public class ContactGroupSSHImpl * @return a java.util.Iterator over all contacts inside this * <tt>ContactGroup</tt> */ - public Iterator contacts() + public Iterator<Contact> contacts() { return contacts.iterator(); } @@ -211,7 +211,7 @@ public class ContactGroupSSHImpl if ( subGroups.contains(sshGroup) ) return this; - Iterator subGroupsIter = subgroups(); + Iterator<ContactGroup> subGroupsIter = subgroups(); while (subGroupsIter.hasNext()) { ContactGroupSSHImpl subgroup @@ -240,7 +240,7 @@ public class ContactGroupSSHImpl if ( contacts.contains(sshContact) ) return this; - Iterator subGroupsIter = subgroups(); + Iterator<ContactGroup> subGroupsIter = subgroups(); while (subGroupsIter.hasNext()) { ContactGroupSSHImpl subgroup @@ -266,7 +266,7 @@ public class ContactGroupSSHImpl */ public Contact getContact(String id) { - Iterator contactsIter = contacts(); + Iterator<Contact> contactsIter = contacts(); while (contactsIter.hasNext()) { ContactSSHImpl contact = (ContactSSHImpl) contactsIter.next(); @@ -285,7 +285,7 @@ public class ContactGroupSSHImpl */ public ContactGroup getGroup(int index) { - return (ContactGroup)subGroups.get(index); + return subGroups.get(index); } /** @@ -296,7 +296,7 @@ public class ContactGroupSSHImpl */ public ContactGroup getGroup(String groupName) { - Iterator groupsIter = subgroups(); + Iterator<ContactGroup> groupsIter = subgroups(); while (groupsIter.hasNext()) { ContactGroupSSHImpl contactGroup @@ -335,7 +335,7 @@ public class ContactGroupSSHImpl * @return a java.util.Iterator over the <tt>ContactGroup</tt> children * of this group (i.e. subgroups). */ - public Iterator subgroups() + public Iterator<ContactGroup> subgroups() { return subGroups.iterator(); } diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetPersistentPresenceSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetPersistentPresenceSSHImpl.java index 4c9d94e..2b5f52e 100644 --- a/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetPersistentPresenceSSHImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetPersistentPresenceSSHImpl.java @@ -745,7 +745,7 @@ public class OperationSetPersistentPresenceSSHImpl */ public List findContactsPointingToUs() { - List contacts = new LinkedList(); + List<Contact> contacts = new LinkedList<Contact>(); BundleContext bc = SSHActivator.getBundleContext(); String osgiQuery = diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderFactorySSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderFactorySSHImpl.java index 30f837c..85b08dd 100644 --- a/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderFactorySSHImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolProviderFactorySSHImpl.java @@ -48,7 +48,7 @@ public class ProtocolProviderFactorySSHImpl */ public AccountID installAccount( String userIDStr, - Map accountProperties) + Map<String, String> accountProperties) { BundleContext context = SSHActivator.getBundleContext(); if (context == null) @@ -104,7 +104,7 @@ public class ProtocolProviderFactorySSHImpl return accountID; } - protected AccountID createAccountID(String userID, Map accountProperties) + protected AccountID createAccountID(String userID, Map<String, String> accountProperties) { return new SSHAccountID(userID, accountProperties); } @@ -160,7 +160,7 @@ public class ProtocolProviderFactorySSHImpl @Override public void modifyAccount( ProtocolProviderService protocolProvider, - Map accountProperties) + Map<String, String> accountProperties) throws NullPointerException { // TODO Auto-generated method stub diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/SSHAccountID.java b/src/net/java/sip/communicator/impl/protocol/ssh/SSHAccountID.java index 982fafc..88c74b4 100644 --- a/src/net/java/sip/communicator/impl/protocol/ssh/SSHAccountID.java +++ b/src/net/java/sip/communicator/impl/protocol/ssh/SSHAccountID.java @@ -28,7 +28,7 @@ public class SSHAccountID * @param userID the user identifier correspnding to thi account * @param accountProperties any other properties necessary for the account. */ - SSHAccountID(String userID, Map accountProperties) + SSHAccountID(String userID, Map<String, String> accountProperties) { super(userID , accountProperties diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/SSHActivator.java b/src/net/java/sip/communicator/impl/protocol/ssh/SSHActivator.java index 36f8a5d..f360923 100644 --- a/src/net/java/sip/communicator/impl/protocol/ssh/SSHActivator.java +++ b/src/net/java/sip/communicator/impl/protocol/ssh/SSHActivator.java @@ -65,7 +65,7 @@ public class SSHActivator { this.bundleContext = context; - Hashtable hashtable = new Hashtable(); + Hashtable<String, String> hashtable = new Hashtable<String, String>(); hashtable.put(ProtocolProviderFactory.PROTOCOL, "SSH"); sshProviderFactory = new ProtocolProviderFactorySSHImpl(); |