commit 070dc8927e99755b9cffe95979b886820b651e5a
author Andrew Brown <andrew.brown@intel.com> Wed Jan 21 09:55:12 2015 -0800
committer Andrew Brown <andrew.brown@intel.com> Wed Jan 21 09:55:12 2015 -0800
tree 21ae8eeaf74cdab24572a770a622c1de6a8df660
parent ac28226f2d934979cdc05982e3a924f88331bf0c

Refactor, add documentation; fix timeouts

src/main/java/com/intel/jndn/utils/ClientObservable.java

diff --git a/src/main/java/com/intel/jndn/utils/ClientObservable.java b/src/main/java/com/intel/jndn/utils/ClientObservable.java
index ce6beda..0a4b341 100644
--- a/src/main/java/com/intel/jndn/utils/ClientObservable.java
+++ b/src/main/java/com/intel/jndn/utils/ClientObservable.java
@@ -26,7 +26,7 @@
  */
 public class ClientObservable extends Observable implements OnData, OnTimeout, OnInterest {
 
-  protected List<ClientObservableEvent> events = new ArrayList<>();
+  protected List<ClientEvent> events = new ArrayList<>();
   protected List<Interest> incomingInterestPackets = new ArrayList<>();
   protected List<Data> incomingDataPackets;
 
@@ -38,7 +38,7 @@
    */
   public <T> void notify(T packet) {
     setChanged();
-    notifyObservers(new ClientObservableEvent(packet));
+    notifyObservers(new ClientEvent(packet));
   }
 
   /**
@@ -68,7 +68,7 @@
    */
   @Override
   public void onTimeout(Interest interest) {
-    notify(interest);
+    notify(new Exception("Interest timed out: " + interest.getName().toUri()));
   }
 
   /**