Refactoring

src/net/java/sip/communicator/service/protocol/ContactGroup.java

@@ -35,7 +35,7 @@ public interface ContactGroup
      * @return an int indicating the number of subgroups that this ContactGroup
      * contains.
      */
-    public int countSubGroups();
+    public int countSubgroups();
 
     /**
      * Returns the subgroup with the specified index.
@@ -102,5 +102,5 @@ public interface ContactGroup
      * @return a regerence to the ProtocolProviderService instance that this
      * ContactGroup belongs to.
      */
-//    public ProtocolProviderService getProtocolProvider();
+    public ProtocolProviderService getProtocolProvider();
 }

test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPersistentPresence.java

@@ -117,7 +117,7 @@ public void testRetrievingServerStoredContactList()
 
         logger.debug("rootGroup="+rootGroup.getGroupName()
                      +" rootGroup.childContacts="+rootGroup.countContacts()
-                     + "rootGroup.childGroups="+rootGroup.countSubGroups()
+                     + "rootGroup.childGroups="+rootGroup.countSubgroups()
                      + "Printing rootGroupContents=\n"+rootGroup.toString());
 
         Hashtable expectedContactList = fixture.preInstalledBuddyList;