[brailleblaster] 3 new revisions pushed by brandon....@xxxxxxxxx on 2015-03-20 18:25 GMT

• From: brailleblaster@xxxxxxxxxxxxxx
• To: brailleblaster@xxxxxxxxxxxxx
• Date: Fri, 20 Mar 2015 18:25:25 +0000

3 new revisions:

Revision: 9f100b419e03
Branch:   default
Author:   Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date:     Fri Mar 20 18:05:24 2015 UTC
Log:      Fixed a bug inserting unnecessary ine break for a block element
https://code.google.com/p/brailleblaster/source/detail?r=9f100b419e03

Revision: da291fc75966
Branch:   default
Author:   Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date:     Fri Mar 20 18:12:48 2015 UTC
Log:      Fixed bug removing line break on emtpy line
https://code.google.com/p/brailleblaster/source/detail?r=da291fc75966

Revision: a1f80d33e3e5
Branch:   default
Author:   Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date:     Fri Mar 20 18:26:32 2015 UTC
Log:      Combined multiple events that occur concurrently
https://code.google.com/p/brailleblaster/source/detail?r=a1f80d33e3e5

==============================================================================
Revision: 9f100b419e03
Branch:   default
Author:   Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date:     Fri Mar 20 18:05:24 2015 UTC
Log:      Fixed a bug inserting unnecessary ine break for a block element
https://code.google.com/p/brailleblaster/source/detail?r=9f100b419e03

Modified:

/src/main/org/brailleblaster/perspectives/braille/stylers/InsertElementHandler.java

=======================================

--- /src/main/org/brailleblaster/perspectives/braille/stylers/InsertElementHandler.java Fri Mar 20 11:55:10 2015 UTC +++ /src/main/org/brailleblaster/perspectives/braille/stylers/InsertElementHandler.java Fri Mar 20 18:05:24 2015 UTC

@@ -85,12 +85,15 @@

insertInList(elList, ev.getListIndex(), ev.getTextOffset() + 1, ev.getBrailleOffset() + 1);

                        else

insertInList(elList, ev.getListIndex(), ev.getTextOffset(), ev.getBrailleOffset());

