Refactoring: moved high-level connection classes to protocol package.

This commit is contained in:
akwizgran
2011-12-08 15:06:50 +00:00
parent 1886609bef
commit caf5f34828
17 changed files with 44 additions and 36 deletions

View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport.batch;
package net.sf.briar.protocol.batch;
import java.util.concurrent.Executor;
@@ -9,7 +9,7 @@ import net.sf.briar.api.protocol.ProtocolReaderFactory;
import net.sf.briar.api.protocol.ProtocolWriterFactory;
import net.sf.briar.api.protocol.TransportIndex;
import net.sf.briar.api.protocol.VerificationExecutor;
import net.sf.briar.api.transport.BatchConnectionFactory;
import net.sf.briar.api.protocol.batch.BatchConnectionFactory;
import net.sf.briar.api.transport.BatchTransportReader;
import net.sf.briar.api.transport.BatchTransportWriter;
import net.sf.briar.api.transport.ConnectionContext;

View File

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

View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport.batch;
package net.sf.briar.protocol.batch;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_PACKET_LENGTH;

View File

@@ -1,11 +1,11 @@
package net.sf.briar.transport.batch;
package net.sf.briar.protocol.batch;
import net.sf.briar.api.transport.BatchConnectionFactory;
import net.sf.briar.api.protocol.batch.BatchConnectionFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Singleton;
public class TransportBatchModule extends AbstractModule {
public class ProtocolBatchModule extends AbstractModule {
@Override
protected void configure() {

View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport.stream;
package net.sf.briar.protocol.stream;
import java.io.IOException;
import java.util.concurrent.Executor;

View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport.stream;
package net.sf.briar.protocol.stream;
import java.io.IOException;
import java.util.concurrent.Executor;

View File

@@ -1,11 +1,11 @@
package net.sf.briar.transport.stream;
package net.sf.briar.protocol.stream;
import net.sf.briar.api.transport.StreamConnectionFactory;
import net.sf.briar.api.protocol.stream.StreamConnectionFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Singleton;
public class TransportStreamModule extends AbstractModule {
public class ProtocolStreamModule extends AbstractModule {
@Override
protected void configure() {

View File

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

View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport.stream;
package net.sf.briar.protocol.stream;
import java.util.concurrent.Executor;
@@ -9,10 +9,10 @@ import net.sf.briar.api.protocol.ProtocolReaderFactory;
import net.sf.briar.api.protocol.ProtocolWriterFactory;
import net.sf.briar.api.protocol.TransportIndex;
import net.sf.briar.api.protocol.VerificationExecutor;
import net.sf.briar.api.protocol.stream.StreamConnectionFactory;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import net.sf.briar.api.transport.StreamConnectionFactory;
import net.sf.briar.api.transport.StreamTransportConnection;
import com.google.inject.Inject;

View File

@@ -9,14 +9,14 @@ import net.sf.briar.api.ContactId;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.protocol.TransportIndex;
import net.sf.briar.api.transport.BatchConnectionFactory;
import net.sf.briar.api.protocol.batch.BatchConnectionFactory;
import net.sf.briar.api.protocol.stream.StreamConnectionFactory;
import net.sf.briar.api.transport.BatchTransportReader;
import net.sf.briar.api.transport.BatchTransportWriter;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.ConnectionRecogniser.Callback;
import net.sf.briar.api.transport.StreamConnectionFactory;
import net.sf.briar.api.transport.StreamTransportConnection;
import net.sf.briar.api.transport.TransportConstants;