Merge pull request #55 from UCSDOalads/commandModeBranch

fix a bug in command mode
UCSDOalads · Mar 30, 2017 · cf75a20 · cf75a20
2 parents eab7825 + 7fce8af
commit cf75a20
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/ui/KeyHandler.java b/src/ui/KeyHandler.java
@@ -19,6 +19,7 @@ public class KeyHandler implements KeyListener {
 	private PaintPanel paintPanel;
 	private boolean inCommandMode;
 	Interpreter interpreter ;
+	private boolean isCurrentDirectionNext;
 
 
 	JTextField textField;
@@ -81,9 +82,10 @@ public void keyTyped(KeyEvent e) {
 
 			//record command
 
-			while(commandHistoryIter.hasNext())
+			while(commandHistoryIter.hasNext()){
 				this.commandHistoryIter.next();
-
+			}
+			isCurrentDirectionNext = true;
 			commandHistoryIter.add(textField.getText());
 
 			executeCommand(textField.getText().substring(PROMPT.length()));
@@ -102,12 +104,20 @@ public void keyPressed(KeyEvent e) {
 			exitCommandMode();
 
 			//if it is up arrow, go back in history
-		} else if (e.getKeyCode() == KeyEvent.VK_UP){
+		} else if (e.getKeyCode() == KeyEvent.VK_UP ){
 			if(commandHistoryIter.hasPrevious()){
+				if(isCurrentDirectionNext){
+					commandHistoryIter.previous();
+				}
+				isCurrentDirectionNext = false;
 				this.textField.setText(commandHistoryIter.previous());
 			}
-		} else if (e.getKeyCode() == KeyEvent.VK_DOWN){
+		} else if (e.getKeyCode() == KeyEvent.VK_DOWN ){
 			if(commandHistoryIter.hasNext()){
+				if(!isCurrentDirectionNext){
+					commandHistoryIter.next();
+				}
+				isCurrentDirectionNext = true;
 				this.textField.setText(commandHistoryIter.next());
 			}
 		}