Merge pull request #150 from UCSDOalads/funcGroup

Fixed the displayBox  canUpdate issue & minor changes to fix the type system

Author: chenggong03

src/actions/UpdateDataDisplayBoxAction.java

@@ -5,14 +5,14 @@
 
 import javax.swing.JOptionPane;
 
-import actions.edit.undoredo.SharedUndoRedoActionManager;
-import actions.edit.undoredo.UndoRedoableInterface;
-import actions.menu.ActionsMenuBarTitles;
 import paintcomponents.NoConnectingLineSegmentException;
 import paintcomponents.data.DataDisplayPaintComponent;
 import paintcomponents.data.DataFromPointNoDataProviderException;
 import paintcomponents.data.DataFromPointProviderCannotProvideDataException;
 import ui.PaintPanel;
+import actions.edit.undoredo.SharedUndoRedoActionManager;
+import actions.edit.undoredo.UndoRedoableInterface;
+import actions.menu.ActionsMenuBarTitles;
 
 public class UpdateDataDisplayBoxAction extends MenuBarPaintAction {
 
@@ -25,7 +25,9 @@ public boolean canPerformAction() {
 
 		if(panel.getSelectTool().getSelectedComponents().size() == 1){
 			if(panel.getSelectTool().getSelectedComponents().get(0) instanceof DataDisplayPaintComponent){
-				return ((DataDisplayPaintComponent) panel.getSelectTool().getSelectedComponents().get(0)).canUpdate();
+				// return true;
+				return ((DataDisplayPaintComponent) panel.getSelectTool()
+						.getSelectedComponents().get(0)).canUpdate();
 			}
 		}
 		return false;

src/actions/global/globalactions/AddDataDisplayBoxGlobalAction.java

@@ -1,20 +1,17 @@
 package actions.global.globalactions;
 
-import java.util.ArrayList;
-
-import paintcomponents.SimplePoint;
 import paintcomponents.data.DataDisplayPaintComponent;
-import paintcomponents.data.DataInputTextfieldPaintComponent;
+import ui.PaintPanel;
 import actions.edit.undoredo.SharedUndoRedoActionManager;
 import actions.edit.undoredo.UndoRedoableInterface;
 import actions.global.GlobalPaintAction;
-import ui.PaintPanel;
 
 public class AddDataDisplayBoxGlobalAction extends GlobalPaintAction {
 
 	private String dataDisplay;
 	private int x;
 	private int y;
+
 	private DataDisplayPaintComponent comp;
 
 	public void setDisplayString(String dataDisplay) {
@@ -40,11 +37,14 @@ public void setY(int y) {
 	@Override
 	protected void execute(PaintPanel panel) {
 		comp = new DataDisplayPaintComponent(
+		// DataDisplayPaintComponent comp = new DataDisplayPaintComponent(
 				dataDisplay, x, y);
+
 		if (panel.getSelectTool() != null) {
-		    panel.getSelectTool().clearSelection();
-		    panel.getSelectTool().selectComponent(comp);
+			panel.getSelectTool().clearSelection();
+			panel.getSelectTool().selectComponent(comp);
 		}
+
 		panel.addPaintComponent(comp);
 
 		// push action to manager

src/paintcomponents/data/DataDisplayPaintComponent.java

@@ -33,26 +33,27 @@ public DataDisplayPaintComponent(String displayingText, int x, int y) {
 	 * @throws NoSuchElementException 
 	 * @see DataToPoint.fetchData for exception details
 	 */
-	public void updateDisplayText() throws NoSuchElementException, NoConnectingLineSegmentException, DataFromPointNoDataProviderException, DataFromPointProviderCannotProvideDataException{
+	public void updateDisplayText() throws NoSuchElementException, NoConnectingLineSegmentException,
+					DataFromPointNoDataProviderException, DataFromPointProviderCannotProvideDataException{
 		Object data = getToPoints().get(0).fetchData();
-		if(data instanceof String){
+		this.setDisplayingText(data.toString());
+		/*if(data instanceof String){
 			this.setDisplayingText(data.toString());
 		} else {
-			this.setDisplayingText("Error: Not A String :: " + "Type : " + data.getClass().toString() + " Value: " + data.toString());
-		}
+			this.setDisplayingText("Error: Not A String :: " + "Type : " +
+						data.getClass().toString() + " Value: " + data.toString());
+		}*/
 	}
 
-	public boolean canUpdate(){
-		try {
-			Object data = getToPoints().get(0).fetchData();
-			if(data instanceof String){
-				return true;
-			}
-		} catch (Exception e) {
-			return false;
-		}
-		return false;
+	public boolean canUpdate() {
+		return true; // temporary
+		/*
+		 * try { Object data = getToPoints().get(0).fetchData(); if (data
+		 * instanceof String) { return true; } } catch (Exception e) { return
+		 * false; } return false;
+		 */
 	}
+
 	@Override
 	public void saveToElement(Element rootElement, Document doc) {
 		super.saveToElement(rootElement, doc);

src/paintcomponents/data/DataToPoint.java

@@ -50,10 +50,11 @@ public DataToPoint(int x, int y, Type expectedType) {
 	 * @throws DataFromPointProviderCannotProvideDataException  when the connecting dataInputPoint's data provider cannot provide a information
 	 * @throws DataFromPointNoDataProviderException  when the connecting DataInputPoint does not have a data provider associated
 	 */
-	public Object fetchData() throws NoConnectingLineSegmentException, NoSuchElementException, DataFromPointNoDataProviderException, DataFromPointProviderCannotProvideDataException{
+	public Object fetchData() throws NoConnectingLineSegmentException, NoSuchElementException,
+				DataFromPointNoDataProviderException, DataFromPointProviderCannotProvideDataException{
 		if(this.lineSegment == null) throw new NoConnectingLineSegmentException();
 
-		Object returnVal = lineSegment.getFromPoint().getData().toString();
+		Object returnVal = lineSegment.getFromPoint().getData();// .toString();
 		if(returnVal == null) throw new NoSuchElementException();
 		return returnVal;
 

src/paintcomponents/java/lazy/MethodPaintComponent.java

@@ -26,9 +26,11 @@ public class MethodPaintComponent extends DataTextIOPaintComponent
 		implements DataFromPointDataProvider {
 
 	private Method displayingMethod;
+	private Class<?>[] wantedType;
 
 	public MethodPaintComponent(Method displayingMethod, int x, int y) {
 		super(displayingMethod.toString(), x, y);
+		this.wantedType = displayingMethod.getParameterTypes();
 		this.displayingMethod = displayingMethod;
 		init();
 	}
@@ -100,6 +102,7 @@ public Object provideInformationToDataFromPoint(
 		Object operatingInstance = null;
 		try {
 			operatingInstance = toPoints.get(0).fetchData();
+			System.out.println(operatingInstance.getClass());
 		} catch (NoSuchElementException | NoConnectingLineSegmentException
 				| DataFromPointNoDataProviderException
 				| DataFromPointProviderCannotProvideDataException e1) {
@@ -116,14 +119,20 @@ public Object provideInformationToDataFromPoint(
 			DataToPoint toPoint = toPoints.get(i+1);
 			try {
 				args[i] = toPoint.fetchData();
+				//This usage's effects haven't been verified to be useful.
+				// ***** DO NOT FOLLOW THIS USAGE IF YOU'RE NOT CLEAR WHAT YOU'RE DOING ******
+				if (wantedType[i].isAssignableFrom(String.class)) {
+					args[i] = wantedType[i].cast(args[i]);
+				}
 			} catch (NoSuchElementException | NoConnectingLineSegmentException
 					| DataFromPointNoDataProviderException
 					| DataFromPointProviderCannotProvideDataException e) {
 				e.printStackTrace();
 				// TODO Handle Exception
 				// arguments must be valid
 				throw new IllegalStateException();
-			}
+			} 
+			 
 		}
 
 		try {