Changeset 67 for trunk/src/org/expeditee/actions/NavigationActions.java

Timestamp:

05/19/08 12:03:18 (16 years ago)

Author:

ra33

Message:

Fixed a bunch of problems with rectangles and resizing the window, as well as adding some more unit tests etc.

File:

• trunk/src/org/expeditee/actions/NavigationActions.java (modified) (5 diffs)

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

@@ -117 +117 @@
         
         public static void NextFrame(boolean addToBack) {
+                addToBack = adjustAddToBack(addToBack);
                 Frame next = FrameIO.LoadNext();
-                FrameUtils.DisplayFrame(next, true);
+                FrameUtils.DisplayFrame(next, addToBack);
         }
         
@@ -145 +146 @@
         
         public static void PreviousFrame(boolean addToBack) {
+                addToBack = adjustAddToBack(addToBack);
                 Frame prev = FrameIO.LoadPrevious();
                 FrameUtils.DisplayFrame(prev, addToBack);
@@ -213 +215 @@
                 // ByMike: Find the first occurence of a ParentItem linked to the source
                 while (parentItemLinkedToSource < items.size()
-                                && (items.get(parentItemLinkedToSource).getLink() == null || !items
-                                                .get(parentItemLinkedToSource).getLink().toLowerCase()
+                                && (items.get(parentItemLinkedToSource).getAbsoluteLink() == null || !items
+                                                .get(parentItemLinkedToSource).getAbsoluteLink().toLowerCase()
                                                 .equals(sourceName))) {
                         parentItemLinkedToSource++; // ByRob: this increments to the next
@@ -224 +226 @@
                         if (items.get(i).isLinkValid()
                                         && !items.get(i).isAnnotation()
-                                        && !items.get(i).getLink().toLowerCase().equals(
+                                        && !items.get(i).getAbsoluteLink().toLowerCase().equals(
                                                         source.getFrameName().toLowerCase())) {
                                 _LastItemUsed = items.get(i);
@@ -250 +252 @@
                         DisplayIO.ToggleTwinFrames();
         }
+        
+        // When display frame is called with addToBack set to false multiple
+        // times...
+        // The first time we add to back but after that we dont
+        // This flag stores the state for the addToBack parameter the last time this
+        // method was called
+        private static boolean _lastAddToBack = true;
+
+        public static void ResetLastAddToBack() {
+                _lastAddToBack = true;
+        }
+        
+        private static boolean adjustAddToBack(boolean addToBack) {
+                boolean originalAddToBack = addToBack;
+                
+                if (!addToBack && _lastAddToBack){
+                        //This adds the first frame to the backup stack when the user
+                        //navigates through a bunch of frames with the keyboard!
+                        addToBack = true;
+                }
+                
+                _lastAddToBack = originalAddToBack;
+                
+                return addToBack;
+        }
 }