Merge branch 'develop' into MYCBranch

Author: CVIllustrious

src/actions/AddLazyJavaClassAction.java

@@ -1,5 +1,7 @@
 package actions;
 
+import java.awt.Dimension;
+
 import javax.swing.JOptionPane;
 
 import actions.edit.undoredo.SharedUndoRedoActionManager;
@@ -8,6 +10,8 @@
 import actions.menu.PaintActionMenuItem;
 import paintcomponents.java.lazy.ClassPaintComponent;
 import ui.PaintPanel;
+import ui.helper.ClassSearchFrame;
+import ui.helper.ClassSearchFrameDelegateInterface;
 
 public class AddLazyJavaClassAction extends PaintAction {
 
@@ -19,37 +23,51 @@ public AddLazyJavaClassAction(PaintPanel panel) {
 	public boolean canPerformAction() {
 		return true;
 	}
-
+	
 	@Override
 	public void performAction() {
-		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() {
+		
+		ClassSearchFrame classSearchFrame = new ClassSearchFrame();
+		classSearchFrame.setDelegate(new ClassSearchFrameDelegateInterface() {
+			
+			@Override
+			public void didSelectClass(String classname) {
 
-				@Override
-				public void undoAction() {
-					comp.remove(panel);
-					panel.repaint();
-				}
-				
-				@Override
-				public void redoAction() {
+				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");
 				}
-			});
-			panel.repaint();
-		} catch (ClassNotFoundException e) {
-			e.printStackTrace();
-			JOptionPane.showMessageDialog(panel,
-					className + " :: Class Not Found");
-		}
+			}
+		});
+		
+		
+		classSearchFrame.setVisible(true);
+		classSearchFrame.setSize(new Dimension(300, 200));
+		
+		
+		
 
 	}
 

src/ui/helper/ClassSearchFrame.java

@@ -101,7 +101,6 @@ public void run() {
 				synchronized (searchingTextField) {
 					searchText = searchingTextField.getText();
 				}
-				System.out.println("Searching for " + searchText);
 				// start Search
 				ArrayList<String> classesForName = searchUtil
 						.classesForName(searchText);
@@ -142,11 +141,10 @@ public void actionPerformed(ActionEvent e) {
 
 		// User cancel the class search
 		if (e.getSource() == btnCancel) {
-			System.exit(0);
+			setVisible(false);
+			dispose();
 		} else if (e.getSource() == btnConfirm) {
 
-			System.out.println("btnConfirm pressed");
-
 			// return the selected (or the first if no selected) class if the
 			// table is not empty
 			if (resultsTable.getRowCount() != 0) {
@@ -161,7 +159,8 @@ public void actionPerformed(ActionEvent e) {
 
 			}
 
-			System.exit(0);
+			setVisible(false);
+			dispose();
 		}
 	}
 

src/ui/helper/ClassSearchFrameTest.java

@@ -21,8 +21,7 @@ public void run() {
 
 					@Override
 					public void didSelectClass(String classname) {
-						// TODO Auto-generated method stub
-						
+						System.out.println(classname);
 					}
 				});