Merge pull request #45 from UCSDOalads/addTESTbylhwlyd1

Rewrote class search frame through input manager

Author: UltimatePea

src/actions/AddLazyJavaClassAction.java

@@ -9,9 +9,10 @@
 import actions.menu.ActionsMenuBarTitles;
 import paintcomponents.java.lazy.ClassPaintComponent;
 import ui.PaintPanel;
+import ui.general.InputManager;
+import ui.general.InputManagerDelegate;
 import ui.helper.classsearch.ClassSearchFrame;
 import ui.helper.classsearch.ClassSearchFrameDelegateInterface;
-
 public class AddLazyJavaClassAction extends PaintAction {
 
 	public AddLazyJavaClassAction(PaintPanel panel) {
@@ -25,49 +26,33 @@ public boolean canPerformAction() {
 
 	@Override
 	public void performAction() {
-		
-		ClassSearchFrame classSearchFrame = new ClassSearchFrame();
-		classSearchFrame.setDelegate(new ClassSearchFrameDelegateInterface() {
+		InputManager im = new InputManager();
+		im.askForClass(panel,new InputManagerDelegate<Class>() {
 
 			@Override
-			public void didSelectClass(String classname) {
-				
-				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();
-				} catch (ClassNotFoundException e) {
-					e.printStackTrace();
-					JOptionPane.showMessageDialog(panel,
-							classname + " :: Class Not Found");
-				}
+			public void didFinishInput(Class input) {
+				ClassPaintComponent comp = new ClassPaintComponent(input,
+						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();
 			}
-		});
-		
-		
-		classSearchFrame.setVisible(true);
-		classSearchFrame.setSize(new Dimension(300, 200));
-		
-		
-		
-
+		} );
+			
 	}
 
 	@Override

src/paintcomponents/java/interactive/MethodPaintComponent.java

@@ -93,7 +93,7 @@ public void evaluate(){
 		Object[] args = new Object[toPoints.size()];
 
 		//Get the input data from each the input points
-		for (int i = 0; i < toPoints.size() ; i++) {
+		for (int i = 0; i < toPoints.size(); i++) {
 			DataToPoint toPoint = toPoints.get(i);
 			try {
 				args[i] = toPoint.fetchData();

src/ui/general/InputManager.java

@@ -1,8 +1,12 @@
 package ui.general;
 
+import java.awt.Dimension;
+
 import javax.swing.JOptionPane;
 
 import ui.PaintPanel;
+import ui.helper.classsearch.ClassSearchFrame;
+import ui.helper.classsearch.ClassSearchFrameDelegateInterface;
 
 /**
  * Ask for things from user.
@@ -69,15 +73,31 @@ public void askForInt(PaintPanel panel, InputManagerDelegate<Integer> delegate)
 	}
 
 	// TODO askForClass
-	public void askForClass(PaintPanel panel, InputManagerDelegate<Integer> delegate) {
-		String input = JOptionPane.showInputDialog("Please Input A Class");
-		try{
-			//TODO Class
-			//delegate.didFinishInput(inputInt);
-		} catch (NumberFormatException exp){
-			exp.printStackTrace();
-			askForClass(panel, delegate);
-		}
+	public void askForClass(PaintPanel panel, InputManagerDelegate<Class> delegate) {
+		ClassSearchFrame classSearchFrame = new ClassSearchFrame();
+		classSearchFrame.setDelegate(new ClassSearchFrameDelegateInterface() {
+				
+			@Override
+			public void didSelectClass(String classname) {
+					
+				try {
+					Class classInput = Class.forName(classname);
+					delegate.didFinishInput(classInput);
+				} catch (ClassNotFoundException e) {
+					e.printStackTrace();
+					JOptionPane.showMessageDialog(panel,
+							classname + " :: Class Not Found");
+				}
+				
+			}
+		});
+			
+			
+		classSearchFrame.setVisible(true);
+		classSearchFrame.setSize(new Dimension(300, 200));
+
 	}
+	
+	
 
 }