Refactoring: renamed package 'protocol' -> 'messaging'.

briar-api/src/net/sf/briar/api/crypto/KeyManager.java

@@ -1,7 +1,7 @@
 package net.sf.briar.api.crypto;
 
 import net.sf.briar.api.ContactId;
-import net.sf.briar.api.protocol.TransportId;
+import net.sf.briar.api.messaging.TransportId;
 import net.sf.briar.api.transport.ConnectionContext;
 import net.sf.briar.api.transport.Endpoint;
 

briar-api/src/net/sf/briar/api/db/DatabaseComponent.java

@@ -9,21 +9,21 @@ import net.sf.briar.api.Rating;
 import net.sf.briar.api.TransportConfig;
 import net.sf.briar.api.TransportProperties;
 import net.sf.briar.api.db.event.DatabaseListener;
-import net.sf.briar.api.protocol.Ack;
-import net.sf.briar.api.protocol.AuthorId;
-import net.sf.briar.api.protocol.RetentionAck;
-import net.sf.briar.api.protocol.RetentionUpdate;
-import net.sf.briar.api.protocol.Group;
-import net.sf.briar.api.protocol.GroupId;
-import net.sf.briar.api.protocol.Message;
-import net.sf.briar.api.protocol.MessageId;
-import net.sf.briar.api.protocol.Offer;
-import net.sf.briar.api.protocol.Request;
-import net.sf.briar.api.protocol.SubscriptionAck;
-import net.sf.briar.api.protocol.SubscriptionUpdate;
-import net.sf.briar.api.protocol.TransportAck;
-import net.sf.briar.api.protocol.TransportId;
-import net.sf.briar.api.protocol.TransportUpdate;
+import net.sf.briar.api.messaging.Ack;
+import net.sf.briar.api.messaging.AuthorId;
+import net.sf.briar.api.messaging.Group;
+import net.sf.briar.api.messaging.GroupId;
+import net.sf.briar.api.messaging.Message;
+import net.sf.briar.api.messaging.MessageId;
+import net.sf.briar.api.messaging.Offer;
+import net.sf.briar.api.messaging.Request;
+import net.sf.briar.api.messaging.RetentionAck;
+import net.sf.briar.api.messaging.RetentionUpdate;
+import net.sf.briar.api.messaging.SubscriptionAck;
+import net.sf.briar.api.messaging.SubscriptionUpdate;
+import net.sf.briar.api.messaging.TransportAck;
+import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.messaging.TransportUpdate;
 import net.sf.briar.api.transport.Endpoint;
 import net.sf.briar.api.transport.TemporarySecret;
 

briar-api/src/net/sf/briar/api/db/MessageHeader.java

@@ -1,8 +1,8 @@
 package net.sf.briar.api.db;
 
