Merge pull request #135 from UCSDOalads/funcGroup

Fixed the classSearch test and fix minor instance redundancy

Author: chenggong03

src/actions/AddLazyJavaMethodComponentAction.java

@@ -56,6 +56,7 @@ public void performAction() {
 			associatedAction.setMethodComponent(comp);
 			associatedAction.setMethod(comp.getDisplayingClass().getMethods()[Integer.parseInt(desiaredConstructorIndex)]);
 			GlobalPaintActionExecuter.getSharedInstance().execute(associatedAction, panel);
+
 		}
 	}
 

src/actions/global/globalactions/FileOpenAndSaveGlobalActionTest.java

@@ -42,6 +42,7 @@ public void test() {
 	 	= (FileSaveAsGlobalAction) ActionName.FILE_SAVE_AS_GLOBAL_ACTION
 					.getAssociatedAction();
 		fileSaveAssociatedAction.setFilePath("JSPFileSaveOpenTest.xml");
+
 		fileSaveAssociatedAction.execute(panel);
 
 
@@ -57,6 +58,7 @@ public void test() {
 	 	= (FileOpenGlobalAction) ActionName.FILE_OPEN_GLOBAL_ACTION
 					.getAssociatedAction();
 		fileOpenAssociatedAction.setFileToOpen("JSPFileSaveOpenTest.xml");
+
 		fileOpenAssociatedAction.execute(panel);
 
 		//Components on the panel should be the same as what was saved to be
@@ -68,6 +70,7 @@ public void test() {
 
 		xml.delete();
 
+
 	}
 
 }

src/classpathutil/ClassSearchTest.java

@@ -13,7 +13,7 @@ public void test() {
 		ClassSearch search = ClassSearch.sharedInstance();
 		ArrayList<String> classesForName = search.classesForName("System");
 
-		assertTrue(classesForName.contains("java.lang.System"));
+		assertTrue(classesForName.contains("System (java.lang)"));
 
 	}
 

src/paintcomponents/java/interactive/MethodPaintComponent.java

@@ -84,10 +84,7 @@ private void init() {
 	public void evaluate(){
 
 		// prepare argument list
-		ArrayList<DataToPoint> toPoints = getToPoints();
-
-		Object operatingInstance = instance;
-		
+		ArrayList<DataToPoint> toPoints = getToPoints();		
 
 		// args takes toPoint 1 to size
 		Object[] args = new Object[toPoints.size()];
@@ -108,7 +105,7 @@ public void evaluate(){
 		}
 
 		try {
-			returnVal = this.displayingMethod.invoke(operatingInstance, args);
+			returnVal = this.displayingMethod.invoke(instance, args);
 		} catch (IllegalAccessException | IllegalArgumentException
 				| InvocationTargetException e) {
 			// TODO Auto-generated catch block

src/script/InterpreterSelectAction.java

@@ -3,7 +3,7 @@
 import ui.PaintPanel;
 
 public class InterpreterSelectAction {
-	
+
 	public InterpreterSelectAction(Tokenizer tokenizer, PaintPanel panel)
 			throws ExecutionErrorException {
 		String token = tokenizer.next();
@@ -12,5 +12,6 @@ public InterpreterSelectAction(Tokenizer tokenizer, PaintPanel panel)
 		} else {
 			throw new ExecutionErrorException("component not found");
 		}
+		panel.repaint();
 	}
 }