Always return a PacketExtension implementation.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5954 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/xmpp/packet/Packet.java

@@ -248,17 +248,20 @@ public abstract class Packet {
         List extensions = element.elements(QName.get(name, namespace));
         if (!extensions.isEmpty()) {
             Class extensionClass = PacketExtension.getExtensionClass(name, namespace);
+            // If a specific PacketExtension implementation has been registered, use that.
             if (extensionClass != null) {
                 try {
-                    Constructor constructor = extensionClass.getDeclaredConstructor(new Class[]{
-                        Element.class});
-                    return (PacketExtension) constructor.newInstance(new Object[]{
-                        extensions.get(0)});
+                    Constructor constructor = extensionClass.getDeclaredConstructor(Element.class);
+                    return (PacketExtension)constructor.newInstance(extensions.get(0));
                 }
                 catch (Exception e) {
                     // Ignore.
                 }
             }
+            // Otherwise, use a normal PacketExtension.
+            else {
+                return new PacketExtension((Element)extensions.get(0));
+            }
         }
         return null;
     }

src/java/org/xmpp/packet/PacketExtension.java

@@ -32,15 +32,16 @@ import java.util.concurrent.ConcurrentHashMap;
  * PacketExtension acts as a wrapper on a child element the same way Packet does for a whole
  * element. The wrapper provides an easy way to handle the packet extension.<p>
  *
- * Subclasses of this class should be registered in the static variable
- * <tt>registeredExtensions</tt> when loaded. The registration process associates the new subclass
+ * Subclasses of this class can be registered using the static variable
+ * <tt>registeredExtensions</tt>. The registration process associates the new subclass
  * with a given qualified name (ie. element name and namespace). This information will be used by
  * {@link Packet#getExtension(String, String)} for locating the corresponding PacketExtension
- * subclass to return for the requested qualified name.
+ * subclass to return for the requested qualified name. Each PacketExtension must have a public
+ * constructor that takes an Element instance as an argument. 
  *
  * @author Gaston Dombiak
  */
-public abstract class PacketExtension {
+public class PacketExtension {
     
     protected static DocumentFactory docFactory = DocumentFactory.getInstance();
     /**
@@ -99,5 +100,9 @@ public abstract class PacketExtension {
      *
      * @return a deep copy of this packet extension.
      */
-    public abstract PacketExtension createCopy();
+    public PacketExtension createCopy() {
+        Element copy = element.createCopy();
+        docFactory.createDocument().add(copy);
+        return new PacketExtension(element);
+    }
 }