Merge pull request #52 from UCSDOalads/addBugsByXiaoquan

Remove undo redo methods in interpreter

Author: UltimatePea

src/script/InterpreterAddActions.java

@@ -2,6 +2,8 @@
 
 import javax.swing.JOptionPane;
 import paintcomponents.TextPaintComponent;
+import actions.AddLazyJavaClassAction;
+import actions.AddTextBoxAction;
 import actions.edit.undoredo.SharedUndoRedoActionManager;
 import actions.edit.undoredo.UndoRedoableInterface;
 import ui.PaintPanel;
@@ -56,27 +58,8 @@ public InterpreterAddActions(Tokenizer tokenizer, 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);
-		panel.addPaintComponent(comp);
-		// push action to the 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;
+		AddTextBoxAction action = new AddTextBoxAction(panel);
+		action.performAction();
+		return panel.getPaintComponents().get(panel.getPaintComponents().size() -1);
 	}
 }

src/script/InterpreterAddData.java

@@ -4,7 +4,9 @@
 import paintcomponents.data.DataDisplayPaintComponent;
 import paintcomponents.data.DataInputTextfieldPaintComponent;
 import ui.PaintPanel;
-
+import actions.AddDataDisplayBoxAction;
+import actions.AddDataInputBoxAction;
+import actions.AddTextBoxAction;
 import actions.edit.undoredo.SharedUndoRedoActionManager;
 import actions.edit.undoredo.UndoRedoableInterface;
 
@@ -47,53 +49,14 @@ public InterpreterAddData(Tokenizer tokenizer, PaintPanel panel)
 	}
 
 	private PaintComponent performAddDisplayBoxAction() {
-		DataDisplayPaintComponent comp = new DataDisplayPaintComponent(
-				"Data Display", panel.getWidth() / 2, panel.getHeight() / 2);
-		panel.addPaintComponent(comp);
-
-		// push action to 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;
+		AddDataDisplayBoxAction action = new AddDataDisplayBoxAction(panel);
+		action.performAction();
+		return panel.getPaintComponents().get(panel.getPaintComponents().size() -1);
 	}
 
 	private PaintComponent performAddInputBoxAction() {
-		DataInputTextfieldPaintComponent comp = new DataInputTextfieldPaintComponent(
-				"Data Input", panel.getWidth() / 2, panel.getHeight() / 2);
-		panel.addPaintComponent(comp);
-
-		// push action to the 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;
+		AddTextBoxAction action = new AddTextBoxAction(panel);
+		action.performAction();
+		return panel.getPaintComponents().get(panel.getPaintComponents().size() -1);
 	}
 }

src/script/InterpreterAddLazy.java

