Author: heiko.braun(a)jboss.com
Date: 2010-03-30 11:01:50 -0400 (Tue, 30 Mar 2010)
New Revision: 1023
Modified:
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java
activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java
activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java
Log:
Fix date calculations
Modified:
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java
===================================================================
---
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java 2010-03-30
14:41:06 UTC (rev 1022)
+++
activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/server/ChartDataService.java 2010-03-30
15:01:50 UTC (rev 1023)
@@ -44,6 +44,9 @@
switch (timespan.getUnit())
{
+ case HOUR:
+ grouped = Grouping.byHour(events, timespan);
+ break;
case DAY:
grouped = Grouping.byDay(events, timespan);
break;
Modified:
activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java
===================================================================
---
activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java 2010-03-30
14:41:06 UTC (rev 1022)
+++
activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Grouping.java 2010-03-30
15:01:50 UTC (rev 1023)
@@ -55,6 +55,11 @@
return slotCount;
}
+ public static SortedMap<Date, List<Event>> byHour(List<Event> events,
Timespan timespan)
+ {
+ return _doSort(events, timespan, Calendar.HOUR_OF_DAY);
+ }
+
public static SortedMap<Date, List<Event>> byDay(List<Event> events,
Timespan timespan)
{
return _doSort(events, timespan, Calendar.DAY_OF_YEAR);
Modified:
activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java
===================================================================
---
activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java 2010-03-30
14:41:06 UTC (rev 1022)
+++
activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/metric/Timespan.java 2010-03-30
15:01:50 UTC (rev 1023)
@@ -114,13 +114,13 @@
cal.add(Calendar.WEEK_OF_YEAR, -1);
- cal.set(Calendar.DAY_OF_WEEK, 7);
+ cal.set(Calendar.DAY_OF_WEEK, cal.getActualMaximum(Calendar.DAY_OF_WEEK));
cal.set(Calendar.HOUR_OF_DAY, 23);
cal.set(Calendar.MINUTE, 59);
cal.set(Calendar.SECOND, 59);
long t1 = cal.getTimeInMillis();
- cal.set(Calendar.DAY_OF_WEEK, 0);
+ cal.set(Calendar.DAY_OF_WEEK, cal.getActualMinimum(Calendar.DAY_OF_WEEK));
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
@@ -152,7 +152,7 @@
cal.set(Calendar.SECOND, 59);
long t1 = cal.getTimeInMillis();
- cal.set(Calendar.DAY_OF_MONTH, 1);
+ cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
Show replies by date