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

1. Clean up code

Browse source 
2. Refactoring work
3. Optimization work. SMACK-153
4. Fixed roster test cases. SMACK-154
4. Fixed vCard issue. SMACK-152

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4538 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Gaston Dombiak 2006-07-18 05:14:33 +00:00 • committed by gato
parent 14b50d790a
commit f57ff10ad9
77 changed files with 995 additions and 932 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/org/jivesoftware/smack/packet/Authentication.java
View file

@ -146,7 +146,7 @@ public class Authentication extends IQ {
}
public String getChildElementXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<query xmlns=\"jabber:iq:auth\">");
if (username != null) {
if (username.equals("")) {

2
source/org/jivesoftware/smack/packet/Bind.java
View file

@ -57,7 +57,7 @@ public class Bind extends IQ {
}
public String getChildElementXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\">");
if (resource != null) {
buf.append("<resource>").append(resource).append("</resource>");

7
source/org/jivesoftware/smack/packet/DefaultPacketExtension.java
View file

@ -20,7 +20,10 @@
package org.jivesoftware.smack.packet;
import java.util.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
/**
* Default implementation of the PacketExtension interface. Unless a PacketExtensionProvider
@ -80,7 +83,7 @@ public class DefaultPacketExtension implements PacketExtension {
}
public String toXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<").append(elementName).append(" xmlns=\"").append(namespace).append("\">");
for (Iterator i=getNames(); i.hasNext(); ) {
String name = (String)i.next();

2
source/org/jivesoftware/smack/packet/IQ.java
View file

@ -67,7 +67,7 @@ public abstract class IQ extends Packet {
}
public String toXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<iq ");
if (getPacketID() != null) {
buf.append("id=\"" + getPacketID() + "\" ");

2
source/org/jivesoftware/smack/packet/Message.java
View file

@ -165,7 +165,7 @@ public class Message extends Packet {
}
public String toXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<message");
if (getPacketID() != null) {
buf.append(" id=\"").append(getPacketID()).append("\"");

6
source/org/jivesoftware/smack/packet/Packet.java
View file

@ -22,8 +22,10 @@ package org.jivesoftware.smack.packet;
import org.jivesoftware.smack.util.StringUtils;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.*;
import java.io.*;
/**
* Base class for XMPP packets. Every packet has a unique ID (which is automatically
@ -351,7 +353,7 @@ public abstract class Packet {
* are no packet extensions.
*/
protected synchronized String getExtensionsXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
// Add in all standard extension sub-packets.
Iterator extensions = getExtensions();
while (extensions.hasNext()) {

4
source/org/jivesoftware/smack/packet/Presence.java
View file

@ -169,7 +169,7 @@ public class Presence extends Packet {
}
public String toXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<presence");
if (getPacketID() != null) {
buf.append(" id=\"").append(getPacketID()).append("\"");
@ -208,7 +208,7 @@ public class Presence extends Packet {
}
public String toString() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append(type);
if (mode != null) {
buf.append(": ").append(mode);

15
source/org/jivesoftware/smack/packet/Registration.java
View file

@ -21,7 +21,6 @@
package org.jivesoftware.smack.packet;
import java.util.Map;
import java.util.Iterator;
/**
* Represents registration packets. An empty GET query will cause the server to return information
@ -49,7 +48,7 @@ import java.util.Iterator;
public class Registration extends IQ {
private String instructions = null;
private Map attributes = null;
private Map<String, String> attributes = null;
/**
* Returns the registration instructions, or <tt>null</tt> if no instructions
@ -76,7 +75,7 @@ public class Registration extends IQ {
*
* @return the account attributes.
*/
public Map getAttributes() {
public Map<String, String> getAttributes() {
return attributes;
}
@ -85,21 +84,19 @@ public class Registration extends IQ {
*
* @param attributes the account attributes.
*/
public void setAttributes(Map attributes) {
public void setAttributes(Map<String, String> attributes) {
this.attributes = attributes;
}
public String getChildElementXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<query xmlns=\"jabber:iq:register\">");
if (instructions != null) {
buf.append("<instructions>").append(instructions).append("</instructions>");
}
if (attributes != null && attributes.size() > 0) {
Iterator fieldNames = attributes.keySet().iterator();
while (fieldNames.hasNext()) {
String name = (String)fieldNames.next();
String value = (String)attributes.get(name);
for (String name : attributes.keySet()) {
String value = attributes.get(name);
buf.append("<").append(name).append(">");
buf.append(value);
buf.append("</").append(name).append(">");

4
source/org/jivesoftware/smack/packet/RosterPacket.java
View file

@ -68,7 +68,7 @@ public class RosterPacket extends IQ {
}
public String getChildElementXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<query xmlns=\"jabber:iq:roster\">");
synchronized (rosterItems) {
for (Item entry : rosterItems) {
@ -197,7 +197,7 @@ public class RosterPacket extends IQ {
}
public String toXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<item jid=\"").append(user).append("\"");
if (name != null) {
buf.append(" name=\"").append(name).append("\"");

2
source/org/jivesoftware/smack/packet/StreamError.java
View file

@ -99,7 +99,7 @@ public class StreamError {
}
public String toString() {
StringBuffer txt = new StringBuffer();
StringBuilder txt = new StringBuilder();
txt.append("stream:error (").append(code).append(")");
return txt.toString();
}

4
source/org/jivesoftware/smack/packet/XMPPError.java
View file

@ -97,7 +97,7 @@ public class XMPPError {
* @return the error as XML.
*/
public String toXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<error code=\"").append(code).append("\">");
if (message != null) {
buf.append(message);
@ -107,7 +107,7 @@ public class XMPPError {
}
public String toString() {
StringBuffer txt = new StringBuffer();
StringBuilder txt = new StringBuilder();
txt.append("(").append(code).append(")");
if (message != null) {
txt.append(" ").append(message);