@@ -115,21 +115,7 @@ private PaintComponent performAddJavaClassAction() {
 			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) {
@@ -147,21 +133,7 @@ private PaintComponent performAddJavaConstructorAction() {
 		ClassConstructorPaintComponent consComp = new ClassConstructorPaintComponent(cons[desiaredConstructorIndex],
 				panel.getWidth() / 2, panel.getHeight() / 2);
 		panel.addPaintComponent(consComp);
-		// add action to undo redo manager
-		SharedUndoRedoActionManager.getSharedInstance().pushUndoableAction(new UndoRedoableInterface() {
 
-			@Override
-			public void undoAction() {
-				consComp.remove(panel);
-				panel.repaint();
-			}
-
-			@Override
-			public void redoAction() {
-				panel.addPaintComponent(consComp);
-				panel.repaint();
-			}
-		});
 		panel.repaint();
 		return consComp;
 	}
@@ -179,20 +151,7 @@ private PaintComponent performAddJavaFieldsComponentAction() {
 		FieldsPaintComponent fieldsComp = new FieldsPaintComponent(classComp.getDisplayingClass(), panel.getWidth() / 2,
 				panel.getHeight() / 2);
 		panel.addPaintComponent(fieldsComp);
-		// push action to the manager
-		SharedUndoRedoActionManager.getSharedInstance().pushUndoableAction(new UndoRedoableInterface() {
 
-			@Override
-			public void undoAction() {
-				fieldsComp.remove(panel);
-			}
-
-			@Override
-			public void redoAction() {
-				panel.addPaintComponent(fieldsComp);
-
-			}
-		});
 		panel.repaint();
 		return fieldsComp;
 	}
@@ -205,21 +164,7 @@ private PaintComponent performAddJavaMethodComponentAction() {
 		MethodPaintComponent methodComp = new MethodPaintComponent(methods[desiaredConstructorIndex], panel.getWidth() / 2,
 				panel.getHeight() / 2);
 		panel.addPaintComponent(methodComp);
-		// add action to undo redo manager
-		SharedUndoRedoActionManager.getSharedInstance().pushUndoableAction(new UndoRedoableInterface() {
 
-			@Override
-			public void undoAction() {
-				methodComp.remove(panel);
-				panel.repaint();
-			}
-
-			@Override
-			public void redoAction() {
-				panel.addPaintComponent(methodComp);
-				panel.repaint();
-			}
-		});
 		panel.repaint();
 		return methodComp;
 	}

src/script/InterpreterFileActions.java

@@ -9,6 +9,9 @@
 
 import org.xml.sax.SAXException;
 
+import actions.AddLazyJavaClassAction;
+import actions.FileOpen;
+import actions.FileSaveAs;
 import file.PanelIO;
 import ui.PaintPanel;
 
@@ -50,29 +53,12 @@ public InterpreterFileActions(Tokenizer tokenizer, PaintPanel panel)
 	}
 
 	private void performOpen(PaintPanel panel2) {
-		String filePath = JOptionPane.showInputDialog("Please input file path");
-		PanelIO io = new PanelIO();
-		try {
-			io.constructPanelFromDocument(panel, filePath, true);
-			panel.repaint();
-		} catch (ParserConfigurationException | SAXException | IOException
-				| ClassNotFoundException | NoSuchMethodException
-				| SecurityException | InstantiationException
-				| IllegalAccessException | IllegalArgumentException
-				| InvocationTargetException e) {
-			e.printStackTrace();
-			JOptionPane.showMessageDialog(panel, e.toString());
-		}
+		FileOpen action = new FileOpen(panel);
+		action.performAction();
 	}
 
 	private void performSaveAs(PaintPanel panel2) {
-		String filePath = JOptionPane.showInputDialog("Please input file path");
-		PanelIO io = new PanelIO();
-		try {
-			io.constructDocumentFromPanel(panel, filePath);
-		} catch (ParserConfigurationException | TransformerException e) {
-			e.printStackTrace();
-			JOptionPane.showMessageDialog(panel, e.toString());
-		}
+		FileSaveAs action = new FileSaveAs(panel);
+		action.performAction();
 	}
 }

src/script/InterpreterRemoveAction.java

@@ -46,21 +46,6 @@ private void performRemoveSelected() {
 			}
 		}
 
-		// push action to the manager
-		SharedUndoRedoActionManager.getSharedInstance().pushUndoableAction(new UndoRedoableInterface() {
-
-			@Override
-			public void undoAction() {
-				for (PaintComponent comp : comps)
-					panel.addPaintComponent(comp);
-			}
-
-			@Override
-			public void redoAction() {
-				for (PaintComponent comp : comps)
-					comp.remove(panel);
-			}
-		});
 		panel.repaint();
 	}
 }

src/script/InterpreterUpdateActions.java

@@ -67,22 +67,7 @@ public InterpreterUpdateActions(Tokenizer tokenizer, PaintPanel panel) throws Ex
 	private void performUpdateDataBox() {
 		try {
 			((DataDisplayPaintComponent) comp).updateDisplayText();
-			// push action to the manager
-			SharedUndoRedoActionManager.getSharedInstance().pushUndoableAction(new UndoRedoableInterface() {
 
-				public void undoAction() {
-					comp.remove(panel);
-					panel.repaint();
-				  if (ComponentMap.map.containsValue(comp)) {
-				  	
-				  }
-				}
-
-				public void redoAction() {
-					panel.addPaintComponent(comp);
-					panel.repaint();
-				}
-			});
 			panel.repaint();
 		} catch (NoSuchElementException | NoConnectingLineSegmentException | DataFromPointNoDataProviderException
 				| DataFromPointProviderCannotProvideDataException e) {
@@ -95,21 +80,7 @@ public void redoAction() {
 	private void performUpdateinputBox() {
 		String s = JOptionPane.showInputDialog("Please specify the message to push to the data input");
 		((DataInputTextfieldPaintComponent) comp).inputData(s);
-		// 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();
 	}
 }