add two interactive execute actions

Author: lhwlyd

src/actions/menu/ActionsMenuBar.java

@@ -32,6 +32,8 @@
 import actions.RemoveAnnotationAction;
 import actions.RemovePaintComponent;
 import actions.UpdateDataDisplayBoxAction;
+import actions.singleinstanceoperations.ExecuteJavaInteractiveConstructor;
+import actions.singleinstanceoperations.ExecuteJavaInteractiveMethod;
 import actions.singleinstanceoperations.SetPointSizeOperation;
 import actions.singleinstanceoperations.UpdateFontSizeOperation;
 import actions.ZoomInAction;
@@ -69,7 +71,8 @@ public ActionsMenuBar(PaintPanel panel){
 		//interactive
 		addAction(new AddInteractiveConstructorAction(panel));
 		addAction(new AddInteractiveJavaMethodComponentAction(panel));
-		
+		addAction(new ExecuteJavaInteractiveConstructor(panel));
+		addAction(new ExecuteJavaInteractiveMethod(panel));
 
 		//edit 
 		addAction(new EditRedoAction(panel));

src/actions/singleinstanceoperations/ExecuteJavaInteractiveConstructor.java

@@ -0,0 +1,31 @@
+package actions.singleinstanceoperations;
+
+import actions.menu.ActionsMenuBarTitles;
+import paintcomponents.java.interactive.ClassConstructorPaintComponent;
+import ui.PaintPanel;
+
+public class ExecuteJavaInteractiveConstructor extends SingleInstanceOperation<ClassConstructorPaintComponent> {
+
+	public ExecuteJavaInteractiveConstructor(PaintPanel panel) {
+		super(panel);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	protected void performActionOnInstance(ClassConstructorPaintComponent instance) {
+		
+		instance.evaluate();
+	}
+
+	@Override
+	protected Class<ClassConstructorPaintComponent> getGenericClassType() {
+		return ClassConstructorPaintComponent.class;
+	}
+
+	@Override
+	public String locationString() {
+		// TODO Auto-generated method stub
+		return ActionsMenuBarTitles.Developer("Interactive/Constructor Evaluate").toString();
+	}
+
+}

src/actions/singleinstanceoperations/ExecuteJavaInteractiveMethod.java

@@ -0,0 +1,32 @@
+package actions.singleinstanceoperations;
+
+import actions.menu.ActionsMenuBarTitles;
+import paintcomponents.java.interactive.ClassConstructorPaintComponent;
+import paintcomponents.java.interactive.MethodPaintComponent;
+import ui.PaintPanel;
+
+public class ExecuteJavaInteractiveMethod extends SingleInstanceOperation<MethodPaintComponent>{
+
+	public ExecuteJavaInteractiveMethod(PaintPanel panel) {
+		super(panel);
+	}
+
+	@Override
+	protected void performActionOnInstance(MethodPaintComponent instance) {
+		// TODO Auto-generated method stub
+		instance.evaluate();
+	}
+
+	@Override
+	protected Class<MethodPaintComponent> getGenericClassType() {
+		// TODO Auto-generated method stub
+		return MethodPaintComponent.class;
+	}
+
+	@Override
+	public String locationString() {
+		// TODO Auto-generated method stub
+		return ActionsMenuBarTitles.Developer("Interactive/Method Evaluate").toString();
+	}
+
+}

src/paintcomponents/java/interactive/ClassConstructorPaintComponent.java

@@ -68,7 +68,7 @@ private void init() {
 	/**
 	 * Calculate the input data and store it.
 	 */
-	public void evaluate(DataFromPoint dataFromPoint){
+	public void evaluate(){
 		// prepare argument list
 				ArrayList<DataToPoint> toPoints = getToPoints();
 				Object[] args = new Object[toPoints.size()];

src/paintcomponents/java/interactive/MethodPaintComponent.java

@@ -55,8 +55,6 @@ public MethodPaintComponent(Method displayingMethod, Object instance, int x, int
 
 	private void init() {
 
-		// line 0 is signature
-		addToPoint(1, new JavaType(this.displayingMethod.getDeclaringClass()));
 		// parameters take place from line 2 to length+1
 		Class[] paramTypes = displayingMethod.getParameterTypes();
 		for (int i = 0; i < paramTypes.length ; i++) {
@@ -83,7 +81,7 @@ private void init() {
 	/**
 	 * Calculate the input data and store it.
 	 */
-	public void evaluate(DataFromPoint dataFromPoint){
+	public void evaluate(){
 
 		// prepare argument list
 		ArrayList<DataToPoint> toPoints = getToPoints();
@@ -92,11 +90,11 @@ public void evaluate(DataFromPoint dataFromPoint){
 
 
 		// args takes toPoint 1 to size
-		Object[] args = new Object[toPoints.size() - 1];
+		Object[] args = new Object[toPoints.size()];
 
 		//Get the input data from each the input points
-		for (int i = 0; i < toPoints.size() - 1; i++) {
-			DataToPoint toPoint = toPoints.get(i+1);
+		for (int i = 0; i < toPoints.size() ; i++) {
+			DataToPoint toPoint = toPoints.get(i);
 			try {
 				args[i] = toPoint.fetchData();
 			} catch (NoSuchElementException | NoConnectingLineSegmentException