[overlord-commits] Overlord SVN: r999 - activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model.

[overlord-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2010-03-10 10:03:03 -0500 (Wed, 10 Mar 2010)
New Revision: 999

Modified:
   activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/BPAFDataSource.java
   activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/DefaultBPAFDataSource.java
   activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/Runner.java
Log:
remove timespan from instance query. Doesn't make sense

Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/BPAFDataSource.java
===================================================================
--- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/BPAFDataSource.java	2010-03-10 15:00:07 UTC (rev 998)
+++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/BPAFDataSource.java	2010-03-10 15:03:03 UTC (rev 999)
@@ -79,9 +79,8 @@
    * Only return result sets that include matching State.Close events.
    * Otherwise you include activities that are still running.
    *
-   * @param processInstance the process instance ID
-   * @param timespan a timespan (inclusive)    
+   * @param processInstance the process instance ID      
    * @return a list of instance activity events.
    */
-  List<Event> getInstanceEvents(String processInstance, Timespan timespan);
+  List<Event> getInstanceEvents(String processInstance);
 }

Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/DefaultBPAFDataSource.java
===================================================================
--- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/DefaultBPAFDataSource.java	2010-03-10 15:00:07 UTC (rev 998)
+++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/DefaultBPAFDataSource.java	2010-03-10 15:03:03 UTC (rev 999)
@@ -144,7 +144,7 @@
     return result;
   }
 
-  public List<Event> getInstanceEvents(final String processInstance, final Timespan timespan)
+  public List<Event> getInstanceEvents(final String processInstance)
   {
     List<Event> result = executeCommand(new SQLCommand<List<Event>>()
     {
@@ -157,8 +157,8 @@
             "and e1.activityDefinitionID is not null\n" +
             "and e2.activityDefinitionID is not null\n" +
             "and e1.processInstanceID='"+processInstance+"' "+
-            "and e1.timeStamp>="+timespan.getStart()+" "+
-            "and e2.timeStamp<="+timespan.getEnd()+" "+
+            //"and e1.timeStamp>="+timespan.getStart()+" "+
+            //"and e2.timeStamp<="+timespan.getEnd()+" "+
             "group by e1.activityInstanceID\n" +
             "order by e1.timeStamp, e1.processInstanceID");
 

Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/Runner.java
===================================================================
--- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/Runner.java	2010-03-10 15:00:07 UTC (rev 998)
+++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/Runner.java	2010-03-10 15:03:03 UTC (rev 999)
@@ -61,7 +61,7 @@
 
     // instance events
     String instance = instances.get(0);
-    List<Event> activityHistory = ds.getInstanceEvents(instance, timespan);
+    List<Event> activityHistory = ds.getInstanceEvents(instance);
     System.out.println("Instance events: "+activityHistory.size());
 
     for(String s : activities)