vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 09:09:38 +02:00
Code Issues Releases Wiki Activity

Merge branch '4.2'

Browse source
This commit is contained in:
Florian Schmaus 2017-05-25 10:39:59 +02:00
commit 7a5f9e6a03
187 changed files with 2284 additions and 588 deletions
Download patch file Download diff file Expand all files Collapse all files

14
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
View file

@ -225,7 +225,7 @@ public class AgentRoster {
while (it.hasNext()) {
p = userPresences.get(it.next());
if (presence == null){
if (presence == null) {
presence = p;
}
else {
@ -276,13 +276,13 @@ public class AgentRoster {
for (int i = 0; i < listeners.length; i++) {
switch (eventType) {
case EVENT_AGENT_ADDED:
listeners[i].agentAdded((String)eventObject);
listeners[i].agentAdded((String) eventObject);
break;
case EVENT_AGENT_REMOVED:
listeners[i].agentRemoved((String)eventObject);
listeners[i].agentRemoved((String) eventObject);
break;
case EVENT_PRESENCE_CHANGED:
listeners[i].presenceChanged((Presence)eventObject);
listeners[i].presenceChanged((Presence) eventObject);
break;
}
}
@ -295,7 +295,7 @@ public class AgentRoster {
private class PresencePacketListener implements StanzaListener {
@Override
public void processStanza(Stanza packet) {
Presence presence = (Presence)packet;
Presence presence = (Presence) packet;
EntityFullJid from = presence.getFrom().asEntityFullJidIfPossible();
if (from == null) {
// TODO Check if we need to ignore these presences or this is a server bug?
@ -308,7 +308,7 @@ public class AgentRoster {
// for a particular user a map with the presence packets saved for each resource.
if (presence.getType() == Presence.Type.available) {
// Ignore the presence packet unless it has an agent status extension.
AgentStatus agentStatus = (AgentStatus)presence.getExtension(
AgentStatus agentStatus = (AgentStatus) presence.getExtension(
AgentStatus.ELEMENT_NAME, AgentStatus.NAMESPACE);
if (agentStatus == null) {
return;
@ -373,7 +373,7 @@ public class AgentRoster {
@Override
public void processStanza(Stanza packet) {
if (packet instanceof AgentStatusRequest) {
AgentStatusRequest statusRequest = (AgentStatusRequest)packet;
AgentStatusRequest statusRequest = (AgentStatusRequest) packet;
for (Iterator<AgentStatusRequest.Item> i = statusRequest.getAgents().iterator(); i.hasNext();) {
AgentStatusRequest.Item item = i.next();
String agentJID = item.getJID();

16
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
View file

@ -340,7 +340,7 @@ public class AgentSession {
StanzaCollector collector = this.connection.createStanzaCollectorAndSend(new AndFilter(
new StanzaTypeFilter(Presence.class), FromMatchesFilter.create(workgroupJID)), presence);
presence = (Presence)collector.nextResultOrThrow();
presence = (Presence) collector.nextResultOrThrow();
// We can safely update this iv since we didn't get any error
this.online = online;
@ -757,7 +757,7 @@ public class AgentSession {
private void handlePacket(Stanza packet) {
if (packet instanceof Presence) {
Presence presence = (Presence)packet;
Presence presence = (Presence) packet;
// The workgroup can send us a number of different presence packets. We
// check for different packet extensions to see what type of presence
@ -772,7 +772,7 @@ public class AgentSession {
}
// QueueOverview packet extensions contain basic information about a queue.
QueueOverview queueOverview = (QueueOverview)presence.getExtension(QueueOverview.ELEMENT_NAME, QueueOverview.NAMESPACE);
QueueOverview queueOverview = (QueueOverview) presence.getExtension(QueueOverview.ELEMENT_NAME, QueueOverview.NAMESPACE);
if (queueOverview != null) {
if (queueOverview.getStatus() == null) {
queue.setStatus(WorkgroupQueue.Status.CLOSED);
@ -791,7 +791,7 @@ public class AgentSession {
// QueueDetails packet extensions contain information about the users in
// a queue.
QueueDetails queueDetails = (QueueDetails)packet.getExtension(QueueDetails.ELEMENT_NAME, QueueDetails.NAMESPACE);
QueueDetails queueDetails = (QueueDetails) packet.getExtension(QueueDetails.ELEMENT_NAME, QueueDetails.NAMESPACE);
if (queueDetails != null) {
queue.setUsers(queueDetails.getUsers());
// Fire event.
@ -812,23 +812,23 @@ public class AgentSession {
}
}
else if (packet instanceof Message) {
Message message = (Message)packet;
Message message = (Message) packet;
// Check if a room invitation was sent and if the sender is the workgroup
MUCUser mucUser = (MUCUser)message.getExtension("x",
MUCUser mucUser = (MUCUser) message.getExtension("x",
"http://jabber.org/protocol/muc#user");
MUCUser.Invite invite = mucUser != null ? mucUser.getInvite() : null;
if (invite != null && workgroupJID.equals(invite.getFrom())) {
String sessionID = null;
Map<String, List<String>> metaData = null;
SessionID sessionIDExt = (SessionID)message.getExtension(SessionID.ELEMENT_NAME,
SessionID sessionIDExt = (SessionID) message.getExtension(SessionID.ELEMENT_NAME,
SessionID.NAMESPACE);
if (sessionIDExt != null) {
sessionID = sessionIDExt.getSessionID();
}
MetaData metaDataExt = (MetaData)message.getExtension(MetaData.ELEMENT_NAME,
MetaData metaDataExt = (MetaData) message.getExtension(MetaData.ELEMENT_NAME,
MetaData.NAMESPACE);
if (metaDataExt != null) {
metaData = metaDataExt.getMetaData();

4
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatSession.java
View file

@ -79,11 +79,11 @@ public class AgentChatSession {
this.sessionID = sessionID;
}
public void setQuestion(String question){
public void setQuestion(String question) {
this.question = question;
}
public String getQuestion(){
public String getQuestion() {
return question;
}

4
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
View file

@ -58,11 +58,11 @@ public class ChatMetadata extends IQ {
private Map<String, List<String>> map = new HashMap<String, List<String>>();
public void setMetadata(Map<String, List<String>> metadata){
public void setMetadata(Map<String, List<String>> metadata) {
this.map = metadata;
}
public Map<String, List<String>> getMetadata(){
public Map<String, List<String>> getMetadata() {
return map;
}

4
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
View file

@ -73,11 +73,11 @@ public class AgentStatusRequest extends IQ {
protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder buf) {
buf.rightAngleBracket();
synchronized (agents) {
for (Iterator<Item> i=agents.iterator(); i.hasNext(); ) {
for (Iterator<Item> i = agents.iterator(); i.hasNext(); ) {
Item item = i.next();
buf.append("<agent jid=\"").append(item.getJID()).append("\">");
if (item.getName() != null) {
buf.append("<name xmlns=\""+ AgentInfo.NAMESPACE + "\">");
buf.append("<name xmlns=\"" + AgentInfo.NAMESPACE + "\">");
buf.append(item.getName());
buf.append("</name>");
}

2
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
View file

@ -88,7 +88,7 @@ public class AgentWorkgroups extends IQ {
protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder buf) {
buf.attribute("jid", agentJID).rightAngleBracket();
for (Iterator<String> it=workgroups.iterator(); it.hasNext();) {
for (Iterator<String> it = workgroups.iterator(); it.hasNext();) {
String workgroupJID = it.next();
buf.append("<workgroup jid=\"" + workgroupJID + "\"/>");
}

2
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
View file

@ -64,7 +64,7 @@ public class MonitorPacket extends IQ {
buf.rightAngleBracket();
if (sessionID != null) {
buf.append("<makeOwner sessionID=\""+sessionID+"\"></makeOwner>");
buf.append("<makeOwner sessionID=\"" + sessionID + "\"></makeOwner>");
}
return buf;

4
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
View file

@ -107,7 +107,7 @@ public final class QueueDetails implements ExtensionElement {
buf.append('<').append(ELEMENT_NAME).append(" xmlns=\"").append(NAMESPACE).append("\">");
synchronized (users) {
for (Iterator<QueueUser> i=users.iterator(); i.hasNext(); ) {
for (Iterator<QueueUser> i = users.iterator(); i.hasNext(); ) {
QueueUser user = i.next();
int position = user.getQueuePosition();
int timeRemaining = user.getEstimatedRemainingTime();
@ -183,7 +183,7 @@ public final class QueueDetails implements ExtensionElement {
throw new SmackException(e);
}
}
else if(parser.getName().equals("waitTime")) {
else if (parser.getName().equals("waitTime")) {
Date wait;
try {
wait = dateFormat.parse(parser.nextText());

2
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java
View file

@ -83,7 +83,7 @@ public class Transcript extends IQ {
.append(sessionID)
.append("\">");
for (Iterator<Stanza> it=packets.iterator(); it.hasNext();) {
for (Iterator<Stanza> it = packets.iterator(); it.hasNext();) {
Stanza packet = it.next();
buf.append(packet.toXML());
}

8
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
View file

@ -83,14 +83,14 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
synchronized (UTC_FORMAT) {
joinTime = UTC_FORMAT.parse(parser.nextText());
}
} catch (ParseException e) {}
} catch (ParseException e) { }
}
else if (parser.getName().equals("leftTime")) {
try {
synchronized (UTC_FORMAT) {
leftTime = UTC_FORMAT.parse(parser.nextText());
}
} catch (ParseException e) {}
} catch (ParseException e) { }
}
else if (parser.getName().equals("agents")) {
agents = parseAgents(parser);
@ -124,14 +124,14 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
synchronized (UTC_FORMAT) {
joinTime = UTC_FORMAT.parse(parser.nextText());
}
} catch (ParseException e) {}
} catch (ParseException e) { }
}
else if (parser.getName().equals("leftTime")) {
try {
synchronized (UTC_FORMAT) {
leftTime = UTC_FORMAT.parse(parser.nextText());
}
} catch (ParseException e) {}
} catch (ParseException e) { }
}
else if (parser.getName().equals("agent")) {
agentJID = null;

2
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
View file

@ -42,7 +42,7 @@ public class WorkgroupInformation implements ExtensionElement {
private String workgroupJID;
public WorkgroupInformation(String workgroupJID){
public WorkgroupInformation(String workgroupJID) {
this.workgroupJID = workgroupJID;
}

2
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSetting.java
View file

@ -22,7 +22,7 @@ public class ChatSetting {
private String value;
private int type;
public ChatSetting(String key, String value, int type){
public ChatSetting(String key, String value, int type) {
setKey(key);
setValue(value);
setType(type);

2
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
View file

@ -80,7 +80,7 @@ public class OfflineSettings extends SimpleIQ {
return (StringUtils.isNotEmpty(getRedirectURL()));
}
public boolean isConfigured(){
public boolean isConfigured() {
return StringUtils.isNotEmpty(getEmailAddress()) &&
StringUtils.isNotEmpty(getSubject()) &&
StringUtils.isNotEmpty(getOfflineText());

4
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
View file

@ -48,11 +48,11 @@ public class SearchSettings extends SimpleIQ {
this.kbLocation = kbLocation;
}
public boolean hasKB(){
public boolean hasKB() {
return StringUtils.isNotEmpty(getKbLocation());
}
public boolean hasForums(){
public boolean hasForums() {
return StringUtils.isNotEmpty(getForumsLocation());
}

14
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
View file

@ -192,7 +192,7 @@ public class Workgroup {
StanzaCollector collector = connection.createStanzaCollectorAndSend(new AndFilter(fromFilter,
typeFilter), directedPresence);
Presence response = (Presence)collector.nextResultOrThrow();
Presence response = (Presence) collector.nextResultOrThrow();
return Presence.Type.available == response.getType();
}
@ -482,7 +482,7 @@ public class Workgroup {
}
private void fireQueueJoinedEvent() {
for (QueueListener listener : queueListeners){
for (QueueListener listener : queueListeners) {
// CHECKSTYLE:OFF
listener.joinedQueue();
// CHECKSTYLE:ON
@ -511,7 +511,7 @@ public class Workgroup {
private void handlePacket(Stanza packet) {
if (packet instanceof Message) {
Message msg = (Message)packet;
Message msg = (Message) packet;
// Check to see if the user left the queue.
ExtensionElement pe = msg.getExtension("depart-queue", "http://jabber.org/protocol/workgroup");
ExtensionElement queueStatus = msg.getExtension("queue-status", "http://jabber.org/protocol/workgroup");
@ -520,7 +520,7 @@ public class Workgroup {
fireQueueDepartedEvent();
}
else if (queueStatus != null) {
QueueUpdate queueUpdate = (QueueUpdate)queueStatus;
QueueUpdate queueUpdate = (QueueUpdate) queueStatus;
if (queueUpdate.getPosition() != -1) {
fireQueuePositionEvent(queueUpdate.getPosition());
}
@ -531,7 +531,7 @@ public class Workgroup {
else {
// Check if a room invitation was sent and if the sender is the workgroup
MUCUser mucUser = (MUCUser)msg.getExtension("x", "http://jabber.org/protocol/muc#user");
MUCUser mucUser = (MUCUser) msg.getExtension("x", "http://jabber.org/protocol/muc#user");
MUCUser.Invite invite = mucUser != null ? mucUser.getInvite() : null;
if (invite != null && workgroupJID.equals(invite.getFrom())) {
String sessionID = null;
@ -540,13 +540,13 @@ public class Workgroup {
pe = msg.getExtension(SessionID.ELEMENT_NAME,
SessionID.NAMESPACE);
if (pe != null) {
sessionID = ((SessionID)pe).getSessionID();
sessionID = ((SessionID) pe).getSessionID();
}
pe = msg.getExtension(MetaData.ELEMENT_NAME,
MetaData.NAMESPACE);
if (pe != null) {
metaData = ((MetaData)pe).getMetaData();
metaData = ((MetaData) pe).getMetaData();
}
WorkgroupInvitation inv = new WorkgroupInvitation(connection.getUser(), msg.getFrom(),

2
smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java
View file

@ -48,7 +48,7 @@ public class RemoteRosterEntry {
* @param groups the list of group names the entry will belong to, or <tt>null</tt> if the
* the roster entry won't belong to a group.
*/
public RemoteRosterEntry(Jid user, String name, String [] groups) {
public RemoteRosterEntry(Jid user, String name, String[] groups) {
this.user = user;
this.name = name;
if (groups != null) {