--- java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoop.java	2014-09-11 01:14:18 UTC (rev 986)
+++ java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoop.java	2014-09-11 01:20:23 UTC (rev 987)
@@ -36,6 +36,9 @@

     boolean done = false;
     
     CompositeLoopConfiguration config = null;

+            
+    // Look in javadoc API and DefaultRecordLoop for what this does.
+    //this._stopOnEOF

                 
     /**
      * No argument constructor.  

@@ -72,7 +75,7 @@

      */
     public void addAdapter(CompositeLoopAdapter adapter) {
         addLoopListener(adapter);

-        addRecordListener(adapter);

+        addRecordListener(adapter);        

     }
         
     /**

@@ -340,6 +343,10 @@

             compositeAdapter.addProcessor(processor);
         }
         

+        if (config.supplyLcioEvents) {
+            addAdapter(new LcioEventSupplier(config.timeout, config.maxQueueSize));
+        }
+        

         // Max records was set?
         if (config.maxRecords != -1) {            
             compositeAdapter.addProcessor(new MaxRecordsProcessor(config.maxRecords));

--- java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoopConfiguration.java	2014-09-11 01:14:18 UTC (rev 986)
+++ java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoopConfiguration.java	2014-09-11 01:20:23 UTC (rev 987)
@@ -5,7 +5,6 @@

 
 import org.freehep.record.source.RecordSource;
 import org.hps.evio.LCSimEventBuilder;

-import org.hps.record.composite.CompositeRecordProcessor;

 import org.hps.record.enums.DataSourceType;
 import org.hps.record.enums.ProcessingStage;
 import org.hps.record.et.EtConnection;

@@ -41,10 +40,16 @@

     LCSimEventBuilder eventBuilder = null;
     String detectorName = null;
     

+    // Event processors.

     List<EvioEventProcessor> evioProcessors = new ArrayList<EvioEventProcessor>();
     List<Driver> drivers = new ArrayList<Driver>();
     List<CompositeRecordProcessor> compositeProcessors = new ArrayList<CompositeRecordProcessor>();
     List<EtEventProcessor> etProcessors = new ArrayList<EtEventProcessor>();

+    
+    // Configuration for supplying LCIO events to JAS3 Studio.
+    boolean supplyLcioEvents;
+    int maxQueueSize = -1;
+    long timeout = -1L;

                      
     /**
      * Set the full path to a file being used as an event source.

@@ -160,6 +165,37 @@

     }
     
     /**

+     * Set whether to supply LCIO events to a DataSource that will automatically
+     * register itself to JAS3 in order to drive Wired, the LCSim Event Browser, etc. 
+     * @param supplyLcioEvents True to supply LCIO events to JAS3.
+     * @return This object.
+     */
+    public CompositeLoopConfiguration setSupplyLcioEvents(boolean supplyLcioEvents) {
+        this.supplyLcioEvents = supplyLcioEvents;
+        return this;
+    }
+    
+    /**
+     * Set the max queue size for the LCIO DataSource that hooks into JAS3.
+     * @param maxQueueSize The maximum queue size or -1 for unlimited.
+     * @return This object.
+     */
+    public CompositeLoopConfiguration setMaxQueueSize(int maxQueueSize) {
+        this.maxQueueSize = maxQueueSize;
+        return this;
+    }
+    
+    /**
+     * Set the timeout for calling <code>next</code> on the LCIO record queue.
+     * @param timeout The timeout in milliseconds.
+     * @return This object.
+     */
+    public CompositeLoopConfiguration setTimeout(long timeout) {
+        this.timeout = timeout;
+        return this;
+    }
+    
+    /**

      * Add an {@link org.hps.record.et.EtEventProcessor} to the loop.
      * @param processor The EtEventProcessor.
      * @return This object.

--- java/trunk/record-util/src/main/java/org/hps/record/lcio/LcioEventQueue.java	                        (rev 0)
+++ java/trunk/record-util/src/main/java/org/hps/record/lcio/LcioEventQueue.java	2014-09-11 01:20:23 UTC (rev 987)
@@ -0,0 +1,47 @@

+package org.hps.record.lcio;
+
+import org.hps.record.AbstractRecordQueue;
+import org.lcsim.event.EventHeader;
+
+public class LcioEventQueue extends AbstractRecordQueue<EventHeader> {    
+    
+    public LcioEventQueue(long timeoutMillis, int maxQueueSize) {
+        super(timeoutMillis, maxQueueSize);
+    }
+    
+    public Class<?> getRecordClass() {
+        return EventHeader.class;
+    }
+    
+    public boolean supportsCurrent() {
+        return true;
+    }
+
+    public boolean supportsNext() {
+        return true;
+    }
+    
+    public boolean supportsPrevious() {
+        return false;
+    }
+    
+    public boolean supportsIndex() {
+        return false;
+    }
+    
+    public boolean supportsShift() {
+        return false;
+    }
+    
+    public boolean supportsRewind() {
+        return false;
+    }
+    
+    public boolean hasCurrent() {
+        return this.size() != 0L;
+    }
+
+    public boolean hasNext() {
+        return true;
+    }      
+}