allow specifying names of components

Author: alpacanitrate

src/script/ComponentMap.java

@@ -0,0 +1,9 @@
+package script;
+
+import java.util.HashMap;
+
+import paintcomponents.PaintComponent;
+
+public class ComponentMap {
+	public static HashMap<String, PaintComponent> map = new HashMap<String, PaintComponent>();
+}

src/script/Interpreter.java

@@ -6,13 +6,15 @@
 import paintcomponents.data.DataDisplayPaintComponent;
 import actions.edit.undoredo.SharedUndoRedoActionManager;
 import actions.edit.undoredo.UndoRedoableInterface;
+import paintcomponents.*;
 
 /**
  * Interpret and execute scripts 
  * @author Xiaoquan Jiang
  */
 public class Interpreter {
 
+	private static final String SELECT = "select";
 	private static final String ZOOM = "zoom";
 	private static final String REMOVE = "remove";
 	private static final String UPDATE = "update";
@@ -21,8 +23,8 @@ public class Interpreter {
 	private static final String EDIT = "edit";
 	private static final String CONSTRUCT = "construct";
 	private static final String ADD = "add";
-	private PaintPanel panel;
-
+	protected PaintPanel panel;
+	
 	public Interpreter(PaintPanel panel) {
 		this.panel = panel;
 	}
@@ -62,6 +64,10 @@ public void interpreteLine(String script) throws ExecutionErrorException {
         new InterpreterRemoveAction(tokenizer, panel);
         break;
 
+			case SELECT:
+				new InterpreterSelectAction(tokenizer, panel);
+				break;
+				
 			default:
 				throw new ExecutionErrorException("invalid script");
 			}

src/script/InterpreterAddActions.java

@@ -1,11 +1,11 @@
 package script;
 
 import javax.swing.JOptionPane;
-
 import paintcomponents.TextPaintComponent;
 import actions.edit.undoredo.SharedUndoRedoActionManager;
 import actions.edit.undoredo.UndoRedoableInterface;
 import ui.PaintPanel;
+import paintcomponents.*;
 
 /**
  * Interpret and execute 'add' scripts 
@@ -17,10 +17,13 @@ public class InterpreterAddActions {
 	private static final String LAZY = "lazy";
 	private static final String HASKELL = "haskell";
 	private static final String DATA = "data";
+	private PaintPanel panel;
+	private PaintComponent component;
 
 	public InterpreterAddActions(Tokenizer tokenizer, PaintPanel panel)
 			throws ExecutionErrorException {
-
+	  this.panel = panel;
+	  
 		if (tokenizer.hasNext()) {
 			switch (tokenizer.next()) {
 			case DATA:
@@ -36,7 +39,7 @@ public InterpreterAddActions(Tokenizer tokenizer, PaintPanel panel)
 				break;
 
 			case TEXT_BOX:
-				performAddTextBox(panel);
+				component = performAddTextBox();
 		    break;
 
 			default:
@@ -45,9 +48,14 @@ public InterpreterAddActions(Tokenizer tokenizer, PaintPanel panel)
 		} else {
 			throw new ExecutionErrorException("incomplete script");
 		}
+		
+		// name and store the component added
+    if (tokenizer.hasNext() && component != null) {
+      ComponentMap.map.put(tokenizer.next(), component);
+    }
 	}
 
-	private void performAddTextBox(PaintPanel panel) {
+	private PaintComponent performAddTextBox() {
 		String s = JOptionPane.showInputDialog("Please enter the text to display");
 		TextPaintComponent comp = new TextPaintComponent(s, panel.getWidth() / 2,
 				panel.getHeight() / 2);
@@ -69,5 +77,6 @@ public void redoAction() {
 					}
 				});
 		panel.repaint();
+		return comp;
 	}
 }

src/script/InterpreterAddData.java

@@ -1,8 +1,10 @@
 package script;
 
+import paintcomponents.PaintComponent;
 import paintcomponents.data.DataDisplayPaintComponent;
 import paintcomponents.data.DataInputTextfieldPaintComponent;
 import ui.PaintPanel;
+
 import actions.edit.undoredo.SharedUndoRedoActionManager;
 import actions.edit.undoredo.UndoRedoableInterface;
 
@@ -14,20 +16,21 @@ public class InterpreterAddData {
 	private static final String INPUT_BOX = "inputBox";
 	private static final String DISPLAY_BOX = "displayBox";
 	private PaintPanel panel;
+	private PaintComponent component;
 
 	public InterpreterAddData(Tokenizer tokenizer, PaintPanel panel)
 			throws ExecutionErrorException {
 
 		this.panel = panel;
-
+		
 		if (tokenizer.hasNext()) {
 			switch (tokenizer.next()) {
 			case DISPLAY_BOX:
-				performAddDisplayBoxAction();
+				component = performAddDisplayBoxAction();
 				break;
 
 			case INPUT_BOX:
-				performAddInputBoxAction();
+				component = performAddInputBoxAction();
 				break;
 
 			default:
@@ -36,9 +39,14 @@ public InterpreterAddData(Tokenizer tokenizer, PaintPanel panel)
 		} else {
 			throw new ExecutionErrorException("incomplete script");
 		}
+		
+    // name and store the component added
+    if (tokenizer.hasNext() && component != null) {
+      ComponentMap.map.put(tokenizer.next(), component);
+    }
 	}
 
-	private void performAddDisplayBoxAction() {
+	private PaintComponent performAddDisplayBoxAction() {
 		DataDisplayPaintComponent comp = new DataDisplayPaintComponent(
 				"Data Display", panel.getWidth() / 2, panel.getHeight() / 2);
 		panel.addPaintComponent(comp);
@@ -60,9 +68,10 @@ public void redoAction() {
 					}
 				});
 		panel.repaint();
+		return comp;
 	}
 
-	private void performAddInputBoxAction() {
+	private PaintComponent performAddInputBoxAction() {
 		DataInputTextfieldPaintComponent comp = new DataInputTextfieldPaintComponent(
 				"Data Input", panel.getWidth() / 2, panel.getHeight() / 2);
 		panel.addPaintComponent(comp);
@@ -85,6 +94,6 @@ public void redoAction() {
 					}
 				});
 		panel.repaint();
+		return comp;
 	}
-
 }