+
+                       if(list.get(ev.getListIndex() + 1).start == 
ev.getTextOffset()){
+                               text.insertLineBreak(ev.getTextOffset());
+                               braille.insertLineBreak(ev.getBrailleOffset());

-                       if(list.size() - 1 != ev.getListIndex() + 1)
-                               list.shiftOffsetsFromIndex(ev.getListIndex() + 
1, 1, 1);
-
-                       text.insertLineBreak(ev.getTextOffset());
-                       braille.insertLineBreak(ev.getBrailleOffset());
+                               if(list.size() - 1 != ev.getListIndex() + 1)
+                                       
list.shiftOffsetsFromIndex(ev.getListIndex() + 1, 1, 1);
+                       }
+
                        tree.rebuildTree(ev.getTreeIndex());
                }
                else {

==============================================================================
Revision: da291fc75966
Branch:   default
Author:   Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date:     Fri Mar 20 18:12:48 2015 UTC
Log:      Fixed bug removing line break on emtpy line
https://code.google.com/p/brailleblaster/source/detail?r=da291fc75966

Modified:

/src/main/org/brailleblaster/perspectives/braille/stylers/RemoveElementHandler.java

=======================================

--- /src/main/org/brailleblaster/perspectives/braille/stylers/RemoveElementHandler.java Tue Dec 23 16:39:37 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/stylers/RemoveElementHandler.java Fri Mar 20 18:12:48 2015 UTC

@@ -45,7 +45,7 @@

                        findRemovalMethod(m);

- if(ev.getNode() instanceof Element && isBlockElement(list.get(ev.getListIndex()))){ + if(ev.getNode() instanceof Element && isBlockElement(list.get(ev.getListIndex())) && ev.getListIndex() <= list.size() - 1 && list.get(ev.getListIndex()).start != ev.getTextOffset()){

                                text.replaceTextRange(ev.getTextOffset(), 1, 
"");
                                braille.replaceTextRange(ev.getBrailleOffset(), 1, 
"");
                                list.shiftOffsetsFromIndex(ev.getListIndex(), 
-1, -1);

==============================================================================
Revision: a1f80d33e3e5
Branch:   default
Author:   Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date:     Fri Mar 20 18:26:32 2015 UTC
Log:      Combined multiple events that occur concurrently
https://code.google.com/p/brailleblaster/source/detail?r=a1f80d33e3e5

Modified:
 /src/main/org/brailleblaster/document/BBDocument.java

/src/main/org/brailleblaster/perspectives/braille/eventQueue/QueueManager.java /src/main/org/brailleblaster/perspectives/braille/stylers/InsertElementHandler.java /src/main/org/brailleblaster/perspectives/braille/stylers/RemoveElementHandler.java

=======================================

--- /src/main/org/brailleblaster/document/BBDocument.java Fri Mar 20 15:21:46 2015 UTC +++ /src/main/org/brailleblaster/document/BBDocument.java Fri Mar 20 18:26:32 2015 UTC

@@ -63,7 +63,6 @@
 import org.brailleblaster.settings.SettingsManager;
 import org.brailleblaster.util.CheckLiblouisutdmlLog;
 import org.brailleblaster.util.FileUtils;
-import org.brailleblaster.util.Notify;
 import org.liblouis.LibLouisUTDML;


=======================================

--- /src/main/org/brailleblaster/perspectives/braille/eventQueue/QueueManager.java Fri Jan 23 17:19:49 2015 UTC +++ /src/main/org/brailleblaster/perspectives/braille/eventQueue/QueueManager.java Fri Mar 20 18:26:32 2015 UTC

@@ -19,7 +19,7 @@
        public void addUndoEvent(EventFrame f){
                if(undoQueue.empty()){
                        f.setId(FIRST_ITEM_ID);
-                       if(!redoQueue.empty() && !swapFrame)
+                       if(!redoQueue.empty() && !swapFrame )
                                redoQueue.clear();
                }
                else{
=======================================

--- /src/main/org/brailleblaster/perspectives/braille/stylers/InsertElementHandler.java Fri Mar 20 18:05:24 2015 UTC +++ /src/main/org/brailleblaster/perspectives/braille/stylers/InsertElementHandler.java Fri Mar 20 18:26:32 2015 UTC

@@ -53,7 +53,13 @@
                        insertElement(ev);

frame.addEvent(new ModelEvent(EventTypes.Delete, ev.getParent().getChild(ev.getParentIndex()), vi.getStartIndex(), ev.getListIndex(), ev.getTextOffset(), ev.getBrailleOffset(), tree.getItemPath()));

                }
-               manager.addRedoEvent(frame);
+

+ if(manager.peekRedoEvent() != null && manager.peekRedoEvent().get(0).getEventType().equals(EventTypes.Whitespace)){

+                       while(!frame.empty())

+ manager.peekRedoEvent().addEvent(manager.peekRedoEvent().size() - 1,frame.pop());

+               }
+               else
+                       manager.addRedoEvent(frame);
        }

        public void redoInsert(EventFrame f){
=======================================

--- /src/main/org/brailleblaster/perspectives/braille/stylers/RemoveElementHandler.java Fri Mar 20 18:12:48 2015 UTC +++ /src/main/org/brailleblaster/perspectives/braille/stylers/RemoveElementHandler.java Fri Mar 20 18:26:32 2015 UTC

@@ -31,7 +31,12 @@

                findRemovalMethod(m);

-               manager.addUndoEvent(eventFrame);

+ if(manager.peekUndoEvent() != null && manager.peekUndoEvent().get(0).getEventType().equals(EventTypes.Whitespace)){

+                       while(!eventFrame.empty())

+ manager.peekUndoEvent().addEvent(manager.peekUndoEvent().size() - 1,eventFrame.pop());

+               }
+               else
+                       manager.addUndoEvent(eventFrame);
        }

        public void removeNode(EventFrame frame){
@@ -56,7 +61,13 @@

                        
manager.dispatch(Message.createUpdateCursorsMessage(Sender.TREE));
                }
-               manager.addUndoEvent(eventFrame);
+

+ if(manager.peekUndoEvent() != null && manager.peekUndoEvent().get(0).getEventType().equals(EventTypes.Whitespace)){

+                       while(!eventFrame.empty())

+ manager.peekUndoEvent().addEvent(manager.peekUndoEvent().size() - 1,eventFrame.pop());

+               }
+               else
+                       manager.addUndoEvent(eventFrame);
        }

        public void undoInsert(EventFrame frame){

Other related posts:

• » [brailleblaster] 3 new revisions pushed by brandon....@xxxxxxxxx on 2015-03-20 18:25 GMT - brailleblaster

1. Home
2. brailleblaster
3. Archive
4. 03-2015

---

• » Previous by Date
• » Next by Date
• » Related Posts
• » View list details
• » Manage your subscription

---