sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Try to fix contact list strange behavior.

Browse Source
cusax-fix
Yana Stamcheva 16 years ago
parent d7b9dc0142
commit 521649136f
3 changed files with 136 additions and 129 deletions
Show Stats Download Patch File Download Diff File

2
src/net/java/sip/communicator/impl/gui/main/MainFrame.java
Unescape View File

@ -371,7 +371,7 @@ public void addProtocolSupportedOperationSets(
presence.addProviderPresenceStatusListener(
new GUIProviderPresenceStatusListener());
presence.addContactPresenceStatusListener(
TreeContactList.presenceFilter);
GuiActivator.getContactList());
}
// Obtain the basic instant messaging operation set.

67
src/net/java/sip/communicator/impl/gui/main/contactlist/PresenceFilter.java
Unescape View File

@ -8,14 +8,11 @@
import java.util.*;
import javax.swing.*;
import net.java.sip.communicator.impl.gui.*;
import net.java.sip.communicator.impl.gui.main.contactlist.contactsource.*;
import net.java.sip.communicator.impl.gui.utils.*;
import net.java.sip.communicator.service.contactlist.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
/**
* The <tt>PresenceFilter</tt> is used to filter offline contacts from the
@ -24,8 +21,7 @@
* @author Yana Stamcheva
*/
public class PresenceFilter
implements ContactListFilter,
ContactPresenceStatusListener
implements ContactListFilter
{
/**
* Indicates if this presence filter shows or hides the offline contacts.
@ -37,8 +33,6 @@ public class PresenceFilter
*/
private boolean isFiltering = false;
private final Object lockedFiltering = new Object();
/**
* Creates an instance of <tt>PresenceFilter</tt>.
*/
@ -57,11 +51,8 @@ public void applyFilter(ContactListTreeModel treeModel)
{
isFiltering = true;
synchronized (lockedFiltering)
{
addMatching(GuiActivator.getContactListService().getRoot(),
treeModel);
}
addMatching(GuiActivator.getContactListService().getRoot(),
treeModel);
isFiltering = false;
}
@ -204,58 +195,6 @@ && isMatching(subgroup))
}
}
/**
* Indicates that a contact has changed its status.
*
* @param evt the presence event containing information about the
* contact status change
*/
public void contactPresenceStatusChanged(
final ContactPresenceStatusChangeEvent evt)
{
final Contact sourceContact = evt.getSourceContact();
final MetaContact metaContact = GuiActivator.getContactListService()
.findMetaContactByContact(sourceContact);
if (metaContact == null
|| (evt.getOldStatus() == evt.getNewStatus()))
return;
SwingUtilities.invokeLater(new Runnable()
{
public void run()
{
UIContact cDescriptor
= MetaContactListSource.getUIContact(metaContact);
if (cDescriptor == null)
cDescriptor = MetaContactListSource
.createUIContact(metaContact);
synchronized(lockedFiltering)
{
if (GuiActivator.getContactList().getCurrentFilter()
.equals(PresenceFilter.this)
&& isMatching(metaContact))
{
if (cDescriptor.getContactNode() == null)
GuiActivator.getContactList()
.addContact(cDescriptor);
else
GuiActivator.getContactList()
.nodeChanged(cDescriptor.getContactNode());
}
else
{
GuiActivator.getContactList()
.removeContact(cDescriptor);
}
}
}
});
}
/**
* Stops this filter current queries.
*/

196
src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
Unescape View File

