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 9875169c1..8fbe320f8 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
@@ -114,133 +114,73 @@ public void addOfflineContacts(){
}
*/
}
-
- /**
- * Indicates that a MetaContact has been added to the
- * MetaContactList.
- */
+
public void metaContactAdded(MetaContactEvent evt) {
// TODO Auto-generated method stub
}
- /**
- * Indicates that a MetaContact has been modified.
- * @param evt the MetaContactListEvent containing the corresponding contact
- */
- public void metaContactModified(MetaContactEvent evt) {
+ public void metaContactRenamed(MetaContactRenamedEvent evt) {
// TODO Auto-generated method stub
}
- /**
- * Indicates that a MetaContact has been removed from
- * the MetaContactList.
- */
- public void metaContactRemoved(MetaContactEvent evt) {
+ public void protoContactAdded(ProtoContactEvent evt) {
// TODO Auto-generated method stub
}
- /**
- * Indicates that a MetaContact has been moved inside the MetaContact list.
- * @param evt the MetaContactListEvent containing the corresponding contact
- */
- public void metaContactMoved(MetaContactEvent evt) {
+ public void protoContactRemoved(ProtoContactEvent evt) {
// TODO Auto-generated method stub
}
- /**
- * Indicates that a MetaContactGroup has been added.
- */
- public void metaContactGroupAdded(MetaContactGroupEvent evt) {
-
- MetaContactGroup sourceGroup = evt.getSourceMetaContactGroup();
-
- this.listModel.groupAdded(sourceGroup, this);
- }
-
- /**
- * Indicates that a MetaContactGroup has been modified (e.g. a proto contact
- * group was removed).
- *
- * @param evt the MetaContactListEvent containing the corresponding contact
- */
- public void metaContactGroupModified(MetaContactGroupEvent evt) {
+ public void protoContactMoved(ProtoContactEvent evt) {
// TODO Auto-generated method stub
- }
-
- /**
- * Indicates that a MetaContactGroup has been removed.
- */
- public void metaContactGroupRemoved(MetaContactGroupEvent evt) {
}
- /**
- * Indicates that a MetaContact has been modified.
- * @param evt the MetaContactListEvent containing the corresponding contact
- */
- public void metaContactRenamed(MetaContactRenamedEvent evt) {
+ public void metaContactRemoved(MetaContactEvent evt) {
// TODO Auto-generated method stub
}
- /**
- * Indicates that a protocol specific Contact instance has been
- * added to the list of protocol specific buddies in this
- * MetaContact
- * @param evt a reference to the corresponding
- * ProtoContactEvent
- */
- public void protoContactAdded(ProtoContactEvent evt) {
+ public void metaContactMoved(MetaContactMovedEvent evt) {
// TODO Auto-generated method stub
}
-
- /**
- * Indicates that a protocol specific Contact instance has been
- * removed from the list of protocol specific buddies in this
- * MetaContact
- * @param evt a reference to the corresponding
- * ProtoContactEvent
+
+ /**
+ * Indicates that a MetaContactGroup has been added.
*/
- public void protoContactRemoved(ProtoContactEvent evt) {
- // TODO Auto-generated method stub
+ public void metaContactGroupAdded(MetaContactGroupEvent evt) {
+ MetaContactGroup sourceGroup = evt.getSourceMetaContactGroup();
+
+ this.listModel.groupAdded(sourceGroup, this);
}
- /**
- * Indicates that a protocol specific Contact instance has been
- * moved from within one MetaContact to another.
- * @param evt a reference to the ProtoContactMovedEvent instance.
- */
- public void protoContactMoved(ProtoContactEvent evt) {
+ public void metaContactGroupModified(MetaContactGroupEvent evt) {
// TODO Auto-generated method stub
}
-
- /**
- * Indicates that a MetaContact has been moved inside the MetaContact list.
- * @param evt the MetaContactListEvent containing the corresponding contact
- */
- public void metaContactMoved(MetaContactMovedEvent evt) {
+
+ public void metaContactGroupRemoved(MetaContactGroupEvent evt) {
// TODO Auto-generated method stub
}
- /**
- * Indicates that the order under which the child contacts were ordered
- * inside the source group has changed.
- * @param evt the MetaContactGroupEvent containind details of this
- * event.
- */
public void childContactsReordered(MetaContactGroupEvent evt) {
- // TODO Auto-generated method stub
+ System.out.println("EHOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO");
+ MetaContactGroup group = evt.getSourceMetaContactGroup();
+
+ int startIndex
+ = this.listModel.indexOf(group.getMetaContact(0));
+ int endIndex
+ = this.listModel.indexOf(group.getMetaContact(group.countChildContacts() - 1));
+ this.listModel.contentChanged(startIndex, endIndex);
}
-
}
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java
index 01ba636a0..1539c7c29 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java
@@ -52,8 +52,8 @@ public ContactListModel(MetaContactListService contactList){
*
* @param index The index of the cell which has to be refreshed.
*/
- public void contactStatusChanged(int index) {
- fireContentsChanged(this, index, index);
+ public void contentChanged(int startIndex, int endIndex) {
+ fireContentsChanged(this, startIndex, endIndex);
}
/**
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java
index a11d7d79f..b522ed514 100755
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java
@@ -249,7 +249,7 @@ public void windowClosing(WindowEvent e) {
}
/*
- * Get the hashtable containg all tabs and correspondins
+ * Get the hashtable containg all tabs and corresponding
* chat panels.
*/
Hashtable contactTabsTable