Changeset 419 for trunk/src/org/expeditee/actions/Navigation.java

Timestamp:

11/21/08 10:46:54 (16 years ago)

Author:

ra33

Message:

Refactored DateTime format code... so all formats are determined in a single spot.

Fixed bug preventing users from clicking a frame title of a protected frame to move to the next and previous frame.

File:

• trunk/src/org/expeditee/actions/Navigation.java (modified) (12 diffs)

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

@@ -33 +33 @@
                 DisplayIO.Back();
         }
-        
+
         public static void Forward() {
                 DisplayIO.Forward();
@@ -44 +44 @@
                 FrameUtils.DisplayFrame(UserSettings.HomeFrame);
         }
-        
+
         public static void GotoZero() {
-                FrameUtils.DisplayFrame(DisplayIO.getCurrentFrame().getFramesetName() + 0);
+                FrameUtils
+                                .DisplayFrame(DisplayIO.getCurrentFrame().getFramesetName() + 0);
         }
 
@@ -64 +65 @@
          */
         public static void Goto(Integer value) {
-                FrameUtils.DisplayFrame(DisplayIO.getCurrentFrame().getFramesetName() + value);
-        }
-        
+                FrameUtils.DisplayFrame(DisplayIO.getCurrentFrame().getFramesetName()
+                                + value);
+        }
+
         /**
          * Loads the Frame with the given FrameName and displays it
@@ -104 +106 @@
                 NextFrame(true);
         }
-        
+
         public static void NextFrame(boolean addToBack) {
                 addToBack = adjustAddToBack(addToBack);
@@ -110 +112 @@
                 FrameUtils.DisplayFrame(next, addToBack, true);
         }
-        
+
         /**
          * Navigates to the last frame in the frameset.
-         *
+         * 
          */
         public static void LastFrame() {
@@ -119 +121 @@
                 FrameUtils.DisplayFrame(last, true, true);
         }
-        
+
         public static void ZeroFrame() {
                 Frame zeroFrame = FrameIO.LoadZero();
                 FrameUtils.DisplayFrame(zeroFrame, true, true);
         }
-        
 
         public static void Next() {
                 NextFrame();
         }
-        
+
         public static void Previous() {
                 PreviousFrame();
         }
-        
+
         public static void PreviousFrame(boolean addToBack) {
                 addToBack = adjustAddToBack(addToBack);
@@ -139 +140 @@
                 FrameUtils.DisplayFrame(prev, addToBack, true);
         }
-        
+
         public static void PreviousFrame() {
                 PreviousFrame(true);
@@ -160 +161 @@
                 }
 
-                //Ensure the parent variable has been initialised
+                // Ensure the parent variable has been initialised
                 if (_Parent == null || !back.equals(_Parent)) { // ByRob: what the heck
                         // is the code doing?
@@ -190 +191 @@
                 while (parentItemLinkedToSource < items.size()
                                 && (items.get(parentItemLinkedToSource).getAbsoluteLink() == null || !items
-                                                .get(parentItemLinkedToSource).getAbsoluteLink().toLowerCase()
-                                                .equals(sourceName))) {
+                                                .get(parentItemLinkedToSource).getAbsoluteLink()
+                                                .toLowerCase().equals(sourceName))) {
                         parentItemLinkedToSource++; // ByRob: this increments to the next
                         // item
@@ -203 +204 @@
                                                         source.getName())) {
                                 _LastItemUsed = items.get(i);
-                                FrameUtils.DisplayFrame(_LastItemUsed.getAbsoluteLink(), false, true);
+                                FrameUtils.DisplayFrame(_LastItemUsed.getAbsoluteLink(), false,
+                                                true);
                                 return;
                         } // ByRob: end of if
@@ -222 +224 @@
                         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
+
+        /*
+         * When display frame is called with addToBack set to false multiple
+         * times... Only the first frame is added to the backup stack. This flag
+         * stores the state for the addToBack parameter the last time this method
+         * was called.
+         */
         private static boolean _lastAddToBack = true;
 
@@ -233 +236 @@
                 _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!
+
+                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;
         }