From 5edd630fd0a79f696e7672d36bfbb8528f237171 Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Wed, 16 Aug 2017 15:59:16 +0200 Subject: [PATCH] Remove unnecessary class --- .../jivesoftware/smackx/jingle/Callback.java | 31 ------------------- .../jingle/component/JingleContent.java | 8 ----- 2 files changed, 39 deletions(-) delete mode 100644 smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/Callback.java diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/Callback.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/Callback.java deleted file mode 100644 index 78360ab7f..000000000 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/Callback.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * - * Copyright 2017 Paul Schaub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jivesoftware.smackx.jingle; - -import org.jivesoftware.smackx.jingle.component.JingleContent; - -/** - * User callback that the user can use to control a jingle content. - */ -public abstract class Callback { - - private final JingleContent content; - - public Callback(JingleContent content) { - this.content = content; - } -} diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleContent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleContent.java index f82050be3..0be8a0e01 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleContent.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleContent.java @@ -16,10 +16,8 @@ */ package org.jivesoftware.smackx.jingle.component; -import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; -import java.util.List; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -32,7 +30,6 @@ import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.util.Async; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smackx.bytestreams.BytestreamSession; -import org.jivesoftware.smackx.jingle.Callback; import org.jivesoftware.smackx.jingle.JingleManager; import org.jivesoftware.smackx.jingle.JingleTransportManager; import org.jivesoftware.smackx.jingle.adapter.JingleDescriptionAdapter; @@ -65,7 +62,6 @@ public class JingleContent implements JingleTransportCallback, JingleSecurityCal private JingleTransport pendingReplacingTransport = null; - private final List callbacks = Collections.synchronizedList(new ArrayList()); private final Set transportBlacklist = Collections.synchronizedSet(new HashSet()); public JingleContent(JingleContentElement.Creator creator, JingleContentElement.Senders senders) { @@ -297,10 +293,6 @@ public class JingleContent implements JingleTransportCallback, JingleSecurityCal /* MISCELLANEOUS */ - public void addCallback(Callback callback) { - callbacks.add(callback); - } - public JingleContentElement getElement() { JingleContentElement.Builder builder = JingleContentElement.getBuilder() .setName(name)