From 4059fbf863fc096b2cf295bfe3b51a800dce421b Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Mon, 10 Oct 2011 16:18:48 +0100
Subject: [PATCH] Moved plugin API from transport package to plugins package
and merged transport subpackages.
---
.../batch => plugins}/BatchTransportCallback.java | 4 +++-
.../batch => plugins}/BatchTransportPlugin.java | 5 +++--
.../stream => plugins}/StreamTransportCallback.java | 3 ++-
.../stream => plugins}/StreamTransportPlugin.java | 4 ++--
.../briar/api/{transport => plugins}/TransportPlugin.java | 2 +-
.../api/transport/{batch => }/BatchTransportReader.java | 2 +-
.../api/transport/{batch => }/BatchTransportWriter.java | 2 +-
.../transport/{stream => }/StreamTransportConnection.java | 2 +-
components/net/sf/briar/plugins/AbstractPlugin.java | 2 +-
.../net/sf/briar/plugins/bluetooth/BluetoothPlugin.java | 6 +++---
.../plugins/bluetooth/BluetoothTransportConnection.java | 2 +-
components/net/sf/briar/plugins/file/FilePlugin.java | 8 ++++----
.../net/sf/briar/plugins/file/FileTransportReader.java | 2 +-
.../net/sf/briar/plugins/file/FileTransportWriter.java | 2 +-
.../net/sf/briar/plugins/file/RemovableDrivePlugin.java | 2 +-
.../net/sf/briar/plugins/socket/SimpleSocketPlugin.java | 2 +-
components/net/sf/briar/plugins/socket/SocketPlugin.java | 6 +++---
.../briar/plugins/socket/SocketTransportConnection.java | 2 +-
test/net/sf/briar/plugins/StubStreamCallback.java | 4 ++--
.../sf/briar/plugins/bluetooth/BluetoothClientTest.java | 4 ++--
.../sf/briar/plugins/bluetooth/BluetoothServerTest.java | 4 ++--
.../sf/briar/plugins/file/RemovableDrivePluginTest.java | 4 ++--
.../sf/briar/plugins/socket/SimpleSocketPluginTest.java | 2 +-
23 files changed, 40 insertions(+), 36 deletions(-)
rename api/net/sf/briar/api/{transport/batch => plugins}/BatchTransportCallback.java (72%)
rename api/net/sf/briar/api/{transport/batch => plugins}/BatchTransportPlugin.java (83%)
rename api/net/sf/briar/api/{transport/stream => plugins}/StreamTransportCallback.java (81%)
rename api/net/sf/briar/api/{transport/stream => plugins}/StreamTransportPlugin.java (83%)
rename api/net/sf/briar/api/{transport => plugins}/TransportPlugin.java (97%)
rename api/net/sf/briar/api/transport/{batch => }/BatchTransportReader.java (93%)
rename api/net/sf/briar/api/transport/{batch => }/BatchTransportWriter.java (93%)
rename api/net/sf/briar/api/transport/{stream => }/StreamTransportConnection.java (94%)
diff --git a/api/net/sf/briar/api/transport/batch/BatchTransportCallback.java b/api/net/sf/briar/api/plugins/BatchTransportCallback.java
similarity index 72%
rename from api/net/sf/briar/api/transport/batch/BatchTransportCallback.java
rename to api/net/sf/briar/api/plugins/BatchTransportCallback.java
index 7f335c6068..5c65d16cf3 100644
--- a/api/net/sf/briar/api/transport/batch/BatchTransportCallback.java
+++ b/api/net/sf/briar/api/plugins/BatchTransportCallback.java
@@ -1,6 +1,8 @@
-package net.sf.briar.api.transport.batch;
+package net.sf.briar.api.plugins;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.transport.BatchTransportReader;
+import net.sf.briar.api.transport.BatchTransportWriter;
import net.sf.briar.api.transport.TransportCallback;
/**
diff --git a/api/net/sf/briar/api/transport/batch/BatchTransportPlugin.java b/api/net/sf/briar/api/plugins/BatchTransportPlugin.java
similarity index 83%
rename from api/net/sf/briar/api/transport/batch/BatchTransportPlugin.java
rename to api/net/sf/briar/api/plugins/BatchTransportPlugin.java
index 5f670367ee..51348c9633 100644
--- a/api/net/sf/briar/api/transport/batch/BatchTransportPlugin.java
+++ b/api/net/sf/briar/api/plugins/BatchTransportPlugin.java
@@ -1,7 +1,8 @@
-package net.sf.briar.api.transport.batch;
+package net.sf.briar.api.plugins;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.transport.TransportPlugin;
+import net.sf.briar.api.transport.BatchTransportReader;
+import net.sf.briar.api.transport.BatchTransportWriter;
/**
* An interface for transport plugins that do not support bidirectional,
diff --git a/api/net/sf/briar/api/transport/stream/StreamTransportCallback.java b/api/net/sf/briar/api/plugins/StreamTransportCallback.java
similarity index 81%
rename from api/net/sf/briar/api/transport/stream/StreamTransportCallback.java
rename to api/net/sf/briar/api/plugins/StreamTransportCallback.java
index 2e41f18f13..eb468ee451 100644
--- a/api/net/sf/briar/api/transport/stream/StreamTransportCallback.java
+++ b/api/net/sf/briar/api/plugins/StreamTransportCallback.java
@@ -1,6 +1,7 @@
-package net.sf.briar.api.transport.stream;
+package net.sf.briar.api.plugins;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.transport.StreamTransportConnection;
import net.sf.briar.api.transport.TransportCallback;
/**
diff --git a/api/net/sf/briar/api/transport/stream/StreamTransportPlugin.java b/api/net/sf/briar/api/plugins/StreamTransportPlugin.java
similarity index 83%
rename from api/net/sf/briar/api/transport/stream/StreamTransportPlugin.java
rename to api/net/sf/briar/api/plugins/StreamTransportPlugin.java
index cfe79f1237..5b1a6a7c8c 100644
--- a/api/net/sf/briar/api/transport/stream/StreamTransportPlugin.java
+++ b/api/net/sf/briar/api/plugins/StreamTransportPlugin.java
@@ -1,7 +1,7 @@
-package net.sf.briar.api.transport.stream;
+package net.sf.briar.api.plugins;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.transport.TransportPlugin;
+import net.sf.briar.api.transport.StreamTransportConnection;
/**
* An interface for transport plugins that support bidirectional, reliable,
diff --git a/api/net/sf/briar/api/transport/TransportPlugin.java b/api/net/sf/briar/api/plugins/TransportPlugin.java
similarity index 97%
rename from api/net/sf/briar/api/transport/TransportPlugin.java
rename to api/net/sf/briar/api/plugins/TransportPlugin.java
index 3f3985fe34..ebc9be2cd2 100644
--- a/api/net/sf/briar/api/transport/TransportPlugin.java
+++ b/api/net/sf/briar/api/plugins/TransportPlugin.java
@@ -1,4 +1,4 @@
-package net.sf.briar.api.transport;
+package net.sf.briar.api.plugins;
import java.io.IOException;
import java.util.Map;
diff --git a/api/net/sf/briar/api/transport/batch/BatchTransportReader.java b/api/net/sf/briar/api/transport/BatchTransportReader.java
similarity index 93%
rename from api/net/sf/briar/api/transport/batch/BatchTransportReader.java
rename to api/net/sf/briar/api/transport/BatchTransportReader.java
index e0e05dc501..f47d096e56 100644
--- a/api/net/sf/briar/api/transport/batch/BatchTransportReader.java
+++ b/api/net/sf/briar/api/transport/BatchTransportReader.java
@@ -1,4 +1,4 @@
-package net.sf.briar.api.transport.batch;
+package net.sf.briar.api.transport;
import java.io.IOException;
import java.io.InputStream;
diff --git a/api/net/sf/briar/api/transport/batch/BatchTransportWriter.java b/api/net/sf/briar/api/transport/BatchTransportWriter.java
similarity index 93%
rename from api/net/sf/briar/api/transport/batch/BatchTransportWriter.java
rename to api/net/sf/briar/api/transport/BatchTransportWriter.java
index 510d66a524..344efa3107 100644
--- a/api/net/sf/briar/api/transport/batch/BatchTransportWriter.java
+++ b/api/net/sf/briar/api/transport/BatchTransportWriter.java
@@ -1,4 +1,4 @@
-package net.sf.briar.api.transport.batch;
+package net.sf.briar.api.transport;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/api/net/sf/briar/api/transport/stream/StreamTransportConnection.java b/api/net/sf/briar/api/transport/StreamTransportConnection.java
similarity index 94%
rename from api/net/sf/briar/api/transport/stream/StreamTransportConnection.java
rename to api/net/sf/briar/api/transport/StreamTransportConnection.java
index 71ffa8da87..5e65b76e19 100644
--- a/api/net/sf/briar/api/transport/stream/StreamTransportConnection.java
+++ b/api/net/sf/briar/api/transport/StreamTransportConnection.java
@@ -1,4 +1,4 @@
-package net.sf.briar.api.transport.stream;
+package net.sf.briar.api.transport;
import java.io.IOException;
import java.io.InputStream;
diff --git a/components/net/sf/briar/plugins/AbstractPlugin.java b/components/net/sf/briar/plugins/AbstractPlugin.java
index a694beb698..1408e57d2a 100644
--- a/components/net/sf/briar/plugins/AbstractPlugin.java
+++ b/components/net/sf/briar/plugins/AbstractPlugin.java
@@ -8,7 +8,7 @@ import java.util.Map.Entry;
import java.util.concurrent.Executor;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.transport.TransportPlugin;
+import net.sf.briar.api.plugins.TransportPlugin;
public abstract class AbstractPlugin implements TransportPlugin {
diff --git a/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java b/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
index 2088ed99f0..25ce8321d9 100644
--- a/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
+++ b/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
@@ -21,9 +21,9 @@ import javax.microedition.io.StreamConnectionNotifier;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
-import net.sf.briar.api.transport.stream.StreamTransportCallback;
-import net.sf.briar.api.transport.stream.StreamTransportConnection;
-import net.sf.briar.api.transport.stream.StreamTransportPlugin;
+import net.sf.briar.api.plugins.StreamTransportCallback;
+import net.sf.briar.api.plugins.StreamTransportPlugin;
+import net.sf.briar.api.transport.StreamTransportConnection;
import net.sf.briar.plugins.AbstractPlugin;
import net.sf.briar.util.OsUtils;
import net.sf.briar.util.StringUtils;
diff --git a/components/net/sf/briar/plugins/bluetooth/BluetoothTransportConnection.java b/components/net/sf/briar/plugins/bluetooth/BluetoothTransportConnection.java
index dc2f666dcf..87c8542455 100644
--- a/components/net/sf/briar/plugins/bluetooth/BluetoothTransportConnection.java
+++ b/components/net/sf/briar/plugins/bluetooth/BluetoothTransportConnection.java
@@ -6,7 +6,7 @@ import java.io.OutputStream;
import javax.microedition.io.StreamConnection;
-import net.sf.briar.api.transport.stream.StreamTransportConnection;
+import net.sf.briar.api.transport.StreamTransportConnection;
class BluetoothTransportConnection implements StreamTransportConnection {
diff --git a/components/net/sf/briar/plugins/file/FilePlugin.java b/components/net/sf/briar/plugins/file/FilePlugin.java
index 3e35a60658..c6ddef1f35 100644
--- a/components/net/sf/briar/plugins/file/FilePlugin.java
+++ b/components/net/sf/briar/plugins/file/FilePlugin.java
@@ -10,11 +10,11 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.plugins.BatchTransportCallback;
+import net.sf.briar.api.plugins.BatchTransportPlugin;
+import net.sf.briar.api.transport.BatchTransportReader;
+import net.sf.briar.api.transport.BatchTransportWriter;
import net.sf.briar.api.transport.TransportConstants;
-import net.sf.briar.api.transport.batch.BatchTransportCallback;
-import net.sf.briar.api.transport.batch.BatchTransportPlugin;
-import net.sf.briar.api.transport.batch.BatchTransportReader;
-import net.sf.briar.api.transport.batch.BatchTransportWriter;
import net.sf.briar.plugins.AbstractPlugin;
import org.apache.commons.io.FileSystemUtils;
diff --git a/components/net/sf/briar/plugins/file/FileTransportReader.java b/components/net/sf/briar/plugins/file/FileTransportReader.java
index a5fafef358..7ab0758392 100644
--- a/components/net/sf/briar/plugins/file/FileTransportReader.java
+++ b/components/net/sf/briar/plugins/file/FileTransportReader.java
@@ -4,7 +4,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import net.sf.briar.api.transport.batch.BatchTransportReader;
+import net.sf.briar.api.transport.BatchTransportReader;
class FileTransportReader implements BatchTransportReader {
diff --git a/components/net/sf/briar/plugins/file/FileTransportWriter.java b/components/net/sf/briar/plugins/file/FileTransportWriter.java
index 19bf88a1ce..ff5a90d5a2 100644
--- a/components/net/sf/briar/plugins/file/FileTransportWriter.java
+++ b/components/net/sf/briar/plugins/file/FileTransportWriter.java
@@ -4,7 +4,7 @@ import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
-import net.sf.briar.api.transport.batch.BatchTransportWriter;
+import net.sf.briar.api.transport.BatchTransportWriter;
class FileTransportWriter implements BatchTransportWriter {
diff --git a/components/net/sf/briar/plugins/file/RemovableDrivePlugin.java b/components/net/sf/briar/plugins/file/RemovableDrivePlugin.java
index 9abec74708..70e9078302 100644
--- a/components/net/sf/briar/plugins/file/RemovableDrivePlugin.java
+++ b/components/net/sf/briar/plugins/file/RemovableDrivePlugin.java
@@ -10,7 +10,7 @@ import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
-import net.sf.briar.api.transport.batch.BatchTransportCallback;
+import net.sf.briar.api.plugins.BatchTransportCallback;
class RemovableDrivePlugin extends FilePlugin
implements RemovableDriveMonitor.Callback {
diff --git a/components/net/sf/briar/plugins/socket/SimpleSocketPlugin.java b/components/net/sf/briar/plugins/socket/SimpleSocketPlugin.java
index ac0c3691ac..f94317195a 100644
--- a/components/net/sf/briar/plugins/socket/SimpleSocketPlugin.java
+++ b/components/net/sf/briar/plugins/socket/SimpleSocketPlugin.java
@@ -11,7 +11,7 @@ import java.util.concurrent.Executor;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
-import net.sf.briar.api.transport.stream.StreamTransportCallback;
+import net.sf.briar.api.plugins.StreamTransportCallback;
class SimpleSocketPlugin extends SocketPlugin {
diff --git a/components/net/sf/briar/plugins/socket/SocketPlugin.java b/components/net/sf/briar/plugins/socket/SocketPlugin.java
index bbb6524248..a333bf3bb2 100644
--- a/components/net/sf/briar/plugins/socket/SocketPlugin.java
+++ b/components/net/sf/briar/plugins/socket/SocketPlugin.java
@@ -10,9 +10,9 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.transport.stream.StreamTransportCallback;
-import net.sf.briar.api.transport.stream.StreamTransportConnection;
-import net.sf.briar.api.transport.stream.StreamTransportPlugin;
+import net.sf.briar.api.plugins.StreamTransportCallback;
+import net.sf.briar.api.plugins.StreamTransportPlugin;
+import net.sf.briar.api.transport.StreamTransportConnection;
import net.sf.briar.plugins.AbstractPlugin;
abstract class SocketPlugin extends AbstractPlugin
diff --git a/components/net/sf/briar/plugins/socket/SocketTransportConnection.java b/components/net/sf/briar/plugins/socket/SocketTransportConnection.java
index bfc68198f4..f5b1782979 100644
--- a/components/net/sf/briar/plugins/socket/SocketTransportConnection.java
+++ b/components/net/sf/briar/plugins/socket/SocketTransportConnection.java
@@ -5,7 +5,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
-import net.sf.briar.api.transport.stream.StreamTransportConnection;
+import net.sf.briar.api.transport.StreamTransportConnection;
class SocketTransportConnection implements StreamTransportConnection {
diff --git a/test/net/sf/briar/plugins/StubStreamCallback.java b/test/net/sf/briar/plugins/StubStreamCallback.java
index d39b32cd45..765ac73fc6 100644
--- a/test/net/sf/briar/plugins/StubStreamCallback.java
+++ b/test/net/sf/briar/plugins/StubStreamCallback.java
@@ -3,8 +3,8 @@ package net.sf.briar.plugins;
import java.util.Map;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.transport.stream.StreamTransportCallback;
-import net.sf.briar.api.transport.stream.StreamTransportConnection;
+import net.sf.briar.api.plugins.StreamTransportCallback;
+import net.sf.briar.api.transport.StreamTransportConnection;
public class StubStreamCallback implements StreamTransportCallback {
diff --git a/test/net/sf/briar/plugins/bluetooth/BluetoothClientTest.java b/test/net/sf/briar/plugins/bluetooth/BluetoothClientTest.java
index 2fc2bfab49..7840aa34f6 100644
--- a/test/net/sf/briar/plugins/bluetooth/BluetoothClientTest.java
+++ b/test/net/sf/briar/plugins/bluetooth/BluetoothClientTest.java
@@ -8,8 +8,8 @@ import java.util.Scanner;
import java.util.TreeMap;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.transport.stream.StreamTransportCallback;
-import net.sf.briar.api.transport.stream.StreamTransportConnection;
+import net.sf.briar.api.plugins.StreamTransportCallback;
+import net.sf.briar.api.transport.StreamTransportConnection;
import net.sf.briar.plugins.ImmediateExecutor;
// This is not a JUnit test - it has to be run manually while the server test
diff --git a/test/net/sf/briar/plugins/bluetooth/BluetoothServerTest.java b/test/net/sf/briar/plugins/bluetooth/BluetoothServerTest.java
index 0ab8e5ecb9..17bf3d94a2 100644
--- a/test/net/sf/briar/plugins/bluetooth/BluetoothServerTest.java
+++ b/test/net/sf/briar/plugins/bluetooth/BluetoothServerTest.java
@@ -8,8 +8,8 @@ import java.util.Scanner;
import java.util.TreeMap;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.transport.stream.StreamTransportCallback;
-import net.sf.briar.api.transport.stream.StreamTransportConnection;
+import net.sf.briar.api.plugins.StreamTransportCallback;
+import net.sf.briar.api.transport.StreamTransportConnection;
import net.sf.briar.plugins.ImmediateExecutor;
//This is not a JUnit test - it has to be run manually while the server test
diff --git a/test/net/sf/briar/plugins/file/RemovableDrivePluginTest.java b/test/net/sf/briar/plugins/file/RemovableDrivePluginTest.java
index 08b2b19e7c..691c924123 100644
--- a/test/net/sf/briar/plugins/file/RemovableDrivePluginTest.java
+++ b/test/net/sf/briar/plugins/file/RemovableDrivePluginTest.java
@@ -14,9 +14,9 @@ import java.util.concurrent.Executor;
import junit.framework.TestCase;
import net.sf.briar.TestUtils;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.plugins.BatchTransportCallback;
+import net.sf.briar.api.transport.BatchTransportWriter;
import net.sf.briar.api.transport.TransportConstants;
-import net.sf.briar.api.transport.batch.BatchTransportCallback;
-import net.sf.briar.api.transport.batch.BatchTransportWriter;
import net.sf.briar.plugins.ImmediateExecutor;
import net.sf.briar.plugins.file.RemovableDriveMonitor.Callback;
diff --git a/test/net/sf/briar/plugins/socket/SimpleSocketPluginTest.java b/test/net/sf/briar/plugins/socket/SimpleSocketPluginTest.java
index 14ddaf666f..702d4ea554 100644
--- a/test/net/sf/briar/plugins/socket/SimpleSocketPluginTest.java
+++ b/test/net/sf/briar/plugins/socket/SimpleSocketPluginTest.java
@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import junit.framework.TestCase;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.transport.stream.StreamTransportConnection;
+import net.sf.briar.api.transport.StreamTransportConnection;
import net.sf.briar.plugins.ImmediateExecutor;
import net.sf.briar.plugins.StubStreamCallback;
--
GitLab