From 19b6afa69ff11609b3e037daca99711bb61436dc Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 28 May 2016 00:17:17 +0000
Subject: [PATCH] Move new methods in Database interface to match existing
alphabetic sorting
---
.../src/org/briarproject/db/Database.java | 74 +++++++++----------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/briar-core/src/org/briarproject/db/Database.java b/briar-core/src/org/briarproject/db/Database.java
index 779e73722f..9779217904 100644
--- a/briar-core/src/org/briarproject/db/Database.java
+++ b/briar-core/src/org/briarproject/db/Database.java
@@ -82,6 +82,12 @@ interface Database<T> {
void addMessage(T txn, Message m, State state, boolean shared)
throws DbException;
+ /**
+ * Adds a dependency between two MessageIds
+ */
+ void addMessageDependency(T txn, MessageId dependentId,
+ MessageId dependencyId) throws DbException;
+
/**
* Records that a message has been offered by the given contact.
*/
@@ -266,6 +272,26 @@ interface Database<T> {
*/
Collection<LocalAuthor> getLocalAuthors(T txn) throws DbException;
+ /**
+ * Returns the dependencies of the given message.
+ * This method makes sure that dependencies in different groups
+ * are returned as {@link ValidationManager.State.INVALID}. Note that this
+ * is not set on the dependencies themselves; the returned states should
+ * only be taken in the context of the given message.
+ * <p/>
+ * Read-only.
+ */
+ Map<MessageId, State> getMessageDependencies(T txn, MessageId m)
+ throws DbException;
+
+ /**
+ * Returns all IDs of messages that depend on the given message.
+ * <p/>
+ * Read-only.
+ */
+ Map<MessageId, State> getMessageDependents(T txn, MessageId m)
+ throws DbException;
+
/**
* Returns the IDs of all messages in the given group.
* <p/>
@@ -327,32 +353,21 @@ interface Database<T> {
throws DbException;
/**
- * Returns the dependencies of the given message.
- * This method makes sure that dependencies in different groups
- * are returned as {@link ValidationManager.State.INVALID}. Note that this
- * is not set on the dependencies themselves; the returned states should
- * only be taken in the context of the given message.
- * <p/>
- * Read-only.
- */
- Map<MessageId, State> getMessageDependencies(T txn, MessageId m)
- throws DbException;
-
- /**
- * Returns all IDs of messages that depend on the given message.
+ * Returns the IDs of some messages received from the given contact that
+ * need to be acknowledged, up to the given number of messages.
* <p/>
* Read-only.
*/
- Map<MessageId, State> getMessageDependents(T txn, MessageId m)
+ Collection<MessageId> getMessagesToAck(T txn, ContactId c, int maxMessages)
throws DbException;
/**
- * Returns the IDs of some messages received from the given contact that
- * need to be acknowledged, up to the given number of messages.
+ * Returns the IDs of any messages that need to be delivered to the given
+ * client.
* <p/>
* Read-only.
*/
- Collection<MessageId> getMessagesToAck(T txn, ContactId c, int maxMessages)
+ Collection<MessageId> getMessagesToDeliver(T txn, ClientId c)
throws DbException;
/**
@@ -364,15 +379,6 @@ interface Database<T> {
Collection<MessageId> getMessagesToOffer(T txn, ContactId c,
int maxMessages) throws DbException;
- /**
- * Returns the IDs of some messages that are eligible to be sent to the
- * given contact, up to the given total length.
- * <p/>
- * Read-only.
- */
- Collection<MessageId> getMessagesToSend(T txn, ContactId c, int maxLength)
- throws DbException;
-
/**
* Returns the IDs of some messages that are eligible to be requested from
* the given contact, up to the given number of messages.
@@ -383,21 +389,21 @@ interface Database<T> {
int maxMessages) throws DbException;
/**
- * Returns the IDs of any messages that need to be validated by the given
- * client.
+ * Returns the IDs of some messages that are eligible to be sent to the
+ * given contact, up to the given total length.
* <p/>
* Read-only.
*/
- Collection<MessageId> getMessagesToValidate(T txn, ClientId c)
+ Collection<MessageId> getMessagesToSend(T txn, ContactId c, int maxLength)
throws DbException;
/**
- * Returns the IDs of any messages that need to be delivered to the given
+ * Returns the IDs of any messages that need to be validated by the given
* client.
* <p/>
* Read-only.
*/
- Collection<MessageId> getMessagesToDeliver(T txn, ClientId c)
+ Collection<MessageId> getMessagesToValidate(T txn, ClientId c)
throws DbException;
/**
@@ -579,12 +585,6 @@ interface Database<T> {
void setMessageState(T txn, MessageId m, State state)
throws DbException;
- /**
- * Adds a dependency between two MessageIds
- */
- void addMessageDependency(T txn, MessageId dependentId,
- MessageId dependencyId) throws DbException;
-
/**
* Sets the reordering window for the given contact and transport in the
* given rotation period.
--
GitLab