Merge pull request #139 from UCSDOalads/funcGroup

Resolve test failures and other minor issues

Author: Yidong Luo

src/actions/global/globalactions/FileOpenAndSaveGlobalActionTest.java

@@ -43,6 +43,7 @@ public void test() {
 					.getAssociatedAction();
 
 		fileSaveAssociatedAction.setFilePath("JSPFileSaveOpenTest.xml");
+
 		fileSaveAssociatedAction.execute(panel);
 
 
@@ -59,6 +60,7 @@ public void test() {
 					.getAssociatedAction();
 
 		fileOpenAssociatedAction.setFileToOpen("JSPFileSaveOpenTest.xml");
+
 		fileOpenAssociatedAction.execute(panel);
 
 		//Components on the panel should be the same as what was saved to be
@@ -70,6 +72,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/paintcomponents/java/lazy/ClassPaintComponent.java

@@ -23,7 +23,7 @@ public Class getDisplayingClass() {
 	}
 
 	public ClassPaintComponent(Class displayingClass, int x, int y) {
-		super(displayingClass.getName(), x, y);
+		super("class " + displayingClass.getName(), x, y);
 		this.displayingClass = displayingClass;
 		//make sure we set correct type for outgoint edges
 		this.getFromPoints().get(0).setExpectedType(new JavaType(displayingClass.getClass()));

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();
 	}
 }