Changeset 8774

Timestamp:

03/08/10 10:24:50 (6 months ago)

Author:

kyli

Message:

#2344 (TEXT_LAYOUT_COMMONS): Removed tab logic, getRun method in ImmHotText.

Location:

branches/private/kyli/2344/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text

Files:

• mvc/TextFlowLogic.java (modified) (1 diff)
• smart/ImmHotText.java (modified) (4 diffs)

branches/private/kyli/2344/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/mvc/TextFlowLogic.java

@@ -435 +435 @@
                         return LogicR3.fire(new EventR3(fields));
                 }
-        },
-
-        /**
-         * Handler for pressing the Tab key
-         */
-        ON_TAB_PRESSED {
-
-                public void defineFilter(EventFilterBuilder filter) {
-                        filter.setSourceClass(TextView.class);
-                        filter.setEventId(TextView.EventIds.TAB_PRESSED);
-                }
-
-                public boolean handle(EventR3 event) {
-                        return fireSetText(event, "    ");
-                }
-
         };
 

branches/private/kyli/2344/modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/smart/ImmHotText.java

@@ -4 +4 @@
 import java.text.AttributedString;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.sophie2.base.commons.structures.ImmHashingTree;
@@ -10 +12 @@
 import org.sophie2.base.commons.util.Hash;
 import org.sophie2.base.commons.util.Hasher;
+import org.sophie2.base.commons.util.ImmColor;
 import org.sophie2.base.commons.util.ImmList;
 import org.sophie2.base.commons.util.ImmMap;
@@ -15 +18 @@
 import org.sophie2.base.model.text.Attachment;
 import org.sophie2.base.model.text.HotAttr;
+import org.sophie2.base.model.text.smart.elements.CommonAttr;
 import org.sophie2.base.model.text.smart.position.HotIndexInterval;
 import org.sophie2.base.model.text.smart.position.HotInterval;
@@ -1165 +1169 @@
                 return res;
         }
-
+        
+        @SuppressWarnings("unchecked")
+         public  Map<HotAttr<?>, ?> getAllStyledValues(HotPos pos) {
+             Map allStylesMap = new HashMap<HotAttr<?>, Object>();
+             HotAttr<ImmColor> backGrAttr = CommonAttr.BACKGROUND_COLOR;
+             HotAttr<?> boldAttr = CommonAttr.BOLD;
+             HotAttr<?> fontFamilyAttr = CommonAttr.FONT_FAMILY;
+             HotAttr<?> fontSizeaAttr = CommonAttr.FONT_SIZE;
+             HotAttr<?> fgAttr = CommonAttr.FOREGROUND_COLOR;
+             HotAttr<?> italicAttr = CommonAttr.ITALIC;
+             HotAttr<?> overlinedAttr = CommonAttr.OVERLINED;
+             HotAttr<?> paraAlignAttr = CommonAttr.PARA_ALIGNMENT;
+             HotAttr<?> paraFirstLineAttr = CommonAttr.PARA_FIRST_LINE_INDENT;
+             HotAttr<?> paraLeftIndentAttr = CommonAttr.PARA_LEFT_INDENT;
+             HotAttr<?> paraLineSpacingAttr = CommonAttr.PARA_LINE_SPACING;
+             HotAttr<?> paraRightIndentAttr = CommonAttr.PARA_RIGHT_INDENT;
+             HotAttr<?> paraSpaceAboveAttr = CommonAttr.PARA_SPACE_ABOVE;
+             HotAttr<?> paraSpaceBelowAttr = CommonAttr.PARA_SPACE_BELOW;
+             HotAttr<?> strikeThroughAttr = CommonAttr.STRIKE_THROUGH;
+             HotAttr<?> underlinedAttr = CommonAttr.UNDERLINED;
+             HotAttr<?> widthExtraAttr = CommonAttr.WIDTH_EXTRA;
+             
+             
+             allStylesMap.put(backGrAttr, getStyleValue(backGrAttr, pos));
+             allStylesMap.put(boldAttr, getStyleValue(boldAttr, pos));
+             allStylesMap.put(fontFamilyAttr, getStyleValue(fontFamilyAttr, pos));
+             allStylesMap.put(fontSizeaAttr, getStyleValue(fontSizeaAttr, pos));
+             allStylesMap.put(fgAttr, getStyleValue(fgAttr, pos));
+             allStylesMap.put(italicAttr, getStyleValue(italicAttr, pos));
+             allStylesMap.put(overlinedAttr, getStyleValue(overlinedAttr, pos));
+             allStylesMap.put(paraAlignAttr, getStyleValue(paraAlignAttr, pos));
+             allStylesMap.put(paraFirstLineAttr, getStyleValue(paraFirstLineAttr, pos));
+             allStylesMap.put(paraLeftIndentAttr, getStyleValue(paraLeftIndentAttr, pos));
+             allStylesMap.put(paraLineSpacingAttr, getStyleValue(paraLineSpacingAttr, pos));
+             allStylesMap.put(paraRightIndentAttr, getStyleValue(paraRightIndentAttr, pos));
+             allStylesMap.put(paraSpaceAboveAttr, getStyleValue(paraSpaceAboveAttr, pos));
+             allStylesMap.put(paraSpaceBelowAttr, getStyleValue(paraSpaceBelowAttr, pos));
+             allStylesMap.put(strikeThroughAttr, getStyleValue(strikeThroughAttr, pos));
+             allStylesMap.put(underlinedAttr, getStyleValue(underlinedAttr, pos));
+             allStylesMap.put(widthExtraAttr, getStyleValue(widthExtraAttr, pos));
+          
+             return allStylesMap;
+             
+            }
+
+        
+        public ImmHotText getRun(HotPos start) {
+                HotPos pos = start.normalize(this);
+                
+                if (pos.isEnd(this)) {
+                        return null;
+                }
+                
+                // TODO create real runs until style change or tab break;
+                
+                HotPos end = pos;
+//              Map<HotAttr<?>, ?> style = getAllStyledValues(pos);
+                
+                end = advance(end, 1);
+//              while (!end.isEnd(this) && 
+//                              getAllStyledValues(advance(end, 1)).equals(style)) {
+//                      end = advance(end, 1);
+//              }
+                
+                HotInterval interval = new HotInterval(pos, end);
+                
+//              if (getPosComparator().compare(pos, end) == 0) {
+//                      return null;
+//              }
+                
+                return subText(interval);
+        }
 }