Ticket #2472: 2472.patch

src/main/java/org/sophie2/base/model/text/mvc/CaretProcessor.java

@@ -8 +8 @@
 import org.sophie2.base.model.text.model.ImmText;
 import org.sophie2.base.model.text.model.ImmTextInterval;
 import org.sophie2.base.model.text.model.ImmTextUtils;
-import org.sophie2.base.model.text.model.TextUnit;
 import org.sophie2.base.model.text.mvc.CaretProcessor.CaretOptions;
 import org.sophie2.base.model.text.style.HotStyleDef;
 
@@ -66 +65 @@
         }
 
         public CaretOptions getDefaultOptions() {
-                return new CaretOptions(0, false);
+                return new CaretOptions(0, false );
         }
 
         private ImmText getStyledText(ImmText sourceText, CaretOptions caretOptions) {
@@ -77 +76 @@
                 int end = begin + 1 > styledText.getEnd() ? begin : begin + 1;
                 Map<HotAttr<?>, Object> caretStyleValues = new HashMap<HotAttr<?>, Object>();
                 //TODO: fix for right-to-left
-                TextUnit prevUnit = begin - 1 < 0 ? styledText.unitAt(begin) : 
-                        styledText.unitAt(begin - 1);
-                HotStyleDef prevStyle = prevUnit == null ? HotStyleDef.getEmpty() : 
-                        prevUnit.getStyle();
                 caretStyleValues.put(LayoutAttr.CARET_ATTR, caretOptions.isCaretVisible());
-                HotStyleDef caretStyle = prevStyle.derive(caretStyleValues);
+                HotStyleDef caretStyle = HotStyleDef.getEmpty().derive(caretStyleValues);
 
                 ImmTextInterval caretInterval = new ImmTextInterval(begin, end);
                 ImmText result = styledText.applyStyle(caretStyle, caretInterval);
@@ -109 +104 @@
                  *                True if the processor should draw the caret,
                  *                false otherwise.
                  */
-                public CaretOptions(int caretPos, boolean isCaretVisible) {
+                public CaretOptions(int caretPos, boolean isCaretVisible) { 
                         this.caretPos = caretPos;
                         this.caretVisible = isCaretVisible;
                 }
@@ -141 +136 @@
                         int result = 1;
                         result = prime * result + this.caretPos;
                         result = prime * result + (this.caretVisible ? 1231 : 1237);
+//                      result = prime * result + this.caretStyle.hashCode();
                         return result;
                 }