Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 20:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Moved plugin API from transport package to plugins package and merged

Browse Source 
transport subpackages.
This commit is contained in:
akwizgran
2011-10-10 16:18:48 +01:00
parent 125ae1b640
commit 4059fbf863
23 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/net/sf/briar/api/transport/batch/BatchTransportCallback.java → api/net/sf/briar/api/plugins/BatchTransportCallback.java
View File

@@ -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.ContactId;
import net.sf.briar.api.transport.BatchTransportReader;
import net.sf.briar.api.transport.BatchTransportWriter;
import net.sf.briar.api.transport.TransportCallback; import net.sf.briar.api.transport.TransportCallback;
/** /**

5
api/net/sf/briar/api/transport/batch/BatchTransportPlugin.java → api/net/sf/briar/api/plugins/BatchTransportPlugin.java
View File

@@ -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.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, * An interface for transport plugins that do not support bidirectional,

3
api/net/sf/briar/api/transport/stream/StreamTransportCallback.java → api/net/sf/briar/api/plugins/StreamTransportCallback.java
View File

@@ -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.ContactId;
import net.sf.briar.api.transport.StreamTransportConnection;
import net.sf.briar.api.transport.TransportCallback; import net.sf.briar.api.transport.TransportCallback;
/** /**

4
api/net/sf/briar/api/transport/stream/StreamTransportPlugin.java → api/net/sf/briar/api/plugins/StreamTransportPlugin.java
View File

@@ -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.ContactId;
import net.sf.briar.api.transport.TransportPlugin; import net.sf.briar.api.transport.StreamTransportConnection;
/** /**
* An interface for transport plugins that support bidirectional, reliable, * An interface for transport plugins that support bidirectional, reliable,

2
api/net/sf/briar/api/transport/TransportPlugin.java → api/net/sf/briar/api/plugins/TransportPlugin.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.transport; package net.sf.briar.api.plugins;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

2
api/net/sf/briar/api/transport/batch/BatchTransportReader.java → api/net/sf/briar/api/transport/BatchTransportReader.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.transport.batch; package net.sf.briar.api.transport;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

2
api/net/sf/briar/api/transport/batch/BatchTransportWriter.java → api/net/sf/briar/api/transport/BatchTransportWriter.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.transport.batch; package net.sf.briar.api.transport;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;

2
api/net/sf/briar/api/transport/stream/StreamTransportConnection.java → api/net/sf/briar/api/transport/StreamTransportConnection.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.transport.stream; package net.sf.briar.api.transport;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

2
components/net/sf/briar/plugins/AbstractPlugin.java
View File

@@ -8,7 +8,7 @@ import java.util.Map.Entry;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import net.sf.briar.api.ContactId; 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 { public abstract class AbstractPlugin implements TransportPlugin {

6
components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
View File

@@ -21,9 +21,9 @@ import javax.microedition.io.StreamConnectionNotifier;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId; import net.sf.briar.api.TransportId;
import net.sf.briar.api.transport.stream.StreamTransportCallback; import net.sf.briar.api.plugins.StreamTransportCallback;
import net.sf.briar.api.transport.stream.StreamTransportConnection; import net.sf.briar.api.plugins.StreamTransportPlugin;
import net.sf.briar.api.transport.stream.StreamTransportPlugin; import net.sf.briar.api.transport.StreamTransportConnection;
import net.sf.briar.plugins.AbstractPlugin; import net.sf.briar.plugins.AbstractPlugin;
import net.sf.briar.util.OsUtils; import net.sf.briar.util.OsUtils;
import net.sf.briar.util.StringUtils; import net.sf.briar.util.StringUtils;

2
components/net/sf/briar/plugins/bluetooth/BluetoothTransportConnection.java
View File

@@ -6,7 +6,7 @@ import java.io.OutputStream;
import javax.microedition.io.StreamConnection; import javax.microedition.io.StreamConnection;
import net.sf.briar.api.transport.stream.StreamTransportConnection; import net.sf.briar.api.transport.StreamTransportConnection;
class BluetoothTransportConnection implements StreamTransportConnection { class BluetoothTransportConnection implements StreamTransportConnection {

8
components/net/sf/briar/plugins/file/FilePlugin.java
View File

@@ -10,11 +10,11 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.sf.briar.api.ContactId; 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.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 net.sf.briar.plugins.AbstractPlugin;
import org.apache.commons.io.FileSystemUtils; import org.apache.commons.io.FileSystemUtils;

2
components/net/sf/briar/plugins/file/FileTransportReader.java
View File

@@ -4,7 +4,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import net.sf.briar.api.transport.batch.BatchTransportReader; import net.sf.briar.api.transport.BatchTransportReader;
class FileTransportReader implements BatchTransportReader { class FileTransportReader implements BatchTransportReader {

2
components/net/sf/briar/plugins/file/FileTransportWriter.java
View File

@@ -4,7 +4,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import net.sf.briar.api.transport.batch.BatchTransportWriter; import net.sf.briar.api.transport.BatchTransportWriter;
class FileTransportWriter implements BatchTransportWriter { class FileTransportWriter implements BatchTransportWriter {

2
components/net/sf/briar/plugins/file/RemovableDrivePlugin.java
View File

@@ -10,7 +10,7 @@ import java.util.logging.Logger;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId; 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 class RemovableDrivePlugin extends FilePlugin
implements RemovableDriveMonitor.Callback { implements RemovableDriveMonitor.Callback {

2
components/net/sf/briar/plugins/socket/SimpleSocketPlugin.java
View File

@@ -11,7 +11,7 @@ import java.util.concurrent.Executor;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId; 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 { class SimpleSocketPlugin extends SocketPlugin {

6
components/net/sf/briar/plugins/socket/SocketPlugin.java
View File

@@ -10,9 +10,9 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.transport.stream.StreamTransportCallback; import net.sf.briar.api.plugins.StreamTransportCallback;
import net.sf.briar.api.transport.stream.StreamTransportConnection; import net.sf.briar.api.plugins.StreamTransportPlugin;
import net.sf.briar.api.transport.stream.StreamTransportPlugin; import net.sf.briar.api.transport.StreamTransportConnection;
import net.sf.briar.plugins.AbstractPlugin; import net.sf.briar.plugins.AbstractPlugin;
abstract class SocketPlugin extends AbstractPlugin abstract class SocketPlugin extends AbstractPlugin

2
components/net/sf/briar/plugins/socket/SocketTransportConnection.java
View File

@@ -5,7 +5,7 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.Socket; import java.net.Socket;
import net.sf.briar.api.transport.stream.StreamTransportConnection; import net.sf.briar.api.transport.StreamTransportConnection;
class SocketTransportConnection implements StreamTransportConnection { class SocketTransportConnection implements StreamTransportConnection {

4
test/net/sf/briar/plugins/StubStreamCallback.java
View File

@@ -3,8 +3,8 @@ package net.sf.briar.plugins;
import java.util.Map; import java.util.Map;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.transport.stream.StreamTransportCallback; import net.sf.briar.api.plugins.StreamTransportCallback;
import net.sf.briar.api.transport.stream.StreamTransportConnection; import net.sf.briar.api.transport.StreamTransportConnection;
public class StubStreamCallback implements StreamTransportCallback { public class StubStreamCallback implements StreamTransportCallback {

4
test/net/sf/briar/plugins/bluetooth/BluetoothClientTest.java
View File

@@ -8,8 +8,8 @@ import java.util.Scanner;
import java.util.TreeMap; import java.util.TreeMap;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.transport.stream.StreamTransportCallback; import net.sf.briar.api.plugins.StreamTransportCallback;
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.ImmediateExecutor;
// This is not a JUnit test - it has to be run manually while the server test // This is not a JUnit test - it has to be run manually while the server test

4
test/net/sf/briar/plugins/bluetooth/BluetoothServerTest.java
View File

@@ -8,8 +8,8 @@ import java.util.Scanner;
import java.util.TreeMap; import java.util.TreeMap;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.transport.stream.StreamTransportCallback; import net.sf.briar.api.plugins.StreamTransportCallback;
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.ImmediateExecutor;
//This is not a JUnit test - it has to be run manually while the server test //This is not a JUnit test - it has to be run manually while the server test

4
test/net/sf/briar/plugins/file/RemovableDrivePluginTest.java
View File

@@ -14,9 +14,9 @@ import java.util.concurrent.Executor;
import junit.framework.TestCase; import junit.framework.TestCase;
import net.sf.briar.TestUtils; import net.sf.briar.TestUtils;
import net.sf.briar.api.ContactId; 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.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.ImmediateExecutor;
import net.sf.briar.plugins.file.RemovableDriveMonitor.Callback; import net.sf.briar.plugins.file.RemovableDriveMonitor.Callback;

2
test/net/sf/briar/plugins/socket/SimpleSocketPluginTest.java
View File

@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import junit.framework.TestCase; import junit.framework.TestCase;
import net.sf.briar.api.ContactId; 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.ImmediateExecutor;
import net.sf.briar.plugins.StubStreamCallback; import net.sf.briar.plugins.StubStreamCallback;