Ticket #2495: 2495.patch

modules/org.sophie2.main.app.layout/src/main/java/org/sophie2/main/app/layout/left/pages/PageStructurePalette.java

@@ -10 +10 @@
 import org.sophie2.base.commons.util.ImmList;
 import org.sophie2.base.commons.util.position.ImmPoint;
 import org.sophie2.base.commons.util.position.ImmSize;
-import org.sophie2.base.commons.util.position.Position;
 import org.sophie2.base.dnd.SophieDragDropHandler;
 import org.sophie2.base.layout.model.TreePalette;
 import org.sophie2.base.layout.model.TreePaletteItem;
 import org.sophie2.base.model.book.ElementH;
-import org.sophie2.base.model.book.frame.BoundMode;
 import org.sophie2.base.model.book.interfaces.ResizableElement;
 import org.sophie2.base.model.book.links.Link;
 import org.sophie2.base.model.book.links.LinkRule;
@@ -255 +253 @@
                         }
 
                         if (type().get() == ItemType.DETAILS_LOCATION) {
-                                ImmPoint pos = model.getLocation(BoundMode.CONTENT,
-                                                Position.TOP_LEFT, element().get().getTime());
+                                ImmPoint pos = element().get().contentLocation().get();
 
                                 return "Frame Location : " + "( " + pos.getX() + 
                                 ", " + pos.getY() + " )";

modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/links/TextLinkProcessor.java

@@ -2 +2 @@
 
 import java.util.HashMap;
 
+
 import org.sophie2.base.commons.structures.ImmTreeMap;
 import org.sophie2.base.commons.util.ImmColor;
 import org.sophie2.base.commons.util.ImmMap;
 import org.sophie2.base.model.text.HotAttr;
+import org.sophie2.base.model.text.TextChange;
 import org.sophie2.base.model.text.TextReplaceChange;
 import org.sophie2.base.model.text.elements.CommonAttr;
 import org.sophie2.base.model.text.model.ImmTextInterval;
@@ -130 +132 @@
 
         public DefaultTextEffect applyChange(TextProcessorEffect prevEffect, ImmText oldSource,
                         ImmText oldResult, TextLinkOptions procOptions) {
-//              TextChange change = prevEffect.getChange();
-//              ImmText sourceText = prevEffect.getText();
-//              ImmText toProcess = sourceText.subText(change.getTargetDamage(sourceText));
-//
-//              TextReplaceChange effect = new TextReplaceChange(
-//                              change.getSourceDamage(oldSource), process(toProcess, procOptions));
-//
-//              ImmText result = effect.applyTo(oldResult);
-//              assert result.getEnd() == sourceText.getEnd() : result.getEnd() + " : " + sourceText.getEnd();
-//
-//              return new DefaultTextEffect(effect, result);
-                
-                ImmText res = process(prevEffect.getText(), procOptions);
-                return new DefaultTextEffect(ImmTextUtils.getChange(oldResult, res), res);
+
+                TextChange change = prevEffect.getChange();
+                ImmText oldResult2 = prevEffect.getText();
+                ImmTextInterval damagedInterval = change.getTargetDamage(oldSource);
+                ImmText damagedText = oldResult2.subText(damagedInterval);
+                damagedText = process(damagedText, procOptions);
+                ImmText res = ImmTextUtils.fastReplaceInterval(damagedInterval, oldResult2, damagedText);
+                if (res == null) {
+                        ImmText prefixText = oldResult2.subText(new ImmTextInterval(oldResult2.getBegin(), damagedInterval.getBegin()));
+                        ImmText suffixText = oldResult2.subText(new ImmTextInterval(damagedInterval.getEnd(), oldResult2.getEnd()));
+                        res = prefixText.concat(damagedText);
+                        res = res.concat(suffixText);
+                }
+                TextChange newChange = new TextReplaceChange(damagedInterval, damagedText);
+                return new DefaultTextEffect(newChange, res);
         }
 
         public ImmText process(ImmText sourceText, TextLinkOptions procOptions) {
@@ -161 +164 @@
                                 HashMap<HotAttr<?>, Object> values = new HashMap<HotAttr<?>, Object>();
                                 ImmColor fgColor = procOptions.getColor(linkId);
                                 if (fgColor != null) {
-
                                         values.put(CommonAttr.FOREGROUND_COLOR, fgColor);
-                                        unitStyle = unitStyle.derive(values);
 
-                                        // TODO performance could be better if the style is applied for a whole interval.
-                                        result = result.applyStyle(unitStyle, new ImmTextInterval(i, i+1));
+                                        HotStyleDef newStyle = HotStyleDef.getEmpty().derive(values);
+                                        int endIndex = getEndForLinkId(sourceText, i);
+                                        result = result.applyStyle(newStyle, new ImmTextInterval(i, endIndex));
+                                        i += endIndex;
                                 }
                         }
                 }
 
                 return result;
         }