-import net.sf.briar.api.protocol.AuthorId;
-import net.sf.briar.api.protocol.GroupId;
-import net.sf.briar.api.protocol.MessageId;
+import net.sf.briar.api.messaging.AuthorId;
+import net.sf.briar.api.messaging.GroupId;
+import net.sf.briar.api.messaging.MessageId;
 
 public interface MessageHeader {
 

briar-api/src/net/sf/briar/api/db/event/RatingChangedEvent.java

@@ -1,7 +1,7 @@
 package net.sf.briar.api.db.event;
 
 import net.sf.briar.api.Rating;
-import net.sf.briar.api.protocol.AuthorId;
+import net.sf.briar.api.messaging.AuthorId;
 
 public class RatingChangedEvent extends DatabaseEvent {
 

briar-api/src/net/sf/briar/api/db/event/RemoteTransportsUpdatedEvent.java

@@ -1,7 +1,7 @@
 package net.sf.briar.api.db.event;
 
 import net.sf.briar.api.ContactId;
-import net.sf.briar.api.protocol.TransportId;
+import net.sf.briar.api.messaging.TransportId;
 
 /**
  * An event that is broadcast when a contact's remote transport properties

briar-api/src/net/sf/briar/api/db/event/TransportAddedEvent.java

@@ -1,6 +1,6 @@
 package net.sf.briar.api.db.event;
 
-import net.sf.briar.api.protocol.TransportId;
+import net.sf.briar.api.messaging.TransportId;
 
 /** An event that is broadcast when a transport is added. */
 public class TransportAddedEvent extends DatabaseEvent {

briar-api/src/net/sf/briar/api/db/event/TransportRemovedEvent.java

@@ -1,6 +1,6 @@
 package net.sf.briar.api.db.event;
 
-import net.sf.briar.api.protocol.TransportId;
+import net.sf.briar.api.messaging.TransportId;
 
 /** An event that is broadcast when a transport is removed. */
 public class TransportRemovedEvent extends DatabaseEvent {

briar-api/src/net/sf/briar/api/messaging/Ack.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.util.Collection;
 

briar-api/src/net/sf/briar/api/messaging/Author.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 /** A pseudonymous author of {@link Message}s. */
 public class Author {

briar-api/src/net/sf/briar/api/messaging/AuthorFactory.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.io.IOException;
 

briar-api/src/net/sf/briar/api/messaging/AuthorId.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.util.Arrays;
 

briar-api/src/net/sf/briar/api/messaging/Group.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 /** A group to which users may subscribe. */
 public class Group {

briar-api/src/net/sf/briar/api/messaging/GroupFactory.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.io.IOException;
 

briar-api/src/net/sf/briar/api/messaging/GroupId.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.util.Arrays;
 

briar-api/src/net/sf/briar/api/messaging/Message.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 public interface Message {
 

briar-api/src/net/sf/briar/api/messaging/MessageFactory.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;

briar-api/src/net/sf/briar/api/messaging/MessageId.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.util.Arrays;
 

briar-api/src/net/sf/briar/api/messaging/MessageVerifier.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.security.GeneralSecurityException;
 

briar-api/src/net/sf/briar/api/messaging/MessagingConstants.java

@@ -1,8 +1,8 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import static net.sf.briar.api.transport.TransportConstants.MIN_CONNECTION_LENGTH;
 
-public interface ProtocolConstants {
+public interface MessagingConstants {
 
 	/**
 	 * The maximum length of a serialised packet in bytes. To allow for future

briar-api/src/net/sf/briar/api/messaging/Offer.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.util.Collection;
 

briar-api/src/net/sf/briar/api/messaging/PacketReader.java

@@ -1,8 +1,8 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.io.IOException;
 
-public interface ProtocolReader {
+public interface PacketReader {
 
 	boolean eof() throws IOException;
 

briar-api/src/net/sf/briar/api/messaging/PacketReaderFactory.java

@@ -0,0 +1,8 @@
+package net.sf.briar.api.messaging;
+
+import java.io.InputStream;
+
+public interface PacketReaderFactory {
+
+	PacketReader createPacketReader(InputStream in);
+}

briar-api/src/net/sf/briar/api/messaging/PacketWriter.java

@@ -1,8 +1,8 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.io.IOException;
 
-public interface ProtocolWriter {
+public interface PacketWriter {
 
 	int getMaxMessagesForAck(long capacity);
 

briar-api/src/net/sf/briar/api/messaging/PacketWriterFactory.java

@@ -0,0 +1,8 @@
+package net.sf.briar.api.messaging;
+
+import java.io.OutputStream;
+
+public interface PacketWriterFactory {
+
+	PacketWriter createPacketWriter(OutputStream out, boolean flush);
+}

briar-api/src/net/sf/briar/api/messaging/Request.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.util.BitSet;
 

briar-api/src/net/sf/briar/api/messaging/RetentionAck.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 /** A packet acknowledging a (@link RetentionUpdate} */
 public class RetentionAck {

briar-api/src/net/sf/briar/api/messaging/RetentionUpdate.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 /**
  * A packet updating the recipient's view of the retention time of the sender's

briar-api/src/net/sf/briar/api/messaging/SubscriptionAck.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 /** A packet acknowledging a {@link SubscriptionUpdate}. */
 public class SubscriptionAck {

briar-api/src/net/sf/briar/api/messaging/SubscriptionUpdate.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.util.Collection;
 

briar-api/src/net/sf/briar/api/messaging/TransportAck.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 /** A packet acknowledging a {@link TransportUpdate}. */
 public class TransportAck {

briar-api/src/net/sf/briar/api/messaging/TransportId.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.util.Arrays;
 

briar-api/src/net/sf/briar/api/messaging/TransportUpdate.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import net.sf.briar.api.TransportProperties;
 

briar-api/src/net/sf/briar/api/messaging/Types.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 /** Struct identifiers for encoding and decoding protocol objects. */
 public interface Types {

briar-api/src/net/sf/briar/api/messaging/UniqueId.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import java.util.Arrays;
 

briar-api/src/net/sf/briar/api/messaging/UnverifiedMessage.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 /** A {@link Message} that has not yet had its signatures verified. */
 public class UnverifiedMessage {

briar-api/src/net/sf/briar/api/messaging/VerificationExecutor.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.messaging;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

briar-api/src/net/sf/briar/api/messaging/duplex/DuplexConnectionFactory.java

@@ -1,8 +1,8 @@
-package net.sf.briar.api.protocol.duplex;
+package net.sf.briar.api.messaging.duplex;
 
 import net.sf.briar.api.ContactId;
+import net.sf.briar.api.messaging.TransportId;
 import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
-import net.sf.briar.api.protocol.TransportId;
 import net.sf.briar.api.transport.ConnectionContext;
 
 public interface DuplexConnectionFactory {

briar-api/src/net/sf/briar/api/messaging/simplex/SimplexConnectionFactory.java

@@ -1,9 +1,9 @@
-package net.sf.briar.api.protocol.simplex;
+package net.sf.briar.api.messaging.simplex;
 
 import net.sf.briar.api.ContactId;
+import net.sf.briar.api.messaging.TransportId;
 import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
 import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
-import net.sf.briar.api.protocol.TransportId;
 import net.sf.briar.api.transport.ConnectionContext;
 
 public interface SimplexConnectionFactory {

briar-api/src/net/sf/briar/api/plugins/Plugin.java

@@ -4,7 +4,7 @@ import java.io.IOException;
 import java.util.Collection;
 
 import net.sf.briar.api.ContactId;
-import net.sf.briar.api.protocol.TransportId;
+import net.sf.briar.api.messaging.TransportId;
 
 public interface Plugin {
 

briar-api/src/net/sf/briar/api/plugins/duplex/DuplexPluginFactory.java

@@ -1,6 +1,6 @@
 package net.sf.briar.api.plugins.duplex;
 
-import net.sf.briar.api.protocol.TransportId;
+import net.sf.briar.api.messaging.TransportId;
 
 public interface DuplexPluginFactory {
 

briar-api/src/net/sf/briar/api/plugins/simplex/SimplexPluginFactory.java

@@ -1,6 +1,6 @@
 package net.sf.briar.api.plugins.simplex;
 
-import net.sf.briar.api.protocol.TransportId;
+import net.sf.briar.api.messaging.TransportId;
 
 public interface SimplexPluginFactory {
 

briar-api/src/net/sf/briar/api/protocol/ProtocolReaderFactory.java

@@ -1,8 +0,0 @@
-package net.sf.briar.api.protocol;
-
-import java.io.InputStream;
-
-public interface ProtocolReaderFactory {
-
-	ProtocolReader createProtocolReader(InputStream in);
-}

briar-api/src/net/sf/briar/api/protocol/ProtocolWriterFactory.java

@@ -1,8 +0,0 @@
-package net.sf.briar.api.protocol;
-
-import java.io.OutputStream;
-
-public interface ProtocolWriterFactory {
-
-	ProtocolWriter createProtocolWriter(OutputStream out, boolean flush);
-}

briar-api/src/net/sf/briar/api/transport/ConnectionContext.java

@@ -1,7 +1,7 @@
 package net.sf.briar.api.transport;
 
 import net.sf.briar.api.ContactId;
-import net.sf.briar.api.protocol.TransportId;
+import net.sf.briar.api.messaging.TransportId;
 
 public class ConnectionContext {
 

briar-api/src/net/sf/briar/api/transport/ConnectionDispatcher.java

@@ -1,10 +1,10 @@
 package net.sf.briar.api.transport;
 
 import net.sf.briar.api.ContactId;
+import net.sf.briar.api.messaging.TransportId;
 import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
 import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
 import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
-import net.sf.briar.api.protocol.TransportId;
 
 public interface ConnectionDispatcher {
 

briar-api/src/net/sf/briar/api/transport/ConnectionRecogniser.java

@@ -2,7 +2,7 @@ package net.sf.briar.api.transport;
 
 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.messaging.TransportId;
 
 /**
  * Maintains the connection reordering windows and decides whether incoming

briar-api/src/net/sf/briar/api/transport/ConnectionRegistry.java

@@ -3,7 +3,7 @@ package net.sf.briar.api.transport;
 import java.util.Collection;
 
 import net.sf.briar.api.ContactId;
-import net.sf.briar.api.protocol.TransportId;
+import net.sf.briar.api.messaging.TransportId;
 
 /**
  * Keeps track of which contacts are currently connected by which transports.

briar-api/src/net/sf/briar/api/transport/Endpoint.java

@@ -1,7 +1,7 @@
 package net.sf.briar.api.transport;
 
 import net.sf.briar.api.ContactId;
-import net.sf.briar.api.protocol.TransportId;
+import net.sf.briar.api.messaging.TransportId;
 
 public class Endpoint {
 

briar-api/src/net/sf/briar/api/transport/TemporarySecret.java

@@ -2,7 +2,7 @@ package net.sf.briar.api.transport;
 
 import static net.sf.briar.api.transport.TransportConstants.CONNECTION_WINDOW_SIZE;
 import net.sf.briar.api.ContactId;
-import net.sf.briar.api.protocol.TransportId;
+import net.sf.briar.api.messaging.TransportId;
 
 public class TemporarySecret extends Endpoint {