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

Timestamp:

05/21/08 09:40:52 (16 years ago)

Author:

ra33

Message:

Made LOTS of changes...
Added DisplayComet
A whole bunch more stats for items and events
Changed lots of stuff for drawing better especially using text as line endpoints

File:

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

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

@@ -160 +160 @@
 
         public static void NextChild(Frame source) {
-                String back = DisplayIO.peekFromBack(); // ByRob: "peekFromBack" is not
-                // an informative term, better to refer to back up stack
+                String back = DisplayIO.peekFromBackUpStack();
                 // if there is no parent frame (i.e. the user is on the home frame) //
-                // ByRob: this should say "for example, the user ...."
                 if (back == null) { // No frame was on the Backup stack
                         FrameGraphics.DisplayMessage("No Parent Frame Found.");
                         _LastItemUsed = null; // ByRob: what is reason for setting
-                        // this to null, who is going to use
-                        // it????
+                        // this to null, who is going to use it????
                         _Parent = null; // ByRob: what is reason for setting this to
                         // null, who is going to use it
@@ -174 +171 @@
                 }
 
-                /*
-                 * if(_Parent == null || !back.equals(_Parent.getFrameName())){ _Parent =
-                 * FrameIO.LoadFrame(back); _LastItemUsed = null; }
-                 */
-
+                //Ensure the parent variable has been initialised
                 if (_Parent == null || !back.equals(_Parent)) { // ByRob: what the heck
                         // is the code doing?
@@ -187 +180 @@
                 }
 
-                Frame parent = FrameIO.LoadFrame(_Parent); // at this point we have
-                // a parent frame (but
-                // does LoadFrame access
-                // backup stack?
-
-                // find the next item to visit // ByRob: We should NOT be trying to
-                // remember state!!! at time of Next, getNameOfCurrentFrame!!!!
-                // Actually, no. It could be situation that there is more than one item
-                // on frame linked to CurrentFr
-
+                Frame parent = FrameIO.LoadFrame(_Parent);
+
+                // find the next item to visit
                 List<Item> items = parent.getItems(); // getItems method gets us the
                 // FirstItem on the frame
@@ -210 +196 @@
 
                 // ByMike: If the 'Next' child is being sought for the 1st time...
-
                 String sourceName = source.getFrameName().toLowerCase();
 
@@ -226 +211 @@
                         if (items.get(i).isLinkValid()
                                         && !items.get(i).isAnnotation()
-                                        && !items.get(i).getAbsoluteLink().toLowerCase().equals(
-                                                        source.getFrameName().toLowerCase())) {
+                                        && !items.get(i).getAbsoluteLink().equalsIgnoreCase(
+                                                        source.getFrameName())) {
                                 _LastItemUsed = items.get(i);
-                                FrameUtils.DisplayFrame(_LastItemUsed.getLink(), false);
+                                FrameUtils.DisplayFrame(_LastItemUsed.getAbsoluteLink(), false);
                                 return;
                         } // ByRob: end of if