conlfict resolved

Author: kaijiec

src/actions/AddLazyJavaMethodComponentAction.java

@@ -46,14 +46,15 @@ public void performAction() {
 		String desiaredConstructorIndex = JOptionPane.showInputDialog(
 						"Please enter the index of the constructor you would like to use: \n\n\n"
 
+
 								+ getMethodsSelectionUI(methods));
 		//call DialogInputChecker to check input
 		DialogInputChecker inputChecker = new DialogInputChecker();
 		if(inputChecker.isValidNumber(desiaredConstructorIndex, 0, methods.length -1)){
 			AddLazyJavaMethodComponentGlobalAction assiciatedAction 
 			= (AddLazyJavaMethodComponentGlobalAction) ActionName.ADD_LAZY_JAVA_METHOD_ACTION.getAssiciatedAction();
 			assiciatedAction.setMethodComponent(comp);
-			assiciatedAction.setMethod(String.class.getMethods()[Integer.parseInt(desiaredConstructorIndex)]);
+			assiciatedAction.setMethod(comp.getDisplayingClass().getMethods()[Integer.parseInt(desiaredConstructorIndex)]);
 			GlobalPaintActionExecuter.getSharedInstance().execute(assiciatedAction, panel);
 		}
 	}

src/actions/InputDataForDataInputBoxAction.java

@@ -21,7 +21,7 @@ public InputDataForDataInputBoxAction(PaintPanel panel) {
 	public boolean canPerformAction() {
 		ArrayList<PaintComponent> comps = panel.getSelectTool().getSelectedComponents();
 		if(comps.size()!= 1) return false;
-		if(comps.get(0) instanceof DataInputTextfieldPaintComponent){
+		if (comps.get(0) instanceof DataInputTextfieldPaintComponent) {
 			return true;
 		}
 		return false;

src/actions/global/globalactions/FileOpenAndSaveGlobalActionTest.java

@@ -14,6 +14,8 @@
 import actions.global.GlobalPaintActionExecuter;
 import paintcomponents.java.lazy.ClassPaintComponent;
 import ui.PaintPanel;
+import java.io.File;
+import java.nio.file.Files;
 
 /*
  * @author Yidong Luo
@@ -39,7 +41,7 @@ public void test() {
 		FileSaveAsGlobalAction fileSaveAssociatedAction 
 	 	= (FileSaveAsGlobalAction) ActionName.FILE_SAVE_AS_GLOBAL_ACTION
 					.getAssiciatedAction();
-		fileSaveAssociatedAction.setFilePath("temp.xml");
+		fileSaveAssociatedAction.setFilePath("JSPFileSaveOpenTest.xml");
 		fileSaveAssociatedAction.execute(panel);
 
 
@@ -54,15 +56,18 @@ public void test() {
 		FileOpenGlobalAction fileOpenAssociatedAction 
 	 	= (FileOpenGlobalAction) ActionName.FILE_OPEN_GLOBAL_ACTION
 					.getAssiciatedAction();
-		fileOpenAssociatedAction.setFileToOpen("temp.xml");
+		fileOpenAssociatedAction.setFileToOpen("JSPFileSaveOpenTest.xml");
 		fileOpenAssociatedAction.execute(panel);
 
 		//Components on the panel should be the same as what was saved to be
 		assertEquals(1, panel.getPaintComponents().size());
 		assertTrue(panel.getPaintComponents().get(0) 
 				instanceof ClassPaintComponent);
 
-			
+		File xml = new File("JSPFileSaveOpenTest.xml");
+		
+		xml.delete();
+		
 	}
 
 }

src/painttools/tools/DefaultPaintTool.java

@@ -0,0 +1,5 @@
+package painttools.tools;
+
+public @interface DefaultPaintTool {
+
+}

src/painttools/tools/SelectTool.java

@@ -3,8 +3,13 @@
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 
+
+import javax.swing.ImageIcon;
+
+import actions.InputDataForDataInputBoxAction;
 import buttons.ToolButton;
 import paintcomponents.PaintComponent;
+import paintcomponents.data.DataInputTextfieldPaintComponent;
 import settings.Defaults;
 import ui.PaintPanel;
 import ui.icons.CustomIcons;
@@ -64,10 +69,17 @@ public void mouseClicked(MouseEvent e) {
 	 * @param comp
 	 */
 	public void selectComponent(PaintComponent comp) {
+		
 		comp.select(this);
+		
+		// update the components listening to select tool
 		for (SelectionToolListener selectionToolListener : listeners) {
 			selectionToolListener.selectionChanged();
 		}
+
+		// prompt data input if user double clicked on a selected data box
+		doubleClickAction(comp);
+
 		panel.repaint();
 	}
 
@@ -78,6 +90,11 @@ public void selectComponent(PaintComponent comp) {
 	 * @param comp
 	 */
 	public void deselectComponent(PaintComponent comp) {
+
+		// check if double clicked, if so perform the action on the data box
+		doubleClickAction(comp);
+
+		// then deselect the component
 		comp.deselect(this);
 		for (SelectionToolListener selectionToolListener : listeners) {
 			selectionToolListener.selectionChanged();
@@ -285,4 +302,22 @@ public void removeSelectedComponent(PaintComponent pc){
 		selectedComponents.remove(pc);
 	}
 
+
+	/**
+	 * Check if user double clicked a data box and it will prompt user to type
+	 * data if double clicked on a selected or de-selected data box
+	 * 
+	 * @param comp
+	 */
+	private void doubleClickAction(PaintComponent comp) {
+
+		// data input box prompt right after a double click on the box
+		if (comp instanceof DataInputTextfieldPaintComponent && getLastMouseEvent().getClickCount() == 2
+				&& !getLastMouseEvent().isConsumed()) {
+
+			InputDataForDataInputBoxAction newAction = new InputDataForDataInputBoxAction(panel);
+			newAction.performAction();
+			getLastMouseEvent().consume();
+		}
+	}
 }