@ -22,6 +22,8 @@
import net.java.sip.communicator.service.contactlist.*;
import net.java.sip.communicator.service.contactlist.event.*;
import net.java.sip.communicator.service.contactsource.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.util.*;
import net.java.sip.communicator.util.swing.*;
@ -33,6 +35,7 @@
public class TreeContactList
extends DefaultTreeContactList
implements MetaContactListListener,
ContactPresenceStatusListener,
MouseListener,
MouseMotionListener,
TreeExpansionListener
@ -123,6 +126,11 @@ public class TreeContactList
*/
private boolean isFiltering = false;
/**
* The object locking the filter.
*/
private final Object filterLock = new Object();
/**
* Creates the <tt>TreeContactList</tt>.
*/
@ -160,9 +168,6 @@ public void childContactsReordered(MetaContactGroupEvent evt)
{
final MetaContactGroup metaGroup = evt.getSourceMetaContactGroup();
final UIGroup uiGroup
= MetaContactListSource.getUIGroup(metaGroup);
SwingUtilities.invokeLater(new Runnable()
{
public void run()
@ -171,8 +176,11 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
UIGroup uiGroup
= MetaContactListSource.getUIGroup(metaGroup);
if (uiGroup != null)
{
GroupNode groupNode = uiGroup.getGroupNode();
@ -194,9 +202,6 @@ public void metaContactAdded(MetaContactEvent evt)
{
final MetaContact metaContact = evt.getSourceMetaContact();
final UIContact uiContact
= MetaContactListSource.createUIContact(metaContact);
SwingUtilities.invokeLater(new Runnable()
{
public void run()
@ -205,8 +210,11 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
UIContact uiContact
= MetaContactListSource.createUIContact(metaContact);
if (currentFilter.isMatching(uiContact))
addContact(uiContact);
else
@ -225,9 +233,6 @@ public void metaContactGroupAdded(MetaContactGroupEvent evt)
{
final MetaContactGroup metaGroup = evt.getSourceMetaContactGroup();
final UIGroup uiGroup
= MetaContactListSource.createUIGroup(metaGroup);
SwingUtilities.invokeLater(new Runnable()
{
public void run()
@ -236,8 +241,11 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
UIGroup uiGroup
= MetaContactListSource.createUIGroup(metaGroup);
if (currentFilter.isMatching(uiGroup))
addGroup(uiGroup);
else
@ -256,9 +264,6 @@ public void metaContactGroupModified(MetaContactGroupEvent evt)
{
final MetaContactGroup metaGroup = evt.getSourceMetaContactGroup();
final UIGroup uiGroup
= MetaContactListSource.getUIGroup(metaGroup);
SwingUtilities.invokeLater(new Runnable()
{
public void run()
@ -267,8 +272,11 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
UIGroup uiGroup
= MetaContactListSource.getUIGroup(metaGroup);
if (uiGroup != null)
{
GroupNode groupNode = uiGroup.getGroupNode();
@ -289,10 +297,6 @@ public void run()
*/
public void metaContactGroupRemoved(final MetaContactGroupEvent evt)
{
final UIGroup uiGroup
= MetaContactListSource.getUIGroup(
evt.getSourceMetaContactGroup());
SwingUtilities.invokeLater(new Runnable()
{
public void run()
@ -301,9 +305,14 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
removeGroup(uiGroup);
UIGroup uiGroup
= MetaContactListSource.getUIGroup(
evt.getSourceMetaContactGroup());
if (uiGroup != null)
removeGroup(uiGroup);
}
}
});
@ -314,12 +323,8 @@ public void run()
* modified in the <tt>MetaContactListService</tt>.
* @param evt the <tt>MetaContactEvent</tt> that notified us
*/
public void metaContactModified(MetaContactModifiedEvent evt)
public void metaContactModified(final MetaContactModifiedEvent evt)
{
final UIContact uiContact
= MetaContactListSource.getUIContact(
evt.getSourceMetaContact());
SwingUtilities.invokeLater(new Runnable()
{
public void run()
@ -328,8 +333,12 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
UIContact uiContact
= MetaContactListSource.getUIContact(
evt.getSourceMetaContact());
if (uiContact != null)
{
ContactNode contactNode
@ -350,16 +359,6 @@ public void run()
*/
public void metaContactMoved(final MetaContactMovedEvent evt)
{
final UIContact uiContact
= MetaContactListSource.getUIContact(
evt.getSourceMetaContact());
final UIGroup oldUIGroup
= MetaContactListSource.getUIGroup(evt.getOldParent());
final UIGroup newUIGroup
= MetaContactListSource.getUIGroup(evt.getNewParent());
SwingUtilities.invokeLater(new Runnable()
{
public void run()
@ -368,8 +367,18 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
UIContact uiContact
= MetaContactListSource.getUIContact(
evt.getSourceMetaContact());
UIGroup oldUIGroup
= MetaContactListSource.getUIGroup(evt.getOldParent());
UIGroup newUIGroup
= MetaContactListSource.getUIGroup(evt.getNewParent());
if (currentFilter.isMatching(uiContact))
{
GroupNode oldParent = oldUIGroup.getGroupNode();
@ -401,7 +410,7 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
UIContact uiContact = MetaContactListSource.getUIContact(
evt.getSourceMetaContact());
@ -418,12 +427,8 @@ public void run()
* renamed in the <tt>MetaContactListService</tt>.
* @param evt the <tt>MetaContactRenamedEvent</tt> that notified us
*/
public void metaContactRenamed(MetaContactRenamedEvent evt)
public void metaContactRenamed(final MetaContactRenamedEvent evt)
{
final UIContact uiContact
= MetaContactListSource.getUIContact(
evt.getSourceMetaContact());
SwingUtilities.invokeLater(new Runnable()
{
public void run()
@ -432,8 +437,12 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
UIContact uiContact
= MetaContactListSource.getUIContact(
evt.getSourceMetaContact());
if (uiContact != null)
{
ContactNode contactNode = uiContact.getContactNode();
@ -451,12 +460,8 @@ public void run()
* modified in the <tt>MetaContactListService</tt>.
* @param evt the <tt>MetaContactEvent</tt> that notified us
*/
public void metaContactAvatarUpdated(MetaContactAvatarUpdateEvent evt)
public void metaContactAvatarUpdated(final MetaContactAvatarUpdateEvent evt)
{
final UIContact uiContact
= MetaContactListSource.getUIContact(
evt.getSourceMetaContact());
SwingUtilities.invokeLater(new Runnable()
{
public void run()
@ -465,8 +470,12 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
UIContact uiContact
= MetaContactListSource.getUIContact(
evt.getSourceMetaContact());
if (uiContact != null)
{
ContactNode contactNode = uiContact.getContactNode();
@ -489,9 +498,6 @@ public void protoContactAdded(ProtoContactEvent evt)
{
final MetaContact metaContact = evt.getNewParent();
final UIContact parentUIContact
= MetaContactListSource.getUIContact(metaContact);
SwingUtilities.invokeLater(new Runnable()
{
public void run()
@ -500,8 +506,11 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
UIContact parentUIContact
= MetaContactListSource.getUIContact(metaContact);
if (parentUIContact == null)
{
UIContact uiContact
@ -538,9 +547,9 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
final UIContact oldUIContact
UIContact oldUIContact
= MetaContactListSource.getUIContact(oldParent);
// Remove old parent if not matching.
@ -587,7 +596,7 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
UIContact oldUIContact
= MetaContactListSource.getUIContact(oldParent);
@ -634,7 +643,7 @@ public void setActiveContact(MetaContact metaContact, boolean isActive)
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
ContactNode contactNode
= MetaContactListSource.getUIContact(metaContact)
@ -900,7 +909,7 @@ public boolean applyFilter(ContactListFilter filter)
// We synchronize the matching and all MetaContactListener events on
// the searchTreeModel in order to prevent modification to be done on
// the actual treeModel while we're working with the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
treeModel.clearDependencies();
@ -940,12 +949,16 @@ public void run()
// filtering.
isFiltering = false;
boolean hasResults = false;
// As we update the tree in the swing thread, we should check the
// temporary model here in order to given correct results.
if (tempTreeModel.getChildCount(tempTreeModel.getRoot()) > 0)
return true;
hasResults = true;
return false;
tempTreeModel = null;
return hasResults;
}
/**
@ -980,7 +993,7 @@ public void run()
// events on the tempTreeModel in order to prevent modification
// to be done on the actual treeModel while we're working with
// the temporary model.
synchronized (tempTreeModel)
synchronized (filterLock)
{
ContactNode contactNode = treeModel.findFirstContactNode();
@ -1594,4 +1607,59 @@ public void serviceChanged(ServiceEvent event)
}
}
}
/**
* Indicates that a contact has changed its status.
*
* @param evt the presence event containing information about the
* contact status change
*/
public void contactPresenceStatusChanged(
final ContactPresenceStatusChangeEvent evt)
{
final Contact sourceContact = evt.getSourceContact();
final MetaContact metaContact = GuiActivator.getContactListService()
.findMetaContactByContact(sourceContact);
if (metaContact == null
|| (evt.getOldStatus() == evt.getNewStatus()))
return;
SwingUtilities.invokeLater(new Runnable()
{
public void run()
{
// We synchronize the matching and all MetaContactListener
// events on the tempTreeModel in order to prevent
// modification to be done on the actual treeModel while
// we're working with the temporary model.
synchronized (filterLock)
{
UIContact uiContact
= MetaContactListSource.getUIContact(metaContact);
if (uiContact == null)
{
uiContact = MetaContactListSource
.createUIContact(metaContact);
if (currentFilter.isMatching(uiContact))
addContact(uiContact);
else
MetaContactListSource
.removeUIContact(metaContact);
}
else if (uiContact.getContactNode() != null)
{
if (!currentFilter.isMatching(uiContact))
removeContact(uiContact);
else
treeModel
.nodeChanged(uiContact.getContactNode());
}
}
}
});
}
}

Write Preview
Loading…
Cancel
Save