[brailleblaster] push by sahel.ma...@xxxxxxxxx - Refactoring code for sidebar( boxline) on 2014-07-07 19:08 GMT
- From: brailleblaster@xxxxxxxxxxxxxx
- To: brailleblaster@xxxxxxxxxxxxx
- Date: Mon, 07 Jul 2014 19:08:42 +0000
Revision: 5d50632421dd
Branch: default
Author: Sahel "sahel.mastoureshgh@xxxxxxxxx"
Date: Mon Jul 7 19:04:23 2014 UTC
Log: Refactoring code for sidebar( boxline)
http://code.google.com/p/brailleblaster/source/detail?r=5d50632421dd
Added:
/src/main/org/brailleblaster/perspectives/braille/mapping/MapList.java
/src/main/org/brailleblaster/perspectives/braille/mapping/elements/BrlOnlyMapElement.java
Modified:
/dist/programData/reader/.DS_Store
/src/main/org/brailleblaster/perspectives/braille/mapping/elements/SectionElement.java
/src/main/org/brailleblaster/perspectives/braille/mapping/elements/TextMapElement.java
/src/main/org/brailleblaster/perspectives/braille/viewInitializer/ViewInitializer.java
/src/main/org/brailleblaster/perspectives/braille/views/tree/XMLTree.java
/src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java
/src/main/org/brailleblaster/perspectives/braille/views/wp/TextView.java
/src/main/org/brailleblaster/perspectives/imageDescriber/views/ImageDescriberView.java
=======================================
--- /dev/null
+++ /src/main/org/brailleblaster/perspectives/braille/mapping/MapList.java
Mon Jul 7 19:04:23 2014 UTC
@@ -0,0 +1,619 @@
+/* BrailleBlaster Braille Transcription Application
+ *
+ * Copyright (C) 2014
+* American Printing House for the Blind, Inc. www.aph.org
+* and
+ * ViewPlus Technologies, Inc. www.viewplus.com
+ * and
+ * Abilitiessoft, Inc. www.abilitiessoft.com
+ * All rights reserved
+ *
+ * This file may contain code borrowed from files produced by various
+ * Java development teams. These are gratefully acknowledged.
+ *
+ * This file is free software; you can redistribute it and/or modify it
+ * under the terms of the Apache 2.0 License, as given at
+ * http://www.apache.org/licenses/
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE
+ * See the Apache 2.0 License for more details.
+ *
+ * You should have received a copy of the Apache 2.0 License along with
+ * this program; see the file LICENSE.txt
+ * If not, see
+ * http://www.apache.org/licenses/
+ *
+ * Maintained by Keith Creasy <kcreasy@xxxxxxx>, Project Manager
+*/
+
+package org.brailleblaster.perspectives.braille.mapping;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+
+import nu.xom.Element;
+import nu.xom.Node;
+import nu.xom.Text;
+
+import org.brailleblaster.perspectives.braille.Manager;
+import org.brailleblaster.perspectives.braille.document.BrailleDocument;
+import
org.brailleblaster.perspectives.braille.mapping.elements.BrailleMapElement;
+import
org.brailleblaster.perspectives.braille.mapping.elements.PageMapElement;
+import
org.brailleblaster.perspectives.braille.mapping.elements.TextMapElement;
+import org.brailleblaster.perspectives.braille.mapping.maps.Paginator;
+import org.brailleblaster.perspectives.braille.messages.Message;
+import org.brailleblaster.perspectives.braille.messages.Sender;
+
+public class MapList extends LinkedList<TextMapElement>{
+ private class UpdaterThread extends Thread {
+ private int start;
+ private int end;
+ private int offset, brailleOffset;
+ MapList list;
+
+ private UpdaterThread(MapList list, int start, int end, int offset, int
brailleOffset){
+ this.list = list;
+ this.start = start;
+ this.end = end;
+ this.offset = offset;
+ this.brailleOffset = brailleOffset;
+ }
+
+ @Override
+ public void run(){
+ for(int i = start; i < end; i++){
+ list.get(i).start +=offset;
+ list.get(i).end += offset;
+
+ if(hasBraille(i)){
+ for(int j = 0; j <
list.get(i).brailleList.size(); j++){
+
list.get(i).brailleList.get(j).start += brailleOffset;
+
list.get(i).brailleList.get(j).end += brailleOffset;
+ }
+ }
+ }
+
+ }
+ }
+
+ private static final long serialVersionUID = 1L;
+ private static final int PROCESSORS =
Runtime.getRuntime().availableProcessors();
+ Manager dm;
+ private TextMapElement current;
+ private int currentIndex = -1;
+ private int prevEnd, nextStart, prevBraille, nextBraille;
+ private Paginator paginator;
+
+ public MapList(Manager dm){
+ this.dm = dm;
+ paginator = new Paginator();
+ }
+
+ public int findClosest(Message message, int low, int high){
+ int location = (Integer)message.getValue("offset");
+ int nodeIndex =
getNodeIndex((TextMapElement)message.getValue("selection"));
+
+ if(location <= this.get(0).start){
+ return 0;
+ }
+ else if(location >= this.getLast().end){
+ return this.indexOf(this.getLast());
+ }
+
+ int mid = low + ((high - low) / 2);
+
+ TextMapElement currentElement = this.get(mid);
+ if(location >= currentElement.start && location <=
currentElement.end){
+ if(location == currentElement.end && location == this.get(mid +
1).start){
+ if(checkForSpace(mid)){
+ return mid + 1;
+ }
+
+ if(mid == nodeIndex)
+ return mid;
+ else if( mid + 1 == nodeIndex)
+ return mid + 1;
+ }
+ else if(location == currentElement.start && location == this.get(mid -
1).end){
+ if(checkForSpace(mid - 1)){
+ return mid;
+ }
+
+ if(nodeIndex == mid - 1)
+ return mid - 1;
+ else
+ return mid;
+ }
+ else{
+ return mid;
+ }
+ }
+ else if(location > currentElement.end && location < this.get(mid +
1).start){
+ if(location - currentElement.end < this.get(mid +
1).start - location){
+ return mid;
+ }
+ else if(location - currentElement.end > this.get(mid + 1).start -
location){
+ return mid + 1;
+ }
+ else {
+ if(mid == nodeIndex)
+ return mid;
+ else if( mid + 1 == nodeIndex)
+ return mid + 1;
+ else
+ return mid;
+ }
+ }
+
+ if(low > high)
+ return -1;
+ else if(location < this.get(mid).start)
+ return findClosest(message, low, mid - 1);
+ else
+ return findClosest(message, mid + 1, high);
+ }
+
+ private boolean checkForSpace(int index){
+ if(this.get(index).n.getValue().length() == 0)
+ return true;
+
+ char firstChar =
this.get(index).value().charAt(this.get(index).n.getValue().length() - 1);
+ String nextElementText = this.get(index + 1).value();
+ if(nextElementText.length() > 0){
+ char nextChar = nextElementText.charAt(0);
+ if( firstChar == ' ' && nextChar != ' '){
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public int findClosestBraille(Message message){
+ int location = (Integer)message.getValue("offset");
+ int nodeIndex =
getNodeIndex((TextMapElement)message.getValue("selection"));
+
+ if(this.getFirst().brailleList.size() > 0 && location <=
this.getFirst().brailleList.getFirst().start){
+ return 0;
+ }
+ else if(this.getLast().brailleList.size() > 0 && location >=
this.getLast().brailleList.getLast().end){
+ return this.indexOf(this.getLast());
+ }
+
+ for(int i = 0; i < this.size(); i++){
+ if(this.get(i).brailleList.size() > 0 && location >=
this.get(i).brailleList.getFirst().start && location <=
this.get(i).brailleList.getLast().end){
+ return i;
+ }
+ else if(this.get(i).brailleList.size() > 0 && this.get(i +
1).brailleList.size() > 0 && location >
this.get(i).brailleList.getLast().end && location < this.get(i +
1).brailleList.getFirst().start){
+ if(location - this.get(i).brailleList.getLast().end > this.get(i +
1).brailleList.getFirst().start - location){
+ return i + 1;
+ }
+ else if(location - this.get(i).brailleList.getLast().end < this.get(i
+ 1).brailleList.getFirst().start - location) {
+ return i;
+ }
+ else {
+ if(i == nodeIndex)
+ return i;
+ else if( i + 1 == nodeIndex)
+ return i + 1;
+ else
+ return i;
+ }
+ }
+ }
+ return 0;
+ }
+
+ public void updateOffsets(int index, Message message){
+ paginator.updateOffsets(get(index), message);
+ int offset = (Integer)message.getValue("length");
+ int total = (Integer)message.getValue("newBrailleLength") -
(Integer)message.getValue("brailleLength");
+
+ this.get(index).end += offset;
+
+ UpdaterThread [] arr = new UpdaterThread[PROCESSORS];
+ int length = (this.size() - index) / PROCESSORS;
+ int start = index + 1;
+
+ for(int i = 0; i < arr.length; i++){
+ if(i == arr.length - 1)
+ arr[i] = new UpdaterThread(this, start,
this.size(), offset, total);
+ else
+ arr[i] = new UpdaterThread(this, start, start + length , offset,
total);
+
+ arr[i].start();
+ start += length;
+ }
+
+ for (int i = 0; i < arr.length; i++) {
+ try {
+ arr[i].join();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+
+ public void shiftOffsetsFromIndex(int index, int offset, int
brailleOffset, int origPos){
+ paginator.shiftOffsets(origPos, offset, brailleOffset);
+ UpdaterThread [] arr = new UpdaterThread[PROCESSORS];
+ int length = (this.size() - index) / PROCESSORS;
+ int start = index;
+
+ for(int i = 0; i < arr.length; i++){
+ if(i == arr.length - 1)
+ arr[i] = new UpdaterThread(this, start, this.size(), offset,
brailleOffset);
+ else
+ arr[i] = new UpdaterThread(this, start, start + length , offset,
brailleOffset);
+
+ arr[i].start();
+ start += length;
+ }
+
+ for (int i = 0; i < arr.length; i++) {
+ try {
+ arr[i].join();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public void adjustOffsets(int index, Message message){
+ if(message.contains("start")){
+ this.get(index).start -=
(Integer)message.getValue("start");
+ if(this.get(index).brailleList.size() > 0){
+ this.get(index).brailleList.getFirst().start -=
(Integer)message.getValue("start");
+ }
+ }
+
+ if(message.contains("end")){
+ this.get(index).end += (Integer)message.getValue("end");
+ if(this.get(index).brailleList.size() > 0)
+ this.get(index).brailleList.getLast().end +=
(Integer)message.getValue("end");
+ }
+ }
+
+ public void checkList(){
+ if(this.currentIndex != -1){
+ int index = this.currentIndex;
+ int next = index + 1;
+ int previous = index - 1;
+
+ //if start is equal to next start, then length is zero,
so remove
+ if(next < this.size()){
+ if(this.get(index).start ==
this.get(next).start){
+ Message m = Message.createRemoveNodeMessage(index,
this.get(index).textLength());
+ System.out.println("Node 1:\t" +
this.get(index).value());
+ System.out.println("Node 2:\t" +
this.get(next).value());
+ dm.dispatch(m);
+ }
+ }
+
+ //if previous end + 1 equals next, then current is no longer between
two block elements
+ //or if current length is zero and equal to previous
end, then delete
+ if(previous >= 0 && next < this.size()){
+ if((this.get(previous).start + this.get(previous).textLength() + 1 ==
this.get(next).start && this.get(index).textLength() == 0)
+ || (this.get(previous).end == this.get(index).start &&
this.get(index).textLength() == 0)){
+ Message m = Message.createRemoveNodeMessage(index,
this.get(index).n.getValue().length());
+ System.out.println("Node 1:\t" +
this.get(index).value());
+ System.out.println("Node 2:\t" +
this.get(next).value());
+ dm.dispatch(m);
+ }
+ }
+
+ //if last element is length zero and equals previousEnd
then delete
+ //if document name is null, then it is a new empty document, so do not
delete
+ if(this.size() > 0 && this.get(this.size() -
1).textLength() == 0){
+ if(this.get(this.size() - 1).start == this.prevEnd ||
(this.get(this.size() - 1).start == 0 && dm.getDocumentName() != null)){
+ Message m = Message.createRemoveNodeMessage(this.size() - 1,
this.get(this.size() - 1).textLength());
+ System.out.println("Node 1:\t" + this.get(this.size() -
1).textLength());
+ System.out.println("Node 2:\t none");
+ dm.dispatch(m);
+ }
+ }
+ }
+ }
+
+ public int getNextBrailleOffset(int index){
+ int i = index + 1;
+ while(i < this.size()){
+ if(this.get(i).brailleList.size() > 0 &&
this.get(i).brailleList.getFirst().start != -1)
+ return this.get(i).brailleList.getFirst().start;
+ i++;
+ }
+
+ i = index - 1;
+ while(i >= 0){
+ if(this.get(i).brailleList.size() > 0 &&
this.get(i).brailleList.getFirst().start != -1)
+ return this.get(i).brailleList.getFirst().start;
+ }
+ return 0;
+ }
+
+ public void setCurrent(int index){
+ this.current = this.get(index);
+ this.currentIndex = index;
+
+ if(index > 0)
+ this.prevEnd = this.get(index -1).end;
+ else
+ this.prevEnd = -1;
+
+ if(index != this.size() - 1)
+ this.nextStart = this.get(index + 1).start;
+ else
+ this.nextStart = -1;
+
+ this.nextBraille = getNextBraille(index);
+ this.prevBraille = getPreviousBraille(index);
+ }
+
+ public TextMapElement getCurrent(){
+ if(this.current == null){
+ setCurrent(0);
+ return this.current;
+ }
+ else {
+ return this.current;
+ }
+ }
+ public int getCurrentIndex(){
+ if(this.current == null && size() > 0){
+ Message message = Message.createSetCurrentMessage(null,
this.getFirst().start, false);
+ dm.dispatch(message);
+ return this.currentIndex;
+ }
+ else if(this.size() == 0){
+ return -1;
+ }
+ else {
+ return this.currentIndex;
+ }
+ }
+
+ private int getCurrentBrailleEnd(){
+ if(this.current.brailleList.size() == 0)
+ return 0;
+ else
+ return this.current.brailleList.getLast().end;
+ }
+
+ private int getCurrentBrailleOffset(){
+
+ if(this.current.brailleList.size() == 0)
+ return 0;
+ else
+ return this.current.brailleList.getFirst().start;
+ }
+
+ private int getNextBraille(int index){
+ int localIndex = index + 1;
+
+ while(localIndex < this.size() &&
this.get(localIndex).brailleList.size() == 0)
+ localIndex++;
+
+ if(localIndex < this.size())
+ return
this.get(localIndex).brailleList.getFirst().start;
+
+ return -1;
+ }
+
+ private int getPreviousBraille(int index){
+ int localIndex = index - 1;
+
+ while(localIndex >= 0 &&
this.get(localIndex).brailleList.size() == 0)
+ localIndex--;
+
+ if(localIndex >= 0)
+ return this.get(localIndex).brailleList.getLast().end;
+
+ return -1;
+ }
+
+ private ArrayList<BrailleMapElement> getPageRanges(){
+ ArrayList<BrailleMapElement> list = new
ArrayList<BrailleMapElement>();
+ for(int i = 0; i < this.current.brailleList.size(); i++){
+ if(this.current.brailleList.get(i).pagenum){
+ list.add(this.current.brailleList.get(i));
+ }
+ }
+
+ return list;
+ }
+
+ public void getCurrentNodeData(Message m){
+ if(this.current == null){
+ int index;
+ if(m.getValue("sender").equals(Sender.BRAILLE))
+ index = findClosestBraille(m);
+ else
+ index = findClosest(m, 0, this.size() - 1);
+
+ setCurrent(index);
+ }
+
+ m.put("start", current.start);
+ m.put("end", current.end);
+ m.put("previous", prevEnd);
+ m.put("next", nextStart);
+ m.put("brailleStart", getCurrentBrailleOffset());
+ m.put("brailleEnd", getCurrentBrailleEnd());
+ m.put("nextBrailleStart", nextBraille);
+ m.put("previousBrailleEnd", prevBraille);
+ m.put("pageRanges", getPageRanges());
+ m.put("currentElement", current);
+ }
+
+ public int getNodeIndex(TextMapElement t){
+ return this.indexOf(t);
+ }
+
+ public void incrementCurrent(Message message){
+ if(this.currentIndex < this.size() - 1 && this.currentIndex >
-1){
+ setCurrent(this.currentIndex + 1);
+ getCurrentNodeData(message);
+ }
+ else if(this.currentIndex == -1 && this.size() > 0){
+ setCurrent(0);
+ getCurrentNodeData(message);
+ }
+ else {
+ getCurrentNodeData(message);
+ }
+ }
+
+ public void decrementCurrent(Message message){
+ if(this.currentIndex > 0){
+ setCurrent(this.currentIndex - 1);
+ getCurrentNodeData(message);
+ }
+ else if(this.currentIndex == -1 && this.size() > 0){
+ setCurrent(0);
+ getCurrentNodeData(message);
+ }
+ else {
+ getCurrentNodeData(message);
+ }
+ }
+
+ public boolean hasBraille(int index){
+ if(this.size() != 0 && this.get(index).brailleList.size() > 0)
+ return true;
+ else
+ return false;
+ }
+
+ @SuppressWarnings("unchecked")
+ public void findTextMapElements(Message message){
+ ArrayList<Text>textList =
(ArrayList<Text>)message.getValue("nodes");
+ ArrayList<TextMapElement> itemList =
(ArrayList<TextMapElement>)message.getValue("itemList");
+
+ int pos = 0;
+ for(int i = 0; i < textList.size(); i++){
+ for(int j = pos; j < this.size(); j++){
+ if(textList.get(i).equals(this.get(j).n)){
+ itemList.add(this.get(j));
+ pos = j + 1;
+ break;
+ }
+ }
+ }
+ }
+
+ public ArrayList<TextMapElement> findTextMapElements(int index, Element
parent, boolean ignoreInlineElement){
+ ArrayList<TextMapElement>list = new ArrayList<TextMapElement>();
+ BrailleDocument doc = dm.getDocument();
+
+ int countDown = index - 1;
+ int countUp = index + 1;
+ while(countDown >= 0 && doc.getParent(this.get(countDown).n,
ignoreInlineElement).equals(parent)){
+ list.add(0, this.get(countDown));
+ countDown--;
+ }
+
+ list.add(this.get(index));
+
+ while(countUp < this.size() && doc.getParent(this.get(countUp).n,
ignoreInlineElement).equals(parent)){
+ list.add(this.get(countUp));
+ countUp++;
+ }
+
+ return list;
+ }
+
+ public ArrayList<Integer> findTextMapElementRange(int index, Element
parent, boolean ignoreInlineElement){
+ if(ignoreInlineElement &&
parent.getAttributeValue("semantics").contains("action")){
+
while(parent.getAttributeValue("semantics").contains("action"))
+ parent = (Element)parent.getParent();
+ }
+ ArrayList<Integer>list = new ArrayList<Integer>();
+ BrailleDocument doc = dm.getDocument();
+
+ int countDown = index - 1;
+ int countUp = index + 1;
+ while(countDown >= 0 && doc.getParent(this.get(countDown).n,
ignoreInlineElement).equals(parent)){
+ list.add(0, countDown);
+ countDown--;
+ }
+
+ list.add(index);
+
+ while(countUp < this.size() && doc.getParent(this.get(countUp).n,
ignoreInlineElement).equals(parent)){
+ list.add(countUp);
+ countUp++;
+ }
+
+ return list;
+ }
+
+ public int findNodeIndex(Node n, int startIndex){
+ for(int i = startIndex; i < this.size(); i++){
+ if(this.get(i).n.equals(n))
+ return i;
+ }
+ return -1;
+ }
+
+ public void clearList(){
+ this.clear();
+ paginator.clear();
+ this.current = null;
+ currentIndex = -1;
+ }
+
+ public int getPrintPageStart(int offset){
+ return paginator.getPrintPageStart(offset);
+ }
+
+ public int getPrintPageEnd(int offset){
+ return paginator.getPrintPageEnd(offset);
+ }
+
+ public int getBraillePageStart(int offset){
+ return paginator.getBraillePageStart(offset);
+ }
+
+ public int getBraillePageEnd(int offset){
+ return paginator.getBraillePageEnd(offset);
+ }
+
+ public void addPrintPage(PageMapElement p){
+ paginator.add(p);
+ }
+
+ public PageMapElement getLastPage(){
+ return paginator.getLast();
+ }
+
+ public boolean inPrintPageRange(int offset){
+ return paginator.inPrintPageRange(offset);
+ }
+
+ public boolean inBraillePageRange(int offset){
+ return paginator.inBraillePageRange(offset);
+ }
+
+ public PageMapElement findPage(int offset){
+ return paginator.findPage(offset);
+ }
+
+ public PageMapElement findBraillePage(int offset){
+ return paginator.findBraillePage(offset);
+ }
+
+ public String findCurrentPrintPageValue(int offset){
+ return paginator.findCurrentPrintPageValue(offset);
+ }
+
+ public String findCurrentBraillePageValue(int offset){
+ return paginator.findCurrentBraillePageValue(offset);
+ }
+
+ public int getPageCount(){
+ return paginator.getSize();
+ }
+}
=======================================
--- /dev/null
+++
/src/main/org/brailleblaster/perspectives/braille/mapping/elements/BrlOnlyMapElement.java
Mon Jul 7 19:04:23 2014 UTC
@@ -0,0 +1,34 @@
+package org.brailleblaster.perspectives.braille.mapping.elements;
+
+import java.util.LinkedList;
+
+import nu.xom.Element;
+import nu.xom.Node;
+
+public class BrlOnlyMapElement extends TextMapElement {
+ Element parent=null;
+
+ public BrlOnlyMapElement(int start, int end, Node n,Element parent) {
+ super(start, end, n);
+ this.parent=parent;
+ // TODO Auto-generated constructor stub
+ }
+ public BrlOnlyMapElement(Node n,Element parent){
+ super(n);
+ this.brailleList = new LinkedList<BrailleMapElement>();
+ this.parent=parent;
+ }
+ public String getText(){
+ return "/n";
+ }
+
+ public int textLength(){
+ return 1;
+ }
+
+ @Override
+ public Element parentElement(){
+ return this.parent;
+ }
+
+}
=======================================
--- /dist/programData/reader/.DS_Store Wed May 21 15:07:25 2014 UTC
+++ /dist/programData/reader/.DS_Store Mon Jul 7 19:04:23 2014 UTC
Binary file, no diff available.
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/mapping/elements/SectionElement.java
Thu Jul 3 18:02:55 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/mapping/elements/SectionElement.java
Mon Jul 7 19:04:23 2014 UTC
@@ -41,8 +41,9 @@
}
else if(current.getChild(i) instanceof Element &&
((Element)current.getChild(i)).getLocalName().equals("brl")){
//Added to handle brl for side bar
- if
(((Element)current.getChild(i).getParent()).getLocalName().equals("sidebar"))
+ if
(((Element)current.getChild(i).getParent()).getLocalName().equals("sidebar")
)
{
+ list.add(new BrlOnlyMapElement(current.getChild(i),
(Element)current.getChild(i).getParent()));
//text.setBRLOnlyText(list, "\n",((Element)current.getChild(i).getParent()));
//braille.setBRLOnlyBraille(list,current.getChild(i));
}
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/mapping/elements/TextMapElement.java
Thu Jul 3 16:07:57 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/mapping/elements/TextMapElement.java
Mon Jul 7 19:04:23 2014 UTC
@@ -39,7 +39,7 @@
}
public boolean isMathML(){
- if(n instanceof Element)
+ if(n instanceof Element &&( ((Element)
n).getLocalName().equals("Math")))
return true;
else
return false;
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/viewInitializer/ViewInitializer.java
Thu Jul 3 18:02:55 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/viewInitializer/ViewInitializer.java
Mon Jul 7 19:04:23 2014 UTC
@@ -6,6 +6,7 @@
import org.brailleblaster.perspectives.braille.Manager;
import org.brailleblaster.perspectives.braille.document.BrailleDocument;
+import
org.brailleblaster.perspectives.braille.mapping.elements.BrlOnlyMapElement;
import
org.brailleblaster.perspectives.braille.mapping.elements.SectionElement;
import
org.brailleblaster.perspectives.braille.mapping.elements.TextMapElement;
import org.brailleblaster.perspectives.braille.mapping.maps.MapList;
@@ -48,6 +49,12 @@
text.setMathML(list, list.get(i));
braille.setBraille(list.get(i), list, i);
}
+ else if(list.get(i) instanceof BrlOnlyMapElement ){
+ System.out.println("instance of brlOnlyMap");
+ text.setBRLOnlyText((BrlOnlyMapElement)
list.get(i));
+ braille.setBRLOnlyBraille((BrlOnlyMapElement)
list.get(i));
+
+ }
else {
text.setText(list.get(i), list, i);
braille.setBraille(list.get(i), list, i);
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/views/tree/XMLTree.java
Thu Jul 3 16:07:57 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/views/tree/XMLTree.java
Mon Jul 7 19:04:23 2014 UTC
@@ -230,6 +230,7 @@
private void populateItemChildren(TreeItem item, Element e){
ArrayList<Text>textList = new ArrayList<Text>();
+
Elements els = e.getChildElements();
for(int i = 0; i < els.size(); i++){
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java
Thu Jul 3 18:02:55 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java
Mon Jul 7 19:04:23 2014 UTC
@@ -42,8 +42,8 @@
import
org.brailleblaster.perspectives.braille.document.BBSemanticsTable.Styles;
import
org.brailleblaster.perspectives.braille.document.BBSemanticsTable.StylesType;
import
org.brailleblaster.perspectives.braille.mapping.elements.BrailleMapElement;
+import
org.brailleblaster.perspectives.braille.mapping.elements.BrlOnlyMapElement;
import
org.brailleblaster.perspectives.braille.mapping.elements.PageMapElement;
-import org.brailleblaster.perspectives.braille.mapping.BrlOnlyMapElement;
import
org.brailleblaster.perspectives.braille.mapping.elements.TextMapElement;
import org.brailleblaster.perspectives.braille.mapping.maps.MapList;
import org.brailleblaster.perspectives.braille.messages.Message;
@@ -953,10 +953,11 @@
spaceBeforeText = 0;
}
- public void setBRLOnlyBraille(MapList list, Node child) {
- String brailleSidebar="\n"+child.getValue();
+ public void setBRLOnlyBraille(BrlOnlyMapElement b) {
+ String brailleSidebar="\n"+b.n.getValue();
view.append(brailleSidebar);
- list.getLast().brailleList.add(new BrailleMapElement(total, total +
brailleSidebar.length(), child));
+ b.setOffsets(total, total+brailleSidebar.length());
total += brailleSidebar.length();
+
}
}
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/views/wp/TextView.java
Thu Jul 3 18:02:55 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/views/wp/TextView.java
Mon Jul 7 19:04:23 2014 UTC
@@ -42,8 +42,8 @@
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.mapping.BrlOnlyMapElement;
import org.brailleblaster.perspectives.braille.mapping.maps.MapList;
+import
org.brailleblaster.perspectives.braille.mapping.elements.BrlOnlyMapElement;
import
org.brailleblaster.perspectives.braille.mapping.elements.PageMapElement;
import
org.brailleblaster.perspectives.braille.mapping.elements.TextMapElement;
import org.brailleblaster.perspectives.braille.messages.Message;
@@ -1760,9 +1760,10 @@
setViewData(m);
}
- public void setBRLOnlyText(MapList list, String text, Element element) {
- view.append(text);
- list.add(new BrlOnlyMapElement(total, total + text.length(),
null,element));
- total += text.length();
+ public void setBRLOnlyText(BrlOnlyMapElement b) {
+ String
textSidebar="\n"+"___________________________________________________";
+ view.append(textSidebar);
+ b.setOffsets(total, total+textSidebar.length());
+ total += textSidebar.length();
}
}
=======================================
---
/src/main/org/brailleblaster/perspectives/imageDescriber/views/ImageDescriberView.java
Thu Jul 3 19:15:15 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/imageDescriber/views/ImageDescriberView.java
Mon Jul 7 19:04:23 2014 UTC
@@ -7,6 +7,11 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+//<<<<<<< local
+//import java.nio.file.Files;
+//import java.nio.file.Path;
+//=======
+//>>>>>>> other
import java.util.ArrayList;
import nu.xom.Element;
Other related posts:
- » [brailleblaster] push by sahel.ma...@xxxxxxxxx - Refactoring code for sidebar( boxline) on 2014-07-07 19:08 GMT - brailleblaster
