Changeset 408

Timestamp:

11/18/08 16:36:36 (16 years ago)

Author:

ra33

Message:

Made changes so that clicking back still counts as accessing a frame for statistics purposes...

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (1 diff)
• actions/Navigation.java (modified) (4 diffs)
• actions/Simple.java (modified) (5 diffs)
• gui/DisplayIO.java (modified) (2 diffs)
• gui/FrameKeyboardActions.java (modified) (2 diffs)
• gui/FrameMouseActions.java (modified) (2 diffs)
• gui/FrameUtils.java (modified) (4 diffs)
• stats/SessionStats.java (modified) (2 diffs)

trunk/src/org/expeditee/actions/Actions.java

@@ -656 +656 @@
                                         // the results are loading
                                         Frame next = _Agent.getResultFrame();
-                                        FrameUtils.DisplayFrame(next, true);
+                                        FrameUtils.DisplayFrame(next, true, true);
                                 }
                         }

trunk/src/org/expeditee/actions/Navigation.java

@@ -103 +103 @@
                 addToBack = adjustAddToBack(addToBack);
                 Frame next = FrameIO.LoadNext();
-                FrameUtils.DisplayFrame(next, addToBack);
+                FrameUtils.DisplayFrame(next, addToBack, true);
         }
         
@@ -112 +112 @@
         public static void LastFrame() {
                 Frame last = FrameIO.LoadLast();
-                FrameUtils.DisplayFrame(last, true);
+                FrameUtils.DisplayFrame(last, true, true);
         }
         
         public static void ZeroFrame() {
                 Frame zeroFrame = FrameIO.LoadZero();
-                FrameUtils.DisplayFrame(zeroFrame, true);
+                FrameUtils.DisplayFrame(zeroFrame, true, true);
         }
         
@@ -132 +132 @@
                 addToBack = adjustAddToBack(addToBack);
                 Frame prev = FrameIO.LoadPrevious();
-                FrameUtils.DisplayFrame(prev, addToBack);
+                FrameUtils.DisplayFrame(prev, addToBack, true);
         }
         
@@ -198 +198 @@
                                                         source.getName())) {
                                 _LastItemUsed = items.get(i);
-                                FrameUtils.DisplayFrame(_LastItemUsed.getAbsoluteLink(), false);
+                                FrameUtils.DisplayFrame(_LastItemUsed.getAbsoluteLink(), false, true);
                                 return;
                         } // ByRob: end of if

trunk/src/org/expeditee/actions/Simple.java

@@ -156 +156 @@
                 actions.add(RUN_FRAME_ACTION);
                 newSimpleTest.getTitleItem().setActions(actions);
-                FrameUtils.DisplayFrame(newSimpleTest, true);
+                FrameUtils.DisplayFrame(newSimpleTest, true, true);
                 MessageBay.displayMessage("New test created");
         }
@@ -165 +165 @@
                         next = FrameIO.LoadNext(next);
                 } while (next != null && !next.isTestFrame());
-                FrameUtils.DisplayFrame(next, true);
+                FrameUtils.DisplayFrame(next, true, true);
         }
 
@@ -174 +174 @@
                 } while (prev != null && !prev.isTestFrame());
 
-                FrameUtils.DisplayFrame(prev, true);
+                FrameUtils.DisplayFrame(prev, true, true);
         }
 
@@ -190 +190 @@
                 } while (next != null);
 
-                FrameUtils.DisplayFrame(lastTest, true);
+                FrameUtils.DisplayFrame(lastTest, true, true);
         }
 
@@ -400 +400 @@
 
         private static void FlagError(Item item) {
-                FrameUtils.DisplayFrame(item.getParent().getName(), true);
+                FrameUtils.DisplayFrame(item.getParent().getName(), true, true);
                 item.setHighlightMode(HighlightMode.Normal);
                 item.setHighlightColor(Color.CYAN);

trunk/src/org/expeditee/gui/DisplayIO.java

@@ -664 +664 @@
                 }
                 _BackedUpFrames[side].push(oldFrame);
-                FrameUtils.DisplayFrame(frame, false);
+                FrameUtils.DisplayFrame(frame, false, true);
                 FrameMouseActions.setHighlightHold(true);
 
@@ -716 +716 @@
                 }
                 _VisitedFrames[side].push(oldFrame);
-                FrameUtils.DisplayFrame(frame, false);
+                FrameUtils.DisplayFrame(frame, false, true);
                 FrameGraphics.requestRefresh(true);
                 return true;

trunk/src/org/expeditee/gui/FrameKeyboardActions.java

@@ -2 +2 @@
 
 import java.awt.Color;
-import java.awt.Polygon;
 import java.awt.Rectangle;
 import java.awt.Toolkit;
@@ -2194 +2193 @@
                         text.setLink(linkTo.getName());
                         text.getParent().setChanged(true);
-                        FrameUtils.DisplayFrame(linkTo, true);
+                        FrameUtils.DisplayFrame(linkTo, true, true);
                         linkTo.moveMouseToDefaultLocation();
                         // this needs to be done if the user doesnt move the mouse before

trunk/src/org/expeditee/gui/FrameMouseActions.java

@@ -769 +769 @@
                                 if (clickedOn.isFrameName()) {
                                         Frame next = FrameIO.LoadNext();
-                                        FrameUtils.DisplayFrame(next, true);
+                                        FrameUtils.DisplayFrame(next, true, true);
                                         return;
                                 }
@@ -2134 +2134 @@
                 }
 
-                FrameUtils.DisplayFrame(next, true);
+                FrameUtils.DisplayFrame(next, true, true);
                 FrameUtils.setTdfcItem(linker);
 

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -364 +364 @@
          *            False otherwise
          */
-        public static void DisplayFrame(Frame toDisplay, boolean addToBack) {
+        public static void DisplayFrame(Frame toDisplay, boolean addToBack, boolean incrementStats) {
                 if (toDisplay == null)
                         return;
@@ -432 +432 @@
 
                 Parse(toDisplay);
-                DisplayIO.setCurrentFrame(toDisplay, addToBack);
+                DisplayIO.setCurrentFrame(toDisplay, incrementStats);
                 FrameMouseActions.updateCursor();
                 // FrameMouseActions.getInstance().refreshHighlights();
@@ -451 +451 @@
          *            false otherwise
          */
-        public static void DisplayFrame(String frameName, boolean addToBack) {
+        public static void DisplayFrame(String frameName, boolean addToBack, boolean incrementStats) {
                 Frame newFrame = getFrame(frameName);
 
                 if (newFrame != null)
                         // display the frame
-                        DisplayFrame(newFrame, addToBack);
+                        DisplayFrame(newFrame, addToBack, incrementStats);
         }
 
@@ -468 +468 @@
          */
         public static void DisplayFrame(String framename) {
-                DisplayFrame(framename, true);
+                DisplayFrame(framename, true, true);
         }
 

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

@@ -22 +22 @@
 
 public class SessionStats extends Stats{
-
+        
         public enum ItemType {
                 Text, Dot, Line, Picture, Total;
@@ -46 +46 @@
         private static int[] _MouseCounters = new int[MOUSE_BUTTONS];
 
-        private static int _AccessedFrames = -1;
+        private static int _AccessedFrames = 0;
 
         private static int _SavedFrames = 0;