diff --git a/core/src/main/java/org/jivesoftware/spark/PresenceManager.java b/core/src/main/java/org/jivesoftware/spark/PresenceManager.java index 69b152819..6c4376d31 100644 --- a/core/src/main/java/org/jivesoftware/spark/PresenceManager.java +++ b/core/src/main/java/org/jivesoftware/spark/PresenceManager.java @@ -19,6 +19,7 @@ import org.jivesoftware.resource.Res; import org.jivesoftware.resource.Default; import org.jivesoftware.resource.SparkRes; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.XmlElement; import org.jivesoftware.smack.roster.Roster; import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smackx.muc.packet.MUCUser; @@ -135,8 +136,8 @@ public class PresenceManager { } public static String getJidFromMUCPresence(Presence presence) { - Collection extensions = presence.getExtensions(); - for (ExtensionElement extension : extensions) { + Collection extensions = presence.getExtensions(); + for (XmlElement extension : extensions) { if (extension instanceof MUCUser) { final MUCUser mucUser = (MUCUser) extension; Jid fullJid = mucUser.getItem().getJid(); diff --git a/core/src/main/java/org/jivesoftware/spark/plugin/PluginClassLoader.java b/core/src/main/java/org/jivesoftware/spark/plugin/PluginClassLoader.java index fd1ec3e86..7eaa4ff51 100644 --- a/core/src/main/java/org/jivesoftware/spark/plugin/PluginClassLoader.java +++ b/core/src/main/java/org/jivesoftware/spark/plugin/PluginClassLoader.java @@ -18,7 +18,7 @@ package org.jivesoftware.spark.plugin; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.provider.ExtensionElementProvider; -import org.jivesoftware.smack.provider.IQProvider; +import org.jivesoftware.smack.provider.IqProvider; import org.jivesoftware.smack.provider.ProviderManager; import org.jivesoftware.smack.xml.SmackXmlParser; import org.jivesoftware.smack.xml.XmlPullParser; @@ -139,7 +139,7 @@ public class PluginClassLoader extends URLClassLoader { try { // Add the provider to the map. Class provider = this.loadClass(className); - if (IQProvider.class.isAssignableFrom(provider)) { + if (IqProvider.class.isAssignableFrom(provider)) { ProviderManager.addIQProvider(elementName, namespace, provider.newInstance()); } else if (IQ.class.isAssignableFrom(provider)) { diff --git a/core/src/main/java/org/jivesoftware/spark/ui/RosterDialog.java b/core/src/main/java/org/jivesoftware/spark/ui/RosterDialog.java index 565e0dd7a..be5b05a6d 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/RosterDialog.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/RosterDialog.java @@ -484,10 +484,10 @@ public class RosterDialog implements ActionListener { for (DomainBareJid search : _usersearchservice) { ReportedData data; - UserSearchManager usersearchManager = new UserSearchManager( + UserSearchManager usersearchManager = UserSearchManager.getInstanceFor( SparkManager.getConnection()); - DataForm f = usersearchManager.getSearchForm(search); + DataForm f = usersearchManager.getSearchForm(search).getDataForm(); FillableForm answer = new FillableForm(f); answer.setAnswer("Name", true); diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/Gateway.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/Gateway.java index d708fa8cf..fca6bd37f 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/Gateway.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/Gateway.java @@ -18,14 +18,18 @@ package org.jivesoftware.sparkimpl.plugin.gateways; import org.jivesoftware.smack.*; import org.jivesoftware.smack.filter.StanzaIdFilter; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.IqData; import org.jivesoftware.smack.packet.XmlEnvironment; -import org.jivesoftware.smack.provider.IQProvider; +import org.jivesoftware.smack.parsing.SmackParsingException; +import org.jivesoftware.smack.provider.IqProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; import org.jivesoftware.spark.SparkManager; +import org.jxmpp.JxmppContext; import org.jxmpp.jid.DomainBareJid; import java.io.IOException; +import java.text.ParseException; /** */ @@ -81,14 +85,14 @@ public class Gateway extends IQ { * * @author Derek DeMoro */ - public static class Provider extends IQProvider { + public static class Provider extends IqProvider { public Provider() { super(); } @Override - public Gateway parse(XmlPullParser parser, int i, XmlEnvironment xmlEnvironment) + public Gateway parse(XmlPullParser parser, int i, IqData iqData, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws IOException, XmlPullParserException { Gateway version = new Gateway(); diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPrivateData.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPrivateData.java index 456e0fcbd..cc47eae47 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPrivateData.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPrivateData.java @@ -19,6 +19,7 @@ import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; import org.jivesoftware.smackx.iqprivate.packet.PrivateData; import org.jivesoftware.smackx.iqprivate.provider.PrivateDataProvider; +import org.jxmpp.JxmppContext; import org.jxmpp.jid.DomainBareJid; import org.jxmpp.jid.impl.JidCreate; @@ -87,7 +88,7 @@ public class GatewayPrivateData implements PrivateData { } @Override - public PrivateData parsePrivateData(XmlPullParser parser) throws IOException, XmlPullParserException { + public PrivateData parsePrivateData(XmlPullParser parser, JxmppContext jxmppContext) throws XmlPullParserException, IOException { GatewayPrivateData data = new GatewayPrivateData(); boolean done = false; diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/manager/Features.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/manager/Features.java index 1169e7a6a..7b445a62a 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/manager/Features.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/manager/Features.java @@ -20,6 +20,7 @@ import org.jivesoftware.smack.packet.XmlEnvironment; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; +import org.jxmpp.JxmppContext; import javax.xml.namespace.QName; import java.io.IOException; @@ -74,7 +75,7 @@ public class Features implements ExtensionElement { } @Override - public Features parse( XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException { + public Features parse( XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws XmlPullParserException, IOException { Features features = new Features(); boolean done = false; while (!done) { diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/scratchpad/PrivateNotes.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/scratchpad/PrivateNotes.java index a3d94faf3..ad6c7c3aa 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/scratchpad/PrivateNotes.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/scratchpad/PrivateNotes.java @@ -24,6 +24,7 @@ import org.jivesoftware.smackx.iqprivate.packet.PrivateData; import org.jivesoftware.smackx.iqprivate.provider.PrivateDataProvider; import org.jivesoftware.spark.SparkManager; import org.jivesoftware.spark.util.log.Log; +import org.jxmpp.JxmppContext; import java.io.IOException; @@ -113,7 +114,7 @@ public class PrivateNotes implements PrivateData { } @Override - public PrivateData parsePrivateData(XmlPullParser parser) throws XmlPullParserException, IOException { + public PrivateData parsePrivateData(XmlPullParser parser, JxmppContext jxmppContext) throws XmlPullParserException, IOException { boolean done = false; while (!done) { XmlPullParser.Event eventType = parser.next(); diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/scratchpad/Tasks.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/scratchpad/Tasks.java index 0a1609a19..619bb4f03 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/scratchpad/Tasks.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/scratchpad/Tasks.java @@ -29,6 +29,7 @@ import org.jivesoftware.smackx.iqprivate.packet.PrivateData; import org.jivesoftware.smackx.iqprivate.provider.PrivateDataProvider; import org.jivesoftware.spark.util.ModelUtil; import org.jivesoftware.spark.util.log.Log; +import org.jxmpp.JxmppContext; /** * @author Derek DeMoro @@ -120,7 +121,7 @@ public class Tasks implements PrivateData { } @Override - public PrivateData parsePrivateData(XmlPullParser parser) throws XmlPullParserException, IOException { + public PrivateData parsePrivateData(XmlPullParser parser, JxmppContext jxmppContext) throws XmlPullParserException, IOException { boolean done = false; while (!done) { XmlPullParser.Event eventType = parser.next(); diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/profile/VCardManager.java b/core/src/main/java/org/jivesoftware/sparkimpl/profile/VCardManager.java index 0d906b315..69a7a07d1 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/profile/VCardManager.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/profile/VCardManager.java @@ -28,6 +28,7 @@ import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.packet.StanzaError; +import org.jivesoftware.smack.packet.XmlElement; import org.jivesoftware.smack.provider.ProviderManager; import org.jivesoftware.smack.xml.SmackXmlParser; import org.jivesoftware.smack.xml.XmlPullParser; diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/JabberAvatarExtension.java b/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/JabberAvatarExtension.java index 0ac736e1b..1244203b0 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/JabberAvatarExtension.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/JabberAvatarExtension.java @@ -18,12 +18,15 @@ package org.jivesoftware.sparkimpl.profile.ext; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.XmlEnvironment; +import org.jivesoftware.smack.parsing.SmackParsingException; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; +import org.jxmpp.JxmppContext; import javax.xml.namespace.QName; import java.io.IOException; +import java.text.ParseException; /** * XEP-0008: IQ-Based Avatars @@ -66,7 +69,7 @@ public class JabberAvatarExtension implements ExtensionElement { } @Override - public JabberAvatarExtension parse(XmlPullParser parser, int i, XmlEnvironment xmlEnvironment) + public JabberAvatarExtension parse(XmlPullParser parser, int i, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws XmlPullParserException, IOException { final JabberAvatarExtension result = new JabberAvatarExtension(); diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/VCardUpdateExtension.java b/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/VCardUpdateExtension.java index 53703ff08..fdd5f39ce 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/VCardUpdateExtension.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/VCardUpdateExtension.java @@ -21,6 +21,7 @@ import org.jivesoftware.smack.packet.XmlEnvironment; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; +import org.jxmpp.JxmppContext; import javax.xml.namespace.QName; import java.io.IOException; @@ -68,7 +69,7 @@ public class VCardUpdateExtension implements ExtensionElement { } @Override - public VCardUpdateExtension parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) + public VCardUpdateExtension parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws XmlPullParserException, IOException { final VCardUpdateExtension result = new VCardUpdateExtension(); diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/search/users/SearchForm.java b/core/src/main/java/org/jivesoftware/sparkimpl/search/users/SearchForm.java index 8dacdcd0d..f79ef2b1a 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/search/users/SearchForm.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/search/users/SearchForm.java @@ -62,13 +62,13 @@ public class SearchForm extends JPanel { throw new IllegalStateException(e); } - searchManager = new UserSearchManager(SparkManager.getConnection()); + searchManager = UserSearchManager.getInstanceFor(SparkManager.getConnection()); setLayout(new GridBagLayout()); // Load searchForm try { - searchForm = searchManager.getSearchForm(serviceName); + searchForm = searchManager.getSearchForm(serviceName).getDataForm(); } catch (XMPPException | SmackException | InterruptedException e) { Log.error("Unable to load search services.", e); @@ -77,7 +77,6 @@ public class SearchForm extends JPanel { return; } - searchManager = new UserSearchManager(SparkManager.getConnection()); questionForm = new DataFormUI(searchForm); questionForm.setBorder(BorderFactory.createTitledBorder(Res.getString("group.search.form"))); diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/search/users/UserSearchForm.java b/core/src/main/java/org/jivesoftware/sparkimpl/search/users/UserSearchForm.java index b7a6279f4..2b7900105 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/search/users/UserSearchForm.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/search/users/UserSearchForm.java @@ -89,7 +89,7 @@ public class UserSearchForm extends JPanel { this.searchServices = searchServices; - searchManager = new UserSearchManager(SparkManager.getConnection()); + searchManager = UserSearchManager.getInstanceFor(SparkManager.getConnection()); addSearchServices(); @@ -168,7 +168,7 @@ public class UserSearchForm extends JPanel { public Object construct() { try { DomainBareJid serviceJid = JidCreate.domainBareFrom(serviceName); - newForm = searchManager.getSearchForm(serviceJid); + newForm = searchManager.getSearchForm(serviceJid).getDataForm(); } catch (XMPPException | SmackException | XmppStringprepException | InterruptedException e) { // Nothing to do diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/settings/SettingsDataProvider.java b/core/src/main/java/org/jivesoftware/sparkimpl/settings/SettingsDataProvider.java index 9e9d7a383..a7ab171e2 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/settings/SettingsDataProvider.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/settings/SettingsDataProvider.java @@ -20,6 +20,7 @@ import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; import org.jivesoftware.smackx.iqprivate.packet.PrivateData; import org.jivesoftware.smackx.iqprivate.provider.PrivateDataProvider; +import org.jxmpp.JxmppContext; import java.io.IOException; import java.util.HashMap; @@ -31,7 +32,7 @@ public class SettingsDataProvider implements PrivateDataProvider { } @Override - public PrivateData parsePrivateData(XmlPullParser parser) throws XmlPullParserException, IOException + public PrivateData parsePrivateData(XmlPullParser parser, JxmppContext jxmppContext) throws XmlPullParserException, IOException { Map map = new HashMap<>(); parser.getEventType(); @@ -47,4 +48,4 @@ public class SettingsDataProvider implements PrivateDataProvider { return new SettingsData(map); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/updater/SparkVersion.java b/core/src/main/java/org/jivesoftware/sparkimpl/updater/SparkVersion.java index d4de24218..2268df197 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/updater/SparkVersion.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/updater/SparkVersion.java @@ -18,12 +18,16 @@ package org.jivesoftware.sparkimpl.updater; import org.jivesoftware.Spark; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.IqData; import org.jivesoftware.smack.packet.XmlEnvironment; -import org.jivesoftware.smack.provider.IQProvider; +import org.jivesoftware.smack.parsing.SmackParsingException; +import org.jivesoftware.smack.provider.IqProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; +import org.jxmpp.JxmppContext; import java.io.IOException; +import java.text.ParseException; import java.util.Date; public class SparkVersion extends IQ { @@ -116,14 +120,14 @@ public class SparkVersion extends IQ { * * @author Derek DeMoro */ - public static class Provider extends IQProvider { + public static class Provider extends IqProvider { public Provider() { super(); } @Override - public SparkVersion parse(XmlPullParser parser, int i, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException{ + public SparkVersion parse(XmlPullParser parser, int i, IqData iqData, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws XmlPullParserException, IOException{ SparkVersion version = new SparkVersion(); boolean done = false; diff --git a/plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/UploadRequest.java b/plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/UploadRequest.java index d91f9fa57..7d10d7fba 100644 --- a/plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/UploadRequest.java +++ b/plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/UploadRequest.java @@ -16,10 +16,12 @@ package org.jivesoftware.spark.plugin.fileupload; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.IqData; import org.jivesoftware.smack.packet.XmlEnvironment; -import org.jivesoftware.smack.provider.IQProvider; +import org.jivesoftware.smack.provider.IqProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; +import org.jxmpp.JxmppContext; import java.io.IOException; @@ -57,14 +59,15 @@ public class UploadRequest extends IQ return buf; } - public static class Provider extends IQProvider + public static class Provider extends IqProvider { public Provider() { super(); } - public UploadRequest parse(XmlPullParser parser, int i, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException + @Override + public UploadRequest parse(XmlPullParser parser, int i, IqData iqData, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws XmlPullParserException, IOException { final UploadRequest uploadRequest = new UploadRequest(); diff --git a/plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/QueryRequest.java b/plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/QueryRequest.java index 5c6076461..9acd7354e 100644 --- a/plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/QueryRequest.java +++ b/plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/QueryRequest.java @@ -16,10 +16,12 @@ package org.jivesoftware.spark.plugin.ofmeet; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.IqData; import org.jivesoftware.smack.packet.XmlEnvironment; -import org.jivesoftware.smack.provider.IQProvider; +import org.jivesoftware.smack.provider.IqProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; +import org.jxmpp.JxmppContext; import java.io.IOException; @@ -55,14 +57,15 @@ public class QueryRequest extends IQ return buf; } - public static class Provider extends IQProvider + public static class Provider extends IqProvider { public Provider() { super(); } - public QueryRequest parse(XmlPullParser parser, int i, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException + @Override + public QueryRequest parse(XmlPullParser parser, int i, IqData iqData, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws XmlPullParserException, IOException { final QueryRequest queryRequest = new QueryRequest(); diff --git a/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameForfeit.java b/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameForfeit.java index cff49ef38..2c59bd796 100644 --- a/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameForfeit.java +++ b/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameForfeit.java @@ -20,6 +20,7 @@ import org.jivesoftware.smack.packet.XmlEnvironment; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; +import org.jxmpp.JxmppContext; import javax.xml.namespace.QName; import java.io.IOException; @@ -72,7 +73,8 @@ public class GameForfeit implements ExtensionElement { public static class Provider extends ExtensionElementProvider { - public GameForfeit parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException + @Override + public GameForfeit parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws XmlPullParserException, IOException { final GameForfeit gameForfeit = new GameForfeit(); boolean done = false; diff --git a/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameMove.java b/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameMove.java index 656f9589e..03e1cbff0 100644 --- a/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameMove.java +++ b/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameMove.java @@ -20,6 +20,7 @@ import org.jivesoftware.smack.packet.XmlEnvironment; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; +import org.jxmpp.JxmppContext; import javax.xml.namespace.QName; import java.io.IOException; @@ -100,7 +101,9 @@ public class GameMove implements ExtensionElement { public static class Provider extends ExtensionElementProvider { - public GameMove parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException + + @Override + public GameMove parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws XmlPullParserException, IOException { final GameMove gameMove = new GameMove(); boolean done = false; diff --git a/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameOffer.java b/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameOffer.java index 2ccef541f..24c45e425 100644 --- a/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameOffer.java +++ b/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameOffer.java @@ -16,10 +16,12 @@ package org.jivesoftware.game.reversi; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.IqData; import org.jivesoftware.smack.packet.XmlEnvironment; -import org.jivesoftware.smack.provider.IQProvider; +import org.jivesoftware.smack.provider.IqProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; +import org.jxmpp.JxmppContext; import java.io.IOException; import java.util.Random; @@ -103,14 +105,15 @@ public class GameOffer extends IQ return buf; } - public static class Provider extends IQProvider + public static class Provider extends IqProvider { public Provider() { super(); } - public GameOffer parse(XmlPullParser parser, int i, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException + @Override + public GameOffer parse(XmlPullParser parser, int i, IqData iqData, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws XmlPullParserException, IOException { final GameOffer gameOffer = new GameOffer(); diff --git a/plugins/tictactoe/src/main/java/tic/tac/toe/packet/GameOfferPacket.java b/plugins/tictactoe/src/main/java/tic/tac/toe/packet/GameOfferPacket.java index 86fccec87..fddb67e91 100644 --- a/plugins/tictactoe/src/main/java/tic/tac/toe/packet/GameOfferPacket.java +++ b/plugins/tictactoe/src/main/java/tic/tac/toe/packet/GameOfferPacket.java @@ -15,14 +15,16 @@ */ package tic.tac.toe.packet; -import java.io.IOException; -import java.util.Random; - import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.IqData; import org.jivesoftware.smack.packet.XmlEnvironment; -import org.jivesoftware.smack.provider.IQProvider; +import org.jivesoftware.smack.provider.IqProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; +import org.jxmpp.JxmppContext; + +import java.io.IOException; +import java.util.Random; /** * The Game Offer Packet @@ -94,14 +96,15 @@ public class GameOfferPacket extends IQ { buf.append( "" ); return buf; } - public static class Provider extends IQProvider + public static class Provider extends IqProvider { public Provider() { super(); } - public GameOfferPacket parse(XmlPullParser parser, int i, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException + @Override + public GameOfferPacket parse(XmlPullParser parser, int i, IqData iqData, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws XmlPullParserException, IOException { final GameOfferPacket gameOffer = new GameOfferPacket(); diff --git a/plugins/tictactoe/src/main/java/tic/tac/toe/packet/InvalidMove.java b/plugins/tictactoe/src/main/java/tic/tac/toe/packet/InvalidMove.java index 6adcf9c00..3844dbaf5 100644 --- a/plugins/tictactoe/src/main/java/tic/tac/toe/packet/InvalidMove.java +++ b/plugins/tictactoe/src/main/java/tic/tac/toe/packet/InvalidMove.java @@ -5,6 +5,7 @@ import org.jivesoftware.smack.packet.XmlEnvironment; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; +import org.jxmpp.JxmppContext; import javax.xml.namespace.QName; import java.io.IOException; @@ -65,7 +66,8 @@ public class InvalidMove implements ExtensionElement { public static class Provider extends ExtensionElementProvider { - public InvalidMove parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException + @Override + public InvalidMove parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws XmlPullParserException, IOException { final InvalidMove gameMove = new InvalidMove(); boolean done = false; diff --git a/plugins/tictactoe/src/main/java/tic/tac/toe/packet/MovePacket.java b/plugins/tictactoe/src/main/java/tic/tac/toe/packet/MovePacket.java index 731f276ca..957685d22 100644 --- a/plugins/tictactoe/src/main/java/tic/tac/toe/packet/MovePacket.java +++ b/plugins/tictactoe/src/main/java/tic/tac/toe/packet/MovePacket.java @@ -20,6 +20,7 @@ import org.jivesoftware.smack.packet.XmlEnvironment; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; +import org.jxmpp.JxmppContext; import javax.xml.namespace.QName; import java.io.IOException; @@ -85,7 +86,8 @@ public class MovePacket implements ExtensionElement { public static class Provider extends ExtensionElementProvider { - public MovePacket parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException + @Override + public MovePacket parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment, JxmppContext jxmppContext) throws XmlPullParserException, IOException { final MovePacket gameMove = new MovePacket(); boolean done = false;