Moved writers into their own package, replaced public static fields in

CryptoModule with provider methods.

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

@@ -7,17 +7,17 @@ import java.util.Map;
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.Rating;
 import net.sf.briar.api.protocol.Ack;
-import net.sf.briar.api.protocol.AckWriter;
 import net.sf.briar.api.protocol.AuthorId;
 import net.sf.briar.api.protocol.Batch;
-import net.sf.briar.api.protocol.BatchWriter;
 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.SubscriptionWriter;
 import net.sf.briar.api.protocol.Subscriptions;
-import net.sf.briar.api.protocol.TransportWriter;
 import net.sf.briar.api.protocol.Transports;
+import net.sf.briar.api.protocol.writers.AckWriter;
+import net.sf.briar.api.protocol.writers.BatchWriter;
+import net.sf.briar.api.protocol.writers.SubscriptionWriter;
+import net.sf.briar.api.protocol.writers.TransportWriter;
 
 /**
  * Encapsulates the database implementation and exposes high-level operations

api/net/sf/briar/api/protocol/writers/AckWriter.java

@@ -1,7 +1,9 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.protocol.writers;
 
 import java.io.IOException;
 
+import net.sf.briar.api.protocol.BatchId;
+
 /** An interface for creating an ack. */
 public interface AckWriter {
 

api/net/sf/briar/api/protocol/writers/BatchWriter.java

@@ -1,7 +1,9 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.protocol.writers;
 
 import java.io.IOException;
 
+import net.sf.briar.api.protocol.BatchId;
+
 /** An interface for creating a batch of messages. */
 public interface BatchWriter {
 

api/net/sf/briar/api/protocol/writers/PacketWriterFactory.java

@@ -0,0 +1,14 @@
+package net.sf.briar.api.protocol.writers;
+
+import java.io.OutputStream;
+
+public interface PacketWriterFactory {
+
+	AckWriter createAckWriter(OutputStream out);
+
+	BatchWriter createBatchWriter(OutputStream out);
+
+	SubscriptionWriter createSubscriptionWriter(OutputStream out);
+
+	TransportWriter createTransportWriter(OutputStream out);
+}

api/net/sf/briar/api/protocol/writers/SubscriptionWriter.java

@@ -1,7 +1,9 @@
-package net.sf.briar.api.protocol;
+package net.sf.briar.api.protocol.writers;
 
 import java.io.IOException;
 
+import net.sf.briar.api.protocol.Group;
+
 /** An interface for creating a subscription update. */
 public interface SubscriptionWriter {
 

api/net/sf/briar/api/protocol/writers/TransportWriter.java

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

api/net/sf/briar/api/serial/Writer.java

@@ -6,7 +6,6 @@ import java.util.Map;
 
 public interface Writer {
 
-	// FIXME: Remove this method
 	long getBytesWritten();
 
 	void writeBoolean(boolean b) throws IOException;