[virtualcommons-svn] SF.net SVN: virtualcommons:[304] csidex/trunk/src/main/java/edu/asu/commons

[<al...@us...>]

Revision: 304
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=304&view=rev
Author:   alllee
Date:     2009-10-19 21:03:43 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
minor hygienic changes to simplify logic, replacing boolean logic to switch on
threaded handling with just a new method slot.  i.e., handle(Event, boolean) changed
to handleWithNewThread(Event)

Modified Paths:
--------------
    csidex/trunk/src/main/java/edu/asu/commons/event/EventConstraintChannel.java
    csidex/trunk/src/main/java/edu/asu/commons/event/EventHandler.java
    csidex/trunk/src/main/java/edu/asu/commons/event/EventTypeChannel.java
    csidex/trunk/src/main/java/edu/asu/commons/event/EventTypeProcessor.java
    csidex/trunk/src/main/java/edu/asu/commons/net/SocketDispatcherWorker.java

Modified: csidex/trunk/src/main/java/edu/asu/commons/event/EventConstraintChannel.java
===================================================================
--- csidex/trunk/src/main/java/edu/asu/commons/event/EventConstraintChannel.java	2009-10-19 20:55:44 UTC (rev 303)
+++ csidex/trunk/src/main/java/edu/asu/commons/event/EventConstraintChannel.java	2009-10-19 21:03:43 UTC (rev 304)
@@ -58,23 +58,18 @@
         }
     }
     
-    public void handle(final Event event, boolean newThread) {
-        if (newThread) {
-            synchronized (eventListeners) {
-                for (final Map.Entry<EventHandler<Event>, EventConstraint> entry : eventListeners.entrySet()) {
-                    if (entry.getValue().accepts(event)) {
-                        new Thread() {
-                            public void run() {
-                                entry.getKey().handle(event);                                
-                            }
-                        }.start();
-                    }
+    public void handleWithNewThread(final Event event) {
+        synchronized (eventListeners) {
+            for (final Map.Entry<EventHandler<Event>, EventConstraint> entry : eventListeners.entrySet()) {
+                if (entry.getValue().accepts(event)) {
+                    new Thread() {
+                        public void run() {
+                            entry.getKey().handle(event);                                
+                        }
+                    }.start();
                 }
             }
         }
-        else {
-            handle(event);
-        }
     }
     
     public void dispatch(final Event event) {

Modified: csidex/trunk/src/main/java/edu/asu/commons/event/EventHandler.java
===================================================================
--- csidex/trunk/src/main/java/edu/asu/commons/event/EventHandler.java	2009-10-19 20:55:44 UTC (rev 303)
+++ csidex/trunk/src/main/java/edu/asu/commons/event/EventHandler.java	2009-10-19 21:03:43 UTC (rev 304)
@@ -22,6 +22,6 @@
      * @param event
      * @param newThread
      */
-    public void handle(E event, boolean newThread);
+    public void handleWithNewThread(E event);
     
 }

Modified: csidex/trunk/src/main/java/edu/asu/commons/event/EventTypeChannel.java
===================================================================
--- csidex/trunk/src/main/java/edu/asu/commons/event/EventTypeChannel.java	2009-10-19 20:55:44 UTC (rev 303)
+++ csidex/trunk/src/main/java/edu/asu/commons/event/EventTypeChannel.java	2009-10-19 21:03:43 UTC (rev 304)
@@ -123,18 +123,9 @@
         if (event == null) return;
         defaultDispatcher.dispatch(event);
     }
-    
-    public void handle(Event event, boolean newThread) {
-        if (event == null) return;
-        if (newThread) {
-            threadedDispatcher.dispatch(event);
-        }
-        else {
-            sequentialDispatcher.dispatch(event);
-        }
-    }
 
-    public void handleInThread(Event event) {
+    public void handleWithNewThread(Event event) {
+        if (event == null) return;
         threadedDispatcher.dispatch(event);
     }
 

Modified: csidex/trunk/src/main/java/edu/asu/commons/event/EventTypeProcessor.java
===================================================================
--- csidex/trunk/src/main/java/edu/asu/commons/event/EventTypeProcessor.java	2009-10-19 20:55:44 UTC (rev 303)
+++ csidex/trunk/src/main/java/edu/asu/commons/event/EventTypeProcessor.java	2009-10-19 21:03:43 UTC (rev 304)
@@ -47,7 +47,8 @@
     
     /**
      * Override this method to handle in the same thread of execution invoking EventChannel.handle(someEvent);
-     * Otherwise, override handleInExperimentThread() to add a new command to the list.
+     * Otherwise, override handleInExperimentThread() to queue a new command to be processed serially by the
+     * experiment.
      */
     public void handle(final E event) {
     	experiment.schedule(new Command() {
@@ -57,17 +58,12 @@
     	});
     }
     
-    public void handle(final E event, boolean newThread) {
-        if (newThread) {
-            new Thread() {
-                public void run() {
-                    handle(event);
-                }
-            }.start();
-        }
-        else {
-            handle(event);
-        }
+    public void handleWithNewThread(final E event) {
+        new Thread() {
+            public void run() {
+                handle(event);
+            }
+        }.start();
     }
     
     public void handleInExperimentThread(E event) {

Modified: csidex/trunk/src/main/java/edu/asu/commons/net/SocketDispatcherWorker.java
===================================================================
--- csidex/trunk/src/main/java/edu/asu/commons/net/SocketDispatcherWorker.java	2009-10-19 20:55:44 UTC (rev 303)
+++ csidex/trunk/src/main/java/edu/asu/commons/net/SocketDispatcherWorker.java	2009-10-19 21:03:43 UTC (rev 304)
@@ -108,7 +108,6 @@
     
     public synchronized Event readEvent() throws IOException, ClassNotFoundException {
 //        return SocketDispatcherWorker.readEvent(socket);
-        
         return (Event) cachedIn.readObject();
     }
 
@@ -125,7 +124,7 @@
     }
     
     private void requestDisconnection(Exception exception) {
-        dispatcher.getLocalEventHandler().handle(new DisconnectionRequest(id, exception), true);
+        dispatcher.getLocalEventHandler().handleWithNewThread(new DisconnectionRequest(id, exception));
     }
     
     public void run() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.