TEXT_INPLACE_EDITOR_R0: TEXT_INPLACE_EDITOR-demo-27.04.2009.patch

src/test/java/org/sophie2/base/model/text/SwingDemoTest.java

@@ -71 +71 @@
                                 .setString("Bla bla bla ! 1 :) : ) :) : ): ) :) \n2 :) : ): )\n :) :):)");
                 HotTextPane pane = new HotTextPane();
                 pane.text().set(text);
+                pane.caretPos().set(text.navigator().get().getBeginning());
+                pane.markPos().set(text.navigator().get().getBeginning());
                 pane.bounds().set(new ImmRect(0, 0, 300, 300));
 
                 JButton bold = new JButton("Bold");

src/main/java/org/sophie2/base/model/text/swing/HotTextPaneLogic.java

@@ -1 +1 @@
 package org.sophie2.base.model.text.swing;
 
 import java.awt.event.KeyEvent;
+import java.util.ArrayList;
 import java.util.Arrays;
 
 import org.sophie2.base.model.text.HotPos;
@@ -70 +71 @@
                         //TODO: This unwrapping is bad. The INSERT_CHAR event should have a parameter instead.
                         EventR3 kbdEvent = event.getCausingEvent(EventR3.class);
                         KeyEvent awtKeyEvent = kbdEvent.getCausingEvent(KeyEvent.class);
+                        if (awtKeyEvent.getKeyChar() == '\b') {
+                                return false;
+                        }
                         text.replaceText(source.caretPos().get(), source.caretPos().get(),
                                         Arrays.asList(new HotUnit(awtKeyEvent.getKeyChar())));
+                        source.text().set(text);
 
                         //
                         // text.replaceText(source.caretPos().get(),
@@ -140 +145 @@
                         return textPane.caretPos().get();
                 }
 
-        }
+        }, 
+        
+        /**
+         * Defines the behavior when deleting text.
+         * 
+         * @author nenko
+         * 
+         */
+        DELETE_TEXT {
+
+                @Override
+                public void defineFilter(EventFilterBuilder filter) {
+                        filter.setSourceClass(HotTextPane.class);
+                        filter.setEventId(HotTextPane.Ops.DELETE);
+                }
+
+                @Override
+                public boolean handle(EventR3 event) {
+                        HotTextPane source = event
+                                        .getSource(HotTextPane.class);
+
+                        HotText text = source.text().get();
+                        Navigator nav = text.navigator().get();
+                        HotPos beforeEnd = nav.advance(nav.getEnd(), -1);
+                        text.replaceText(beforeEnd, nav.getEnd(),
+                                        new ArrayList<HotUnit>());
+
+                        source.text().set(text);
+
+                        return true;
+                }
+
+        },
 
 }
+ No newline at end of file