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

Update ContactList transport issue.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@9036 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-08-30 03:52:00 +00:00
committed by derek
parent 812ea44c92
commit 330e020ca3
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,7 +287,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
changeOfflineToOnline(bareJID, entry, presence); changeOfflineToOnline(bareJID, entry, presence);
} }
else if (presence.getType() == Presence.Type.available) { else if (presence.getType() == Presence.Type.available) {
updateContactItemsPresence(presence, bareJID); updateContactItemsPresence(presence, entry, bareJID);
} }
else if (presence.getType() == Presence.Type.unavailable && !isPending) { else if (presence.getType() == Presence.Type.unavailable && !isPending) {
// If not available, move to offline group. // If not available, move to offline group.
@ -296,7 +296,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
moveToOfflineGroup(presence, bareJID); moveToOfflineGroup(presence, bareJID);
} }
else { else {
updateContactItemsPresence(rosterPresence, bareJID); updateContactItemsPresence(rosterPresence, entry, bareJID);
} }
} }
@ -308,12 +308,16 @@ public final class ContactList extends JPanel implements ActionListener, Contact
* @param presence the users presence. * @param presence the users presence.
* @param bareJID the bare jid of the user. * @param bareJID the bare jid of the user.
*/ */
private void updateContactItemsPresence(Presence presence, String bareJID) { private void updateContactItemsPresence(Presence presence, RosterEntry entry, String bareJID) {
final Iterator groupIterator = groupList.iterator(); final Iterator groupIterator = groupList.iterator();
while (groupIterator.hasNext()) { while (groupIterator.hasNext()) {
ContactGroup group = (ContactGroup)groupIterator.next(); ContactGroup group = (ContactGroup)groupIterator.next();
ContactItem item = group.getContactItemByJID(bareJID); ContactItem item = group.getContactItemByJID(bareJID);
if (item != null) { if (item != null) {
if (group == offlineGroup) {
changeOfflineToOnline(bareJID, entry, presence);
continue;
}
item.setPresence(presence); item.setPresence(presence);
group.fireContactGroupUpdated(); group.fireContactGroupUpdated();
} }

4
src/java/org/jivesoftware/sparkimpl/plugin/language/LanguagePlugin.java
View File

@ -47,6 +47,10 @@ public class LanguagePlugin implements Plugin {
URL url = getClass().getClassLoader().getResource("i18n"); URL url = getClass().getClassLoader().getResource("i18n");
File[] files = URLFileSystem.url2File(url).listFiles(); File[] files = URLFileSystem.url2File(url).listFiles();
if(files == null){
return;
}
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
File propertiesFile = files[i]; File propertiesFile = files[i];
String propertiesName = propertiesFile.getName(); String propertiesName = propertiesFile.getName();