+        private int getEndForLinkId(ImmText sourceText, int beginIndex) {
+                String linkId = sourceText.unitAt(beginIndex).getStyle().getValue(CommonAttr.LINK_ATTRIBUTE);
+                int endIndex  = beginIndex;
+                for (; endIndex < sourceText.getEnd(); ++endIndex) {
+                        if (! sourceText.unitAt(endIndex).getStyle().getValue(CommonAttr.LINK_ATTRIBUTE).equals(linkId)) {
+                                break;
+                        }
+                }
+                return endIndex;
+        }
 
         public DefaultTextEffect setOptions(ImmText source, ImmText oldProcessed,
                         TextLinkOptions oldOptions, TextLinkOptions newOptions) {

modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/model/TextUtils.java

@@ -97 +97 @@
          *                      The text's prefix.
          */
         public static ImmText getPrefix(ImmText text, int toIndex) {
-                if (text.getEnd() == 0) {
+                if (text.getEnd() == 0 || text.getEnd() == toIndex) {
                         return text;
                 }
                 ImmTextInterval interval = 
@@ -120 +120 @@
          */
         public static ImmText getSuffix(ImmText text, int fromIndex) {
 
-                if (text.getEnd() == 0 && fromIndex == 0) {
+                if (text.getEnd() == 0 || fromIndex == text.getBegin()) {
                         return text;
                 }
                 int begin = ImmTextUtils.advance(text, text.getBegin(), fromIndex);

modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/model/ImmHotText.java

@@ -89 +89 @@
         public ImmHotText replace(ImmTextInterval interval, ImmText newText) {
                 assert interval != null : "Interval should not be null";
                 assert newText != null : "Text should not be null";
-                
+
                 if (interval.isEmpty() && newText.getEnd() == 0) {
                         return this;
                 }
@@ -114 +114 @@
                         newTextUnits = newTextUnits.remove(index);
                 }
 
-                int endRunIndex = getRunEnd(0);
+                HotStyleDef lastUnitStyle = null;
+                HotStyleDef lastUsedStyle = null;
                 HotStyleDef newStyle  = newStyles;
                 if (newText.getEnd() >= 1) {
                         TextUnit unit = newText.unitAt(0);
                         HotStyleDef style = unit.getStyle();
-                                newStyle = newStyle.derive(style);
+                        lastUnitStyle = style;
+                        newStyle = newStyle.derive(style);
+                        lastUsedStyle = newStyle;
                 }
 
                 for (int i = 0; i < newText.getEnd(); ++i, ++index) {
                         TextUnit unit = newText.unitAt(i);
-                        if (i >= endRunIndex) {
-                                HotStyleDef style = unit.getStyle();
-                                newStyle = newStyle.replaceDerive(style);
-                                endRunIndex = getRunEnd(endRunIndex + 1);
+                        HotStyleDef style = unit.getStyle();
+                        if (lastUnitStyle != null && 
+                                        style.getHash().equals(lastUnitStyle.getHash())) {
+                                newStyle = lastUsedStyle;
+                        } else {
+                        //I do not see the difference between using derive 
+                        //and replaceDerive(if sth. is wrong with the styles-use replaceDerive instead)
+                        //--diana 05-08-10
+                                newStyle = newStyle.derive(style);
+                                lastUsedStyle = newStyle;
+                                lastUnitStyle = style;
                         }
 
                         newTextUnits = 
@@ -156 +166 @@
         }
 
         public ImmHotText applyStyle(HotStyleDef style, ImmTextInterval interval) {
-                
+
                 if (interval.isEmpty()) {
                         return this;
                 }
-                
+
                 ImmList<TextUnit> newImmTextUnits = this.textUnits;
+                HotStyleDef lastUnitStyle = this.textUnits.get(interval.getBegin()).getStyle();
+                HotStyleDef lastUsedStyle = this.textUnits.get(interval.getBegin()).getStyle().derive(style);
 
+                
                 // TODO what if the begin is after the end?? --kyli
                 for (int i = interval.getBegin(); i < interval.getEnd(); ++i) {
+                        HotStyleDef unitStyle = this.textUnits.get(i).getStyle();
+                        HotStyleDef newStyle = lastUsedStyle;
+                        if (! unitStyle.getHash().equals(lastUnitStyle.getHash())) {
+                                newStyle = unitStyle.derive(style);
+                                lastUnitStyle = unitStyle;
+                                lastUsedStyle = newStyle;
+                        }
                         TextUnit newTextUnit =  new TextUnit(this.textUnits.get(i).getChar(),
-                                        this.textUnits.get(i).getStyle().derive(style));
+                                        newStyle);
                         newImmTextUnits = newImmTextUnits.set(i, newTextUnit);
                 }
 
@@ -241 +261 @@
                 ImmHotText otherHotText = (ImmHotText) otherText;
                 return new ImmHotText(this.textUnits.concat(otherHotText.textUnits));
         }
-
-        private int getRunEnd(int i) {
-                if (this.getEnd() <= i) {
-                        return i;
+        
+        @SuppressWarnings("unused")
+        private ImmHotText replaceUnits(ImmTextInterval interval, ImmHotText text) {
+                ImmList<TextUnit> newUnits = text.textUnits;
+                ImmList<TextUnit> newTextUnits = this.textUnits;
+                assert interval.getEnd() - interval.getBegin() == newUnits.size() : "Inconsistent replace!";
+                for(int i = interval.getBegin(); i < interval.getEnd(); ++i) {
+                        newTextUnits = newTextUnits.set(i, newUnits.get(i - interval.getBegin()));
                 }
-                int endIndex = i;
-                assert endIndex < this.getEnd() && endIndex >= this.getBegin();
+                assert newTextUnits.size() == this.textUnits.size();
+                return new ImmHotText(newTextUnits);
+        }
 
-                HotStyleDef styleDef = unitAt(endIndex).getStyle();
-                while (endIndex < this.getEnd()) {
-                        if (! unitAt(endIndex).getStyle().equals(styleDef)) {
-                                break;
-                        }
-                        ++ endIndex;
-                }
-                return endIndex - 1 < getBegin() ? endIndex : endIndex - 1;
-        }
+        //Currently the HotStyleDef::equals method is not fast enough to use this function ;(
+        //      private int getRunEnd(int i) {
+        //              if (this.getEnd() <= i) {
+        //                      return i;
+        //              }
+        //              int endIndex = i;
+        //              assert endIndex < this.getEnd() && endIndex >= this.getBegin();
+        //
+        //              HotStyleDef styleDef = unitAt(endIndex).getStyle();
+        //              while (endIndex < this.getEnd()) {
+        //                      if (! unitAt(endIndex).getStyle().equals(styleDef)) {
+        //                              break;
+        //                      }
+        //                      ++ endIndex;
+        //              }
+        //              return endIndex - 1 < getBegin() ? endIndex : endIndex - 1;
+        //      }
 }

modules/org.sophie2.base.connectivity/.settings/org.eclipse.jdt.launching.prefs

@@ +1 @@
+#Thu Aug 12 11:26:08 EEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning

modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/frame/rotate/FrameRotateHaloMenu.java

@@ -41 +41 @@
                                 if (!computeVisible()) {
                                         return ImmPoint.ZERO;
                                 }
+                                ImmPoint frameLocation = frameView.contentLocation().get(); 
+                                
                                 FrameH frame = frameView.model().get(); 
-                                ImmPoint frameLocation = frame.getLocation(BoundMode.CONTENT, Position.TOP_LEFT, 
-                                                frameView.getTime()); 
-                                ImmPoint locInParent = frame.getLocation(BoundMode.MARGIN, Position.BOTTOM_RIGHT,
-                                                frameView.getTime());
+                                ImmPoint locInParent = frame.getLocation(frameView.contentLocation().get(),
+                                                BoundMode.MARGIN, Position.BOTTOM_RIGHT);
                                 ImmPoint locInFrame = 
                                         locInParent.translate(-frameLocation.getX(), -frameLocation.getY());
                                 return locInFrame;

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

@@ -4 +4 @@
 import java.util.Map;
 
 import org.sophie2.base.model.text.HotAttr;
+import org.sophie2.base.model.text.TextChange;
+import org.sophie2.base.model.text.TextReplaceChange;
 import org.sophie2.base.model.text.elements.LayoutAttr;
 import org.sophie2.base.model.text.model.ImmText;
 import org.sophie2.base.model.text.model.ImmTextInterval;
@@ -45 +47 @@
                 ImmText sourceText = prevEffect.getText();
                 ImmText newText = getStyledText(sourceText, procOptions);
 
-                return new DefaultTextEffect(ImmTextUtils.getChange(oldResult, newText), newText);
+                ImmTextInterval damagedInterval = prevEffect.getChange().getSourceDamage(oldSource);
+                ImmText replaceText = newText.subText(damagedInterval);
+                TextChange change = new TextReplaceChange(damagedInterval, replaceText);
+                return new DefaultTextEffect(change, newText);
         }
 
         public Class<CaretOptions> getOptionsClass() {
@@ -59 +64 @@
         public DefaultTextEffect setOptions(ImmText source, 
                         ImmText oldProcessed, CaretOptions oldOptions, CaretOptions newOptions) {
 
+                
                 ImmText newText = getStyledText(source, newOptions);
 
                 return new DefaultTextEffect(ImmTextUtils.getChange(oldProcessed, newText), newText);

modules/org.sophie2.main.func.text/.settings/org.eclipse.core.resources.prefs

@@ +1 @@
+#Thu Aug 12 10:29:41 EEST 2010
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

modules/org.sophie2.main.app.halos/src/test/java/org/sophie2/main/app/halos/frame/rotate/FrameRotateHaloButtonTest.java

@@ -116 +116 @@
         @Test
         public void test90() {
                 
-                ImmArea area = this.frame.getBoundArea(BoundMode.MARGIN, this.fv.getTime(), true);
+                ImmArea area = this.fv.getBoundArea(BoundMode.MARGIN, true);
                 int marginHeight = (int) area.getBounds().getHeight();
                 
                 rotate(0, -marginHeight, -Math.PI/2, null);
@@ -128 +128 @@
         @Test
         public void test45() {
                 
-                ImmArea area = this.frame.getBoundArea(BoundMode.MARGIN, this.fv.getTime(), true);
+                ImmArea area = this.fv.getBoundArea(BoundMode.MARGIN, true);
                 int marginHeight = (int) area.getBounds().getHeight();
                 
                 rotate(0, -marginHeight/2, -Math.PI/4, null);
@@ -142 +142 @@
                 BaseBookView bookView = this.pwa.bookView().get();
                 bookView.setViewOptions(bookView.getViewOptions().modifyZoom(0.5f));
                                 
-                ImmArea area = this.frame.getBoundArea(BoundMode.MARGIN, this.fv.getTime(), true);
+                ImmArea area = this.fv.getBoundArea(BoundMode.MARGIN, true);
 
                 int marginHeight = (int) area.getBounds().getHeight();
                 rotate(0, -marginHeight/4, -Math.PI/4, null);
@@ -156 +156 @@
                 BaseBookView bookView = this.pwa.bookView().get();
                 bookView.setViewOptions(bookView.getViewOptions().modifyZoom(2.0f));
                 
-                ImmArea area = this.frame.getBoundArea(BoundMode.MARGIN, this.fv.getTime(), true);
+                ImmArea area = this.fv.getBoundArea(BoundMode.MARGIN, true);
                 int marginHeight = (int) area.getBounds().getHeight();
                 
                 rotate(0, -marginHeight, -Math.PI/4, null);

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

@@ -20 +20 @@
 import org.sophie2.base.model.text.elements.TextAlign;
 import org.sophie2.base.model.text.model.ImmHotText;
 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.style.HotStyleDef;
 import org.sophie2.main.app.commons.util.AttributedPair;
@@ -75 +74 @@
 
                 applyStyles(element, builder, entries);
 
-
-                ImmText newText = new ImmHotText(builder.toString(), null);
+                String text = builder.toString();
+                ImmText newText = ImmTextUtils.createEmptyText();
                 int curPos = newText.getBegin();
 
                 for (ElementEntry entry : entries) {
                         int length = entry.getLength();
-                        ImmTextInterval interval = new ImmTextInterval(curPos, ImmTextUtils.
-                                        advance(newText, curPos, length));
                         HotStyleDef def = HotStyleDef.getEmpty().derive(entry.getAttributes());
-                        newText = newText.applyStyle(def, interval);
-                        curPos = ImmTextUtils.advance(newText, curPos, length);
+                        ImmText styledText = new ImmHotText(text.substring(curPos, curPos + length) , def); 
+                        curPos += length;
+                        newText = newText.concat(styledText);
                 }
 
                 return newText;

modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/page/PwaSelector.java

@@ -340 +340 @@
          *                      True if the specified ElementView can be selected; false otherwise.
          */
         public boolean canBeSelected(ElementView toSelect) {
-                if (!toSelect.getTime().isOn()) {
+                if (!toSelect.isOn().get()) {
                         return false;
                 }
                 

modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/view/TextFrameView.java

@@ -3 +3 @@
 import java.util.List;
 
 import org.sophie2.base.commons.util.position.ImmArea;
-import org.sophie2.base.media.TimePos;
 import org.sophie2.base.model.book.frame.BoundMode;
 import org.sophie2.base.model.resources.r4.access.ResourceAccess;
 import org.sophie2.base.model.text.model.ImmTextInterval;
@@ -55 +54 @@
          */
         public Prop<ImmArea> wrappedArea() {
                 class wrappedArea extends AutoProperty<ImmArea> {
-
+                        
                         @Override
                         protected ImmArea compute() {
-                                TimePos time = getTime();
-                                ImmArea resArea = model().get().getBoundArea(BoundMode.CONTENT, time, true);
+                                ImmArea resArea = getBoundArea(BoundMode.CONTENT, true);
                                 ElementView parentView = parent().get();
                                 
                                 if (parentView != null) {
@@ -73 +71 @@
                                                                 break;
                                                         }
                                                         resArea = resArea.subtract(
-                                                                        nextView.model().get().getBoundArea(BoundMode.MARGIN, time, false));
+                                                                        nextView.getBoundArea(BoundMode.MARGIN, false));
                                                 }
                                         }
+                                        return resArea; 
                                 }
-                                return resArea;
+                                return ImmArea.EMPTY;
                         }
                 }
                 return getBean().makeProp(wrappedArea.class);

modules/org.sophie2.base.model.book/src/main/java/org/sophie2/base/model/book/FrameH.java

@@ -1 +1 @@
 package org.sophie2.base.model.book;
 
 import org.sophie2.base.commons.util.ImmList;
-import org.sophie2.base.commons.util.position.ImmArea;
 import org.sophie2.base.commons.util.position.ImmInsets;
 import org.sophie2.base.commons.util.position.ImmPoint;
 import org.sophie2.base.commons.util.position.ImmSize;
 import org.sophie2.base.media.TimePos;
 import org.sophie2.base.model.book.frame.BoundMode;
-import org.sophie2.base.model.book.frame.FrameR4;
-import org.sophie2.base.model.book.frame.WrappingModes;
 import org.sophie2.base.model.book.interfaces.CompositeElement;
 import org.sophie2.base.model.book.interfaces.MemberElement;
 import org.sophie2.base.model.book.interfaces.ResizableElement;
@@ -196 +193 @@
                 return ".frame.s2";
         }
         
-        @Override
-        public ImmArea getBoundArea(BoundMode boundMode, TimePos elementTime,
-                        Boolean wrapMode) {
-                if (!wrapMode) { 
-                                if (WrappingModes.NO_WRAP.equals(this.get(FrameR4.KEY_WRAP))) { 
-                                        return ImmArea.EMPTY; 
-                                } 
-                } 
-                return super.getBoundArea(boundMode, elementTime, wrapMode);
-        }
-
 }

modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/align/AlignElementsLogic.java

@@ -49 +49 @@
 
                         ImmArea bounds = ImmArea.EMPTY;
                         for (ElementView view : selected) {
-                                ImmArea area = view.model().get().getBoundArea(BoundMode.CONTENT, view.getTime(), true); 
+                                ImmArea area = view.getBoundArea(BoundMode.CONTENT, true); 
                                 bounds = bounds.union(area);
                         }
 
@@ -66 +66 @@
                         for (int i = 0; i < selected.size(); ++i) {
                                 if (selected.get(i).model().get().isMember()) {
                                         ElementView selectedView = selected.get(i);
-                                        ImmRect oldBounds = selectedView.model().get().getBoundArea( 
-                                                        BoundMode.CONTENT, selectedView.getTime(), true).getBounds();   
+                                        ImmRect oldBounds = selectedView.getBoundArea( 
+                                                        BoundMode.CONTENT, true).getBounds();   
                                         ImmPoint newLocation = button.calculateNewLocation(oldBounds, alignValue);
                                         oldLocations.add(selectedView.model().get().get(MemberElement.KEY_LOCATION)); 
                                         newLocations.add(newLocation);

modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/search/TextSearchProcessor.java

@@ -4 +4 @@
 
 import org.sophie2.base.commons.util.ImmColor;
 import org.sophie2.base.model.text.HotAttr;
+import org.sophie2.base.model.text.TextChange;
 import org.sophie2.base.model.text.TextReplaceChange;
 import org.sophie2.base.model.text.elements.CommonAttr;
 import org.sophie2.base.model.text.model.ImmTextInterval;
@@ -31 +32 @@
         }
 
         private static TextSearchProcessor instance = null;
-
+        
         /**
          * Gets the only instance of this processor.
          * 
@@ -63 +64 @@
 
                 ImmText newResult = process(sourceText, procOptions);
 
-                return new DefaultTextEffect(
-                                ImmTextUtils.getChange(oldResult, newResult), newResult);
+                ImmTextInterval damagedInterval = prevEffect.getChange().getSourceDamage(oldSource);
+                ImmText damagedText = newResult.subText(damagedInterval);
+                TextChange change = new TextReplaceChange(damagedInterval, damagedText);
+                
+                return new DefaultTextEffect(change, newResult);
         }
 
         public Class<TextSearchOptions> getOptionsClass() {
@@ -73 +77 @@
 
         public ImmText process(ImmText sourceText, TextSearchOptions procOptions) {
 
+                ImmTextInterval searchedInterval = procOptions.getInterval();
+                if (searchedInterval.isEmpty()) {
+                        return sourceText;
+                }
                 HashMap<HotAttr<?>, Object> styleValues = new HashMap<HotAttr<?>, Object>();
                 styleValues.put(CommonAttr.BACKGROUND_COLOR, procOptions.getColor());
 
                 HotStyleDef style = HotStyleDef.getEmpty().derive(styleValues);
-                if (procOptions.getInterval().getBegin() >= sourceText.getBegin() &&
-                                procOptions.getInterval().getEnd() <= sourceText.getEnd()) {
-                        return sourceText.applyStyle(style, procOptions.getInterval());
+                if (searchedInterval.getBegin() >= sourceText.getBegin() &&
+                                searchedInterval.getEnd() <= sourceText.getEnd()) {
+                        return sourceText.applyStyle(style, searchedInterval);
                 }
                 return sourceText;
         }
@@ -119 +127 @@
                 private final ImmTextInterval interval;
                 private final ImmColor highlightColor;
 
+                @Override
+                public boolean equals(Object o) {
+                        if (o == null) {
+                                return false;
+                        }
+                        if (! (o instanceof TextSearchOptions)) {
+                                return false;
+                        }
+                        TextSearchOptions opts = (TextSearchOptions) o;
+                        return this.highlightColor.equals(opts.getColor()) 
+                                                && this.interval.equals(opts.getInterval());
+                }
                 /**
                  * Default constructor.
                  * 

modules/org.sophie2.base.commons/src/main/java/org/sophie2/base/commons/util/position/ImmArea.java

@@ -90 +90 @@
                 });
         }
 
+        @Override
+        public String toString() {
+                return "ImmArea: " + this.area.getBounds().height + " " + this.area.getBounds().width;
+        }
         /**
          * Computes the union of this area and another one.
          * 
@@ -279 +283 @@
                         return h.toHash();
                 }
         }
+        
+        @Override
+        public int hashCode() {
+                final int prime = 31;
+                int result = 1;
+                result = prime * result + ((this.area == null) ? 0 : this.area.hashCode());
+                return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj) {
+                        return true;
+                }
+                if (obj == null) {
+                        return false;
+                }
+                if (getClass() != obj.getClass()) {
+                        return false;
+                }
+                ImmArea other = (ImmArea) obj;
+                if (this.area == null) {
+                        if (other.area != null) {
+                                return false;
+                        }
+                } else if (!this.area.equals(other.area)) {
+                        return false;
+                }
+                
+                return true;
+        }
 }

modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/properties/PropertiesHud.java

@@ -561 +561 @@
                                         res = model.getLocation(BoundMode.CONTENT,
                                                         rotationPosition().get(), time);
                                         
-                                        ImmPoint contentLoc = model.getLocation(
-                                                        BoundMode.CONTENT, Position.TOP_LEFT, time);
+                                        ImmPoint contentLoc = fv.contentLocation().get();
                                         ImmMatrix m = ImmMatrix.IDENTITY.rotate
                                                         (model.getRotationAngle(), contentLoc.getX(), contentLoc.getY());
                                         res = m.transform(res);

modules/org.sophie2.extra.func.spellcheck/src/main/java/org/sophie2/extra/func/spellcheck/UnderliningProcessor.java

@@ -4 +4 @@
 import java.util.List;
 
 import org.sophie2.base.model.text.HotAttr;
+import org.sophie2.base.model.text.TextChange;
 import org.sophie2.base.model.text.TextReplaceChange;
 import org.sophie2.base.model.text.elements.LayoutAttr;
 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.mvc.DefaultTextEffect;
 import org.sophie2.base.model.text.mvc.TextProcessor;
 import org.sophie2.base.model.text.mvc.TextProcessorEffect;
@@ -49 +49 @@
                 ImmText sourceText = prevEffect.getText();
                 ImmText newResult = process(sourceText, procOptions);
 
-                return new DefaultTextEffect(
-                                ImmTextUtils.getChange(oldResult, newResult), newResult);
+                ImmTextInterval damagedInterval = prevEffect.getChange().getSourceDamage(oldSource);
+                ImmText damagedText = newResult.subText(damagedInterval);
+                TextChange change = new TextReplaceChange(damagedInterval, damagedText);
+                return new DefaultTextEffect(change, newResult);
         }
 
         public Class<UnderlineOptions> getOptionsClass() {
@@ -70 +72 @@
                         
                         if (procOptions.getIntervals() != null) {
                                 for (ImmTextInterval interval : procOptions.getIntervals()) {
-                                        if (interval.getBegin() >= result.getBegin() && 
+                                        if (!interval.isEmpty() && interval.getBegin() >= result.getBegin() && 
                                                 interval.getEnd() <= result.getEnd ()){
                                                 result = result.applyStyle(style, interval);
                                         }
@@ -86 +88 @@
                         UnderlineOptions newOptions) {
         
                 ImmText result = process (source, newOptions);
-                
+
                 //TODO: this is possibly slow and unneeded
                 ImmTextInterval oldDamagedInterval = new ImmTextInterval (oldProcessed.getBegin(), oldProcessed.getEnd());
                 ImmTextInterval newDamagedInterval = new ImmTextInterval (result.getBegin(), result.getEnd());

modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/mvc/SelectionProcessor.java

@@ -44 +44 @@
 
         public DefaultTextEffect applyChange(TextProcessorEffect prevEffect,
                         ImmText oldSource, ImmText oldResult, SelectionOptions procOptions) {
-        
+
                 ImmText sourceText = prevEffect.getText();
                 ImmText newText = processText(sourceText, procOptions); 
 
                 assert newText.getEnd() == 
                         sourceText.getEnd() : newText.getEnd() + " : " + sourceText.getEnd();
+                ImmTextInterval damagedInterval = prevEffect.getChange().getSourceDamage(oldSource);
+                ImmText damagedText = newText.subText(damagedInterval);
 
-                        return new DefaultTextEffect(ImmTextUtils.getChange(oldResult, newText), newText);
+                TextChange change = new TextReplaceChange(damagedInterval, damagedText);
+                return new DefaultTextEffect(change, newText);
         }
 
         public Class<SelectionOptions> getOptionsClass() {
@@ -75 +78 @@
                 Object value = procOptions.getValue();
                 ImmTextInterval selectionInterval = procOptions.getSelection();
 
+                if (selectionInterval.isEmpty()) {
+                        return sourceText;
+                }
                 if (ImmTextUtils.isIndexInText(selectionInterval.getBegin(), sourceText) &&
                                 ImmTextUtils.isIndexInText(selectionInterval.getEnd(), sourceText)) { 
 
@@ -93 +99 @@
         public DefaultTextEffect setOptions(ImmText source, 
                         ImmText oldProcessed, SelectionOptions oldOptions, SelectionOptions newOptions) {
 
+                ImmText newText;
+                if (newOptions.equals(oldOptions)) {
+                        newText = oldProcessed;
+                } else {
+                        newText = processText(source, newOptions);
+                }
                 ImmTextInterval damagedInterval = 
                         oldOptions.getSelection().unite(newOptions.getSelection());
 
-                ImmText newText = processText(source, newOptions);
-
                 TextChange change = 
                         new TextReplaceChange(damagedInterval, newText.subText(damagedInterval));
 

modules/org.sophie2.base.model.book/src/main/java/org/sophie2/base/model/book/ElementH.java

@@ -5 +5 @@
 
 import org.sophie2.base.commons.structures.ImmTreeList;
 import org.sophie2.base.commons.util.ImmList;
-import org.sophie2.base.commons.util.position.ImmArea;
 import org.sophie2.base.commons.util.position.ImmInsets;
-import org.sophie2.base.commons.util.position.ImmMatrix;
 import org.sophie2.base.commons.util.position.ImmPoint;
 import org.sophie2.base.commons.util.position.ImmRect;
-import org.sophie2.base.commons.util.position.ImmSize;
 import org.sophie2.base.commons.util.position.Position;
 import org.sophie2.base.media.TimePos;
 import org.sophie2.base.model.book.actions.RemoveSubElementAction;
 import org.sophie2.base.model.book.frame.BoundMode;
 import org.sophie2.base.model.book.frame.FrameR4;
-import org.sophie2.base.model.book.frame.WrappingModes;
 import org.sophie2.base.model.book.interfaces.CompositeElement;
 import org.sophie2.base.model.book.interfaces.MemberElement;
 import org.sophie2.base.model.book.interfaces.StyledElement;
@@ -68 +64 @@
         public static final int Y_OFFSET = 50;
 
         /**
-         * Calculates the bound area of this element in the selected
-         * {@link BoundMode} for the selected {@link TimePos}. For a simple element,
-         * like {@link FrameR4}, will return the area of the element itself. For a
-         * composite element, returns the union of all the sub-elements, considering
-         * rotation angles.
-         * 
-         * @param boundMode
-         *          The mode for calculating the area.
-         * @param elementTime
-         *          The current moment for which to calculate the area. Needed,
-         *          since the location is time-dependent.
-         * @param wrapMode 
-         *            Whether or not the area is important. Used for calculating the 
-         *            area for the different wrapping modes of frames. When the text should 
-         *            not go around the frame, the area of the frame is not 
-         *            important.When wrapMode is <b>false</b>, it will be checked 
-         *            whether or not the wrap mode of the frame is 
-         *            {@link WrappingModes#NO_WRAP}, and if so, the area will be 
-         *            empty. The default value is <b>true</b>.
-         * @return 
-         *                      The calculated {@link ImmArea}.
-         */
-        public ImmArea getBoundArea(BoundMode boundMode,
-                        TimePos elementTime, Boolean wrapMode) {
-
-                if (!elementTime.isOn()) {
-                        return ImmArea.EMPTY;
-                }
-
-                ImmPoint contentLocation = getLocation(BoundMode.CONTENT,
-                                Position.TOP_LEFT, elementTime);
-
-                if (ElementUtils.isContainer(this)) {
-                        ImmArea area = ImmArea.EMPTY;
-                        for (ElementH element : getChildElements(elementTime)) {
-
-                                // TODO (r4) consider relative locations.. --kyli
-                                area = area.union(element.getBoundArea(boundMode, getSubTime( 
-                                                getChildRef(element), elementTime), wrapMode));
-                        }
-                        return area.transform(ImmMatrix.IDENTITY.rotate(getRotationAngle(),
-                                        contentLocation.getX(), contentLocation.getY()));
-                }
-
-                ImmPoint position = getLocation(boundMode, Position.TOP_LEFT,
-                                elementTime);
-                ImmSize size = boundMode.getSize(getWrapSize(), getPaddingInsets(),
-                                getStyleHelper().getBorderInsets(), getMarginInsets());
-                ImmArea res = new ImmArea(new ImmRect(position, size)).transform(
-                                ImmMatrix.IDENTITY.rotate(getRotationAngle(),
-                                                contentLocation.getX(), contentLocation.getY()));
-                return res;
-        }
-
-        /**
          * Retrieves the currently active children of this element. This means that
          * they should have {@link ActivationChannel}s with appropriate values.
          * Useful for views.
@@ -304 +245 @@
         }
 
         /**
+         * Gets the location of a specific frame position, given a content location and a mode.
+         * Used for optimization since it re-uses the calculated content location which is
+         * time-dependent.
+         * (The content location is the location of the point TOP_LEFT in bound mode CONTENT in a specified time)  
+         * 
+         * @param contentLocation
+         *                        - The provided content location for the element.
+         * @param mode
+         *            - {@link BoundMode} in which the point will be calculated
+         * @param pos
+         *            - {@link Position} of the point in the rectangle
+         * @return The location of the interesting point (pos) of the mode`s
+         *         rectangle.
+         */
+        public ImmPoint getLocation(ImmPoint contentLocation, BoundMode mode,
+                        Position pos) {
+                ImmRect bounds = new ImmRect(contentLocation, getWrapSize());
+
+                ImmPoint point = pos.getPoint(mode.getRect(
+                                bounds, getPaddingInsets(),
+                                getStyleHelper().getBorderInsets(), getMarginInsets()));
+                return point;
+        }
+
+        /**
          * Gets the location of a specific frame position in specific mode.
          * 
          * @param mode
@@ -320 +286 @@
                 LocationChannel channel = get(MemberElement.KEY_LOCATION);
                 ImmPoint contentLocation = channel.getValue(localTime);
 
-                ImmRect bounds = new ImmRect(contentLocation, getWrapSize());
-
-                ImmPoint point = pos.getPoint(mode.getRect(bounds, getPaddingInsets(),
-                                getStyleHelper().getBorderInsets(), getMarginInsets()));
-                return point;
+                return getLocation(contentLocation, mode, pos);
         }
 
         /**

modules/org.sophie2.extra.func.spellcheck/src/test/java/org/sophie2/extra/func/spellcheck/SpellCheckDemoTest.java

@@ -327 +327 @@
                                 String textStr = modelText.toString();
 
                                 List<String> misspelled = new LinkedList<String> ();
-                                SpellCheckUtility.getMisspelledWords (misspelled, null, textStr);
+                                //SpellCheckUtility.getMisspelledWords (misspelled, null, textStr);
 
                                 DefaultListModel model = (DefaultListModel) listMisspelled.getModel();
 

modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/element/ElementView.java

@@ -10 +10 @@
 import org.sophie2.base.commons.util.ImmList;
 import org.sophie2.base.commons.util.NaiveImmList;
 import org.sophie2.base.commons.util.position.ImmArea;
+import org.sophie2.base.commons.util.position.ImmMatrix;
+import org.sophie2.base.commons.util.position.ImmPoint;
+import org.sophie2.base.commons.util.position.ImmRect;
+import org.sophie2.base.commons.util.position.ImmSize;
+import org.sophie2.base.commons.util.position.Position;
 import org.sophie2.base.media.AudioChunk;
 import org.sophie2.base.media.MediaComposite;
 import org.sophie2.base.media.TimePos;
 import org.sophie2.base.model.book.ElementH;
+import org.sophie2.base.model.book.ElementH.ElementUtils;
+import org.sophie2.base.model.book.frame.BoundMode;
+import org.sophie2.base.model.book.frame.FrameR4;
+import org.sophie2.base.model.book.frame.WrappingModes;
 import org.sophie2.base.model.book.interfaces.CompositeElement;
+import org.sophie2.base.model.book.interfaces.MemberElement;
 import org.sophie2.base.model.book.links.Link;
 import org.sophie2.base.model.book.links.LinkTrigger;
 import org.sophie2.base.model.book.resource.r4.ElementR4;
 import org.sophie2.base.model.book.timelines.ActivationChannel;
+import org.sophie2.base.model.book.timelines.LocationChannel;
 import org.sophie2.base.model.resources.r4.ResourceRefR4;
 import org.sophie2.base.model.resources.r4.access.ResourceAccess;
 import org.sophie2.base.model.resources.r4.model.ResourceModel;
@@ -123 +134 @@
                         @Override
                         protected SceneElement compute() {
                                 SceneElement res = new DefaultCompositeSceneElement() {
-                                        @SuppressWarnings("synthetic-access")
                                         @Override
                                         protected void setupElements() {
                                                 List<SceneElement> subs = subElements().get();
@@ -352 +362 @@
         public BaseBookView getBookView() {
                 return findParentElement(BaseBookView.class);
         }
+        
+        /**
+         * Prop used to reduce the time dependency. Used only for optimization purposes.
+         * 
+         * @return
+         *                      The location for the current moment in time.
+         */
+        public Prop<ImmPoint> contentLocation() {
+                class contentLocation extends AutoProperty<ImmPoint> {
 
+                        @Override
+                        protected ImmPoint compute() {
+                                return  model().get().getLocation(BoundMode.CONTENT, 
+                                                Position.TOP_LEFT, getTime());
+                        }
+                }
+                return getBean().makeProp(contentLocation.class);
+        }
+        
         /**
+         * Prop used to reduce the time dependency. Used only for optimization purposes.
+         * 
+         * @return
+         *                      The location for the margins area in this time.
+         */
+        public Prop<ImmPoint> marginLocation() {
+                class marginLocation extends AutoProperty<ImmPoint> {
+
+                        @Override
+                        protected ImmPoint compute() {
+                                return  model().get().getLocation(contentLocation().get(), BoundMode.MARGIN,
+                                                Position.TOP_LEFT);
+                        }
+                }
+                return getBean().makeProp(marginLocation.class);
+        }
+        
+        /**
+         * Prop used to reduce the time setting time. Used for optimization.
+         * 
+         * @return
+         *              The current location channel.
+         */
+        public Prop<LocationChannel> locationChannel() {
+                class locationChannel extends AutoProperty<LocationChannel> {
+
+                        @Override
+                        protected LocationChannel compute() {
+                                return model().get().get(MemberElement.KEY_LOCATION);
+                        }
+                }
+                return getBean().makeProp(locationChannel.class);
+        }
+        
+        /**
          * Adds all scene elements that should be displayed as children of this view's model scene
          * element.
          * 
@@ -405 +468 @@
          */
         public static final ImmColor INVISIBLE_COLOR = new ImmColor(0.8f, 0.8f, 1.0f, 0.8f);
 
-        private Prop<Boolean> isOn() {
+        /**
+         * Property used to determine whether the time phase is on.
+         * 
+         * @return
+         *              true if the time phase is on, false otherwise.
+         */
+        public Prop<Boolean> isOn() {
                 class isOn extends AutoProperty<Boolean> {
                         @Override
                         protected Boolean compute() {
@@ -766 +835 @@
                  */
                 public static final int RESOURCE_REF_PARAM_INDEX = 0;
         }
+        
+        /**
+         * Calculates the bound area of this element in the selected
+         * {@link BoundMode} for the selected {@link TimePos}. For a simple element,
+         * like {@link FrameR4}, will return the area of the element itself. For a
+         * composite element, returns the union of all the sub-elements, considering
+         * rotation angles.
+         * 
+         * @param boundMode
+         *          The mode for calculating the area.
+         * @param wrapMode 
+         *            Whether or not the area is important. Used for calculating the 
+         *            area for the different wrapping modes of frames. When the text should 
+         *            not go around the frame, the area of the frame is not 
+         *            important.When wrapMode is <b>false</b>, it will be checked 
+         *            whether or not the wrap mode of the frame is 
+         *            {@link WrappingModes#NO_WRAP}, and if so, the area will be 
+         *            empty. The default value is <b>true</b>.
+         * @return 
+         *                      The calculated {@link ImmArea}.
+         */
+        public ImmArea getBoundArea(BoundMode boundMode, Boolean wrapMode) {
+                
+                ElementH model = model().get();
+                if (!isOn().get()) {
+                        return ImmArea.EMPTY;
+                }
 
+                ImmPoint contentLocation = contentLocation().get();
+
+                if (ElementUtils.isContainer(this.model().get())) {
+                        ImmArea area = ImmArea.EMPTY;
+                        for (ElementView element : elementViews().get()) {
+                                if (element.isOn().get()) {
+                                        ImmArea innerArea = element.getBoundArea(boundMode, wrapMode);
+                                
+                                        area = area.union(innerArea);
+                                }
+                        }
+                        return area.transform(ImmMatrix.IDENTITY.rotate(model.getRotationAngle(),
+                                        contentLocation.getX(), contentLocation.getY()));
+                }
+                ImmPoint position;
+                if (BoundMode.CONTENT.equals(boundMode)) {
+                        position = contentLocation;
+                } else if (BoundMode.MARGIN.equals(boundMode)){
+                        position = marginLocation().get();
+                } else {
+                        TimePos elementTime = getTime();
+                        position = model.getLocation(boundMode, Position.TOP_LEFT,
+                                        elementTime);
+                }
+
+                ImmSize size = boundMode.getSize(model.getWrapSize(), model.getPaddingInsets(),
+                                model.getStyleHelper().getBorderInsets(), model.getMarginInsets());
+                ImmArea res = new ImmArea(new ImmRect(position, size)).transform(
+                                ImmMatrix.IDENTITY.rotate(model.getRotationAngle(),
+                                                contentLocation.getX(), contentLocation.getY()));
+                return res;
+        }
+
 }
+ No newline at end of file

modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/frame/FrameView.java

@@ -26 +26 @@
 import org.sophie2.base.model.book.actions.base.SetKeyAction;
 import org.sophie2.base.model.book.frame.BoundMode;
 import org.sophie2.base.model.book.frame.FrameR4;
-import org.sophie2.base.model.book.interfaces.MemberElement;
+import org.sophie2.base.model.book.frame.WrappingModes;
 import org.sophie2.base.model.book.interfaces.ResourceFrame;
 import org.sophie2.base.model.book.interfaces.StyledElement;
 import org.sophie2.base.model.book.links.LinkTrigger;
-import org.sophie2.base.model.book.timelines.LocationChannel;
 import org.sophie2.base.model.resources.r4.ResourceRefR4;
 import org.sophie2.base.model.resources.r4.access.ResourceAccess;
 import org.sophie2.base.model.resources.r4.changes.AutoAction;
@@ -483 +482 @@
                 
                 return getBean().makeProp(localRectCache.class);
         }
-        
-        
-        /**
-         * Prop used to reduce the time dependency. Used only for optimization purposes.
-         * 
-         * @return
-         *                      The content location for the current moment in time.
-         */
-        private Prop<ImmPoint> contentLocation() {
-                class contentLocation extends AutoProperty<ImmPoint> {
 
-                        @Override
-                        protected ImmPoint compute() {
-                                LocationChannel channel = model().get().get(MemberElement.KEY_LOCATION);
-                                
-                                return channel.getValue(getTime());
-                        }
-                }
-                return getBean().makeProp(contentLocation.class);
-        }
-        
         /**
          * Gets the top-left location for the current moment in time. 
          * @param mode
@@ -693 +672 @@
                 
                 return getBean().makeProp(templateKind.class);
         }
+        
+        
+        @Override
+        public ImmArea getBoundArea(BoundMode boundMode, Boolean wrapMode) {
+                if (!wrapMode) { 
+                        if (WrappingModes.NO_WRAP.equals(model().get().get(FrameR4.KEY_WRAP))) { 
+                                return ImmArea.EMPTY; 
+                        } 
+                } 
+                return super.getBoundArea(boundMode, wrapMode);
+        }
+        
 }

modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/page/ScenePageLogic.java

@@ -151 +151 @@
                                         List<ElementView> toSelect = new ArrayList<ElementView>();
 
                                         for (ElementView view : elementViews) {
-                                                ImmRect bounds = view.model().get().getBoundArea(BoundMode.OUT_BORDER, 
-                                                                view.getTime(), true).getBounds(); 
+                                                ImmRect bounds = view.getBoundArea(BoundMode.OUT_BORDER, 
+                                                                true).getBounds(); 
                                                 if (selRect.contains(bounds))
                                                         if (pwa.getSel().canBeSelected(view)) {
                                                                 toSelect.add(view);

modules/org.sophie2.extra.func.annotations/src/main/java/org/sophie2/extra/func/annotations/view/AudioAnnotationView.java

@@ -65 +65 @@
 
                         @Override
                         protected ImmRect compute() {
-                                return model().get().getBoundArea( 
-                                                BoundMode.CONTENT, getTime(), true).getBounds(); 
+                                return getBoundArea(BoundMode.CONTENT, true).getBounds(); 
                         }
                 }
                 return getBean().makeProp(bounds.class);

modules/org.sophie2.base.connectivity/.settings/org.eclipse.jdt.core.prefs

@@ -1 @@
-#Wed Oct 21 16:55:23 EEST 2009
+#Thu Aug 12 11:26:08 EEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -16 +16 @@
 org.eclipse.jdt.core.codeComplete.localSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/model/ImmTextUtils.java

@@ -1 +1 @@
 package org.sophie2.base.model.text.model;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -70 +72 @@
         public static int advance(ImmText text, int index, int offset) {
                 if (!isIndexInText(index, text)) {
                         throw new IllegalArgumentException("The input index does not " +
-                        "belong to the current text: " + index + " text: " + text + ":");
+                                        "belong to the current text: " + index + " text: " + text + ":");
                 }
 
                 int newIndex = index + offset;
@@ -96 +98 @@
          *             New concatenate text. 
          */
         public static ImmText concat(ImmText text1, ImmText text2) {
-                
+
                 return text1.concat(text2);
-//              ImmText replacedText = text1.replace(new ImmTextInterval(text1.getEnd(),
-//                              text1.getEnd()), text2);
-//              int endText1 = text1.getEnd();
-//              for (int i = text2.getBegin(); i < text2.getEnd(); ++i) {
-//                      int pos = i + endText1;
-//                      replacedText = replacedText.applyStyle(
-//                                      HotStyleDef.getDefault().derive(text2.unitAt(i).getStyle()),
-//                                      new ImmTextInterval(pos, pos + 1));
-//              }
-//              return replacedText;
+                //              ImmText replacedText = text1.replace(new ImmTextInterval(text1.getEnd(),
+                //                              text1.getEnd()), text2);
+                //              int endText1 = text1.getEnd();
+                //              for (int i = text2.getBegin(); i < text2.getEnd(); ++i) {
+                //                      int pos = i + endText1;
+                //                      replacedText = replacedText.applyStyle(
+                //                                      HotStyleDef.getDefault().derive(text2.unitAt(i).getStyle()),
+                //                                      new ImmTextInterval(pos, pos + 1));
+                //              }
+                //              return replacedText;
         }
 
         /**
@@ -145 +147 @@
                                 text.getStyleValue(attribute, new ImmTextInterval(beginPosition, beginPosition)))) {
                         beginPosition = advance(text, beginPosition, - 1);
                 }
-                
+
                 if (!(beginPosition == text.getBegin() && value.equals(
                                 text.getStyleValue(attribute, new ImmTextInterval(beginPosition, beginPosition))))) {
                         beginPosition = advance(text, beginPosition, 1);
@@ -195 +197 @@
                 return text.unitAt(position).getStyle().getValue(attribute);
         }
 
-        
+
         /**
          * Creates a change that modifies the source text to the result.
          * 
@@ -208 +210 @@
          *                              change.applyTo(source).getStyledHash().equals(result.getStyledHash).
          */
         public static TextChange getChange(ImmText source, ImmText result) {
-                
+
                 // FIXME this implementation is dummy.. --kyli@2010-05-20
                 return new TextReplaceChange(
                                 new ImmTextInterval(source.getBegin(), source.getEnd()), result);
         }
+        /**
+         * Method for fast(faster than using the replace function of the text) replacing interval of a text with another text. 
+         * The replacing text should be the same length as the interval. The styles of the new text are not derived - 
+         * they are the same as using concat function.
+         * 
+         * @param interval
+         *                              The interval to be replaced.
+         * @param oldText
+         *                              The text to be replaced.
+         * @param replacedText
+         *                              The replacing text.
+         * @return
+         *                      The new replaced text.
+         */
+        public static ImmText fastReplaceInterval(ImmTextInterval interval, ImmText oldText, ImmText replacedText) {
+                if(! (oldText instanceof ImmHotText) || ! (replacedText instanceof ImmHotText)) {
+                        return null;
+                }
+                ImmHotText oldHotText = (ImmHotText) oldText;
+                ImmHotText replacedHotText = (ImmHotText) replacedText;
+                try {
+                        Method m = oldHotText.getClass().getDeclaredMethod("replaceUnits", ImmTextInterval.class, ImmHotText.class);
+                        m.setAccessible(true);
+                        try {
+                                return (ImmText) m.invoke(oldHotText, interval, replacedHotText);
+                        } catch (IllegalArgumentException e) {
+                                return null;
+                        } catch (IllegalAccessException e) {
+                                return null;
+                        } catch (InvocationTargetException e) {
+                                return null;
+                        }
+                } catch (SecurityException e) {
+                        return null;
+                } catch (NoSuchMethodException e) {
+                        return null;
+                }
+        }
 }

modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/view/HotTextLogic.java

@@ -124 +124 @@
 
                         Boolean forceSignificance = event.getEventParam(
                                         TextView.EventIds.FORCE_SIGNIFICANCE_PARAM_INDEX, Boolean.class);
-
+                        
                         final Message description = event.getEventParam(
                                         TextView.EventIds.DESCRIPTION_PARAM_INDEX, Message.class);
 

modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/style/HotStyleDef.java

@@ -4 +4 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import org.sophie2.base.commons.structures.ImmTreeList;
 import org.sophie2.base.commons.structures.ImmTreeMap;
 import org.sophie2.base.commons.util.Hash;
 import org.sophie2.base.commons.util.Hashable;
 import org.sophie2.base.commons.util.Hasher;
-import org.sophie2.base.commons.util.AccessCreateCollectionUtil;
 import org.sophie2.base.commons.util.ImmList;
 import org.sophie2.base.commons.util.ImmMap;
-import org.sophie2.base.commons.util.ImmMap.ImmEntry;
 import org.sophie2.base.model.text.HotAttr;
 import org.sophie2.base.model.text.elements.CommonAttr;
 import org.sophie2.base.model.text.model.TextUnit;
@@ -37 +36 @@
         private static final Map<ImmMap<HotAttr<?>, Object>, HotStyleDef> usedStyles = 
                 new HashMap<ImmMap<HotAttr<?>,Object>, HotStyleDef>();
 
-
+        private Hash hashCode = null;
+        
         private HotStyleDef(ImmMap<HotAttr<?>, Object> values) {
                 // Disable direct instantiation.
                 ImmMap<HotAttr<?>, Object> allValues = values;
@@ -80 +80 @@
          *                      The style's attributes.
          */
         public ImmList<HotAttr<?>> getAttributeKeys() {
-                ImmList<HotAttr<?>> keys = AccessCreateCollectionUtil.<HotAttr<?>>createDosImmList();
-                for (ImmEntry<HotAttr<?>, Object> entry : this.attrValues.asList()) {
-                        keys = keys.add(entry.getKey());
-                }
-                return keys;
+                return ImmTreeList.create(this.attrValues.toMap().keySet());
         }
 
 
@@ -242 +238 @@
         }
 
         public Hash getHash() {
-
-                Hasher hasher = new Hasher();
-                // XXX values may not be hash-able.. 
-                // think of a smarter realization of HotStyleDef!! --kyli
-                Iterator<ImmMap.ImmEntry<HotAttr<?>, Object>> it = this.attrValues.iterator();
-                while (it.hasNext()) {
-                        ImmMap.ImmEntry<HotAttr<?>, Object> entry = it.next();
-                        hasher.addHashed(entry.getKey().getHash());
-                        hasher.addObject(entry.getValue());
+                if (this.hashCode == null) {
+                        Hasher hasher = new Hasher();
+                        // XXX values may not be hash-able.. 
+                        // think of a smarter realization of HotStyleDef!! --kyli
+                        Iterator<ImmMap.ImmEntry<HotAttr<?>, Object>> it = this.attrValues.iterator();
+                        while (it.hasNext()) {
+                                ImmMap.ImmEntry<HotAttr<?>, Object> entry = it.next();
+                                hasher.addHashed(entry.getKey().getHash());
+                                hasher.addObject(entry.getValue());
+                        }
+                        this.hashCode = hasher.toHash();
                 }
-                return hasher.toHash();
+                return this.hashCode;
         }
 }
+ No newline at end of file