From 28674a46206c041dd99d8e857a3d1c90b1294746 Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Sun, 13 Aug 2017 19:44:02 +0200 Subject: [PATCH] Refactoring --- .../smackx/jft/JingleFileTransferManager.java | 4 +- .../component/AbstractJingleFileOffer.java | 4 +- .../component/AbstractJingleFileRequest.java | 4 +- .../jft/component/JingleFileTransfer.java | 5 +- .../jft/component/JingleFileTransferFile.java | 178 ++++++++++++++++++ .../component/JingleIncomingFileOffer.java | 9 +- .../component/JingleIncomingFileRequest.java | 9 +- .../component/JingleOutgoingFileOffer.java | 11 +- .../component/JingleOutgoingFileRequest.java | 9 +- .../file/AbstractJingleFileTransferFile.java | 56 ------ .../smackx/jft/component/file/LocalFile.java | 104 ---------- .../smackx/jft/component/file/RemoteFile.java | 65 ------- .../jft/component/file/package-info.java | 22 --- .../JingleFileTransferController.java | 6 +- .../jingle/component/JingleTransport.java | 3 +- .../jingle_ibb/JingleIBBTransport.java | 11 -- .../jingle_s5b/JingleS5BTransport.java | 11 -- 17 files changed, 205 insertions(+), 306 deletions(-) create mode 100644 smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransferFile.java delete mode 100644 smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/AbstractJingleFileTransferFile.java delete mode 100644 smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/LocalFile.java delete mode 100644 smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/RemoteFile.java delete mode 100644 smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/package-info.java diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java index 1a1bc97b1..425f21414 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java @@ -32,11 +32,11 @@ import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.jft.adapter.JingleFileTransferAdapter; import org.jivesoftware.smackx.jft.component.JingleFileTransfer; +import org.jivesoftware.smackx.jft.component.JingleFileTransferFile; import org.jivesoftware.smackx.jft.component.JingleIncomingFileOffer; import org.jivesoftware.smackx.jft.component.JingleIncomingFileRequest; import org.jivesoftware.smackx.jft.component.JingleOutgoingFileOffer; import org.jivesoftware.smackx.jft.component.JingleOutgoingFileRequest; -import org.jivesoftware.smackx.jft.component.file.RemoteFile; import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController; import org.jivesoftware.smackx.jft.controller.OutgoingFileRequestController; import org.jivesoftware.smackx.jft.listener.IncomingFileOfferListener; @@ -132,7 +132,7 @@ public final class JingleFileTransferManager extends Manager implements JingleDe return null; } - public OutgoingFileRequestController requestFile(RemoteFile file, FullJid from) { + public OutgoingFileRequestController requestFile(JingleFileTransferFile.RemoteFile file, FullJid from) { JingleOutgoingFileRequest request = new JingleOutgoingFileRequest(file); //TODO at some point. diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java index 9711f8ee6..e851b16ce 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java @@ -16,12 +16,10 @@ */ package org.jivesoftware.smackx.jft.component; -import org.jivesoftware.smackx.jft.component.file.AbstractJingleFileTransferFile; - /** * Created by vanitas on 22.07.17. */ -public abstract class AbstractJingleFileOffer extends JingleFileTransfer { +public abstract class AbstractJingleFileOffer extends JingleFileTransfer { public AbstractJingleFileOffer(D fileTransferFile) { super(fileTransferFile); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java index 94cafa493..a9c5bd394 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java @@ -16,12 +16,10 @@ */ package org.jivesoftware.smackx.jft.component; -import org.jivesoftware.smackx.jft.component.file.AbstractJingleFileTransferFile; - /** * Created by vanitas on 22.07.17. */ -public abstract class AbstractJingleFileRequest extends JingleFileTransfer { +public abstract class AbstractJingleFileRequest extends JingleFileTransfer { public AbstractJingleFileRequest(D fileTransferFile) { super(fileTransferFile); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransfer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransfer.java index 43d412f61..3ffbe37af 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransfer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransfer.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.jivesoftware.smackx.jft.component.file.AbstractJingleFileTransferFile; import org.jivesoftware.smackx.jft.controller.JingleFileTransferController; import org.jivesoftware.smackx.jft.element.JingleFileTransferElement; import org.jivesoftware.smackx.jft.listener.ProgressListener; @@ -38,11 +37,11 @@ public abstract class JingleFileTransfer extends JingleDescription progressListeners = Collections.synchronizedList(new ArrayList()); - public JingleFileTransfer(AbstractJingleFileTransferFile file) { + public JingleFileTransfer(JingleFileTransferFile file) { this.file = file; } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransferFile.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransferFile.java new file mode 100644 index 000000000..7730b4d44 --- /dev/null +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransferFile.java @@ -0,0 +1,178 @@ +/** + * + * 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.jft.component; + +import java.io.File; +import java.util.Date; + +import org.jivesoftware.smackx.hashes.element.HashElement; +import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; + +/** + * Represent a file sent in a file transfer. + * This can be both LocalFile (available to the client), or RemoteFile (file not yet available). + */ +public abstract class JingleFileTransferFile { + + public JingleFileTransferFile() { + + } + + public JingleFileTransferChildElement getElement() { + JingleFileTransferChildElement.Builder builder = JingleFileTransferChildElement.getBuilder(); + builder.setDate(getDate()); + builder.setSize(getSize()); + builder.setName(getName()); + builder.setDescription(getDescription()); + builder.setMediaType(getMediaType()); + builder.setHash(getHashElement()); + + return builder.build(); + } + + public abstract Date getDate(); + + public abstract long getSize(); + + public abstract String getName(); + + public abstract String getDescription(); + + public abstract String getMediaType(); + + public abstract HashElement getHashElement(); + + public static class LocalFile extends JingleFileTransferFile { + + private File file; + private String name; + private String description; + private String mediaType; + private HashElement hashElement; + + public LocalFile(File file) { + this(file, null, null); + } + + public LocalFile(File file, String description) { + this(file, description, null); + } + + public LocalFile(File file, String description, String mediaType) { + super(); + this.file = file; + String path = file.getAbsolutePath(); + name = path.substring(path.lastIndexOf(File.separator) + 1); + this.description = description; + this.mediaType = mediaType; + } + + @Override + public Date getDate() { + return new Date(file.lastModified()); + } + + public void setDate(Date date) { + } + + @Override + public long getSize() { + return file.length(); + } + + @Override + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public String getMediaType() { + return mediaType; + } + + @Override + public HashElement getHashElement() { + return hashElement; + } + + public void setDescription(String description) { + this.description = description; + } + + public void setMediaType(String mediaType) { + this.mediaType = mediaType; + } + + public void setHashElement(HashElement hashElement) { + this.hashElement = hashElement; + } + + public File getFile() { + return file; + } + } + + public static class RemoteFile extends JingleFileTransferFile { + + private JingleFileTransferChildElement file; + + public RemoteFile(JingleFileTransferChildElement file) { + super(); + this.file = file; + } + + @Override + public String getDescription() { + return file.getDescription(); + } + + @Override + public String getMediaType() { + return file.getMediaType(); + } + + @Override + public HashElement getHashElement() { + return file.getHash(); + } + + @Override + public Date getDate() { + return file.getDate(); + } + + @Override + public long getSize() { + return file.getSize(); + } + + @Override + public String getName() { + return file.getName(); + } + } + +} diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java index 9fd9625bc..7a4eac609 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java @@ -29,7 +29,6 @@ import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smackx.bytestreams.BytestreamSession; -import org.jivesoftware.smackx.jft.component.file.RemoteFile; import org.jivesoftware.smackx.jft.controller.IncomingFileOfferController; import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; import org.jivesoftware.smackx.jingle.component.JingleSession; @@ -40,14 +39,14 @@ import org.jivesoftware.smackx.jingle.element.JingleElement; * Behind the scenes logic of an incoming Jingle file offer. * Created by vanitas on 26.07.17. */ -public class JingleIncomingFileOffer extends AbstractJingleFileOffer implements IncomingFileOfferController { +public class JingleIncomingFileOffer extends AbstractJingleFileOffer implements IncomingFileOfferController { private static final Logger LOGGER = Logger.getLogger(JingleIncomingFileOffer.class.getName()); private File target; public JingleIncomingFileOffer(JingleFileTransferChildElement offer) { - super(new RemoteFile(offer)); + super(new JingleFileTransferFile.RemoteFile(offer)); } @Override @@ -133,7 +132,7 @@ public class JingleIncomingFileOffer extends AbstractJingleFileOffer } @Override - public RemoteFile getFile() { - return (RemoteFile) this.file; + public JingleFileTransferFile.RemoteFile getFile() { + return (JingleFileTransferFile.RemoteFile) this.file; } } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java index 9e2dd6bb7..20c9ad04b 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java @@ -17,7 +17,6 @@ package org.jivesoftware.smackx.jft.component; import org.jivesoftware.smackx.bytestreams.BytestreamSession; -import org.jivesoftware.smackx.jft.component.file.RemoteFile; import org.jivesoftware.smackx.jft.controller.IncomingFileRequestController; import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; import org.jivesoftware.smackx.jft.element.JingleFileTransferElement; @@ -28,10 +27,10 @@ import org.jivesoftware.smackx.jingle.element.JingleElement; * Created by vanitas on 27.07.17. * TODO: RemoteFile???? */ -public class JingleIncomingFileRequest extends AbstractJingleFileRequest implements IncomingFileRequestController { +public class JingleIncomingFileRequest extends AbstractJingleFileRequest implements IncomingFileRequestController { public JingleIncomingFileRequest(JingleFileTransferChildElement request) { - super(new RemoteFile(request)); + super(new JingleFileTransferFile.RemoteFile(request)); } @Override @@ -60,7 +59,7 @@ public class JingleIncomingFileRequest extends AbstractJingleFileRequest implements OutgoingFileOfferController { +public class JingleOutgoingFileOffer extends AbstractJingleFileOffer implements OutgoingFileOfferController { private static final Logger LOGGER = Logger.getLogger(JingleOutgoingFileOffer.class.getName()); public JingleOutgoingFileOffer(File file) { - super(new LocalFile(file)); + super(new JingleFileTransferFile.LocalFile(file)); } @Override @@ -47,7 +46,7 @@ public class JingleOutgoingFileOffer extends AbstractJingleFileOffer @Override public void onBytestreamReady(BytestreamSession bytestreamSession) { - File mFile = ((LocalFile) file).getFile(); + File mFile = ((JingleFileTransferFile.LocalFile) file).getFile(); OutputStream outputStream = null; InputStream inputStream = null; @@ -89,7 +88,7 @@ public class JingleOutgoingFileOffer extends AbstractJingleFileOffer } @Override - public LocalFile getFile() { - return (LocalFile) file; + public JingleFileTransferFile.LocalFile getFile() { + return (JingleFileTransferFile.LocalFile) file; } } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java index e77f0b4a7..2b3c1211d 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java @@ -17,7 +17,6 @@ package org.jivesoftware.smackx.jft.component; import org.jivesoftware.smackx.bytestreams.BytestreamSession; -import org.jivesoftware.smackx.jft.component.file.RemoteFile; import org.jivesoftware.smackx.jft.controller.OutgoingFileRequestController; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionInfoElement; import org.jivesoftware.smackx.jingle.element.JingleElement; @@ -25,15 +24,15 @@ import org.jivesoftware.smackx.jingle.element.JingleElement; /** * Created by vanitas on 27.07.17. */ -public class JingleOutgoingFileRequest extends AbstractJingleFileRequest implements OutgoingFileRequestController { +public class JingleOutgoingFileRequest extends AbstractJingleFileRequest implements OutgoingFileRequestController { - public JingleOutgoingFileRequest(RemoteFile file) { + public JingleOutgoingFileRequest(JingleFileTransferFile.RemoteFile file) { super(file); } @Override - public RemoteFile getFile() { - return (RemoteFile) file; + public JingleFileTransferFile.RemoteFile getFile() { + return (JingleFileTransferFile.RemoteFile) file; } @Override diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/AbstractJingleFileTransferFile.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/AbstractJingleFileTransferFile.java deleted file mode 100644 index 82f113904..000000000 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/AbstractJingleFileTransferFile.java +++ /dev/null @@ -1,56 +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.jft.component.file; - -import java.util.Date; - -import org.jivesoftware.smackx.hashes.element.HashElement; -import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; - -/** - * Created by vanitas on 26.07.17. - */ -public abstract class AbstractJingleFileTransferFile { - - public AbstractJingleFileTransferFile() { - - } - - public JingleFileTransferChildElement getElement() { - JingleFileTransferChildElement.Builder builder = JingleFileTransferChildElement.getBuilder(); - builder.setDate(getDate()); - builder.setSize(getSize()); - builder.setName(getName()); - builder.setDescription(getDescription()); - builder.setMediaType(getMediaType()); - builder.setHash(getHashElement()); - - return builder.build(); - } - - public abstract Date getDate(); - - public abstract long getSize(); - - public abstract String getName(); - - public abstract String getDescription(); - - public abstract String getMediaType(); - - public abstract HashElement getHashElement(); -} diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/LocalFile.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/LocalFile.java deleted file mode 100644 index b01abee66..000000000 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/LocalFile.java +++ /dev/null @@ -1,104 +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.jft.component.file; - -import java.io.File; -import java.util.Date; - -import org.jivesoftware.smackx.hashes.element.HashElement; - -/** - * Created by vanitas on 26.07.17. - */ -public class LocalFile extends AbstractJingleFileTransferFile { - - private File file; - private String name; - private String description; - private String mediaType; - private HashElement hashElement; - - public LocalFile(File file) { - this(file, null, null); - } - - public LocalFile(File file, String description) { - this(file, description, null); - } - - public LocalFile(File file, String description, String mediaType) { - super(); - this.file = file; - String path = file.getAbsolutePath(); - name = path.substring(path.lastIndexOf(File.separator) + 1); - this.description = description; - this.mediaType = mediaType; - } - - @Override - public Date getDate() { - return new Date(file.lastModified()); - } - - public void setDate(Date date) { - } - - @Override - public long getSize() { - return file.length(); - } - - @Override - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public String getDescription() { - return description; - } - - @Override - public String getMediaType() { - return mediaType; - } - - @Override - public HashElement getHashElement() { - return hashElement; - } - - public void setDescription(String description) { - this.description = description; - } - - public void setMediaType(String mediaType) { - this.mediaType = mediaType; - } - - public void setHashElement(HashElement hashElement) { - this.hashElement = hashElement; - } - - public File getFile() { - return file; - } -} diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/RemoteFile.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/RemoteFile.java deleted file mode 100644 index 3fcc3f289..000000000 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/RemoteFile.java +++ /dev/null @@ -1,65 +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.jft.component.file; - -import java.util.Date; - -import org.jivesoftware.smackx.hashes.element.HashElement; -import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; - -/** - * Created by vanitas on 26.07.17. - */ -public class RemoteFile extends AbstractJingleFileTransferFile { - - private JingleFileTransferChildElement file; - - public RemoteFile(JingleFileTransferChildElement file) { - super(); - this.file = file; - } - - @Override - public String getDescription() { - return file.getDescription(); - } - - @Override - public String getMediaType() { - return file.getMediaType(); - } - - @Override - public HashElement getHashElement() { - return file.getHash(); - } - - @Override - public Date getDate() { - return file.getDate(); - } - - @Override - public long getSize() { - return file.getSize(); - } - - @Override - public String getName() { - return file.getName(); - } -} diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/package-info.java deleted file mode 100644 index 3ec853410..000000000 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/package-info.java +++ /dev/null @@ -1,22 +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. - */ - -/** - * Smack's API for XEP-0234: Jingle File Transfer. - * Classes that may represent files. - */ -package org.jivesoftware.smackx.jft.component.file; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/JingleFileTransferController.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/JingleFileTransferController.java index 9c53049fd..77adaea94 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/JingleFileTransferController.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/JingleFileTransferController.java @@ -16,12 +16,12 @@ */ package org.jivesoftware.smackx.jft.controller; -import org.jivesoftware.smackx.jft.component.file.AbstractJingleFileTransferFile; +import org.jivesoftware.smackx.jft.component.JingleFileTransferFile; import org.jivesoftware.smackx.jft.listener.ProgressListener; import org.jivesoftware.smackx.jingle.JingleDescriptionController; /** - * Created by vanitas on 27.07.17. + * User interface for Jingle file transfers. */ public interface JingleFileTransferController extends JingleDescriptionController { @@ -29,5 +29,5 @@ public interface JingleFileTransferController extends JingleDescriptionControlle void removeProgressListener(ProgressListener listener); - AbstractJingleFileTransferFile getFile(); + JingleFileTransferFile getFile(); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleTransport.java index b22490942..914327581 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleTransport.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleTransport.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.jivesoftware.smack.SmackException; -import org.jivesoftware.smack.SmackFuture; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smackx.bytestreams.BytestreamSession; @@ -32,7 +31,7 @@ import org.jivesoftware.smackx.jingle.element.JingleElement; /** * Class that represents a contents transport component. */ -public abstract class JingleTransport extends SmackFuture { +public abstract class JingleTransport { private JingleContent parent; private final ArrayList> ourCandidates = new ArrayList<>(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransport.java index 62032841b..9403f75ec 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransport.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransport.java @@ -23,7 +23,6 @@ import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smackx.bytestreams.BytestreamSession; import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamListener; @@ -148,14 +147,4 @@ public class JingleIBBTransport extends JingleTransport