Changeset 103 for trunk/src/org/expeditee/stats

Timestamp:

06/13/08 18:00:25 (16 years ago)

Author:

ra33

Message:

Fixed up a few bugs with Saving of frames when actions are performed and with Comet and Tree stats.

Location:

trunk/src/org/expeditee/stats

Files:

• CometStats.java (modified) (1 diff)
• SessionStats.java (modified) (8 diffs)
• TreeStats.java (modified) (1 diff)

trunk/src/org/expeditee/stats/CometStats.java

@@ -56 +56 @@
 
                 StringBuffer sb = new StringBuffer();
+                sb.append(SessionStats.getDate());
                 sb.append("CometName: ").append(_name).append('\n');
-                sb.append("Edits: ").append(_sessions).append('\n');
+                sb.append("Versions: ").append(_sessions).append('\n');
                 sb.append("            Current  | Average  | Total").append('\n');
                 Time averageActive = new Time((long) (0.5 + active.getTime()

trunk/src/org/expeditee/stats/SessionStats.java

@@ -89 +89 @@
 
         public static String getCurrentStats() {
-                StringBuffer stats = getSessionDateTime();
+                StringBuffer stats = getLength();
 
                 long elapsedTime = (new Date()).getTime() - _StartTime.getTime();
@@ -107 +107 @@
 
         private static String getTimeElapsed() {
-                SimpleDateFormat formatter = new SimpleDateFormat("HH:mm");
                 Date currentTime = new Date();
                 long elapsedTime = currentTime.getTime() - _StartTime.getTime();
-                String time = formatter.format(_StartTime);
-                time += "-->" + formatter.format(currentTime);
-                time += " = " + (int) (elapsedTime / MILLISECONDS_PER_MINUTE); // (new
+                String time = "" + (int) ((double)elapsedTime / MILLISECONDS_PER_MINUTE + 0.5); // (new
                 // SimpleDateFormat("m").format(elapsedTime));
 
@@ -260 +257 @@
                 if (_StatsEnabled) {
                         _AccessedFrames++;
-                        _FrameEvents.clear();
-                        _FrameAccessTime = new Date();
-                        _FrameAccessDarkTime = (Time) _DarkTime.clone();
                 }
         }
@@ -269 +263 @@
                 FrameEdited(frameName);
                 _SavedFrames++;
+                
+                _FrameEvents.clear();
+                _FrameAccessTime = new Date();
+                _FrameAccessDarkTime = (Time) _DarkTime.clone();
         }
 
@@ -350 +348 @@
 
         private static void FrameEdited(String name) {
-                _FramesEdited.append(Logger.EasyDateFormat("ddMMMyyyy-HHmm:ss"))
+                _FramesEdited.append(Logger.EasyDateFormat("ddMMMyyyy:HHmm:ss"))
                                 .append("[").append(name).append("]\n");
         }
@@ -402 +400 @@
 
         public static String getItemStats() {
-                StringBuffer stats = getSessionDateTime();
+                StringBuffer stats = getLength();
                 int max = 0;
                 for (int i = 0; i < STAT_TYPES; i++) {
@@ -436 +434 @@
 
         public static String getEventStats() {
-                StringBuffer stats = getSessionDateTime();
+                StringBuffer stats = getLength();
                 int max = getMax(_EventTimes);
                 int maxWidthEvents = ("" + max).length();
@@ -485 +483 @@
          * @return
          */
-        private static StringBuffer getSessionDateTime() {
+        public static StringBuffer getLength() {
+                StringBuffer stats = getDate();
+                stats.append("SessionTime: ").append(getTimeElapsed()).append("\n");
+                return stats;
+        }
+        
+        public static StringBuffer getDate() {
                 StringBuffer stats = new StringBuffer("Date: ");
-                stats.append(Logger.EasyDateFormat("ddMMMyyyy")).append("\n");
-                stats.append("SessionTime: ").append(getTimeElapsed()).append("\n");
+                stats.append(Logger.EasyDateFormat("ddMMMyyyy:HHmm")).append("\n");
                 return stats;
         }

trunk/src/org/expeditee/stats/TreeStats.java

@@ -68 +68 @@
 
                 StringBuffer sb = new StringBuffer();
+                sb.append(SessionStats.getDate());
                 sb.append("TopFrame: ").append(_name).append('\n');
                 sb.append("Frames:   ").append(_treeFrames).append('\n');
                 sb.append("Versions: ").append(_treeSessions).append('\n');
-                sb.append("            FrameAve |VersionAve| Total").append('\n');
+                sb.append("           VersionAve| FrameAve | Total").append('\n');
                 Time averageActive = new Time((long) (0.5 + active.getTime()
                                 / (1.0 * _treeFrames)));