[brailleblaster] push by sahel.ma...@xxxxxxxxx - Fixing issue whencursor move around boxline on 2014-07-10 18:02 GMT

• From: brailleblaster@xxxxxxxxxxxxxx
• To: brailleblaster@xxxxxxxxxxxxx
• Date: Thu, 10 Jul 2014 18:02:44 +0000

Revision: 808ee99871b6
Branch:   default
Author:   Sahel "sahel.mastoureshgh@xxxxxxxxx"
Date:     Thu Jul 10 17:59:36 2014 UTC
Log:      Fixing issue whencursor move around boxline
http://code.google.com/p/brailleblaster/source/detail?r=808ee99871b6

Modified:
 /src/main/org/brailleblaster/perspectives/braille/Manager.java

/src/main/org/brailleblaster/perspectives/braille/mapping/elements/BrlOnlyMapElement.java /src/main/org/brailleblaster/perspectives/braille/mapping/elements/SectionElement.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/braille/Manager.java Thu Jul 3 18:02:55 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/Manager.java Thu Jul 10 17:59:36 2014 UTC

@@ -418,7 +418,7 @@

                ArrayList<SectionElement>secList = vi.getSectionList();
                Element e = (Element)textList.get(0).getParent();

- while(e != null && !e.getLocalName().equals("level1") && !e.getLocalName().equals("body")){ + while(e != null && !e.getLocalName().equals("level1") && !e.getLocalName().equals("body") && !((Element) e.getParent()).getLocalName().equals("sidebar")){

                        e = (Element)e.getParent();
                }

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

--- /src/main/org/brailleblaster/perspectives/braille/mapping/elements/BrlOnlyMapElement.java Mon Jul 7 19:04:23 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/mapping/elements/BrlOnlyMapElement.java Thu Jul 10 17:59:36 2014 UTC

@@ -16,19 +16,28 @@
        public BrlOnlyMapElement(Node n,Element parent){
                super(n);
                this.brailleList = new LinkedList<BrailleMapElement>();
+               this.brailleList.add(new BrailleMapElement(n));
                this.parent=parent;
        }
        public String getText(){
-               return "/n";
+               String str = "";
+               int num=this.n.getValue().length();
+               for (int i=0;i<num;i++)
+                       str=str+'-';
+               return str;
        }

        public int textLength(){
-               return 1;
+               return getText().length();
        }

        @Override
        public Element parentElement(){
                return this.parent;
        }
+       public void setBrailleOffsets(int start, int end){
+               this.brailleList.getFirst().start = start;
+               this.brailleList.getFirst().end = end;
+       }

 }
=======================================

--- /src/main/org/brailleblaster/perspectives/braille/mapping/elements/SectionElement.java Mon Jul 7 19:04:23 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/mapping/elements/SectionElement.java Thu Jul 10 17:59:36 2014 UTC

@@ -44,8 +44,7 @@

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));
+
                                }
                                else
                                {
=======================================

--- /src/main/org/brailleblaster/perspectives/braille/viewInitializer/ViewInitializer.java Mon Jul 7 19:04:23 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/viewInitializer/ViewInitializer.java Thu Jul 10 17:59:36 2014 UTC

@@ -50,9 +50,8 @@
                                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));
+                               text.setBRLOnlyText((BrlOnlyMapElement) 
list.get(i),false);
+                               braille.setBRLOnlyBraille((BrlOnlyMapElement) 
list.get(i),false);

                        }
                        else {
@@ -84,6 +83,11 @@
                                text.prependMathML(list, list.get(i));
                                braille.prependBraille(list.get(i), list, i);
                        }
