Changeset 676 for trunk/src/org/expeditee
- Timestamp:
- 01/10/14 14:25:42 (10 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gui/AttributeUtils.java
r671 r676 203 203 _Attrib.put("Link", Item.class.getMethod("getLink"), 204 204 Item.class.getMethod("setLink", pString)); 205 _Attrib.put("AddToHistory", Item.class.getMethod("getLinkHistory"), 206 Item.class.getMethod("setLinkHistory", pBool)); 205 207 _Attrib.put("Action", Item.class.getMethod("getAction"), 206 208 Item.class.getMethod("setActions", pList)); -
trunk/src/org/expeditee/gui/FrameCreator.java
r670 r676 276 276 Item previousButton = template.copy(); 277 277 previousButton.setID(current.getNextItemID()); 278 // don't store button navigation in history,279 // since it's annoying to have to click back through all of it to get back to the profile frame280 previousButton.set Action("gotoQuiet " + link);278 previousButton.setLink(link); 279 previousButton.setLinkHistory(false); 280 previousButton.setLinkMark(false); 281 281 current.addItem(previousButton); 282 282 -
trunk/src/org/expeditee/gui/FrameMouseActions.java
r673 r676 824 824 825 825 Navigation.setLastNavigationItem(clickedOn); 826 load(clickedOn.getAbsoluteLink() );826 load(clickedOn.getAbsoluteLink(), clickedOn.getLinkHistory()); 827 827 // DisplayIO.UpdateTitle(); 828 828 return; … … 2264 2264 } 2265 2265 2266 private static void load(String toLoad ) {2266 private static void load(String toLoad, boolean addToHistory) { 2267 2267 if (FrameIO.isValidFrameName(toLoad)) { 2268 2268 DisplayIO.clearBackedUpFrames(); 2269 FrameUtils.DisplayFrame(toLoad );2269 FrameUtils.DisplayFrame(toLoad, addToHistory, true); 2270 2270 } else { 2271 2271 MessageBay.errorMessage(toLoad + " is not a valid frame name."); -
trunk/src/org/expeditee/io/DefaultFrameReader.java
r659 r676 129 129 130 130 _ItemTags.put('A', Item.class.getMethod("setTooltip", pString)); 131 _ItemTags.put('B', Item.class.getMethod("setLinkHistory", pBool)); 131 132 132 133 // Lines and constraints are created differently -
trunk/src/org/expeditee/io/DefaultFrameWriter.java
r656 r676 125 125 126 126 _ItemTags.put("A", Item.class.getMethod("getTooltip", param)); 127 _ItemTags.put("B", Item.class.getMethod("getLinkHistory", param)); 127 128 128 129 } catch (Exception e) { -
trunk/src/org/expeditee/items/Item.java
r665 r676 303 303 304 304 private String _link = null; 305 306 private boolean _linkHistory = true; 305 307 306 308 private StringBuffer _tag = new StringBuffer(); … … 1683 1685 invalidateCommonTrait(ItemAppearence.LinkChanged); 1684 1686 } 1687 1688 public void setLinkHistory(boolean value) { 1689 _linkHistory = value; 1690 } 1691 1692 public boolean getLinkHistory() { 1693 return _linkHistory; 1694 } 1685 1695 1686 1696 public void setLinkFrameset(String frameset) {
Note:
See TracChangeset
for help on using the changeset viewer.