Changeset 676

Timestamp:

01/10/14 14:25:42 (10 years ago)

Author:

jts21

Message:

Switch to using a link instead of an action for navigation buttons, also add a setting for whether a link should be added to history (to enable navigation buttons that don't generate history)

Location:

trunk/src/org/expeditee

Files:

• gui/AttributeUtils.java (modified) (1 diff)
• gui/FrameCreator.java (modified) (1 diff)
• gui/FrameMouseActions.java (modified) (2 diffs)
• io/DefaultFrameReader.java (modified) (1 diff)
• io/DefaultFrameWriter.java (modified) (1 diff)
• items/Item.java (modified) (2 diffs)

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

@@ -203 +203 @@
                         _Attrib.put("Link",                 Item.class.getMethod("getLink"),
                                                             Item.class.getMethod("setLink", pString));
+                        _Attrib.put("AddToHistory",         Item.class.getMethod("getLinkHistory"),
+                                                            Item.class.getMethod("setLinkHistory", pBool));
                         _Attrib.put("Action",               Item.class.getMethod("getAction"),
                                                             Item.class.getMethod("setActions", pList));

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

@@ -276 +276 @@
                 Item previousButton = template.copy();
                 previousButton.setID(current.getNextItemID());
-                // don't store button navigation in history,
-                // since it's annoying to have to click back through all of it to get back to the profile frame
-                previousButton.setAction("gotoQuiet " + link);
+                previousButton.setLink(link);
+                previousButton.setLinkHistory(false);
+                previousButton.setLinkMark(false);
                 current.addItem(previousButton);
 

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

@@ -824 +824 @@
 
                                 Navigation.setLastNavigationItem(clickedOn);
-                                load(clickedOn.getAbsoluteLink());
+                                load(clickedOn.getAbsoluteLink(), clickedOn.getLinkHistory());
                                 // DisplayIO.UpdateTitle();
                                 return;
@@ -2264 +2264 @@
         }
 
-        private static void load(String toLoad) {
+        private static void load(String toLoad, boolean addToHistory) {
                 if (FrameIO.isValidFrameName(toLoad)) {
                         DisplayIO.clearBackedUpFrames();
-                        FrameUtils.DisplayFrame(toLoad);
+                        FrameUtils.DisplayFrame(toLoad, addToHistory, true);
                 } else {
                         MessageBay.errorMessage(toLoad + " is not a valid frame name.");

trunk/src/org/expeditee/io/DefaultFrameReader.java

@@ -129 +129 @@
                         
                         _ItemTags.put('A', Item.class.getMethod("setTooltip", pString));
+                        _ItemTags.put('B', Item.class.getMethod("setLinkHistory", pBool));
                         
                         // Lines and constraints are created differently

trunk/src/org/expeditee/io/DefaultFrameWriter.java

@@ -125 +125 @@
                         
                         _ItemTags.put("A", Item.class.getMethod("getTooltip", param));
+                        _ItemTags.put("B", Item.class.getMethod("getLinkHistory", param));
 
                 } catch (Exception e) {

trunk/src/org/expeditee/items/Item.java

@@ -303 +303 @@
 
         private String _link = null;
+        
+        private boolean _linkHistory = true;
 
         private StringBuffer _tag = new StringBuffer();
@@ -1683 +1685 @@
                 invalidateCommonTrait(ItemAppearence.LinkChanged);
         }
+        
+        public void setLinkHistory(boolean value) {
+                _linkHistory = value;
+        }
+        
+        public boolean getLinkHistory() {
+                return _linkHistory;
+        }
 
         public void setLinkFrameset(String frameset) {