[brailleblaster] 2 new revisions pushed by brandon....@xxxxxxxxx on 2014-12-03 14:09 GMT
- From: brailleblaster@xxxxxxxxxxxxxx
- To: brailleblaster@xxxxxxxxxxxxx
- Date: Wed, 03 Dec 2014 14:10:05 +0000
2 new revisions:
Revision: e4bf38fbec94
Branch: rt1835-UndoRemoveElement
Author: Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date: Wed Dec 3 14:00:01 2014 UTC
Log: Removed unused variables
https://code.google.com/p/brailleblaster/source/detail?r=e4bf38fbec94
Revision: 3b68e9d01652
Branch: rt1835-UndoRemoveElement
Author: Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date: Wed Dec 3 14:11:02 2014 UTC
Log: Added a seperate class for handling splitting elements
https://code.google.com/p/brailleblaster/source/detail?r=3b68e9d01652
==============================================================================
Revision: e4bf38fbec94
Branch: rt1835-UndoRemoveElement
Author: Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date: Wed Dec 3 14:00:01 2014 UTC
Log: Removed unused variables
https://code.google.com/p/brailleblaster/source/detail?r=e4bf38fbec94
Modified:
/src/main/org/brailleblaster/BBIni.java
/src/main/org/brailleblaster/perspectives/braille/Manager.java
/src/main/org/brailleblaster/perspectives/braille/mapping/maps/MapList.java
/src/main/org/brailleblaster/perspectives/braille/stylers/BoxlineHandler.java
/src/main/org/brailleblaster/perspectives/braille/stylers/ElementInserter.java
/src/main/org/brailleblaster/perspectives/braille/stylers/HideActionHandler.java
=======================================
--- /src/main/org/brailleblaster/BBIni.java Fri Nov 7 16:51:38 2014 UTC
+++ /src/main/org/brailleblaster/BBIni.java Wed Dec 3 14:00:01 2014 UTC
@@ -94,8 +94,6 @@
private static String releaseDate;
private static String brailleblasterPath; // FO
- private static String osName;
- private static String osVersion;
private static String fileSep;
private static String nativeCommandPath;
private static String nativeLibraryPath;
@@ -129,9 +127,6 @@
platformName = SWT.getPlatform();
Main m = new Main();
brailleblasterPath = getBrailleblasterPath(m);
- osName = System.getProperty("os.name");
- osVersion = System.getProperty("os.version");
- fileSep = System.getProperty("file.separator");
String userHome = System.getProperty("user.home");
String BBHome;
programDataPath = brailleblasterPath + fileSep + "programData";
=======================================
--- /src/main/org/brailleblaster/perspectives/braille/Manager.java Mon Dec
1 16:01:25 2014 UTC
+++ /src/main/org/brailleblaster/perspectives/braille/Manager.java Wed Dec
3 14:00:01 2014 UTC
@@ -644,9 +644,9 @@
braille.removeWhitespace(brailleStart,
(Integer)message.getValue("length"));
if(start >= t.end && index != list.size() - 1 &&
list.size() > 1)
- list.shiftOffsetsFromIndex(index + 1,
(Integer)message.getValue("length"), (Integer)message.getValue("length"),
(Integer)message.getValue("offset"));
+ list.shiftOffsetsFromIndex(index + 1,
(Integer)message.getValue("length"), (Integer)message.getValue("length"));
else if(index != list.size() -1 || (index == list.size() - 1 && start <
t.start))
- list.shiftOffsetsFromIndex(index, (Integer)message.getValue("length"),
(Integer)message.getValue("length"), (Integer)message.getValue("offset"));
+ list.shiftOffsetsFromIndex(index, (Integer)message.getValue("length"),
(Integer)message.getValue("length"));
}
else
braille.removeWhitespace(0,
(Integer)message.getValue("length"));
@@ -681,7 +681,6 @@
}
private void splitElement(Message m){
- int origPos =list.getCurrent().start;
int treeIndex = treeView.getBlockElementIndex();
ArrayList<Integer> originalElements =
list.findTextMapElementRange(list.getCurrentIndex(),
(Element)list.getCurrent().parentElement(), true);
@@ -709,7 +708,7 @@
text.clearTextRange(textStart, textEnd - textStart);
braille.clearTextRange(brailleStart, brailleEnd - brailleStart);
- list.shiftOffsetsFromIndex(currentIndex, -(textEnd - textStart),
-(brailleEnd - brailleStart), origPos);
+ list.shiftOffsetsFromIndex(currentIndex, -(textEnd - textStart),
-(brailleEnd - brailleStart));
int firstElementIndex = currentIndex;
currentIndex = insertElement(els.get(0), currentIndex, textStart,
brailleStart) - 1;
@@ -736,7 +735,7 @@
int secondElementIndex = currentIndex + 1;
currentIndex = insertElement(els.get(1), currentIndex + 1,
list.get(currentIndex).end + insertionString.length(),
list.get(currentIndex).brailleList.getLast().end +
insertionString.length());
- list.shiftOffsetsFromIndex(currentIndex, list.get(currentIndex - 1).end
- textStart, list.get(currentIndex - 1).brailleList.getLast().end -
brailleStart, origPos);
+ list.shiftOffsetsFromIndex(currentIndex, list.get(currentIndex - 1).end
- textStart, list.get(currentIndex - 1).brailleList.getLast().end -
brailleStart);
treeView.split(Message.createSplitTreeMessage(firstElementIndex,
secondElementIndex, currentIndex, treeIndex));
}
@@ -778,7 +777,6 @@
}
private void insertElementAtBeginning(Message m){
- int origPos = list.getCurrent().start;
if(list.getCurrentIndex() > 0 && list.getCurrent().start != 0)
document.insertEmptyTextNode(vi, list, list.getCurrent(),
list.getCurrent().start - 1, list.getCurrent().brailleList.getFirst().start
- 1,list.getCurrentIndex(),(String) m.getValue("elementName"));
else
@@ -786,9 +784,9 @@
if(list.size() - 1 != list.getCurrentIndex() - 1){
if(list.getCurrentIndex() == 0)
-
list.shiftOffsetsFromIndex(list.getCurrentIndex() + 1, 1, 1, origPos);
+
list.shiftOffsetsFromIndex(list.getCurrentIndex() + 1, 1, 1);
else
-
list.shiftOffsetsFromIndex(list.getCurrentIndex(), 1, 1, origPos);
+
list.shiftOffsetsFromIndex(list.getCurrentIndex(), 1, 1);
}
int index = treeView.getSelectionIndex();
@@ -802,10 +800,9 @@
}
private void insertElementAtEnd(Message m){
- int origPos = list.getCurrent().start;
document.insertEmptyTextNode(vi, list, list.getCurrent(),
list.getCurrent().end + 1, list.getCurrent().brailleList.getLast().end + 1,
list.getCurrentIndex() + 1,(String) m.getValue("elementName"));
if(list.size() - 1 != list.getCurrentIndex() + 1)
- list.shiftOffsetsFromIndex(list.getCurrentIndex() + 2,
1, 1, origPos);
+ list.shiftOffsetsFromIndex(list.getCurrentIndex() + 2,
1, 1);
int index = treeView.getSelectionIndex();
@@ -1046,7 +1043,7 @@
private void adjustStyle(ArrayList<TextMapElement> itemList, Message
message) {
int start = list.indexOf(itemList.get(0));
int end = list.indexOf(itemList.get(itemList.size() - 1));
- int origPos =
list.get(list.getNodeIndex(itemList.get(0))).start;
+
if (start > 0) {
message.put("prev", list.get(start - 1).end);
message.put("braillePrev",
@@ -1071,12 +1068,12 @@
if (message.contains("linesBeforeOffset"))
list.shiftOffsetsFromIndex(start,
(Integer)
message.getValue("linesBeforeOffset"),
- (Integer)
message.getValue("linesBeforeOffset"), origPos);
+ (Integer)
message.getValue("linesBeforeOffset"));
if (message.contains("linesAfterOffset") && list.size() > 1
&& end < list.size() - 1)
list.shiftOffsetsFromIndex(end + 1,
(Integer)
message.getValue("linesAfterOffset"),
- (Integer)
message.getValue("linesAfterOffset"), origPos);
+ (Integer)
message.getValue("linesAfterOffset"));
treeView.adjustItemStyle(list.getCurrent());
}
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/mapping/maps/MapList.java
Mon Sep 22 22:51:43 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/mapping/maps/MapList.java
Wed Dec 3 14:00:01 2014 UTC
@@ -236,7 +236,7 @@
}
- public void shiftOffsetsFromIndex(int index, int offset, int
brailleOffset, int origPos){
+ public void shiftOffsetsFromIndex(int index, int offset, int
brailleOffset){
UpdaterThread [] arr = new UpdaterThread[PROCESSORS];
int length = (this.size() - index) / PROCESSORS;
int start = index;
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/stylers/BoxlineHandler.java
Mon Nov 17 21:08:29 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/stylers/BoxlineHandler.java
Wed Dec 3 14:00:01 2014 UTC
@@ -182,7 +182,7 @@
//set text
text.insertText(start, list.get(startPos).getText() + "\n");
braille.insertText(brailleStart,
list.get(startPos).brailleList.getFirst().value() + "\n");
- list.shiftOffsetsFromIndex(startPos + 1,
list.get(startPos).getText().length() + 1,
list.get(startPos).brailleList.getFirst().value().length() + 1,
list.get(startPos + 1).start);
+ list.shiftOffsetsFromIndex(startPos + 1,
list.get(startPos).getText().length() + 1,
list.get(startPos).brailleList.getFirst().value().length() + 1);
return startPos;
}
@@ -218,7 +218,7 @@
//set text
text.insertText(end, "\n" + list.get(endPos).getText());
braille.insertText(brailleEnd, "\n" +
list.get(endPos).brailleList.getFirst().value());
- list.shiftOffsetsFromIndex(endPos + 1,
list.get(endPos).getText().length() + 1,
list.get(endPos).brailleList.getFirst().value().length() + 1,
list.get(endPos).start);
+ list.shiftOffsetsFromIndex(endPos + 1,
list.get(endPos).getText().length() + 1,
list.get(endPos).brailleList.getFirst().value().length() + 1);
return endPos;
}
@@ -298,7 +298,7 @@
//set text
text.insertText(start, list.get(index).getText() + "\n");
braille.insertText(brailleStart,
list.get(index).brailleList.getFirst().value() + "\n");
- list.shiftOffsetsFromIndex(index + 1, list.get(index).getText().length()
+ 1, list.get(index).brailleList.getFirst().value().length() + 1,
list.get(index + 1).start);
+ list.shiftOffsetsFromIndex(index + 1, list.get(index).getText().length()
+ 1, list.get(index).brailleList.getFirst().value().length() + 1);
}
private void replaceBoxLine(Element brl, Element replacement){
@@ -310,7 +310,7 @@
braille.replaceTextRange(list.get(index).brailleList.getFirst().start,
list.get(index).brailleList.getLast().end -
list.get(index).brailleList.getFirst().start, t.getValue());
if(length > 0)
- list.shiftOffsetsFromIndex(index + 1, length, length,
0);
+ list.shiftOffsetsFromIndex(index + 1, length, length);
}
private ArrayList<Element> findBoxlines(Element e){
@@ -486,7 +486,7 @@
int index = list.indexOf(b);
manager.getText().replaceTextRange(b.start, (b.end + 1) - b.start,
"");
manager.getBraille().replaceTextRange(b.brailleList.getFirst().start,
(b.brailleList.getFirst().end + 1) - b.brailleList.getFirst().start, "");
- list.shiftOffsetsFromIndex(index, -((b.end + 1) - b.start),
-((b.brailleList.getFirst().end + 1) - b.brailleList.getFirst().start), 0);
+ list.shiftOffsetsFromIndex(index, -((b.end + 1) - b.start),
-((b.brailleList.getFirst().end + 1) - b.brailleList.getFirst().start));
list.remove(index);
}
@@ -497,7 +497,7 @@
int index = list.indexOf(b);
manager.getText().replaceTextRange(b.start - 1, b.end - (b.start -
1), "");
manager.getBraille().replaceTextRange(b.brailleList.getFirst().start -
1, b.brailleList.getFirst().end - (b.brailleList.getFirst().start - 1), "");
- list.shiftOffsetsFromIndex(index, -(b.end - (b.start - 1)),
-(b.brailleList.getFirst().end - (b.brailleList.getFirst().start - 1)), 0);
+ list.shiftOffsetsFromIndex(index, -(b.end - (b.start - 1)),
-(b.brailleList.getFirst().end - (b.brailleList.getFirst().start - 1)));
list.remove(index);
}
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/stylers/ElementInserter.java
Fri Nov 21 20:58:40 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/stylers/ElementInserter.java
Wed Dec 3 14:00:01 2014 UTC
@@ -108,7 +108,7 @@
textLength = (Integer)m.getValue("textLength");
textOffset = (Integer)m.getValue("textOffset");
- list.shiftOffsetsFromIndex(index + 1, textLength,
brailleLength, 0);
+ list.shiftOffsetsFromIndex(index + 1, textLength,
brailleLength);
index++;
}
}
@@ -214,7 +214,7 @@
private void createBlankLine(int textOffset, int brailleOffset, int
index){
manager.getText().insertText(textOffset, "\n");
manager.getBraille().insertText(brailleOffset, "\n");
- list.shiftOffsetsFromIndex(index, 1, 1, 0);
+ list.shiftOffsetsFromIndex(index, 1, 1);
}
private boolean isBoxline(Element e){
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/stylers/HideActionHandler.java
Tue Nov 25 18:49:04 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/stylers/HideActionHandler.java
Wed Dec 3 14:00:01 2014 UTC
@@ -204,7 +204,7 @@
vi.remove(list, list.indexOf(itemList.get(i)));
}
- list.shiftOffsetsFromIndex(index, -textLength, -brailleLength,
0);
+ list.shiftOffsetsFromIndex(index, -textLength, -brailleLength);
manager.getDocument().applyAction(m);
}
==============================================================================
Revision: 3b68e9d01652
Branch: rt1835-UndoRemoveElement
Author: Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date: Wed Dec 3 14:11:02 2014 UTC
Log: Added a seperate class for handling splitting elements
https://code.google.com/p/brailleblaster/source/detail?r=3b68e9d01652
Added:
/src/main/org/brailleblaster/perspectives/braille/stylers/ElementSplitter.java
Modified:
/src/main/org/brailleblaster/perspectives/braille/Manager.java
=======================================
--- /dev/null
+++
/src/main/org/brailleblaster/perspectives/braille/stylers/ElementSplitter.java
Wed Dec 3 14:11:02 2014 UTC
@@ -0,0 +1,130 @@
+package org.brailleblaster.perspectives.braille.stylers;
+
+import java.util.ArrayList;
+
+import nu.xom.Element;
+import nu.xom.Text;
+
+import org.brailleblaster.perspectives.braille.Manager;
+import
org.brailleblaster.perspectives.braille.document.BBSemanticsTable.Styles;
+import
org.brailleblaster.perspectives.braille.document.BBSemanticsTable.StylesType;
+import org.brailleblaster.perspectives.braille.mapping.maps.MapList;
+import org.brailleblaster.perspectives.braille.messages.Message;
+import
org.brailleblaster.perspectives.braille.viewInitializer.ViewInitializer;
+import org.brailleblaster.perspectives.braille.views.tree.BBTree;
+import org.brailleblaster.perspectives.braille.views.wp.BrailleView;
+import org.brailleblaster.perspectives.braille.views.wp.TextView;
+
+public class ElementSplitter {
+ Manager manager;
+ MapList list;
+ TextView text;
+ BrailleView braille;
+ BBTree tree;
+ ViewInitializer vi;
+
+ public ElementSplitter(Manager manager, MapList list, ViewInitializer
vi){
+ this.manager = manager;
+ this.list = list;
+ this.vi = vi;
+ text = manager.getText();
+ braille = manager.getBraille();
+ tree = manager.getTreeView();
+ }
+
+ public void splitElement(Message m){
+ int treeIndex = tree.getBlockElementIndex();
+
+ ArrayList<Integer> originalElements =
list.findTextMapElementRange(list.getCurrentIndex(),
(Element)list.getCurrent().parentElement(), true);
+ ArrayList<Element> els = manager.getDocument().splitElement(list,
list.getCurrent(), m);
+
+ int textStart = list.get(originalElements.get(0)).start;
+ int textEnd = list.get(originalElements.get(originalElements.size() -
1)).end;
+
+ int brailleStart =
list.get(originalElements.get(0)).brailleList.getFirst().start;
+ int brailleEnd = list.get(originalElements.get(originalElements.size() -
1)).brailleList.getLast().end;
+
+ int currentIndex = list.getCurrentIndex();
+
+ for(int i = originalElements.size() - 1; i >= 0; i--){
+ int pos = originalElements.get(i);
+
+ if(pos < currentIndex){
+ vi.remove(list, pos);
+ currentIndex--;
+ }
+ else if(pos >= currentIndex){
+ vi.remove(list, pos);
+ }
+ }
+
+ text.clearTextRange(textStart, textEnd - textStart);
+ braille.clearTextRange(brailleStart, brailleEnd - brailleStart);
+ list.shiftOffsetsFromIndex(currentIndex, -(textEnd - textStart),
-(brailleEnd - brailleStart));
+
+ int firstElementIndex = currentIndex;
+ currentIndex = insertElement(els.get(0), currentIndex, textStart,
brailleStart) - 1;
+
+ String insertionString = "";
+ Styles style =
manager.getStyleTable().get(manager.getStyleTable().getKeyFromAttribute(manager.getDocument().getParent(list.get(currentIndex).n,
true)));
+
+ if(style.contains(StylesType.linesBefore)){
+ for(int i = 0; i <
Integer.valueOf((String)style.get(StylesType.linesBefore)) + 1; i++)
+ insertionString += "\n";
+ }
+ else if(style.contains(StylesType.linesAfter)){
+ for(int i = 0; i <
Integer.valueOf((String)style.get(StylesType.linesAfter)) + 1; i++)
+ insertionString += "\n";
+ }
+ else {
+ insertionString = "\n";
+ }
+
+ text.insertText(list.get(currentIndex).end, insertionString);
+ braille.insertText(list.get(currentIndex).brailleList.getLast().end,
insertionString);
+ m.put("length", insertionString.length());
+
+ int secondElementIndex = currentIndex + 1;
+ currentIndex = insertElement(els.get(1), currentIndex + 1,
list.get(currentIndex).end + insertionString.length(),
list.get(currentIndex).brailleList.getLast().end +
insertionString.length());
+
+ list.shiftOffsetsFromIndex(currentIndex, list.get(currentIndex - 1).end
- textStart, list.get(currentIndex - 1).brailleList.getLast().end -
brailleStart);
+
+ tree.split(Message.createSplitTreeMessage(firstElementIndex,
secondElementIndex, currentIndex, treeIndex));
+ }
+
+ private int insertElement(Element e, int index, int start, int
brailleStart){
+ int count = e.getChildCount();
+ int currentIndex = index;
+ int currentStart = start;
+ int currentBrailleStart = brailleStart;
+
+ for(int i = 0; i < count; i++){
+ if(e.getChild(i) instanceof Text){
+ text.insertText(vi,list, currentIndex,
currentStart, e.getChild(i));
+ currentStart = list.get(currentIndex).end;
+ i++;
+ insertBraille((Element)e.getChild(i), currentIndex,
currentBrailleStart);
+ currentBrailleStart =
list.get(currentIndex).brailleList.getLast().end;
+ currentIndex++;
+ }
+ else if(e.getChild(i) instanceof Element
&& !((Element)e.getChild(i)).getLocalName().equals("brl")){
+ currentIndex = insertElement((Element)e.getChild(i), currentIndex,
currentStart, currentBrailleStart);
+ currentStart = list.get(currentIndex - 1).end;
+ currentBrailleStart = list.get(currentIndex -
1).brailleList.getLast().end;
+ }
+ }
+
+ return currentIndex;
+ }
+
+ private void insertBraille(Element e, int index, int brailleStart){
+ int count = e.getChildCount();
+
+ for(int i = 0; i < count; i++){
+ if(e.getChild(i) instanceof Text){
+ braille.insert(list.get(index), e.getChild(i),
brailleStart);
+ brailleStart =
list.get(index).brailleList.getLast().end;
+ }
+ }
+ }
+}
=======================================
--- /src/main/org/brailleblaster/perspectives/braille/Manager.java Wed Dec
3 14:00:01 2014 UTC
+++ /src/main/org/brailleblaster/perspectives/braille/Manager.java Wed Dec
3 14:11:02 2014 UTC
@@ -56,7 +56,6 @@
import org.brailleblaster.perspectives.Controller;
import org.brailleblaster.perspectives.braille.document.BBSemanticsTable;
import
org.brailleblaster.perspectives.braille.document.BBSemanticsTable.Styles;
-import
org.brailleblaster.perspectives.braille.document.BBSemanticsTable.StylesType;
import org.brailleblaster.perspectives.braille.document.BrailleDocument;
import org.brailleblaster.perspectives.braille.eventQueue.EventFrame;
import org.brailleblaster.perspectives.braille.eventQueue.EventQueue;
@@ -74,6 +73,7 @@
import org.brailleblaster.perspectives.braille.stylepanel.StyleManager;
import org.brailleblaster.perspectives.braille.stylers.BoxlineHandler;
import org.brailleblaster.perspectives.braille.stylers.ElementRemover;
+import org.brailleblaster.perspectives.braille.stylers.ElementSplitter;
import org.brailleblaster.perspectives.braille.stylers.HideActionHandler;
import org.brailleblaster.search.*;
import org.brailleblaster.perspectives.braille.viewInitializer.ViewFactory;
@@ -168,10 +168,8 @@
else {
arch = ArchiverFactory.getArchive(
templateFile, false);
vi = ViewFactory.createUpdater(arch, document, text, braille,
treeView);
- //list = vi.getList(this);
resetConfiguations();
initializeAllViews(docName, templateFile, null);
- //formatTemplateDocument();
setTabTitle(docName);
}
}
@@ -405,7 +403,6 @@
else {
System.out.println("The Document Base document tree
is empty");
logger.error("The Document Base document tree is null, the file failed
to parse properly");
- //workingFilePath = null;
}
}
catch(Exception e){
@@ -670,7 +667,8 @@
private void handleInsertNode(Message m){
if(m.getValue("split").equals(true)){
- splitElement(m);
+ ElementSplitter splitter = new ElementSplitter(this,
list, vi);
+ splitter.splitElement(m);
}
else {
if(m.getValue("atStart").equals(true))
@@ -679,91 +677,6 @@
insertElementAtEnd(m);
}
}
-
- private void splitElement(Message m){
- int treeIndex = treeView.getBlockElementIndex();
-
- ArrayList<Integer> originalElements =
list.findTextMapElementRange(list.getCurrentIndex(),
(Element)list.getCurrent().parentElement(), true);
- ArrayList<Element> els = document.splitElement(list, list.getCurrent(),
m);
-
- int textStart = list.get(originalElements.get(0)).start;
- int textEnd = list.get(originalElements.get(originalElements.size() -
1)).end;
- int brailleStart =
list.get(originalElements.get(0)).brailleList.getFirst().start;
-
- int brailleEnd = list.get(originalElements.get(originalElements.size() -
1)).brailleList.getLast().end;
-
- int currentIndex = list.getCurrentIndex();
-
- for(int i = originalElements.size() - 1; i >= 0; i--){
- int pos = originalElements.get(i);
-
- if(pos < currentIndex){
- vi.remove(list, pos);
- currentIndex--;
- }
- else if(pos >= currentIndex){
- vi.remove(list, pos);
- }
- }
-
- text.clearTextRange(textStart, textEnd - textStart);
- braille.clearTextRange(brailleStart, brailleEnd - brailleStart);
- list.shiftOffsetsFromIndex(currentIndex, -(textEnd - textStart),
-(brailleEnd - brailleStart));
-
- int firstElementIndex = currentIndex;
- currentIndex = insertElement(els.get(0), currentIndex, textStart,
brailleStart) - 1;
-
- String insertionString = "";
- Styles style =
styles.get(styles.getKeyFromAttribute(document.getParent(list.get(currentIndex).n,
true)));
-
- if(style.contains(StylesType.linesBefore)){
- for(int i = 0; i <
Integer.valueOf((String)style.get(StylesType.linesBefore)) + 1; i++)
- insertionString += "\n";
- }
- else if(style.contains(StylesType.linesAfter)){
- for(int i = 0; i <
Integer.valueOf((String)style.get(StylesType.linesAfter)) + 1; i++)
- insertionString += "\n";
- }
- else {
- insertionString = "\n";
- }
-
- text.insertText(list.get(currentIndex).end, insertionString);
- braille.insertText(list.get(currentIndex).brailleList.getLast().end,
insertionString);
- m.put("length", insertionString.length());
-
- int secondElementIndex = currentIndex + 1;
- currentIndex = insertElement(els.get(1), currentIndex + 1,
list.get(currentIndex).end + insertionString.length(),
list.get(currentIndex).brailleList.getLast().end +
insertionString.length());
-
- list.shiftOffsetsFromIndex(currentIndex, list.get(currentIndex - 1).end
- textStart, list.get(currentIndex - 1).brailleList.getLast().end -
brailleStart);
-
- treeView.split(Message.createSplitTreeMessage(firstElementIndex,
secondElementIndex, currentIndex, treeIndex));
- }
-
- private int insertElement(Element e, int index, int start, int
brailleStart){
- int count = e.getChildCount();
- int currentIndex = index;
- int currentStart = start;
- int currentBrailleStart = brailleStart;
-
- for(int i = 0; i < count; i++){
- if(e.getChild(i) instanceof Text){
- text.insertText(vi,list, currentIndex,
currentStart, e.getChild(i));
- currentStart = list.get(currentIndex).end;
- i++;
- insertBraille((Element)e.getChild(i), currentIndex,
currentBrailleStart);
- currentBrailleStart =
list.get(currentIndex).brailleList.getLast().end;
- currentIndex++;
- }
- else if(e.getChild(i) instanceof Element
&& !((Element)e.getChild(i)).getLocalName().equals("brl")){
- currentIndex = insertElement((Element)e.getChild(i), currentIndex,
currentStart, currentBrailleStart);
- currentStart = list.get(currentIndex - 1).end;
- currentBrailleStart = list.get(currentIndex -
1).brailleList.getLast().end;
- }
- }
-
- return currentIndex;
- }
public void insertBraille(Element e, int index, int brailleStart){
int count = e.getChildCount();
Other related posts:
- » [brailleblaster] 2 new revisions pushed by brandon....@xxxxxxxxx on 2014-12-03 14:09 GMT - brailleblaster