+                       else if(list.get(i) instanceof BrlOnlyMapElement ){
+                               text.setBRLOnlyText((BrlOnlyMapElement) 
list.get(i),true);
+                               braille.setBRLOnlyBraille((BrlOnlyMapElement) 
list.get(i),true);
+
+                       }
                        else {
                                text.prependText(list.get(i), list, i);
                                braille.prependBraille(list.get(i), list, i);
=======================================

--- /src/main/org/brailleblaster/perspectives/braille/views/tree/XMLTree.java Mon Jul 7 19:04:23 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/views/tree/XMLTree.java Thu Jul 10 17:59:36 2014 UTC

@@ -8,6 +8,7 @@
 import nu.xom.Text;

 import org.brailleblaster.perspectives.braille.Manager;

+import org.brailleblaster.perspectives.braille.mapping.elements.BrlOnlyMapElement; import org.brailleblaster.perspectives.braille.mapping.elements.TextMapElement;

 import org.brailleblaster.perspectives.braille.messages.Message;
 import org.brailleblaster.perspectives.braille.messages.Sender;
@@ -388,8 +389,13 @@

        private void searchTree(TreeItem item, TextMapElement t, Message m){
                boolean found = false;
+               if(t instanceof BrlOnlyMapElement){
+                       searchTreeForElement(item, t.parentElement(), m);
+                       if(m.contains("item"))
+                       found = true;
+               }

-               if(t.n instanceof Element) {
+               else if(t.n instanceof Element) {
                        searchTreeForElement(item, (Element)t.n, m);
                        if(m.contains("item"))
                                found = true;
=======================================

--- /src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java Mon Jul 7 19:04:23 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java Thu Jul 10 17:59:36 2014 UTC

@@ -953,11 +953,20 @@
                spaceBeforeText = 0;
        }

-       public void setBRLOnlyBraille(BrlOnlyMapElement b) {
-               String brailleSidebar="\n"+b.n.getValue();
-               view.append(brailleSidebar);
-               b.setOffsets(total, total+brailleSidebar.length());
-               total += brailleSidebar.length();
+       public void setBRLOnlyBraille(BrlOnlyMapElement b,boolean insert) {
+               String brailleSidebar=b.n.getValue();
+               spaceBeforeText++;
+               if(insert){
+                   view.insert("\n"+brailleSidebar);
+                   
view.setCaretOffset(spaceBeforeText+brailleSidebar.length()+total);
+
+               }
+               else{
+                       view.append("\n"+brailleSidebar);
+               }

+ b.setBrailleOffsets(spaceBeforeText+total, spaceBeforeText+total+brailleSidebar.length());

+               total += spaceBeforeText+brailleSidebar.length();
+               spaceBeforeText = 0;

        }
 }
=======================================

--- /src/main/org/brailleblaster/perspectives/braille/views/wp/TextView.java Mon Jul 7 19:04:23 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/views/wp/TextView.java Thu Jul 10 17:59:36 2014 UTC

@@ -320,6 +320,7 @@

if(view.getLineAtOffset(view.getCaretOffset()) != currentLine && !manager.inPrintPageRange(view.getCaretOffset()))

                                        
sendStatusBarUpdate(view.getLineAtOffset(view.getCaretOffset()));
+
                        }
                });

@@ -1760,10 +1761,19 @@
                setViewData(m);
        }

-       public void setBRLOnlyText(BrlOnlyMapElement b) {

- String textSidebar="\n"+"___________________________________________________";

-               view.append(textSidebar);
-               b.setOffsets(total, total+textSidebar.length());
-               total += textSidebar.length();
+       public void setBRLOnlyText(BrlOnlyMapElement b,boolean insert) {
+
+               String textSidebar=b.getText();
+               spaceBeforeText++;
+               if(insert){
+                   view.insert("\n"+textSidebar);
+                   
view.setCaretOffset(spaceBeforeText+textSidebar.length()+total);
+               }
+               else{
+                       view.append("\n"+textSidebar);
+               }

+ b.setOffsets(spaceBeforeText+total, spaceBeforeText+total+textSidebar.length());

+               total += spaceBeforeText+textSidebar.length();
+               spaceBeforeText = 0;
        }
 }

Other related posts:

• » [brailleblaster] push by sahel.ma...@xxxxxxxxx - Fixing issue whencursor move around boxline on 2014-07-10 18:02 GMT - brailleblaster

1. Home
2. brailleblaster
3. Archive
4. 07-2014

---

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

---