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

Code cleanup.

Browse Source
This commit is contained in:
akwizgran
2016-01-20 10:30:36 +00:00
parent 2216e2b0f2
commit f5f572139a
6 changed files with 31 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-core/src/org/briarproject/db/Database.java
View File

@@ -411,7 +411,7 @@ interface Database<T> {
int maxLength) throws DbException;
/**
* Returns all settings that belong to a namespace.
* Returns all settings in the given namespace.
* <p>
* Locking: read.
*/
@@ -526,11 +526,12 @@ interface Database<T> {
throws DbException;
/**
* Merges the given settings with the existing settings.
* Merges the given settings with the existing settings in the given
* namespace.
* <p>
* Locking: write.
*/
void mergeSettings(T txn, Settings s, String Namespace) throws DbException;
void mergeSettings(T txn, Settings s, String namespace) throws DbException;
/**
* Marks a message as needing to be acknowledged to the given contact.