diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java index 61d35b5e1..f2ee51884 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java @@ -29,8 +29,8 @@ import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.jet.component.JetSecurity; import org.jivesoftware.smackx.jet.provider.JetSecurityProvider; import org.jivesoftware.smackx.jft.JingleFileTransferManager; -import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController; import org.jivesoftware.smackx.jft.component.JingleOutgoingFileOffer; +import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController; import org.jivesoftware.smackx.jingle.JingleDescriptionManager; import org.jivesoftware.smackx.jingle.JingleManager; import org.jivesoftware.smackx.jingle.JingleTransportManager; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetSecurityAdapter.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetSecurityAdapter.java index 6292555ba..32e9831da 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetSecurityAdapter.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetSecurityAdapter.java @@ -16,8 +16,8 @@ */ package org.jivesoftware.smackx.jet; -import org.jivesoftware.smackx.jet.element.JetSecurityElement; import org.jivesoftware.smackx.jet.component.JetSecurity; +import org.jivesoftware.smackx.jet.element.JetSecurityElement; import org.jivesoftware.smackx.jingle.adapter.JingleSecurityAdapter; import org.jivesoftware.smackx.jingle.element.JingleContentSecurityElement; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/OutgoingJetOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/OutgoingJetOffer.java deleted file mode 100644 index 7fb2bf10c..000000000 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/OutgoingJetOffer.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.jet; - -import java.io.File; - -import org.jivesoftware.smackx.jft.component.JingleOutgoingFileOffer; - -/** - * Created by vanitas on 14.07.17. - */ -public class OutgoingJetOffer extends JingleOutgoingFileOffer { - - public OutgoingJetOffer(File file) { - super(file); - } -} diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/provider/JetSecurityProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/provider/JetSecurityProvider.java index 2b8e618c8..cd6fa5ece 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/provider/JetSecurityProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/provider/JetSecurityProvider.java @@ -23,8 +23,8 @@ import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smackx.jet.JetManager; -import org.jivesoftware.smackx.jet.element.JetSecurityElement; import org.jivesoftware.smackx.jet.component.JetSecurity; +import org.jivesoftware.smackx.jet.element.JetSecurityElement; import org.jivesoftware.smackx.jingle.provider.JingleContentSecurityProvider; import org.xmlpull.v1.XmlPullParser; 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 2f5d9952a..eafbd5d33 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 @@ -30,14 +30,14 @@ import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.jft.adapter.JingleFileTransferAdapter; -import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController; -import org.jivesoftware.smackx.jft.controller.OutgoingFileRequestController; import org.jivesoftware.smackx.jft.component.JingleFileTransfer; 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; import org.jivesoftware.smackx.jft.listener.IncomingFileRequestListener; import org.jivesoftware.smackx.jft.provider.JingleFileTransferProvider; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/JingleFileTransferAdapter.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/JingleFileTransferAdapter.java index d56b1b461..307a4d9d2 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/JingleFileTransferAdapter.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/JingleFileTransferAdapter.java @@ -18,11 +18,11 @@ package org.jivesoftware.smackx.jft.adapter; import java.util.List; -import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; -import org.jivesoftware.smackx.jft.element.JingleFileTransferElement; import org.jivesoftware.smackx.jft.component.JingleFileTransfer; import org.jivesoftware.smackx.jft.component.JingleIncomingFileOffer; import org.jivesoftware.smackx.jft.component.JingleIncomingFileRequest; +import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; +import org.jivesoftware.smackx.jft.element.JingleFileTransferElement; import org.jivesoftware.smackx.jingle.adapter.JingleDescriptionAdapter; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement; 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 59a70394e..43d412f61 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,9 +20,9 @@ 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.component.file.AbstractJingleFileTransferFile; import org.jivesoftware.smackx.jft.listener.ProgressListener; import org.jivesoftware.smackx.jingle.component.JingleDescription; 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 c10da5a63..3b5c3959c 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,9 +29,9 @@ 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.jft.component.file.RemoteFile; import org.jivesoftware.smackx.jingle.component.JingleSession; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionInfoElement; import org.jivesoftware.smackx.jingle.element.JingleElement; 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 968db9949..c07d633b6 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,10 +17,10 @@ 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; -import org.jivesoftware.smackx.jft.component.file.RemoteFile; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionInfoElement; import org.jivesoftware.smackx.jingle.element.JingleElement; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java index 22c48adfc..a9af3da99 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java @@ -25,8 +25,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.jivesoftware.smackx.bytestreams.BytestreamSession; -import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController; import org.jivesoftware.smackx.jft.component.file.LocalFile; +import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionInfoElement; import org.jivesoftware.smackx.jingle.element.JingleElement; 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 29caf6f44..e930e4a25 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,8 +17,8 @@ package org.jivesoftware.smackx.jft.component; import org.jivesoftware.smackx.bytestreams.BytestreamSession; -import org.jivesoftware.smackx.jft.controller.OutgoingFileRequestController; 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; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java index 4e783f6fd..85430c414 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java @@ -24,10 +24,10 @@ import java.util.ArrayList; import org.jivesoftware.smack.util.ParserUtils; import org.jivesoftware.smackx.hashes.element.HashElement; import org.jivesoftware.smackx.hashes.provider.HashElementProvider; +import org.jivesoftware.smackx.jft.component.JingleFileTransfer; import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; import org.jivesoftware.smackx.jft.element.JingleFileTransferElement; import org.jivesoftware.smackx.jft.element.Range; -import org.jivesoftware.smackx.jft.component.JingleFileTransfer; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement; import org.jivesoftware.smackx.jingle.provider.JingleContentDescriptionProvider; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/component/JingleContentTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/component/JingleContentTest.java index 580eb947c..f14d3747f 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/component/JingleContentTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/component/JingleContentTest.java @@ -1,3 +1,19 @@ +/** + * + * 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.component; import static junit.framework.TestCase.assertEquals; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/component/JingleSessionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/component/JingleSessionTest.java index b88d4fe86..e14b7bfb8 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/component/JingleSessionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/component/JingleSessionTest.java @@ -1,3 +1,19 @@ +/** + * + * 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.component; import static junit.framework.TestCase.assertEquals;