Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 04:39:54 +01:00
Code Issues Projects Releases Wiki Activity

Renamed a database method.

Browse Source
This commit is contained in:
akwizgran
2013-12-22 01:56:11 +00:00
parent f1af27554d
commit ff01b181bc
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-api/src/net/sf/briar/api/db/DatabaseComponent.java
View File

@@ -185,7 +185,7 @@ public interface DatabaseComponent {
* Returns the ID of the inbox group for the given contact, or null if no * Returns the ID of the inbox group for the given contact, or null if no
* inbox group has been set. * inbox group has been set.
*/ */
GroupId getInboxGroup(ContactId c) throws DbException; GroupId getInboxGroupId(ContactId c) throws DbException;
/** /**
* Returns the headers of all messages in the inbox group for the given * Returns the headers of all messages in the inbox group for the given

2
briar-core/src/net/sf/briar/db/Database.java
View File

@@ -293,7 +293,7 @@ interface Database<T> {
* <p> * <p>
* Locking: contact read, subscription read. * Locking: contact read, subscription read.
*/ */
GroupId getInboxGroup(T txn, ContactId c) throws DbException; GroupId getInboxGroupId(T txn, ContactId c) throws DbException;
/** /**
* Returns the headers of all messages in the inbox group for the given * Returns the headers of all messages in the inbox group for the given

4
briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
View File

@@ -946,7 +946,7 @@ DatabaseCleaner.Callback {
} }
} }
public GroupId getInboxGroup(ContactId c) throws DbException { public GroupId getInboxGroupId(ContactId c) throws DbException {
contactLock.readLock().lock(); contactLock.readLock().lock();
try { try {
subscriptionLock.readLock().lock(); subscriptionLock.readLock().lock();
@@ -955,7 +955,7 @@ DatabaseCleaner.Callback {
try { try {
if(!db.containsContact(txn, c)) if(!db.containsContact(txn, c))
throw new NoSuchContactException(); throw new NoSuchContactException();
GroupId inbox = db.getInboxGroup(txn, c); GroupId inbox = db.getInboxGroupId(txn, c);
db.commitTransaction(txn); db.commitTransaction(txn);
return inbox; return inbox;
} catch(DbException e) { } catch(DbException e) {

2
briar-core/src/net/sf/briar/db/JdbcDatabase.java
View File

@@ -1351,7 +1351,7 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
} }
public GroupId getInboxGroup(Connection txn, ContactId c) public GroupId getInboxGroupId(Connection txn, ContactId c)
throws DbException { throws DbException {
PreparedStatement ps = null; PreparedStatement ps = null;
ResultSet rs = null; ResultSet rs = null;

2
briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java
View File

@@ -390,7 +390,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
} catch(NoSuchContactException expected) {} } catch(NoSuchContactException expected) {}
try { try {
db.getInboxGroup(contactId); db.getInboxGroupId(contactId);
fail(); fail();
} catch(NoSuchContactException expected) {} } catch(NoSuchContactException expected) {}