Added new database events and simplified database locking.

briar-api/src/net/sf/briar/api/db/event/LocalSubscriptionsUpdatedEvent.java

@@ -9,20 +9,20 @@ import net.sf.briar.api.ContactId;
  * An event that is broadcast when the set of subscriptions visible to one or
  * more contacts is updated.
  */
-public class SubscriptionsUpdatedEvent extends DatabaseEvent {
+public class LocalSubscriptionsUpdatedEvent extends DatabaseEvent {
 
-	private final Collection<ContactId> affectedContacts;
+	private final Collection<ContactId> affected;
 
-	public SubscriptionsUpdatedEvent() {
-		affectedContacts = Collections.emptyList();
+	public LocalSubscriptionsUpdatedEvent() {
+		affected = Collections.emptyList();
 	}
 
-	public SubscriptionsUpdatedEvent(Collection<ContactId> affectedContacts) {
-		this.affectedContacts = affectedContacts;
+	public LocalSubscriptionsUpdatedEvent(Collection<ContactId> affected) {
+		this.affected = affected;
 	}
 
 	/** Returns the contacts affected by the update. */
 	public Collection<ContactId> getAffectedContacts() {
-		return affectedContacts;
+		return affected;
 	}
 }

briar-api/src/net/sf/briar/api/db/event/LocalTransportsUpdatedEvent.java

@@ -4,6 +4,6 @@ package net.sf.briar.api.db.event;
  * An event that is broadcast when the local transport properties are
  * updated.
  */
-public class TransportsUpdatedEvent extends DatabaseEvent {
+public class LocalTransportsUpdatedEvent extends DatabaseEvent {
 
 }

briar-api/src/net/sf/briar/api/db/event/RemoteSubscriptionsUpdatedEvent.java

@@ -0,0 +1,17 @@
+package net.sf.briar.api.db.event;
+
+import net.sf.briar.api.ContactId;
+
+/**  An event that is broadcast when a contact's subscriptions are updated. */
+public class RemoteSubscriptionsUpdatedEvent extends DatabaseEvent {
+
+	private final ContactId contactId;
+
+	public RemoteSubscriptionsUpdatedEvent(ContactId contactId) {
+		this.contactId = contactId;
+	}
+
+	public ContactId getContactId() {
+		return contactId;
+	}
+}

briar-api/src/net/sf/briar/api/db/event/RemoteTransportsUpdatedEvent.java

@@ -0,0 +1,28 @@
+package net.sf.briar.api.db.event;
+
+import net.sf.briar.api.ContactId;
+import net.sf.briar.api.protocol.TransportId;
+
+/**
+ * An event that is broadcast when a contact's remote transport properties
+ * are updated.
+ */
+public class RemoteTransportsUpdatedEvent extends DatabaseEvent {
+
+	private final ContactId contactId;
+	private final TransportId transportId;
+
+	public RemoteTransportsUpdatedEvent(ContactId contactId,
+			TransportId transportId) {
+		this.contactId = contactId;
+		this.transportId = transportId;
+	}
+
+	public ContactId getContactId() {
+		return contactId;
+	}
+
+	public TransportId getTransportId() {
+		return transportId;
+	}
+}

briar-api/src/net/sf/briar/api/db/event/TransportAddedEvent.java

@@ -0,0 +1,17 @@
+package net.sf.briar.api.db.event;
+
+import net.sf.briar.api.protocol.TransportId;
+
+/** An event that is broadcast when a transport is added. */
+public class TransportAddedEvent extends DatabaseEvent {
+
+	private final TransportId transportId;
+
+	public TransportAddedEvent(TransportId transportId) {
+		this.transportId = transportId;
+	}
+
+	public TransportId getTransportId() {
+		return transportId;
+	}
+}

briar-api/src/net/sf/briar/api/db/event/TransportRemovedEvent.java

@@ -0,0 +1,17 @@
+package net.sf.briar.api.db.event;
+
+import net.sf.briar.api.protocol.TransportId;
+
+/** An event that is broadcast when a transport is removed. */
+public class TransportRemovedEvent extends DatabaseEvent {
+
+	private final TransportId transportId;
+
+	public TransportRemovedEvent(TransportId transportId) {
+		this.transportId = transportId;
+	}
+
+	public TransportId getTransportId() {
+		return transportId;
+	}
+}