Revision: 0f5d8093b7e1 Branch: rt1835-UndoRemoveElement Author: Brandon Roller<brandon.r.roller@xxxxxxxxx> Date: Mon Dec 8 20:51:17 2014 UTC Log: Added Redo capability for removal of an element https://code.google.com/p/brailleblaster/source/detail?r=0f5d8093b7e1 Modified: /src/main/org/brailleblaster/perspectives/braille/mapping/maps/MapList.java/src/main/org/brailleblaster/perspectives/braille/stylers/ElementInserter.java /src/main/org/brailleblaster/perspectives/braille/stylers/ElementRemover.java
=======================================--- /src/main/org/brailleblaster/perspectives/braille/mapping/maps/MapList.java Wed Dec 3 14:00:01 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/mapping/maps/MapList.java Mon Dec 8 20:51:17 2014 UTC
@@ -717,4 +717,8 @@ return false; } + + public boolean empty(){ + return size() == 0; + } } =======================================--- /src/main/org/brailleblaster/perspectives/braille/stylers/ElementInserter.java Mon Dec 8 19:48:22 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/stylers/ElementInserter.java Mon Dec 8 20:51:17 2014 UTC
@@ -68,7 +68,7 @@if(ev.getNode() instanceof Element && ((Element)ev.getNode()).getAttributeValue("semantics").contains("style")){ ArrayList<TextMapElement>elList = constructMapElements((Element)ev.getNode(), 0);
- if(list.size() > 0 && ev.getListIndex() > 0 && list.get(ev.getListIndex() - 1).end == ev.getTextOffset()) + if(!list.empty() && ev.getListIndex() > 0 && list.get(ev.getListIndex() - 1).end == ev.getTextOffset()) insertInList(elList, ev.getListIndex(), ev.getTextOffset() + 1, ev.getBrailleOffset() + 1);
elseinsertInList(elList, ev.getListIndex(), ev.getTextOffset(), ev.getBrailleOffset());
=======================================--- /src/main/org/brailleblaster/perspectives/braille/stylers/ElementRemover.java Mon Dec 8 19:05:31 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/stylers/ElementRemover.java Mon Dec 8 20:51:17 2014 UTC
@@ -59,7 +59,10 @@ list.shiftOffsetsFromIndex(ev.getListIndex(), -1, -1); }- manager.dispatch(Message.createSetCurrentMessage(Sender.TREE, ev.getTextOffset(), false));
+ if(!list.empty()) + list.setCurrent(ev.getListIndex()); + + manager.dispatch(Message.createUpdateCursorsMessage(Sender.TREE)); } private void removeElement(Message message){