From e25112eb6ad3b42ae5ef47b4b800f25c24c4f76d Mon Sep 17 00:00:00 2001
From: Emil Ivov <emcho@jitsi.org>
Date: Sun, 11 Jul 2010 15:19:32 +0000
Subject: [PATCH] Adds a default packet extension provider. Refactors a few
 more packet extensions so that they would extend AbstractPacketExtension

---
 .../OperationSetBasicTelephonyJabberImpl.java  | 18 ++++++++++++++++++
 .../jingle/RtpDescriptionPacketExtension.java  | 10 +++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
index c30428b6f..6ecb25d57 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
@@ -9,6 +9,7 @@
 import java.util.*;
 
 import net.java.sip.communicator.impl.protocol.jabber.OperationSetBasicInstantMessagingJabberImpl.*;
+import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
 import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.*;
 import net.java.sip.communicator.impl.protocol.jabber.extensions.mailnotification.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -81,6 +82,23 @@ public void registrationStateChanged(RegistrationStateChangeEvent evt)
             providerManager.addIQProvider( JingleIQ.ELEMENT_NAME,
                                            JingleIQ.NAMESPACE,
                                            new JingleIQProvider());
+
+            //<description/> provider
+            providerManager.addExtensionProvider(
+                RtpDescriptionPacketExtension.ELEMENT_NAME,
+                RtpDescriptionPacketExtension.NAMESPACE,
+                new DefaultPacketExtensionProvider
+                    <RtpDescriptionPacketExtension>(
+                                    RtpDescriptionPacketExtension.class));
+
+            //<payload-type/> provider
+            providerManager.addExtensionProvider(
+                PayloadTypePacketExtension.ELEMENT_NAME,
+                RtpDescriptionPacketExtension.NAMESPACE,
+                new DefaultPacketExtensionProvider
+                    <PayloadTypePacketExtension>(
+                                    PayloadTypePacketExtension.class));
+
             subscribeForJinglePackets();
 
             if (logger.isInfoEnabled())
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RtpDescriptionPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RtpDescriptionPacketExtension.java
index 81971fd0d..7376f57f7 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RtpDescriptionPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RtpDescriptionPacketExtension.java
@@ -46,11 +46,6 @@ public class RtpDescriptionPacketExtension
     private final List<PayloadTypePacketExtension> payloadTypes
                                 = new ArrayList<PayloadTypePacketExtension>();
 
-    /**
-     * The combined list of all child elements that this extension contains.
-     */
-    private List<PacketExtension> children;
-
     /**
      * An optional encryption element that contains encryption parameters for
      * this session.
@@ -63,6 +58,11 @@ public class RtpDescriptionPacketExtension
      */
     private BandwidthPacketExtension bandwidth;
 
+    /**
+     * The combined list of all child elements that this extension contains.
+     */
+    private List<PacketExtension> children;
+
     /**
      * Creates a new <tt>RtpDescriptionPacketExtension</tt>.
      */