Ticket #1958: rtf.patch

src/main/java/org/sophie2/main/func/text/rtf/ApplyRtfStylesUtility.java

@@ -23 +23 @@
 import org.sophie2.base.model.text.smart.elements.TextAlign;
 import org.sophie2.base.model.text.smart.position.HotInterval;
 import org.sophie2.base.model.text.smart.style.HotStyleDef;
+import org.sophie2.main.app.commons.element.ElementEntry;
 import org.sophie2.main.app.commons.util.AttributedPair;
 
 /**
@@ -90 +91 @@
                 return newText;
         }
 
-        /**
-         * Holds style information for a text {@link Element}. 
-         */
-        private class ElementEntry {
-                /**
-                 * The length (in chars) of the {@link Element}.
-                 */
-                private int length;
-                /**
-                 * The style attributes for this element.
-                 */
-                private Map<HotAttr<?>, Object> attributes;
-
-                public ElementEntry(int length, Map<HotAttr<?>, Object> attributes) {
-                        this.length = length;
-                        this.attributes = attributes;
-                }
-
-                public int getLength() {
-                        return this.length;
-                }
-
-                public Map<HotAttr<?>, Object> getAttributes() {
-                        return this.attributes;
-                }
-
-        }
-
         private void applyStyles(Element element, 
                         StringBuilder builder, List<ElementEntry> entries) throws BadLocationException {
-
                 if (element.getElementCount() == 0) {
                         int begin = element.getStartOffset();
                         int end = element.getEndOffset();
@@ -139 +111 @@
                         }
 
                         entries.add(new ElementEntry(text.length(), styleValues));
+                        
                         builder.append(text);
                 }