mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-1235, hopefully refixed this

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@12507 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Wolf Posdorfer
2011-06-17 12:20:22 +00:00
committed by wolf.posdorfer
parent 4a51cdfd56
commit dda4a7b2f2
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/org/jivesoftware/spark/UserManager.java
View File

@ -376,7 +376,7 @@ public class UserManager {
public void searchContacts(String contact, final JFrame parent) { public void searchContacts(String contact, final JFrame parent) {
if (parents.get(parent) == null) { if (parents.get(parent) == null && parent.getGlassPane() !=null) {
parents.put(parent, parent.getGlassPane()); parents.put(parent, parent.getGlassPane());
} }
@ -390,6 +390,7 @@ public class UserManager {
final ContactList contactList = SparkManager.getWorkspace().getContactList(); final ContactList contactList = SparkManager.getWorkspace().getContactList();
for (ContactGroup contactGroup : contactList.getContactGroups()) { for (ContactGroup contactGroup : contactList.getContactGroups()) {
contactGroup.clearSelection();
for (ContactItem contactItem : contactGroup.getContactItems()) { for (ContactItem contactItem : contactGroup.getContactItems()) {
if (!contactMap.containsKey(contactItem.getJID())) { if (!contactMap.containsKey(contactItem.getJID())) {
contacts.add(contactItem); contacts.add(contactItem);

2
src/java/org/jivesoftware/spark/ui/ContactList.java
View File

@ -1964,7 +1964,7 @@ public final class ContactList extends JPanel implements ActionListener,
if (contactGroup == null) { if (contactGroup == null) {
contactGroup = addContactGroup(groupName); contactGroup = addContactGroup(groupName);
contactGroup.setVisible(true); contactGroup.setVisible(true);
validateTree(); //validateTree();
repaint(); repaint();
} }
} }

25
src/java/org/jivesoftware/sparkimpl/plugin/chat/PresenceChangePlugin.java
View File

@ -69,24 +69,31 @@ public class PresenceChangePlugin implements Plugin {
private static final long serialVersionUID = 7705539667621148816L; private static final long serialVersionUID = 7705539667621148816L;
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
ContactItem item = contactList.getSelectedUsers().iterator().next();
String bareAddress = StringUtils.parseBareAddress(item.getJID()); for (ContactItem item : contactList.getSelectedUsers()) {
sparkContacts.add(bareAddress); String bareAddress = StringUtils.parseBareAddress(item
.getJID());
sparkContacts.add(bareAddress);
}
} }
}; };
listenAction.putValue(Action.NAME, Res.getString("menuitem.alert.when.online")); listenAction.putValue(Action.NAME, Res.getString("menuitem.alert.when.online"));
listenAction.putValue(Action.SMALL_ICON, SparkRes.getImageIcon(SparkRes.SMALL_ALARM_CLOCK)); listenAction.putValue(Action.SMALL_ICON, SparkRes.getImageIcon(SparkRes.SMALL_ALARM_CLOCK));
final Action removeAction = new AbstractAction() { final Action removeAction = new AbstractAction() {
private static final long serialVersionUID = -8726129089417116105L; private static final long serialVersionUID = -8726129089417116105L;
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
ContactItem item = contactList.getSelectedUsers().iterator().next();
String bareAddress = StringUtils.parseBareAddress(item.getJID()); for (ContactItem item : contactList.getSelectedUsers()) {
sparkContacts.remove(bareAddress); String bareAddress = StringUtils.parseBareAddress(item
} .getJID());
}; sparkContacts.remove(bareAddress);
}
}
};
removeAction.putValue(Action.NAME, Res.getString("menuitem.remove.alert.when.online")); removeAction.putValue(Action.NAME, Res.getString("menuitem.remove.alert.when.online"));
removeAction.putValue(Action.SMALL_ICON, SparkRes.getImageIcon(SparkRes.SMALL_DELETE)); removeAction.putValue(Action.SMALL_ICON, SparkRes.getImageIcon(SparkRes.SMALL_DELETE));