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

Additional refactoring work.

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4539 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Matt Tucker 2006-07-18 06:47:38 +00:00 • committed by matt
parent f57ff10ad9
commit 9895123ff3
11 changed files with 138 additions and 374 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,10 +20,7 @@
package org.jivesoftware.smack.packet;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.*;
/**
* Default implementation of the PacketExtension interface. Unless a PacketExtensionProvider
@ -51,7 +48,7 @@ public class DefaultPacketExtension implements PacketExtension {
private String elementName;
private String namespace;
private Map map;
private Map<String,String> map;
/**
* Creates a new generic packet extension.
@ -85,8 +82,7 @@ public class DefaultPacketExtension implements PacketExtension {
public String toXML() {
StringBuilder buf = new StringBuilder();
buf.append("<").append(elementName).append(" xmlns=\"").append(namespace).append("\">");
for (Iterator i=getNames(); i.hasNext(); ) {
String name = (String)i.next();
for (String name : getNames()) {
String value = getValue(name);
buf.append("<").append(name).append(">");
buf.append(value);
@ -97,16 +93,16 @@ public class DefaultPacketExtension implements PacketExtension {
}
/**
* Returns an Iterator for the names that can be used to get
* Returns an unmodifiable collection of the names that can be used to get
* values of the packet extension.
*
* @return an Iterator for the names.
* @return the names.
*/
public synchronized Iterator getNames() {
public synchronized Collection<String> getNames() {
if (map == null) {
return Collections.EMPTY_LIST.iterator();
return Collections.emptySet();
}
return Collections.unmodifiableMap(new HashMap(map)).keySet().iterator();
return Collections.unmodifiableSet(new HashMap<String,String>(map).keySet());
}
/**
@ -119,7 +115,7 @@ public class DefaultPacketExtension implements PacketExtension {
if (map == null) {
return null;
}
return (String)map.get(name);
return map.get(name);
}
/**
@ -130,7 +126,7 @@ public class DefaultPacketExtension implements PacketExtension {
*/
public synchronized void setValue(String name, String value) {
if (map == null) {
map = new HashMap();
map = new HashMap<String,String>();
}
map.put(name, value);
}

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

@ -72,8 +72,8 @@ public abstract class Packet {
private String packetID = null;
private String to = null;
private String from = null;
private List packetExtensions = null;
private Map properties = null;
private List<PacketExtension> packetExtensions = null;
private Map<String,Object> properties = null;
private XMPPError error = null;
/**
@ -168,15 +168,15 @@ public abstract class Packet {
}
/**
* Returns an Iterator for the packet extensions attached to the packet.
* Returns an unmodifiable collection of the packet extensions attached to the packet.
*
* @return an Iterator for the packet extensions.
* @return the packet extensions.
*/
public synchronized Iterator getExtensions() {
public synchronized Collection<PacketExtension> getExtensions() {
if (packetExtensions == null) {
return Collections.EMPTY_LIST.iterator();
return Collections.emptyList();
}
return Collections.unmodifiableList(new ArrayList(packetExtensions)).iterator();
return Collections.unmodifiableList(new ArrayList<PacketExtension>(packetExtensions));
}
/**
@ -197,8 +197,7 @@ public abstract class Packet {
if (packetExtensions == null || elementName == null || namespace == null) {
return null;
}
for (Iterator i=packetExtensions.iterator(); i.hasNext(); ) {
PacketExtension ext = (PacketExtension)i.next();
for (PacketExtension ext : packetExtensions) {
if (elementName.equals(ext.getElementName()) && namespace.equals(ext.getNamespace())) {
return ext;
}
@ -213,7 +212,7 @@ public abstract class Packet {
*/
public synchronized void addExtension(PacketExtension extension) {
if (packetExtensions == null) {
packetExtensions = new ArrayList();
packetExtensions = new ArrayList<PacketExtension>();
}
packetExtensions.add(extension);
}
@ -245,56 +244,6 @@ public abstract class Packet {
return properties.get(name);
}
/**
* Sets a packet property with an int value.
*
* @param name the name of the property.
* @param value the value of the property.
*/
public void setProperty(String name, int value) {
setProperty(name, new Integer(value));
}
/**
* Sets a packet property with a long value.
*
* @param name the name of the property.
* @param value the value of the property.
*/
public void setProperty(String name, long value) {
setProperty(name, new Long(value));
}
/**
* Sets a packet property with a float value.
*
* @param name the name of the property.
* @param value the value of the property.
*/
public void setProperty(String name, float value) {
setProperty(name, new Float(value));
}
/**
* Sets a packet property with a double value.
*
* @param name the name of the property.
* @param value the value of the property.
*/
public void setProperty(String name, double value) {
setProperty(name, new Double(value));
}
/**
* Sets a packet property with a bboolean value.
*
* @param name the name of the property.
* @param value the value of the property.
*/
public void setProperty(String name, boolean value) {
setProperty(name, new Boolean(value));
}
/**
* Sets a property with an Object as the value. The value must be Serializable
* or an IllegalArgumentException will be thrown.
@ -307,7 +256,7 @@ public abstract class Packet {
throw new IllegalArgumentException("Value must be serialiazble");
}
if (properties == null) {
properties = new HashMap();
properties = new HashMap<String, Object>();
}
properties.put(name, value);
}
@ -325,15 +274,15 @@ public abstract class Packet {
}
/**
* Returns an Iterator for all the property names that are set.
* Returns an unmodifiable collection of all the property names that are set.
*
* @return an Iterator for all property names.
* @return all property names.
*/
public synchronized Iterator getPropertyNames() {
public synchronized Collection<String> getPropertyNames() {
if (properties == null) {
return Collections.EMPTY_LIST.iterator();
return Collections.emptySet();
}
return properties.keySet().iterator();
return Collections.unmodifiableSet(new HashSet<String>(properties.keySet()));
}
/**
@ -355,17 +304,14 @@ public abstract class Packet {
protected synchronized String getExtensionsXML() {
StringBuilder buf = new StringBuilder();
// Add in all standard extension sub-packets.
Iterator extensions = getExtensions();
while (extensions.hasNext()) {
PacketExtension extension = (PacketExtension)extensions.next();
for (PacketExtension extension : getExtensions()) {
buf.append(extension.toXML());
}
// Add in packet properties.
if (properties != null && !properties.isEmpty()) {
buf.append("<properties xmlns=\"http://www.jivesoftware.com/xmlns/xmpp/properties\">");
// Loop through all properties and write them out.
for (Iterator i=getPropertyNames(); i.hasNext(); ) {
String name = (String)i.next();
for (String name : getPropertyNames()) {
Object value = getProperty(name);
buf.append("<property>");
buf.append("<name>").append(StringUtils.escapeForXML(name)).append("</name>");
@ -409,10 +355,20 @@ public abstract class Packet {
}
finally {
if (out != null) {
try { out.close(); } catch (Exception e) { }
try {
out.close();
}
catch (Exception e) {
// Ignore.
}
}
if (byteStream != null) {
try { byteStream.close(); } catch (Exception e) { }
try {
byteStream.close();
}
catch (Exception e) {
// Ignore.
}
}
}
}