Fixed some missing imports from recent refactoring.

briar-api/src/org/briarproject/api/db/DatabaseComponent.java

@@ -13,6 +13,7 @@ import org.briarproject.api.sync.Ack;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.Message;
+import org.briarproject.api.sync.MessageHeader;
 import org.briarproject.api.sync.MessageId;
 import org.briarproject.api.sync.Offer;
 import org.briarproject.api.sync.Request;
@@ -163,7 +164,7 @@ public interface DatabaseComponent {
 	 * Returns the headers of all messages in the inbox group for the given
 	 * contact, or null if no inbox group has been set.
 	 */
-	Collection<org.briarproject.api.sync.MessageHeader> getInboxMessageHeaders(ContactId c)
+	Collection<MessageHeader> getInboxMessageHeaders(ContactId c)
 			throws DbException;
 
 	/** Returns the local pseudonym with the given ID. */
@@ -183,7 +184,7 @@ public interface DatabaseComponent {
 	byte[] getMessageBody(MessageId m) throws DbException;
 
 	/** Returns the headers of all messages in the given group. */
-	Collection<org.briarproject.api.sync.MessageHeader> getMessageHeaders(GroupId g)
+	Collection<MessageHeader> getMessageHeaders(GroupId g)
 			throws DbException;
 
 	/** Returns true if the given message is marked as read. */

briar-api/src/org/briarproject/api/sync/MessageFactory.java

@@ -8,11 +8,11 @@ import java.security.GeneralSecurityException;
 
 public interface MessageFactory {
 
-	Message createAnonymousMessage(MessageId parent, org.briarproject.api.sync.Group group,
+	Message createAnonymousMessage(MessageId parent, Group group,
 			String contentType, long timestamp, byte[] body) throws IOException,
 			GeneralSecurityException;
 
-	Message createPseudonymousMessage(MessageId parent, org.briarproject.api.sync.Group group,
+	Message createPseudonymousMessage(MessageId parent, Group group,
 			Author author, PrivateKey privateKey, String contentType,
 			long timestamp, byte[] body) throws IOException,
 			GeneralSecurityException;

briar-api/src/org/briarproject/api/sync/MessageHeader.java

@@ -83,7 +83,8 @@ public class MessageHeader {
 	}
 
 	/**
-	 * Returns message status. (This only applies to locally generated private messages.)
+	 * Returns message status. (This only applies to locally generated private
+	 * messages.)
 	 */
 	public State getStatus() {
 		return status;

briar-api/src/org/briarproject/api/sync/UnverifiedMessage.java

@@ -6,14 +6,14 @@ import org.briarproject.api.Author;
 public class UnverifiedMessage {
 
 	private final MessageId parent;
-	private final org.briarproject.api.sync.Group group;
+	private final Group group;
 	private final Author author;
 	private final String contentType;
 	private final long timestamp;
 	private final byte[] raw, signature;
 	private final int bodyStart, bodyLength, signedLength;
 
-	public UnverifiedMessage(MessageId parent, org.briarproject.api.sync.Group group, Author author,
+	public UnverifiedMessage(MessageId parent, Group group, Author author,
 			String contentType, long timestamp, byte[] raw, byte[] signature,
 			int bodyStart, int bodyLength, int signedLength) {
 		this.parent = parent;
@@ -37,10 +37,10 @@ public class UnverifiedMessage {
 	}
 
 	/**
-	 * Returns the {@link org.briarproject.api.sync.Group} to which the message belongs, or null if this
+	 * Returns the {@link Group} to which the message belongs, or null if this
 	 * is a private message.
 	 */
-	public org.briarproject.api.sync.Group getGroup() {
+	public Group getGroup() {
 		return group;
 	}