Merge pull request #31 from eprogramming/master

this close #4

Author: helio-frota

src/main/java/org/esmerilprogramming/mterm/event/BlockAction.java renamed to src/main/java/org/esmerilprogramming/mterm/event/BlockPromptStringDeletionAction.java

@@ -16,29 +16,30 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.JTextArea;
 
-import org.esmerilprogramming.mterm.handler.AeshHandler;
-
 /**
- * BlockAction class.
- *
+ * BlockPromptStringDeletionAction class.
+ * This class block the deletion of the PS1.
+ * 
  * @author <a href="mailto:[email protected]">Helio Frota</a>
  */
 @SuppressWarnings("serial")
-public class BlockAction extends AbstractAction {
-
-  private AeshHandler aesh;
-  private JTextArea textArea;
-
-  public BlockAction(JTextArea textArea, AeshHandler aesh) {
-    this.textArea = textArea;
-    this.aesh = aesh;
+public class BlockPromptStringDeletionAction extends AbstractAction {
+  
+  private int promptStringLength;
+  private Action blockPromptStringDeletion;
+  
+  public BlockPromptStringDeletionAction(int promptStringLength, Action blockPromptStringDeletion) {
+    this.promptStringLength = promptStringLength;
+    this.blockPromptStringDeletion = blockPromptStringDeletion;
   }
-
-  public void actionPerformed(ActionEvent ev) {
-
+  
+  public void actionPerformed(ActionEvent e) {
+    JTextArea textarea = (JTextArea) e.getSource();
+    if (textarea.getCaretPosition() > promptStringLength) {
+      blockPromptStringDeletion.actionPerformed(null);
+    }
   }
-
-
 }

src/main/java/org/esmerilprogramming/mterm/event/MtermDocListener.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2014 EsmerilProgramming.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.esmerilprogramming.mterm.event;
+
+import javax.swing.Action;
+import javax.swing.JTextArea;
+import javax.swing.text.NavigationFilter;
+import javax.swing.text.Position;
+
+/**
+ * MtermNavigationFilter class.
+ * This class take care of the caret position.
+ * 
+ * @author <a href="mailto:[email protected]">Helio Frota</a>
+ */
+public class MtermNavigationFilter extends NavigationFilter {
+  private int promptStringLength;
+  private Action blockPromptStringDeletionAction;
+
+  public MtermNavigationFilter(int promptStringLength, JTextArea textarea) {
+    this.promptStringLength = promptStringLength;
+    blockPromptStringDeletionAction = textarea.getActionMap().get("delete-previous");
+    textarea.getActionMap().put("delete-previous",
+        new BlockPromptStringDeletionAction(promptStringLength, blockPromptStringDeletionAction));
+    textarea.setCaretPosition(promptStringLength);
+  }
+
+  public void setDot(NavigationFilter.FilterBypass filter, int dot, Position.Bias bias) {
+    filter.setDot(Math.max(dot, promptStringLength), bias);
+  }
+
+  public void moveDot(NavigationFilter.FilterBypass filter, int dot, Position.Bias bias) {
+    filter.moveDot(Math.max(dot, promptStringLength), bias);
+  }
+
+
+}

src/main/java/org/esmerilprogramming/mterm/event/MtermNavigationFilter.java

@@ -32,7 +32,7 @@
 import javax.swing.KeyStroke;
 
 import org.esmerilprogramming.mterm.Mterm;
-import org.esmerilprogramming.mterm.event.MtermDocListener;
+import org.esmerilprogramming.mterm.event.MtermNavigationFilter;
 import org.esmerilprogramming.mterm.event.RunAction;
 import org.esmerilprogramming.mterm.event.TabAction;
 import org.esmerilprogramming.mterm.handler.AeshHandler;
@@ -53,7 +53,6 @@ public final class MtermUI extends JFrame {
   public MtermUI() {
     initGraphComponents();
     applyEventsAndStreams();
-    System.out.print(Mterm.buildPS1());
   }
 
   private void initGraphComponents() {
@@ -79,7 +78,7 @@ private void initGraphComponents() {
 
     setJMenuBar(m.create());
 
-    textArea = new JTextArea(21, 80);
+    textArea = new JTextArea(Mterm.buildPS1(), 21, 80);
     textArea.setFont(new Font("Monospaced", Font.PLAIN, 15));
     textArea.setLineWrap(true);
     textArea.setWrapStyleWord(true);
@@ -135,9 +134,7 @@ public void actionPerformed(ActionEvent arg0) {
     textArea.getActionMap().put("tab", new TabAction(textArea, aesh));
     textArea.getInputMap().put(KeyStroke.getKeyStroke("UP"), "none");
     textArea.getInputMap().put(KeyStroke.getKeyStroke("DOWN"), "none");
-    textArea.getInputMap().put(KeyStroke.getKeyStroke("BACK_SPACE"), "none");
-    
-    textArea.getDocument().addDocumentListener(new MtermDocListener());
+    textArea.setNavigationFilter(new MtermNavigationFilter(Mterm.buildPS1().length(), textArea));
   }
 
   public JTextArea getTextArea() {