diff --git a/build/lib/dist/smack.jar b/build/lib/dist/smack.jar
index 740cf28e..b139e465 100644
Binary files a/build/lib/dist/smack.jar and b/build/lib/dist/smack.jar differ
diff --git a/build/lib/dist/smackx-debug.jar b/build/lib/dist/smackx-debug.jar
index ba636498..f22e736b 100644
Binary files a/build/lib/dist/smackx-debug.jar and b/build/lib/dist/smackx-debug.jar differ
diff --git a/build/lib/dist/smackx.jar b/build/lib/dist/smackx.jar
index c53c0217..8bd3554b 100644
Binary files a/build/lib/dist/smackx.jar and b/build/lib/dist/smackx.jar differ
diff --git a/build/projects/Spark.iws b/build/projects/Spark.iws
index 4f5d8871..c6a3397d 100644
--- a/build/projects/Spark.iws
+++ b/build/projects/Spark.iws
@@ -15,8 +15,12 @@
-
+
+
+
+
+
@@ -122,10 +126,91 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -380,7 +465,92 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ C:\spark\src\java\org\jivesoftware\spark\PluginManager.java
+ C:\spark\src\java\org\jivesoftware\sparkimpl\plugin\viewer\PluginViewer.java
+ C:\spark\src\java\org\jivesoftware\sparkimpl\plugin\viewer\SparkPlugUI.java
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -391,22 +561,15 @@
+
-
-
+
-
-
-
-
-
-
-
@@ -444,6 +607,13 @@
+
+
+
+
+
+
+
@@ -452,14 +622,14 @@
+
-
-
+
@@ -469,14 +639,14 @@
+
-
-
+
@@ -587,7 +757,7 @@
-
+
@@ -631,7 +801,6 @@
-
@@ -641,6 +810,7 @@
+
@@ -681,107 +851,107 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/java/org/jivesoftware/AccountCreationWizard.java b/src/java/org/jivesoftware/AccountCreationWizard.java
index 5be3d835..781caa2a 100644
--- a/src/java/org/jivesoftware/AccountCreationWizard.java
+++ b/src/java/org/jivesoftware/AccountCreationWizard.java
@@ -11,7 +11,6 @@
package org.jivesoftware;
import org.jivesoftware.smack.AccountManager;
-import org.jivesoftware.smack.SSLXMPPConnection;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.spark.component.TitlePanel;
@@ -265,10 +264,10 @@ public class AccountCreationWizard extends JPanel {
if (useSSL) {
if (!hostPortConfigured) {
- con = new SSLXMPPConnection(serverName);
+ con = new XMPPConnection(serverName);
}
else {
- con = new SSLXMPPConnection(localPref.getXmppHost(), port, serverName);
+ con = new XMPPConnection(localPref.getXmppHost(), port, serverName);
}
}
else {
diff --git a/src/java/org/jivesoftware/LoginDialog.java b/src/java/org/jivesoftware/LoginDialog.java
index fea9b215..3d0dc1f7 100644
--- a/src/java/org/jivesoftware/LoginDialog.java
+++ b/src/java/org/jivesoftware/LoginDialog.java
@@ -13,7 +13,6 @@ package org.jivesoftware;
import org.jivesoftware.resource.Default;
import org.jivesoftware.resource.SparkRes;
import org.jivesoftware.smack.Roster;
-import org.jivesoftware.smack.SSLXMPPConnection;
import org.jivesoftware.smack.SmackConfiguration;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
@@ -591,10 +590,10 @@ public final class LoginDialog {
if (useSSL) {
if (!hostPortConfigured) {
- connection = new SSLXMPPConnection(serverName);
+ connection = new XMPPConnection(serverName);
}
else {
- connection = new SSLXMPPConnection(localPref.getXmppHost(), port, serverName);
+ connection = new XMPPConnection(localPref.getXmppHost(), port, serverName);
}
}
else {
@@ -614,7 +613,7 @@ public final class LoginDialog {
// Subscriptions are always manual
Roster roster = connection.getRoster();
- roster.setSubscriptionMode(Roster.SUBSCRIPTION_MANUAL);
+ roster.setSubscriptionMode(Roster.SubscriptionMode.manual);
sessionManager.setServerAddress(connection.getServiceName());
sessionManager.initializeSession(connection, getUsername(), getPassword());
diff --git a/src/java/org/jivesoftware/MainWindow.java b/src/java/org/jivesoftware/MainWindow.java
index b7f4cf17..0402ae50 100644
--- a/src/java/org/jivesoftware/MainWindow.java
+++ b/src/java/org/jivesoftware/MainWindow.java
@@ -251,7 +251,7 @@ public final class MainWindow extends JFrame implements ActionListener {
SparkRes.getImageIcon(SparkRes.USER1_MESSAGE_24x24), this);
if (status != null) {
- Presence presence = new Presence(Presence.Type.UNAVAILABLE);
+ Presence presence = new Presence(Presence.Type.unavailable);
presence.setStatus(status);
con.sendPacket(presence);
}
diff --git a/src/java/org/jivesoftware/spark/SessionManager.java b/src/java/org/jivesoftware/spark/SessionManager.java
index fdabfb25..60d54b0a 100644
--- a/src/java/org/jivesoftware/spark/SessionManager.java
+++ b/src/java/org/jivesoftware/spark/SessionManager.java
@@ -306,7 +306,7 @@ public final class SessionManager implements ConnectionListener {
// Change Status
Workspace workspace = SparkManager.getWorkspace();
Presence presence = workspace.getStatusBar().getPresence();
- if (workspace != null && presence.getMode() == Presence.Mode.AVAILABLE) {
+ if (workspace != null && presence.getMode() == Presence.Mode.available) {
unavaliable = true;
StatusItem away = workspace.getStatusBar().getStatusItem("Away");
Presence p = away.getPresence();
diff --git a/src/java/org/jivesoftware/spark/Workspace.java b/src/java/org/jivesoftware/spark/Workspace.java
index bb34195c..6b4ac01a 100644
--- a/src/java/org/jivesoftware/spark/Workspace.java
+++ b/src/java/org/jivesoftware/spark/Workspace.java
@@ -213,10 +213,10 @@ public class Workspace extends JPanel implements PacketListener {
public void processPacket(Packet packet) {
Presence presence = (Presence)packet;
if (presence != null && presence.getProperty("anonymous") != null) {
- boolean isAvailable = statusBox.getPresence().getMode() == Presence.Mode.AVAILABLE;
- Presence reply = new Presence(Presence.Type.AVAILABLE);
+ boolean isAvailable = statusBox.getPresence().getMode() == Presence.Mode.available;
+ Presence reply = new Presence(Presence.Type.available);
if (!isAvailable) {
- reply.setType(Presence.Type.UNAVAILABLE);
+ reply.setType(Presence.Type.unavailable);
}
reply.setTo(presence.getFrom());
SparkManager.getSessionManager().getConnection().sendPacket(reply);
diff --git a/src/java/org/jivesoftware/spark/component/Notifications.java b/src/java/org/jivesoftware/spark/component/Notifications.java
index 2284ec25..54ca906f 100644
--- a/src/java/org/jivesoftware/spark/component/Notifications.java
+++ b/src/java/org/jivesoftware/spark/component/Notifications.java
@@ -151,10 +151,10 @@ public final class Notifications implements ActionListener, MainWindowListener {
return;
}
- if (presence.getMode() == Presence.Mode.AVAILABLE || presence.getMode() == Presence.Mode.CHAT) {
+ if (presence.getMode() == Presence.Mode.available || presence.getMode() == Presence.Mode.chat) {
trayIcon.setIcon(availableIcon);
}
- else if (presence.getMode() == Presence.Mode.AWAY || presence.getMode() == Presence.Mode.EXTENDED_AWAY) {
+ else if (presence.getMode() == Presence.Mode.away || presence.getMode() == Presence.Mode.xa) {
trayIcon.setIcon(unavaliableIcon);
}
else {
@@ -275,7 +275,7 @@ public final class Notifications implements ActionListener, MainWindowListener {
StatusBar statusBox = workspace.getStatusBar();
Presence presence = statusBox.getPresence();
- if (presence.getMode() != Presence.Mode.AVAILABLE) {
+ if (presence.getMode() != Presence.Mode.available) {
SparkManager.getSessionManager().changePresence(presence);
}
diff --git a/src/java/org/jivesoftware/spark/component/RosterTree.java b/src/java/org/jivesoftware/spark/component/RosterTree.java
index 6debc5dc..4c26d857 100644
--- a/src/java/org/jivesoftware/spark/component/RosterTree.java
+++ b/src/java/org/jivesoftware/spark/component/RosterTree.java
@@ -100,26 +100,20 @@ public final class RosterTree extends JPanel {
public void presenceChanged(String user) {
Presence presence = roster.getPresence(user);
- changePresence(user, presence != null && presence.getMode() == Presence.Mode.AVAILABLE);
+ changePresence(user, presence != null && presence.getMode() == Presence.Mode.available);
}
});
- final Iterator iter = roster.getGroups();
- while (iter.hasNext()) {
- final RosterGroup group = (RosterGroup)iter.next();
-
-
+ for(RosterGroup group : roster.getGroups()){
final JiveTreeNode groupNode = new JiveTreeNode(group.getName(), true);
groupNode.setAllowsChildren(true);
if (group.getEntryCount() > 0) {
rootNode.add(groupNode);
}
- Iterator entries = group.getEntries();
- while (entries.hasNext()) {
- final RosterEntry entry = (RosterEntry)entries.next();
+ for(RosterEntry entry : group.getEntries()){
String name = entry.getName();
if (name == null) {
name = entry.getUser();
@@ -129,10 +123,10 @@ public final class RosterTree extends JPanel {
final JiveTreeNode entryNode = new JiveTreeNode(name, false);
final Presence p = roster.getPresence(entry.getUser());
addressMap.put(entryNode, entry.getUser());
- if (p != null && p.getType() == Presence.Type.AVAILABLE && p.getMode() == Presence.Mode.AVAILABLE) {
+ if (p != null && p.getType() == Presence.Type.available && p.getMode() == Presence.Mode.available) {
groupNode.add(entryNode);
}
- else if ((p == null || p.getType() == Presence.Type.UNAVAILABLE) && showUnavailableAgents) {
+ else if ((p == null || p.getType() == Presence.Type.unavailable) && showUnavailableAgents) {
groupNode.add(entryNode);
}
diff --git a/src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java b/src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java
index dd835237..07228350 100644
--- a/src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java
+++ b/src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java
@@ -522,7 +522,7 @@ public class SparkTransferManager {
final PacketListener packetListener = new PacketListener() {
public void processPacket(Packet packet) {
Presence presence = (Presence)packet;
- if (presence == null || presence.getType() == Presence.Type.UNAVAILABLE) {
+ if (presence == null || presence.getType() == Presence.Type.unavailable) {
if (transfer != null) {
transfer.cancel();
}
diff --git a/src/java/org/jivesoftware/spark/ui/ChatContainer.java b/src/java/org/jivesoftware/spark/ui/ChatContainer.java
index 48207358..dec076d1 100644
--- a/src/java/org/jivesoftware/spark/ui/ChatContainer.java
+++ b/src/java/org/jivesoftware/spark/ui/ChatContainer.java
@@ -267,10 +267,10 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
}
final String userid = StringUtils.parseResource(p.getFrom());
- if (p.getType() == Presence.Type.UNAVAILABLE) {
+ if (p.getType() == Presence.Type.unavailable) {
fireUserHasLeft(chatRoom, userid);
}
- else if (p.getType() == Presence.Type.AVAILABLE) {
+ else if (p.getType() == Presence.Type.available) {
fireUserHasJoined(chatRoom, userid);
}
@@ -282,7 +282,7 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
if (statusItem == null && p == null) {
tabIcon = SparkRes.getImageIcon(SparkRes.CLEAR_BALL_ICON);
}
- else if (statusItem == null && p != null && p.getType() == Presence.Type.AVAILABLE) {
+ else if (statusItem == null && p != null && p.getType() == Presence.Type.available) {
tabIcon = SparkRes.getImageIcon(SparkRes.GREEN_BALL);
}
else {
diff --git a/src/java/org/jivesoftware/spark/ui/ContactGroupTransferHandler.java b/src/java/org/jivesoftware/spark/ui/ContactGroupTransferHandler.java
index 3fe62ba9..38f324c5 100644
--- a/src/java/org/jivesoftware/spark/ui/ContactGroupTransferHandler.java
+++ b/src/java/org/jivesoftware/spark/ui/ContactGroupTransferHandler.java
@@ -233,10 +233,9 @@ public class ContactGroupTransferHandler extends TransferHandler {
Roster roster = SparkManager.getConnection().getRoster();
RosterEntry entry = roster.getEntry(item.getFullJID());
- Iterator iter = roster.getGroups();
RosterGroup groupFound = null;
- while (iter.hasNext()) {
- RosterGroup group = (RosterGroup)iter.next();
+
+ for(RosterGroup group : roster.getGroups()){
if (group.getName().equals(contactGroup.getGroupName())) {
try {
groupFound = group;
@@ -287,10 +286,9 @@ public class ContactGroupTransferHandler extends TransferHandler {
Roster roster = SparkManager.getConnection().getRoster();
RosterEntry entry = roster.getEntry(item.getFullJID());
- Iterator groups = roster.getGroups();
RosterGroup rosterGroup = null;
- while (groups.hasNext()) {
- RosterGroup group = (RosterGroup)groups.next();
+
+ for(RosterGroup group : roster.getGroups()){
if (group.getName().equals(contactGroup.getGroupName())) {
try {
rosterGroup = group;
diff --git a/src/java/org/jivesoftware/spark/ui/ContactItem.java b/src/java/org/jivesoftware/spark/ui/ContactItem.java
index ccade700..9f947dd0 100644
--- a/src/java/org/jivesoftware/spark/ui/ContactItem.java
+++ b/src/java/org/jivesoftware/spark/ui/ContactItem.java
@@ -258,7 +258,7 @@ public class ContactItem extends JPanel {
String date = formatter.format(new Date());
if (presence == null) {
- if (this.presence != null && (this.presence.getMode() == Presence.Mode.AVAILABLE || this.presence.getMode() == Presence.Mode.CHAT)) {
+ if (this.presence != null && (this.presence.getMode() == Presence.Mode.available || this.presence.getMode() == Presence.Mode.chat)) {
awayTime = new Date();
presenceHistory.add("Signed out at " + date);
}
@@ -266,10 +266,10 @@ public class ContactItem extends JPanel {
}
// Add away time.
- if (presence.getMode() == Presence.Mode.AVAILABLE || presence.getMode() == Presence.Mode.CHAT) {
+ if (presence.getMode() == Presence.Mode.available || presence.getMode() == Presence.Mode.chat) {
awayTime = null;
- if (this.presence == null || (this.presence.getMode() != Presence.Mode.AVAILABLE || this.presence.getMode() != Presence.Mode.CHAT)) {
+ if (this.presence == null || (this.presence.getMode() != Presence.Mode.available || this.presence.getMode() != Presence.Mode.chat)) {
String status = presence.getStatus();
if (!ModelUtil.hasLength(status)) {
status = "Available";
@@ -278,8 +278,8 @@ public class ContactItem extends JPanel {
presenceHistory.add(status + " at " + date);
}
}
- else if (this.presence != null && (this.presence.getMode() == Presence.Mode.AVAILABLE || this.presence.getMode() == Presence.Mode.CHAT)) {
- if (presence != null && presence.getMode() != Presence.Mode.AVAILABLE && presence.getMode() != Presence.Mode.CHAT) {
+ else if (this.presence != null && (this.presence.getMode() == Presence.Mode.available || this.presence.getMode() == Presence.Mode.chat)) {
+ if (presence != null && presence.getMode() != Presence.Mode.available && presence.getMode() != Presence.Mode.chat) {
awayTime = new Date();
String status = presence.getStatus();
if (!ModelUtil.hasLength(status)) {
@@ -315,30 +315,30 @@ public class ContactItem extends JPanel {
boolean isAvailable = false;
if (status == null && presence != null) {
Presence.Mode mode = presence.getMode();
- if (mode == Presence.Mode.AVAILABLE) {
+ if (mode == Presence.Mode.available) {
status = "Available";
isAvailable = true;
}
- else if (mode == Presence.Mode.AWAY) {
+ else if (mode == Presence.Mode.away) {
status = "I'm away";
statusIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY);
}
- else if (mode == Presence.Mode.CHAT) {
+ else if (mode == Presence.Mode.chat) {
status = "I'm free to chat";
}
- else if (mode == Presence.Mode.DO_NOT_DISTURB) {
+ else if (mode == Presence.Mode.dnd) {
status = "Do not disturb";
statusIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY);
}
- else if (mode == Presence.Mode.EXTENDED_AWAY) {
+ else if (mode == Presence.Mode.xa) {
status = "Extended away";
statusIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY);
}
}
- else if (presence != null && (presence.getMode() == Presence.Mode.DO_NOT_DISTURB || presence.getMode() == Presence.Mode.AWAY || presence.getMode() == Presence.Mode.EXTENDED_AWAY)) {
+ else if (presence != null && (presence.getMode() == Presence.Mode.dnd || presence.getMode() == Presence.Mode.away || presence.getMode() == Presence.Mode.xa)) {
statusIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY);
}
- else if (presence != null && presence.getType() == Presence.Type.AVAILABLE) {
+ else if (presence != null && presence.getType() == Presence.Type.available) {
isAvailable = true;
}
else if (presence == null) {
@@ -411,24 +411,24 @@ public class ContactItem extends JPanel {
boolean isAvailable = false;
if (status == null && presence != null) {
Presence.Mode mode = presence.getMode();
- if (mode == Presence.Mode.AVAILABLE) {
+ if (mode == Presence.Mode.available) {
status = "Available";
isAvailable = true;
}
- else if (mode == Presence.Mode.AWAY) {
+ else if (mode == Presence.Mode.away) {
status = "I'm away";
}
- else if (mode == Presence.Mode.CHAT) {
+ else if (mode == Presence.Mode.chat) {
status = "I'm free to chat";
}
- else if (mode == Presence.Mode.DO_NOT_DISTURB) {
+ else if (mode == Presence.Mode.dnd) {
status = "Do not disturb";
}
- else if (mode == Presence.Mode.EXTENDED_AWAY) {
+ else if (mode == Presence.Mode.xa) {
status = "Extended away";
}
}
- else if (presence != null && presence.getType() == Presence.Type.AVAILABLE) {
+ else if (presence != null && presence.getType() == Presence.Type.available) {
isAvailable = true;
}
else if (presence == null) {
diff --git a/src/java/org/jivesoftware/spark/ui/ContactList.java b/src/java/org/jivesoftware/spark/ui/ContactList.java
index 25d40fd2..341e2ae4 100644
--- a/src/java/org/jivesoftware/spark/ui/ContactList.java
+++ b/src/java/org/jivesoftware/spark/ui/ContactList.java
@@ -277,7 +277,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
// If online, check to see if they are in the offline group.
// If so, remove from offline group and add to all groups they
// belong to.
- if (presence.getType() == Presence.Type.AVAILABLE && offlineGroup.getContactItemByJID(bareJID) != null) {
+ if (presence.getType() == Presence.Type.available && offlineGroup.getContactItemByJID(bareJID) != null) {
changeOfflineToOnline(bareJID, entry, presence);
}
else if (presence.getFrom().indexOf("workgroup.") != -1) {
@@ -285,7 +285,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
}
// If online, but not in offline group, update presence.
- else if (presence.getType() == Presence.Type.AVAILABLE) {
+ else if (presence.getType() == Presence.Type.available) {
final Iterator groupIterator = groupList.iterator();
while (groupIterator.hasNext()) {
ContactGroup group = (ContactGroup)groupIterator.next();
@@ -298,7 +298,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
}
// If not available, move to offline group.
- else if (presence.getType() == Presence.Type.UNAVAILABLE && !isPending) {
+ else if (presence.getType() == Presence.Type.unavailable && !isPending) {
moveToOfflineGroup(bareJID);
}
@@ -347,11 +347,9 @@ public final class ContactList extends JPanel implements ActionListener, Contact
offlineGroup.removeContactItem(offlineItem);
// Add To all groups it belongs to.
- Iterator groups = entry.getGroups();
- boolean isFiled = groups.hasNext();
-
- while (groups.hasNext()) {
- final RosterGroup rosterGroup = (RosterGroup)groups.next();
+ boolean isFiled = false;
+ for(RosterGroup rosterGroup : entry.getGroups()){
+ isFiled = true;
ContactGroup contactGroup = getContactGroup(rosterGroup.getName());
if (contactGroup != null) {
String name = entry.getName();
@@ -415,14 +413,10 @@ public final class ContactList extends JPanel implements ActionListener, Contact
roster.addRosterListener(this);
- final Iterator rosterGroups = roster.getGroups();
- while (rosterGroups.hasNext()) {
- RosterGroup group = (RosterGroup)rosterGroups.next();
+ for(RosterGroup group : roster.getGroups()){
ContactGroup contactGroup = addContactGroup(group.getName());
- Iterator entries = group.getEntries();
- while (entries.hasNext()) {
- RosterEntry entry = (RosterEntry)entries.next();
+ for(RosterEntry entry : group.getEntries()){
String name = entry.getName();
if (name == null) {
name = entry.getUser();
@@ -447,9 +441,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
// Add Unfiled Group
// addContactGroup(unfiledGroup);
- final Iterator unfiledEntries = roster.getUnfiledEntries();
- while (unfiledEntries.hasNext()) {
- RosterEntry entry = (RosterEntry)unfiledEntries.next();
+ for(RosterEntry entry : roster.getUnfiledEntries()){
String name = entry.getName();
if (name == null) {
name = entry.getUser();
@@ -501,9 +493,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
if (entry != null && (entry.getType() == RosterPacket.ItemType.NONE || entry.getType() == RosterPacket.ItemType.FROM)) {
// Ignore, since the new user is pending to be added.
- final Iterator groups = entry.getGroups();
- while (groups.hasNext()) {
- final RosterGroup group = (RosterGroup)groups.next();
+ for(RosterGroup group : entry.getGroups()){
ContactGroup contactGroup = getContactGroup(group.getName());
if (contactGroup == null) {
contactGroup = addContactGroup(group.getName());
@@ -550,12 +540,9 @@ public final class ContactList extends JPanel implements ActionListener, Contact
RosterEntry rosterEntry = roster.getEntry(jid);
if (rosterEntry != null) {
// Check for new Roster Groups and add them if they do not exist.
- Iterator rosterGroups = rosterEntry.getGroups();
-
- boolean isUnfiled = true;
- while (rosterGroups.hasNext()) {
+ boolean isUnfiled = true;
+ for(RosterGroup group : rosterEntry.getGroups()){
isUnfiled = false;
- RosterGroup group = (RosterGroup)rosterGroups.next();
// Handle if this is a new Entry in a new Group.
if (getContactGroup(group.getName()) == null) {
@@ -612,9 +599,8 @@ public final class ContactList extends JPanel implements ActionListener, Contact
while (jids.hasNext()) {
jid = (String)jids.next();
rosterEntry = roster.getEntry(jid);
- Iterator groups = rosterEntry.getGroups();
- while (groups.hasNext()) {
- RosterGroup g = (RosterGroup)groups.next();
+
+ for(RosterGroup g : rosterEntry.getGroups()){
groupSet.add(g.getName());
}
@@ -1200,9 +1186,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
RosterGroup rosterGroup = roster.getGroup(groupName);
if (rosterGroup != null) {
- Iterator entries = rosterGroup.getEntries();
- while (entries.hasNext()) {
- RosterEntry entry = (RosterEntry)entries.next();
+ for(RosterEntry entry : rosterGroup.getEntries()){
try {
rosterGroup.removeEntry(entry);
}
@@ -1289,12 +1273,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
Roster roster = SparkManager.getConnection().getRoster();
RosterEntry entry = roster.getEntry(item.getFullJID());
if (entry != null) {
- int groupCount = 0;
- Iterator groups = entry.getGroups();
- while (groups.hasNext()) {
- groups.next();
- groupCount++;
- }
+ int groupCount = entry.getGroups().size();
if (groupCount > 1) {
popup.add(removeContactFromGroupMenu);
@@ -1397,7 +1376,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
Action subscribeAction = new AbstractAction() {
public void actionPerformed(ActionEvent e) {
String jid = item.getFullJID();
- Presence response = new Presence(Presence.Type.SUBSCRIBE);
+ Presence response = new Presence(Presence.Type.subscribe);
response.setTo(jid);
SparkManager.getConnection().sendPacket(response);
@@ -1538,14 +1517,14 @@ public final class ContactList extends JPanel implements ActionListener, Contact
PacketListener subscribeListener = new PacketListener() {
public void processPacket(Packet packet) {
final Presence presence = (Presence)packet;
- if (presence != null && presence.getType() == Presence.Type.SUBSCRIBE) {
+ if (presence != null && presence.getType() == Presence.Type.subscribe) {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
subscriptionRequest(presence.getFrom());
}
});
}
- else if (presence != null && presence.getType() == Presence.Type.UNSUBSCRIBE) {
+ else if (presence != null && presence.getType() == Presence.Type.unsubscribe) {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
Roster roster = SparkManager.getConnection().getRoster();
@@ -1556,7 +1535,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
roster.removeEntry(entry);
}
catch (XMPPException e) {
- Presence unsub = new Presence(Presence.Type.UNSUBSCRIBED);
+ Presence unsub = new Presence(Presence.Type.unsubscribed);
unsub.setTo(presence.getFrom());
SparkManager.getConnection().sendPacket(unsub);
Log.error(e);
@@ -1567,7 +1546,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
}
- else if (presence != null && presence.getType() == Presence.Type.SUBSCRIBED) {
+ else if (presence != null && presence.getType() == Presence.Type.subscribe) {
// Find Contact in Contact List
String jid = StringUtils.parseBareAddress(presence.getFrom());
ContactItem item = getContactItemByJID(jid);
@@ -1587,7 +1566,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
}
}
}
- else if (presence != null && presence.getType() == Presence.Type.UNSUBSCRIBED) {
+ else if (presence != null && presence.getType() == Presence.Type.unsubscribed) {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
Roster roster = SparkManager.getConnection().getRoster();
@@ -1730,7 +1709,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
final Roster roster = SparkManager.getConnection().getRoster();
RosterEntry entry = roster.getEntry(jid);
if (entry != null && entry.getType() == RosterPacket.ItemType.TO) {
- Presence response = new Presence(Presence.Type.SUBSCRIBED);
+ Presence response = new Presence(Presence.Type.subscribed);
response.setTo(jid);
SparkManager.getConnection().sendPacket(response);
@@ -1760,7 +1739,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
public void actionPerformed(ActionEvent e) {
dialog.dispose();
- Presence response = new Presence(Presence.Type.SUBSCRIBED);
+ Presence response = new Presence(Presence.Type.subscribed);
response.setTo(jid);
SparkManager.getConnection().sendPacket(response);
@@ -1777,7 +1756,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
denyButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
// Send subscribed
- Presence response = new Presence(Presence.Type.UNSUBSCRIBE);
+ Presence response = new Presence(Presence.Type.unsubscribe);
response.setTo(jid);
SparkManager.getConnection().sendPacket(response);
dialog.dispose();
@@ -2061,9 +2040,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
SparkManager.getSessionManager().changePresence(presence);
final Roster roster = con.getRoster();
- final Iterator rosterEntries = roster.getEntries();
- while (rosterEntries.hasNext()) {
- RosterEntry entry = (RosterEntry)rosterEntries.next();
+ for(RosterEntry entry : roster.getEntries()){
updateUserPresence(roster.getPresence(entry.getUser()));
}
}
diff --git a/src/java/org/jivesoftware/spark/ui/NewRoster.java b/src/java/org/jivesoftware/spark/ui/NewRoster.java
index 478fd5eb..53a5fdc7 100644
--- a/src/java/org/jivesoftware/spark/ui/NewRoster.java
+++ b/src/java/org/jivesoftware/spark/ui/NewRoster.java
@@ -78,9 +78,7 @@ public class NewRoster extends JPanel implements RosterListener {
roster.addRosterListener(this);
- final Iterator rosterGroups = roster.getGroups();
- while (rosterGroups.hasNext()) {
- RosterGroup group = (RosterGroup)rosterGroups.next();
+ for(RosterGroup group : roster.getGroups()){
// Create Group node.
final RosterNode groupNode = new RosterNode(group.getName(), true);
@@ -88,10 +86,7 @@ public class NewRoster extends JPanel implements RosterListener {
rootNode.add(groupNode);
}
-
- Iterator entries = group.getEntries();
- while (entries.hasNext()) {
- RosterEntry entry = (RosterEntry)entries.next();
+ for(RosterEntry entry : group.getEntries()){
String nickname = entry.getName();
if (nickname == null) {
nickname = entry.getUser();
@@ -110,9 +105,7 @@ public class NewRoster extends JPanel implements RosterListener {
rootNode.add(unfiledGroup);
// Add Unfiled Group
- final Iterator unfiledEntries = roster.getUnfiledEntries();
- while (unfiledEntries.hasNext()) {
- RosterEntry entry = (RosterEntry)unfiledEntries.next();
+ for(RosterEntry entry : roster.getUnfiledEntries()){
String name = entry.getName();
if (name == null) {
name = entry.getUser();
diff --git a/src/java/org/jivesoftware/spark/ui/RetryPanel.java b/src/java/org/jivesoftware/spark/ui/RetryPanel.java
index ee9711b7..6e2958d8 100644
--- a/src/java/org/jivesoftware/spark/ui/RetryPanel.java
+++ b/src/java/org/jivesoftware/spark/ui/RetryPanel.java
@@ -69,7 +69,7 @@ public class RetryPanel extends JPanel {
retryButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent actionEvent) {
- attemptReconnect();
+ //attemptReconnect();
}
});
@@ -120,7 +120,7 @@ public class RetryPanel extends JPanel {
countdown--;
}
else {
- attemptReconnect();
+ //attemptReconnect();
}
}
};
@@ -136,6 +136,7 @@ public class RetryPanel extends JPanel {
retryButton.setVisible(false);
}
+ /*
private void attemptReconnect() {
retryButton.setText("Attempting....");
timer.stop();
@@ -171,6 +172,7 @@ public class RetryPanel extends JPanel {
}
+ */
/**
* Adds a ReconnectListener.
diff --git a/src/java/org/jivesoftware/spark/ui/RosterDialog.java b/src/java/org/jivesoftware/spark/ui/RosterDialog.java
index c7475acd..3d34edfc 100644
--- a/src/java/org/jivesoftware/spark/ui/RosterDialog.java
+++ b/src/java/org/jivesoftware/spark/ui/RosterDialog.java
@@ -295,10 +295,7 @@ public class RosterDialog implements PropertyChangeListener, ActionListener {
boolean isSubscribed = true;
if (userEntry != null) {
- Iterator iter = userEntry.getGroups();
- if (iter.hasNext()) {
- isSubscribed = false;
- }
+ isSubscribed = userEntry.getGroups().size() == 0;
}
if (isSubscribed) {
diff --git a/src/java/org/jivesoftware/spark/ui/RosterPickList.java b/src/java/org/jivesoftware/spark/ui/RosterPickList.java
index 8f057c71..bc2a5cd8 100644
--- a/src/java/org/jivesoftware/spark/ui/RosterPickList.java
+++ b/src/java/org/jivesoftware/spark/ui/RosterPickList.java
@@ -69,9 +69,7 @@ public class RosterPickList extends JPanel {
public Collection showRoster(JDialog parent) {
// Populate Invite Panel with Available users.
Roster roster = SparkManager.getConnection().getRoster();
- Iterator iter = roster.getEntries();
- while (iter.hasNext()) {
- RosterEntry entry = (RosterEntry)iter.next();
+ for(RosterEntry entry : roster.getEntries()){
Presence presence = roster.getPresence(entry.getUser());
if (presence != null) {
ContactItem item = new ContactItem(entry.getName(), entry.getUser());
diff --git a/src/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomInfo.java b/src/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomInfo.java
index 09a92578..27ad051a 100644
--- a/src/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomInfo.java
+++ b/src/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomInfo.java
@@ -145,7 +145,7 @@ public final class ConferenceRoomInfo extends JPanel implements ChatRoomListener
String nickname = StringUtils.parseResource(userid);
userMap.put(nickname, userid);
- if (p.getType() == Presence.Type.AVAILABLE) {
+ if (p.getType() == Presence.Type.available) {
addParticipant(userid, p);
agentInfoPanel.setVisible(true);
}
diff --git a/src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java b/src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
index f91dbb79..d67efb18 100644
--- a/src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
+++ b/src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
@@ -407,13 +407,13 @@ public class ChatRoomImpl extends ChatRoom {
final SimpleDateFormat formatter = new SimpleDateFormat("h:mm a");
String time = formatter.format(new Date());
- if (presence.getType() == Presence.Type.UNAVAILABLE && contactItem != null) {
+ if (presence.getType() == Presence.Type.unavailable && contactItem != null) {
if (isOnline) {
getTranscriptWindow().insertNotificationMessage("*** " + participantNickname + " went offline at " + time + ".");
}
isOnline = false;
}
- else if (presence.getType() == Presence.Type.AVAILABLE) {
+ else if (presence.getType() == Presence.Type.available) {
if (!isOnline) {
getTranscriptWindow().insertNotificationMessage("*** " + participantNickname + " is online at " + time + ".");
}
diff --git a/src/java/org/jivesoftware/spark/ui/rooms/GroupChatRoom.java b/src/java/org/jivesoftware/spark/ui/rooms/GroupChatRoom.java
index 01a7a862..9a1faef1 100644
--- a/src/java/org/jivesoftware/spark/ui/rooms/GroupChatRoom.java
+++ b/src/java/org/jivesoftware/spark/ui/rooms/GroupChatRoom.java
@@ -621,7 +621,7 @@ public final class GroupChatRoom extends ChatRoom {
}
- if (presence.getType() == Presence.Type.UNAVAILABLE && !"303".equals(code)) {
+ if (presence.getType() == Presence.Type.unavailable && !"303".equals(code)) {
if (currentUserList.contains(from)) {
if (showPresenceMessages) {
getTranscriptWindow().insertNotificationMessage(nickname + " has left the room.");
diff --git a/src/java/org/jivesoftware/spark/ui/status/StatusBar.java b/src/java/org/jivesoftware/spark/ui/status/StatusBar.java
index 856a8d5f..98cb3c48 100644
--- a/src/java/org/jivesoftware/spark/ui/status/StatusBar.java
+++ b/src/java/org/jivesoftware/spark/ui/status/StatusBar.java
@@ -104,7 +104,7 @@ public class StatusBar extends JPanel {
setStatus("Online");
- currentPresence = new Presence(Presence.Type.AVAILABLE, "Online", -1, Presence.Mode.AVAILABLE);
+ currentPresence = new Presence(Presence.Type.available, "Online", -1, Presence.Mode.available);
setBorder(BorderFactory.createLineBorder(new Color(197, 213, 230), 1));
@@ -330,11 +330,11 @@ public class StatusBar extends JPanel {
final ImageIcon awayIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY);
final ImageIcon dndIcon = SparkRes.getImageIcon(SparkRes.IM_DND);
- StatusItem online = new StatusItem(new Presence(Presence.Type.AVAILABLE, "Online", -1, Presence.Mode.AVAILABLE), availableIcon);
- StatusItem freeToChat = new StatusItem(new Presence(Presence.Type.AVAILABLE, "Free To Chat", -1, Presence.Mode.CHAT), SparkRes.getImageIcon(SparkRes.FREE_TO_CHAT_IMAGE));
- StatusItem away = new StatusItem(new Presence(Presence.Type.AVAILABLE, "Away", -1, Presence.Mode.AWAY), awayIcon);
- StatusItem dnd = new StatusItem(new Presence(Presence.Type.AVAILABLE, "Do Not Disturb", -1, Presence.Mode.DO_NOT_DISTURB), dndIcon);
- StatusItem extendedAway = new StatusItem(new Presence(Presence.Type.AVAILABLE, "Extended Away", -1, Presence.Mode.EXTENDED_AWAY), awayIcon);
+ StatusItem online = new StatusItem(new Presence(Presence.Type.available, "Online", -1, Presence.Mode.available), availableIcon);
+ StatusItem freeToChat = new StatusItem(new Presence(Presence.Type.available, "Free To Chat", -1, Presence.Mode.chat), SparkRes.getImageIcon(SparkRes.FREE_TO_CHAT_IMAGE));
+ StatusItem away = new StatusItem(new Presence(Presence.Type.available, "Away", -1, Presence.Mode.away), awayIcon);
+ StatusItem dnd = new StatusItem(new Presence(Presence.Type.available, "Do Not Disturb", -1, Presence.Mode.dnd), dndIcon);
+ StatusItem extendedAway = new StatusItem(new Presence(Presence.Type.available, "Extended Away", -1, Presence.Mode.xa), awayIcon);
dndList.add(freeToChat);
dndList.add(online);
diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/chat/PresenceChangePlugin.java b/src/java/org/jivesoftware/sparkimpl/plugin/chat/PresenceChangePlugin.java
index c5393a16..30ab78dd 100644
--- a/src/java/org/jivesoftware/sparkimpl/plugin/chat/PresenceChangePlugin.java
+++ b/src/java/org/jivesoftware/sparkimpl/plugin/chat/PresenceChangePlugin.java
@@ -70,7 +70,7 @@ public class PresenceChangePlugin implements Plugin {
public void poppingUp(Object object, JPopupMenu popup) {
if (object instanceof ContactItem) {
ContactItem item = (ContactItem)object;
- if (item.getPresence() == null || (item.getPresence().getMode() != Presence.Mode.AVAILABLE && item.getPresence().getMode() != Presence.Mode.CHAT)) {
+ if (item.getPresence() == null || (item.getPresence().getMode() != Presence.Mode.available && item.getPresence().getMode() != Presence.Mode.chat)) {
if (contacts.contains(item)) {
popup.add(removeAction);
}
@@ -94,7 +94,7 @@ public class PresenceChangePlugin implements Plugin {
SparkManager.getConnection().addPacketListener(new PacketListener() {
public void processPacket(Packet packet) {
Presence presence = (Presence)packet;
- if (presence == null || (presence.getMode() != Presence.Mode.AVAILABLE && presence.getMode() != Presence.Mode.CHAT)) {
+ if (presence == null || (presence.getMode() != Presence.Mode.available && presence.getMode() != Presence.Mode.chat)) {
return;
}
String from = presence.getFrom();
diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPlugin.java b/src/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPlugin.java
index 06b050f6..c3ac584f 100644
--- a/src/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPlugin.java
+++ b/src/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPlugin.java
@@ -194,7 +194,7 @@ public class GatewayPlugin implements Plugin {
Transport transport = TransportManager.getTransport(packet.getFrom());
if (transport != null) {
boolean registered = presence != null && presence.getMode() != null;
- if (presence.getType() == Presence.Type.UNAVAILABLE) {
+ if (presence.getType() == Presence.Type.unavailable) {
registered = false;
}
RolloverButton button = uiMap.get(transport);
@@ -218,7 +218,7 @@ public class GatewayPlugin implements Plugin {
String domain = StringUtils.parseServer(presence.getFrom());
Transport transport = TransportManager.getTransport(domain);
if (transport != null) {
- if (presence.getType() == Presence.Type.AVAILABLE) {
+ if (presence.getType() == Presence.Type.available) {
item.setIcon(transport.getIcon());
}
else {
@@ -245,7 +245,7 @@ public class GatewayPlugin implements Plugin {
String domain = StringUtils.parseServer(presence.getFrom());
Transport transport = TransportManager.getTransport(domain);
if (transport != null) {
- if (presence.getType() == Presence.Type.AVAILABLE) {
+ if (presence.getType() == Presence.Type.available) {
return transport.getIcon();
}
else {
diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportManager.java b/src/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportManager.java
index c5cc9980..ddcec985 100644
--- a/src/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportManager.java
+++ b/src/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportManager.java
@@ -69,7 +69,7 @@ public class TransportManager {
public static boolean isRegistered(XMPPConnection con, Transport transport) {
Presence presence = con.getRoster().getPresence(transport.getServiceName());
boolean registered = presence != null && presence.getMode() != null;
- if (presence == null || presence.getType() == Presence.Type.UNAVAILABLE) {
+ if (presence == null || presence.getType() == Presence.Type.unavailable) {
registered = false;
}
return registered;
diff --git a/src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPlugin.java b/src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPlugin.java
index 291ccb0d..eaebd35e 100644
--- a/src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPlugin.java
+++ b/src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPlugin.java
@@ -36,7 +36,7 @@ public class SoundPlugin implements Plugin, MessageListener, ChatRoomListener {
SparkManager.getConnection().addPacketListener(new PacketListener() {
public void processPacket(Packet packet) {
Presence presence = (Presence)packet;
- if (presence != null && presence.getType() == Presence.Type.UNAVAILABLE) {
+ if (presence != null && presence.getType() == Presence.Type.unavailable) {
SoundPreferences preferences = soundPreference.getPreferences();
if (preferences != null && preferences.isPlayOfflineSound()) {
String offline = preferences.getOfflineSound();