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

getElementAt - optimized

Browse Source
cusax-fix
Yana Stamcheva 20 years ago
parent a5a09583b9
commit 53dbc9b33c
2 changed files with 90 additions and 181 deletions
Show Stats Download Patch File Download Diff File

62
src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
Unescape View File

@ -7,19 +7,15 @@
package net.java.sip.communicator.impl.gui.main.contactlist;
import java.util.*;
import java.awt.*;
import java.awt.event.*;
import java.util.*;
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.text.*;
import com.sun.media.*;
import net.java.sip.communicator.impl.gui.main.*;
import net.java.sip.communicator.impl.gui.main.contactlist.ContactListPanel.*;
import net.java.sip.communicator.service.contactlist.*;
import net.java.sip.communicator.service.contactlist.event.*;
import net.java.sip.communicator.service.protocol.*;
@ -94,10 +90,7 @@ public void valueChanged(ListSelectionEvent e) {
* Refreshes the list model.
*/
public void metaContactAdded(MetaContactEvent evt) {
System.out.println("META CONTACT ADDED!!!!!!!!!!");
int index = this.listModel.indexOf(evt.getSourceMetaContact());
this.listModel.contentAdded(index, index);
this.repaint();
}
/**
@ -105,9 +98,7 @@ public void metaContactAdded(MetaContactEvent evt) {
* Refreshes the list when a meta contact is renamed.
*/
public void metaContactRenamed(MetaContactRenamedEvent evt) {
int index = this.listModel.indexOf(evt.getSourceMetaContact());
this.listModel.contentChanged(index, index);
this.repaint();
}
/**
@ -125,9 +116,7 @@ public void protoContactAdded(ProtoContactEvent evt) {
* Refreshes the list when a protocol contact has been removed.
*/
public void protoContactRemoved(ProtoContactEvent evt) {
int index = this.listModel.indexOf(evt.getOldParent());
this.listModel.contentChanged(index, index);
this.repaint();
}
/**
@ -135,11 +124,7 @@ public void protoContactRemoved(ProtoContactEvent evt) {
* Refreshes the list when a protocol contact has been moved.
*/
public void protoContactMoved(ProtoContactEvent evt) {
int index = this.listModel.indexOf(evt.getOldParent());
int index1 = this.listModel.indexOf(evt.getNewParent());
this.listModel.contentChanged(index, index);
this.listModel.contentChanged(index1, index1);
this.repaint();
}
/**
@ -147,11 +132,7 @@ public void protoContactMoved(ProtoContactEvent evt) {
* Refreshes the list when a meta contact has been removed.
*/
public void metaContactRemoved(MetaContactEvent evt) {
int index = this.listModel.indexOf(evt.getParentGroup());
this.listModel.contentChanged(index,
index + listModel
.countContactsAndSubgroups(evt.getParentGroup()));
this.repaint();
}
/**
@ -159,24 +140,15 @@ public void metaContactRemoved(MetaContactEvent evt) {
* Refreshes the list when a meta contact has been moved.
*/
public void metaContactMoved(MetaContactMovedEvent evt) {
int index = this.listModel.indexOf(evt.getSourceMetaContact());
this.listModel.contentChanged(index, index);
this.repaint();
}
/**
* Handles the <tt>MetaContactGroupEvent</tt>.
* Refreshes the list model when a new meta contact group has been added.
*/
public void metaContactGroupAdded(MetaContactGroupEvent evt) {
System.out.println("META CONTACT GROUP ADDED!!!!!!!!!!");
MetaContactGroup sourceGroup = evt.getSourceMetaContactGroup();
int index = this.listModel.indexOf(sourceGroup);
this.listModel.contentAdded(index,
index + listModel.countContactsAndSubgroups(sourceGroup));
public void metaContactGroupAdded(MetaContactGroupEvent evt) {
this.repaint();
//this.ensureIndexIsVisible(0);
}
@ -185,11 +157,7 @@ public void metaContactGroupAdded(MetaContactGroupEvent evt) {
* Refreshes the list when a meta contact group has been modified.
*/
public void metaContactGroupModified(MetaContactGroupEvent evt) {
MetaContactGroup sourceGroup = evt.getSourceMetaContactGroup();
int index = this.listModel.indexOf(sourceGroup);
this.listModel.contentChanged(index, index);
this.repaint();
}
/**
@ -208,15 +176,7 @@ public void metaContactGroupRemoved(MetaContactGroupEvent evt) {
* depends on the contact and not on the index.
*/
public void childContactsReordered(MetaContactGroupEvent evt) {
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);
this.repaint();
if (currentlySelectedContact != null)
this.setSelectedValue(currentlySelectedContact, false);
}

209
src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java
Unescape View File

@ -35,8 +35,6 @@ public class ContactListModel extends AbstractListModel {
private Vector closedGroups = new Vector();
private Vector offlineContacts = new Vector();
private boolean showOffline = true;
/**
@ -108,8 +106,7 @@ public int getSize() {
* @return The object at the given index.
*/
public Object getElementAt(int index) {
Object element = this.getElementAt(this.rootGroup, index);
Object element = this.getElementAt(this.rootGroup, -1, index);
return element;
}
@ -131,10 +128,9 @@ private int getContactListSize(MetaContactGroup group) {
Iterator i = group.getChildContacts();
while (i.hasNext()) {
MetaContact contact = (MetaContact) i.next();
synchronized (offlineContacts) {
if (!offlineContacts.contains(contact))
size++;
}
if (isContactOnline(contact))
size++;
}
}
size += group.countSubgroups();
@ -198,7 +194,7 @@ public int indexOf(MetaContact contact) {
int index = -1;
if (!offlineContacts.contains(contact)) {
if (showOffline || isContactOnline(contact)) {
int currentIndex = 0;
MetaContactGroup parentGroup = this.contactList
.findParentMetaContactGroup(contact);
@ -267,7 +263,7 @@ public int countContactsAndSubgroups(MetaContactGroup parentGroup) {
Iterator i = parentGroup.getChildContacts();
while (i.hasNext()) {
MetaContact contact = (MetaContact) i.next();
if (!offlineContacts.contains(contact))
if (isContactOnline(contact))
count++;
}
}
@ -302,7 +298,7 @@ public int countDirectChildContacts(MetaContactGroup parentGroup) {
Iterator i = parentGroup.getChildContacts();
while (i.hasNext()) {
MetaContact contact = (MetaContact) i.next();
if (!offlineContacts.contains(contact))
if (isContactOnline(contact))
count++;
}
}
@ -317,36 +313,43 @@ public int countDirectChildContacts(MetaContactGroup parentGroup) {
* @param searchedIndex The index to search for.
* @return The element at the given index, if it finds it, otherwise null.
*/
private Object getElementAt(MetaContactGroup group, int searchedIndex) {
private Object getElementAt(MetaContactGroup group,
int currentIndex, int searchedIndex) {
Object element = null;
if (!this.isGroupClosed(group)) {
Iterator contacts = group.getChildContacts();
while (contacts.hasNext()) {
MetaContact contact = (MetaContact) contacts.next();
if (!offlineContacts.contains(contact)
&& this.indexOf(contact) == searchedIndex) {
element = contact;
break;
}
}
if (element == null) {
Iterator subgroups = group.getSubgroups();
while (subgroups.hasNext()) {
MetaContactGroup subgroup = (MetaContactGroup) subgroups
.next();
if(currentIndex == searchedIndex) {
element = group;
}
else {
if(!isGroupClosed(group)) {
int childCount = countChildContacts(group);
if(searchedIndex <= (currentIndex + childCount)) {
if (this.indexOf(subgroup) != searchedIndex) {
element = getElementAt(subgroup, searchedIndex);
if (element != null) {
MetaContact contact = group.getMetaContact(
searchedIndex - currentIndex - 1);
if(showOffline || isContactOnline(contact))
element = contact;
}
else {
currentIndex += childCount;
Iterator subgroups = group.getSubgroups();
while (subgroups.hasNext()) {
MetaContactGroup subgroup
= (MetaContactGroup) subgroups.next();
element = getElementAt(
subgroup, currentIndex + 1, searchedIndex);
if(element != null)
break;
else {
if(!isGroupClosed(subgroup))
currentIndex
+= countChildContacts(subgroup) + 1;
else
currentIndex ++;
}
} else {
element = subgroup;
break;
}
}
}
@ -394,89 +397,6 @@ public boolean isGroupClosed(MetaContactGroup group) {
return false;
}
/**
* Removes all offline contacts from the contact list.
*/
public void removeOfflineContacts() {
// Stock offline contacts before adding them in
// offlineContacts Vector in order to have
// getElementAt and indexOf working as nothing
// was changed.
Vector offlineContactsCopy = new Vector();
// A copy of the size as it was before removing an offline contact.
int size = this.getSize();
for (int i = 0; i < size; i++) {
Object element = this.getElementAt(i);
if (element instanceof MetaContact) {
MetaContact contactNode = (MetaContact) element;
if (!getMetaContactStatus(contactNode).isOnline()) {
int index = indexOf(contactNode);
this.contentRemoved(index, index);
offlineContactsCopy.add(contactNode);
}
}
}
//Remove also offline contacts in closed groups.
for (int j = 0; j < closedGroups.size(); j++) {
MetaContactGroup closedGroup
= (MetaContactGroup) closedGroups.get(j);
removeClosedOfflineContacts(closedGroup, offlineContactsCopy);
}
this.offlineContacts = offlineContactsCopy;
}
/**
* Recursively removes offline contacts contained in closed groups.
*
* @param group A MetaContactGroup.
* @param offlineContactsCopy A copy of the offlineContacts Vector.
*/
private void removeClosedOfflineContacts(MetaContactGroup group,
Vector offlineContactsCopy) {
Iterator iter = group.getChildContacts();
while (iter.hasNext()) {
MetaContact contact = (MetaContact) iter.next();
if (!getMetaContactStatus(contact).isOnline()) {
offlineContactsCopy.add(contact);
}
}
Iterator iter1 = group.getSubgroups();
while (iter1.hasNext()) {
MetaContactGroup subgroup = (MetaContactGroup) iter1.next();
if (subgroup.countChildContacts() > 0
|| subgroup.countSubgroups() > 0) {
removeClosedOfflineContacts(subgroup, offlineContactsCopy);
}
}
}
/**
* Adds all offline contacts back to the contact list.
*/
public void addOfflineContacts() {
//Create a copy of the list containing offline contacts
//and after that delete it. We need that the list is empty
//when calculating indexOf.
Vector contacts = (Vector) this.offlineContacts.clone();
this.offlineContacts.removeAllElements();
for (int i = 0; i < contacts.size(); i++) {
MetaContact contact = (MetaContact) contacts.get(i);
if (!isGroupClosed(contact.getParentMetaContactGroup())) {
int index = this.indexOf(contact);
contentAdded(index, index);
}
}
}
/**
* Returns true if offline contacts should be shown,
* false otherwise.
@ -495,6 +415,7 @@ public boolean showOffline() {
*/
public void setShowOffline(boolean showOffline) {
this.showOffline = showOffline;
this.contentChanged(0, getSize() - 1);
}
/**
@ -506,17 +427,45 @@ public void setShowOffline(boolean showOffline) {
* @param newStatus The new status of the contact.
*/
public void updateContactStatus(MetaContact contact,
PresenceStatus newStatus) {
if (!showOffline) {
if (newStatus.isOnline() && offlineContacts.contains(contact)) {
offlineContacts.remove(contact);
} else if (!newStatus.isOnline()
&& !offlineContacts.contains(contact)) {
offlineContacts.add(contact);
}
}
PresenceStatus newStatus) {
int index = this.indexOf(contact);
this.contentChanged(index, index);
}
/**
* Returns TRUE if the given meta contact is online, FALSE otherwise.
* @param contact the meta contact
* @return TRUE if the given meta contact is online, FALSE otherwise
*/
public boolean isContactOnline(MetaContact contact)
{
//Lays on the fact that the default contact is the most connected.
if(contact.getDefaultContact().getPresenceStatus().getStatus()
> PresenceStatus.ONLINE_THRESHOLD) {
return true;
}
else {
return false;
}
}
public int countChildContacts(MetaContactGroup group)
{
if(showOffline)
return group.countChildContacts();
else {
int count = 0;
Iterator i = group.getChildContacts();
while(i.hasNext()) {
MetaContact metaContact = (MetaContact)i.next();
if(isContactOnline(metaContact)) {
count ++;
}
else {
break;
}
}
return count;
}
}
}

Write Preview
Loading…
Cancel
Save