Moved plugin API from transport package to plugins package and merged

transport subpackages.

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;
 
 /**

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,

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;
 
 /**

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,

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;

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;

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;

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;

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 {
 

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;

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 {
 

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;

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 {
 

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 {
 

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 {

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 {
 

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

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 {
 

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 {
 

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

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

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;
 

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;