Merged clock and os packages, moved events into their own package.

briar-api/src/net/sf/briar/api/db/DatabaseComponent.java

@@ -12,7 +12,7 @@ import net.sf.briar.api.LocalAuthor;
 import net.sf.briar.api.TransportConfig;
 import net.sf.briar.api.TransportId;
 import net.sf.briar.api.TransportProperties;
-import net.sf.briar.api.db.event.DatabaseListener;
+import net.sf.briar.api.event.EventListener;
 import net.sf.briar.api.messaging.Ack;
 import net.sf.briar.api.messaging.Group;
 import net.sf.briar.api.messaging.GroupId;
@@ -43,10 +43,10 @@ public interface DatabaseComponent {
 	void close() throws DbException, IOException;
 
 	/** Adds a listener to be notified when database events occur. */
-	void addListener(DatabaseListener d);
+	void addListener(EventListener d);
 
 	/** Removes a listener. */
-	void removeListener(DatabaseListener d);
+	void removeListener(EventListener d);
 
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,

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

@@ -1,6 +0,0 @@
-package net.sf.briar.api.db.event;
-
-/** An abstract superclass for database events. */
-public abstract class DatabaseEvent {
-
-}

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

@@ -1,7 +0,0 @@
-package net.sf.briar.api.db.event;
-
-/** An interface for receiving notifications when database events occur. */
-public interface DatabaseListener {
-
-	void eventOccurred(DatabaseEvent e);
-}

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

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

briar-api/src/net/sf/briar/api/event/ContactAddedEvent.java

@@ -1,9 +1,9 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.ContactId;
 
 /** An event that is broadcast when a contact is added. */
-public class ContactAddedEvent extends DatabaseEvent {
+public class ContactAddedEvent extends Event {
 
 	private final ContactId contactId;
 

briar-api/src/net/sf/briar/api/event/ContactRemovedEvent.java

@@ -1,9 +1,9 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.ContactId;
 
 /** An event that is broadcast when a contact is removed. */
-public class ContactRemovedEvent extends DatabaseEvent {
+public class ContactRemovedEvent extends Event {
 
 	private final ContactId contactId;
 

briar-api/src/net/sf/briar/api/event/Event.java

@@ -0,0 +1,6 @@
+package net.sf.briar.api.event;
+
+/** An abstract superclass for events. */
+public abstract class Event {
+
+}

briar-api/src/net/sf/briar/api/event/EventListener.java

@@ -0,0 +1,7 @@
+package net.sf.briar.api.event;
+
+/** An interface for receiving notifications when events occur. */
+public interface EventListener {
+
+	void eventOccurred(Event e);
+}

briar-api/src/net/sf/briar/api/event/LocalAuthorAddedEvent.java

@@ -1,9 +1,9 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.AuthorId;
 
 /** An event that is broadcast when a local pseudonym is added. */
-public class LocalAuthorAddedEvent extends DatabaseEvent {
+public class LocalAuthorAddedEvent extends Event {
 
 	private final AuthorId authorId;
 

briar-api/src/net/sf/briar/api/event/LocalAuthorRemovedEvent.java

@@ -1,9 +1,9 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.AuthorId;
 
 /** An event that is broadcast when a local pseudonym is removed. */
-public class LocalAuthorRemovedEvent extends DatabaseEvent {
+public class LocalAuthorRemovedEvent extends Event {
 
 	private final AuthorId authorId;
 

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

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import java.util.Collection;
 
@@ -8,7 +8,7 @@ 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 LocalSubscriptionsUpdatedEvent extends DatabaseEvent {
+public class LocalSubscriptionsUpdatedEvent extends Event {
 
 	private final Collection<ContactId> affected;
 

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

@@ -0,0 +1,9 @@
+package net.sf.briar.api.event;
+
+/**
+ * An event that is broadcast when the local transport properties are
+ * updated.
+ */
+public class LocalTransportsUpdatedEvent extends Event {
+
+}

briar-api/src/net/sf/briar/api/event/MessageAddedEvent.java

@@ -1,10 +1,10 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.messaging.Group;
 
 /** An event that is broadcast when a message is added to the database. */
-public class MessageAddedEvent extends DatabaseEvent {
+public class MessageAddedEvent extends Event {
 
 	private final Group group;
 	private final ContactId contactId;

briar-api/src/net/sf/briar/api/event/MessageExpiredEvent.java

@@ -1,9 +1,9 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 /**
  * An event that is broadcast when one or messages expire from the database,
  * potentially changing the database's retention time.
  */
-public class MessageExpiredEvent extends DatabaseEvent {
+public class MessageExpiredEvent extends Event {
 
 }

briar-api/src/net/sf/briar/api/event/MessageRequestedEvent.java

@@ -1,9 +1,9 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.ContactId;
 
 /** An event that is broadcast when a message is requested by a contact. */
-public class MessageRequestedEvent extends DatabaseEvent {
+public class MessageRequestedEvent extends Event {
 
 	private final ContactId contactId;
 

briar-api/src/net/sf/briar/api/event/MessageToAckEvent.java

@@ -1,12 +1,12 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.ContactId;
 
 /**
- * An event that is broadcast when a message is received or offered from a
+ * An event that is broadcast when a message is received from or offered by a
  * contact and needs to be acknowledged.
  */
-public class MessageToAckEvent extends DatabaseEvent {
+public class MessageToAckEvent extends Event {
 
 	private final ContactId contactId;
 

briar-api/src/net/sf/briar/api/event/MessageToRequestEvent.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.ContactId;
 
@@ -6,7 +6,7 @@ import net.sf.briar.api.ContactId;
  * An event that is broadcast when a message is offered by a contact and needs
  * to be requested.
  */
-public class MessageToRequestEvent extends DatabaseEvent {
+public class MessageToRequestEvent extends Event {
 
 	private final ContactId contactId;
 

briar-api/src/net/sf/briar/api/event/RemoteRetentionTimeUpdatedEvent.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.ContactId;
 
@@ -6,7 +6,7 @@ import net.sf.briar.api.ContactId;
  * An event that is broadcast when the retention time of a contact's database
  * changes.
  */
-public class RemoteRetentionTimeUpdatedEvent extends DatabaseEvent {
+public class RemoteRetentionTimeUpdatedEvent extends Event {
 
 	private final ContactId contactId;
 

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

@@ -1,9 +1,9 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.ContactId;
 
 /**  An event that is broadcast when a contact's subscriptions are updated. */
-public class RemoteSubscriptionsUpdatedEvent extends DatabaseEvent {
+public class RemoteSubscriptionsUpdatedEvent extends Event {
 
 	private final ContactId contactId;
 

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

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.TransportId;
@@ -7,7 +7,7 @@ import net.sf.briar.api.TransportId;
  * An event that is broadcast when a contact's remote transport properties
  * are updated.
  */
-public class RemoteTransportsUpdatedEvent extends DatabaseEvent {
+public class RemoteTransportsUpdatedEvent extends Event {
 
 	private final ContactId contactId;
 	private final TransportId transportId;

briar-api/src/net/sf/briar/api/event/SubscriptionAddedEvent.java

@@ -1,9 +1,9 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.messaging.Group;
 
 /** An event that is broadcast when the user subscribes to a group. */
-public class SubscriptionAddedEvent extends DatabaseEvent {
+public class SubscriptionAddedEvent extends Event {
 
 	private final Group group;
 

briar-api/src/net/sf/briar/api/event/SubscriptionRemovedEvent.java

@@ -1,9 +1,9 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.messaging.Group;
 
 /** An event that is broadcast when the user unsubscribes from a group. */
-public class SubscriptionRemovedEvent extends DatabaseEvent {
+public class SubscriptionRemovedEvent extends Event {
 
 	private final Group group;
 

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

@@ -1,9 +1,9 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.TransportId;
 
-/** An event that is broadcast when a transport is added to the database. */
-public class TransportAddedEvent extends DatabaseEvent {
+/** An event that is broadcast when a transport is added. */
+public class TransportAddedEvent extends Event {
 
 	private final TransportId transportId;
 	private final long maxLatency;

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

@@ -1,9 +1,9 @@
-package net.sf.briar.api.db.event;
+package net.sf.briar.api.event;
 
 import net.sf.briar.api.TransportId;
 
 /** An event that is broadcast when a transport is removed. */
-public class TransportRemovedEvent extends DatabaseEvent {
+public class TransportRemovedEvent extends Event {
 
 	private final TransportId transportId;
 

briar-api/src/net/sf/briar/api/system/Clock.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.clock;
+package net.sf.briar.api.system;
 
 /**
  * An interface for time-related system functions that allows them to be

briar-api/src/net/sf/briar/api/system/FileUtils.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.os;
+package net.sf.briar.api.system;
 
 import java.io.File;
 import java.io.IOException;

briar-api/src/net/sf/briar/api/system/SystemClock.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.clock;
+package net.sf.briar.api.system;
 
 /** Default clock implementation. */
 public class SystemClock implements Clock {

briar-api/src/net/sf/briar/api/system/SystemTimer.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.clock;
+package net.sf.briar.api.system;
 
 import java.util.TimerTask;
 

briar-api/src/net/sf/briar/api/system/Timer.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.clock;
+package net.sf.briar.api.system;
 
 import java.util.TimerTask;