Merge pull request #46 from UCSDOalads/connectCommandWindowAndScriptInterpreter

connect command window and interpreter

Author: UltimatePea

src/script/InterpreterAddLazyJavaClass.java

@@ -2,6 +2,7 @@
 
 import javax.swing.JOptionPane;
 
+import actions.AddLazyJavaClassAction;
 import actions.edit.undoredo.SharedUndoRedoActionManager;
 import actions.edit.undoredo.UndoRedoableInterface;
 import paintcomponents.PaintComponent;
@@ -21,32 +22,9 @@ public InterpreterAddLazyJavaClass(Tokenizer tokenizer, PaintPanel panel)
 	}
 
 	private PaintComponent performAddJavaClassAction() {
-		String className = JOptionPane.showInputDialog("Please specify the name of the Java Class");
-		try {
-			Class classObj = Class.forName(className);
-			ClassPaintComponent comp = new ClassPaintComponent(classObj, panel.getWidth() / 2, panel.getHeight() / 2);
-			panel.addPaintComponent(comp);
-			// add action to undo redo manager
-			SharedUndoRedoActionManager.getSharedInstance().pushUndoableAction(new UndoRedoableInterface() {
-
-				@Override
-				public void undoAction() {
-					comp.remove(panel);
-					panel.repaint();
-				}
-
-				@Override
-				public void redoAction() {
-					panel.addPaintComponent(comp);
-					panel.repaint();
-				}
-			});
-			panel.repaint();
-			return comp;
-		} catch (ClassNotFoundException e) {
-			e.printStackTrace();
-			JOptionPane.showMessageDialog(panel, className + " :: Class Not Found");
-			return null;
-		}
+		
+		AddLazyJavaClassAction action = new AddLazyJavaClassAction(panel);
+		action.performAction();
+		return panel.getPaintComponents().get(panel.getPaintComponents().size() -1);
 	}
 }

src/ui/KeyHandler.java

@@ -3,19 +3,29 @@
 import java.awt.event.KeyEvent;
 
 import paintcomponents.TextPaintComponent;
+import script.ExecutionErrorException;
+import script.Interpreter;
 
 public class KeyHandler {
 
+	private static final int VERTICAL_OFFSET = 5;
 	private PaintPanel paintPanel;
 	private String pendingCommand;
 	private boolean inCommandMode;
 	private TextPaintComponent component;
-
+	Interpreter interpreter ;
 	public KeyHandler(PaintPanel paintPanel) {
 		pendingCommand = "";
 		this.paintPanel = paintPanel;
+		
+		//initialize text component
 		this.component = new TextPaintComponent("", 0, 0);
 		this.paintPanel.addPaintComponent(this.component);
+		
+		interpreter = new Interpreter(paintPanel);
+		
+		
+		//not in command
 		inCommandMode = false;
 	}
 
@@ -55,6 +65,11 @@ public void keyPressed(KeyEvent e) {
 
 	private void executeCommand(String pendingCommand2) {
 
+		try {
+			interpreter.interpreteLine(pendingCommand2);
+		} catch (ExecutionErrorException e) {
+			e.printStackTrace();
+		}
 	}
 
 	private void update() {
@@ -67,7 +82,7 @@ private void update() {
 		int height = paintPanel.getHeight();
 		int rowHeight = component.getRowHeight();
 		component.setX(0);
-		component.setY(height - rowHeight);
+		component.setY(height - rowHeight - VERTICAL_OFFSET);
 		paintPanel.repaint();
 	}