Merge pull request #125 from UCSDOalads/funcGroup

Remove .xml file after testing file open/save function and fixed the String class problem

Author: chenggong03

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/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 {
+
+}