Add typesystem

CVIllustrious · CVIllustrious · commit d79691f11cdf · 2017-03-25T17:58:35.000-07:00
diff --git a/TODOList.txt b/TODOList.txt
@@ -1,8 +1,8 @@
 1. File Save/Close Operations
 2. Edit Undo/Redo Operations
-3. More usable SelectTools
-4. Remove Functinoality
-5. Zooming and Scrolling and Moving Function
+//3. More usable SelectTools
+//4. Remove Functinoality
+//5. Zooming and Scrolling and Moving Function
 6. Data Point Connection Types
 7. Available Class Search
 8. Auto-Update Display Box Affected by Recent Changes
diff --git a/src/actions/ConstructDataLineSegmentAction.java b/src/actions/ConstructDataLineSegmentAction.java
@@ -49,7 +49,8 @@ public void performAction() {
 				.getSelectedComponents();
 		DataFromPoint fromPoint = (DataFromPoint) comps.get(0);
 		DataToPoint toPoint = (DataToPoint) comps.get(1);
-		if (!fromPoint.getExpectedType().equals(toPoint.getExpectedType())) {
+		//if (!fromPoint.getExpectedType().equals(toPoint.getExpectedType())) {
+		if(!toPoint.getExpectedType().canBeAssignedFrom(fromPoint.getExpectedType())){
 			int result = JOptionPane.showConfirmDialog(panel,
 					"The source type is " + fromPoint.getExpectedType()
 							+ ", the destination type is "
diff --git a/src/paintcomponents/data/DataDisplayPaintComponent.java b/src/paintcomponents/data/DataDisplayPaintComponent.java
@@ -6,6 +6,7 @@
 import org.w3c.dom.Element;
 
 import paintcomponents.NoConnectingLineSegmentException;
+import typesystem.JavaType;
 import ui.PaintPanel;
 
 /**
@@ -19,7 +20,7 @@ public class DataDisplayPaintComponent extends DataTextIOPaintComponent {
 
 	public DataDisplayPaintComponent(String displayingText, int x, int y) {
 		super(displayingText, x, y);
-		addToPoint(0, String.class.getName());
+		addToPoint(0, new JavaType(String.class));
 	}
 
 	/**
@@ -50,7 +51,7 @@ public void saveToElement(Element rootElement, Document doc) {
 	public DataDisplayPaintComponent(Element rootElement, PaintPanel panel) {
 		super(rootElement, panel);
 		//we only need to do the same thing as our designated constructor
-		addToPoint(0, String.class.getName());
+		addToPoint(0, new JavaType(String.class));
 		//we have to link the points
 		linkPoints(rootElement);
 
diff --git a/src/paintcomponents/data/DataFromPoint.java b/src/paintcomponents/data/DataFromPoint.java
@@ -4,6 +4,7 @@
 import org.w3c.dom.Element;
 
 import paintcomponents.SimplePoint;
+import typesystem.Type;
 import ui.PaintPanel;
 
 /**
@@ -17,7 +18,7 @@ public class DataFromPoint extends SimplePoint {
 
 	private DataLineSegment lineSegment;
 	private DataFromPointDataProvider provider;
-	private String expectedType;
+	private Type expectedType;
 
 	/**
 	 * @return the lineSegment
@@ -34,7 +35,7 @@ public void setLineSegment(DataLineSegment lineSegment) {
 		this.lineSegment = lineSegment;
 	}
 
-	public DataFromPoint(int x, int y, String expectedType) {
+	public DataFromPoint(int x, int y, Type expectedType) {
 		super(x, y);
 		this.expectedType = expectedType;
 	}
@@ -65,11 +66,11 @@ public void setProvider(DataFromPointDataProvider provider) {
 		this.provider = provider;
 	}
 
-	public String getExpectedType() {
+	public Type getExpectedType() {
 		return expectedType;
 	}
 
-	public void setExpectedType(String expectedType) {
+	public void setExpectedType(Type expectedType) {
 		this.expectedType = expectedType;
 	}
 	
diff --git a/src/paintcomponents/data/DataInputTextfieldPaintComponent.java b/src/paintcomponents/data/DataInputTextfieldPaintComponent.java
@@ -3,6 +3,7 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import typesystem.JavaType;
 import ui.PaintPanel;
 
 /**
@@ -18,7 +19,7 @@ public class DataInputTextfieldPaintComponent extends DataTextIOPaintComponent
 	public DataInputTextfieldPaintComponent(String displayingText, int x,
 			int y) {
 		super(displayingText, x, y);
-		addFromPoint(this, 0, String.class.getName());
+		addFromPoint(this, 0, new JavaType(String.class));
 	}
 
 	public void inputData(String s) {
@@ -46,7 +47,7 @@ public void saveToElement(Element rootElement, Document doc) {
 	public DataInputTextfieldPaintComponent(Element rootElement, PaintPanel panel) {
 		super(rootElement, panel);
 		//do the same thing as the designated constructor
-		addFromPoint(this, 0, String.class.getName());
+		addFromPoint(this, 0, new JavaType(String.class));
 		//link the points
 		linkPoints(rootElement);
 	}
diff --git a/src/paintcomponents/data/DataTextIOPaintComponent.java b/src/paintcomponents/data/DataTextIOPaintComponent.java
@@ -10,6 +10,7 @@
 
 import file.PanelIO;
 import painttools.tools.SelectTool;
+import typesystem.Type;
 import ui.PaintPanel;
 
 /**
@@ -83,7 +84,7 @@ public DataTextIOPaintComponent(String displayingText, int x, int y) {
 	 * @param yShift
 	 *            the row number of placing the data from point
 	 */
-	public void addFromPoint(DataFromPointDataProvider provider, int yShift, String expectedType) {
+	public void addFromPoint(DataFromPointDataProvider provider, int yShift, Type expectedType) {
 		DataFromPoint fromPoint = new DataFromPoint(getX(), getY(), expectedType);
 		fromPoint.setProvider(provider);
 		fromPoints.add(new DataFromPointInfo(fromPoint, yShift));
@@ -97,7 +98,7 @@ public void addFromPoint(DataFromPointDataProvider provider, int yShift, String
 	 *            the row number
 	 * @return the added toPoint
 	 */
-	public void addToPoint(int yShift, String expectedType) {
+	public void addToPoint(int yShift, Type expectedType) {
 		DataToPoint toPoint = new DataToPoint(getX(), getY(), expectedType);
 		toPoints.add(new DataToPointInfo(toPoint, yShift));
 
diff --git a/src/paintcomponents/data/DataToPoint.java b/src/paintcomponents/data/DataToPoint.java
@@ -7,6 +7,7 @@
 
 import paintcomponents.NoConnectingLineSegmentException;
 import paintcomponents.SimplePoint;
+import typesystem.Type;
 import ui.PaintPanel;
 
 /**
@@ -19,7 +20,7 @@ public class DataToPoint extends SimplePoint {
 	
 	
 	DataLineSegment lineSegment;
-	private String expectedType;
+	private Type expectedType;
 
 	/**
 	 * @return the lineSegment
@@ -35,7 +36,7 @@ public void setLineSegment(DataLineSegment lineSegment) {
 		this.lineSegment = lineSegment;
 	}
 
-	public DataToPoint(int x, int y, String expectedType) {
+	public DataToPoint(int x, int y, Type expectedType) {
 		super(x, y);
 		this.expectedType = expectedType;
 	}
@@ -58,11 +59,11 @@ public Object fetchData() throws NoConnectingLineSegmentException, NoSuchElement
 		
 	}
 
-	public String getExpectedType() {
+	public Type getExpectedType() {
 		return expectedType;
 	}
 
-	public void setExpectedType(String expectedType) {
+	public void setExpectedType(Type expectedType) {
 		this.expectedType = expectedType;
 	}
 	
diff --git a/src/paintcomponents/haskell/HaskellExpressionPaintComponent.java b/src/paintcomponents/haskell/HaskellExpressionPaintComponent.java
@@ -12,6 +12,7 @@
 import paintcomponents.data.DataFromPointProviderCannotProvideDataException;
 import paintcomponents.data.DataTextIOPaintComponent;
 import paintcomponents.data.DataToPoint;
+import typesystem.HaskellType;
 import ui.PaintPanel;
 
 public class HaskellExpressionPaintComponent extends DataTextIOPaintComponent implements DataFromPointDataProvider {
@@ -53,7 +54,7 @@ private void init() {
 		for (int i = 0; i < typeParser.getArguments().size(); i++) {
 			builder.append("arg" + i + " :: " + typeParser.getArguments().get(i)
 					+ "\n");
-			addToPoint(i + 2, typeParser.getArguments().get(i));
+			addToPoint(i + 2, new HaskellType(typeParser.getArguments().get(i)));
 
 		}
 		// return value
diff --git a/src/paintcomponents/haskell/HaskellTypeParser.java b/src/paintcomponents/haskell/HaskellTypeParser.java
@@ -7,13 +7,15 @@
 
 import javax.swing.LookAndFeel;
 
+import typesystem.HaskellType;
+
 public class HaskellTypeParser {
 
 	private HashMap<String, ArrayList<String>> associatedTypeClasses;
 	// (Eq a, Ord a, Eq t) => will become [<a,[Eq, Ord]>, <t,[Eq]>]
 	private ArrayList<String> arguments;
-	private String returnType;
-	private String displayingExprType;
+	private HaskellType returnType;
+	private HaskellType displayingExprType;
 
 	/**
 	 * @return the associatedTypeClasses
@@ -32,14 +34,14 @@ public ArrayList<String> getArguments() {
 	/**
 	 * @return the returnType
 	 */
-	public String getReturnType() {
+	public HaskellType getReturnType() {
 		return returnType;
 	}
 
 	/**
 	 * @return the displayingExprType
 	 */
-	public String getDisplayingExprType() {
+	public HaskellType getDisplayingExprType() {
 		return displayingExprType;
 	}
 
@@ -93,7 +95,7 @@ public boolean parseType(){
 				equalArrowIndex = doubleColonIndex;
 			}
 			parseArguments(type.substring(equalArrowIndex + 2).trim());
-			this.displayingExprType = type.substring(doubleColonIndex + 2).trim();
+			this.displayingExprType = new HaskellType(type.substring(doubleColonIndex + 2).trim());
 			return true;
 	}
 
@@ -104,7 +106,7 @@ private void parseArguments(String argStr) {
 			String arg = arguments[i];
 			this.arguments.add(arg);
 		}
-		this.returnType = arguments[arguments.length - 1];
+		this.returnType = new HaskellType( arguments[arguments.length - 1]);
 		
 	}
 
diff --git a/src/paintcomponents/java/lazy/ClassConstructorPaintComponent.java b/src/paintcomponents/java/lazy/ClassConstructorPaintComponent.java
@@ -11,7 +11,6 @@
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
 
 import paintcomponents.NoConnectingLineSegmentException;
 import paintcomponents.data.DataFromPoint;
@@ -20,6 +19,7 @@
 import paintcomponents.data.DataFromPointProviderCannotProvideDataException;
 import paintcomponents.data.DataTextIOPaintComponent;
 import paintcomponents.data.DataToPoint;
+import typesystem.JavaType;
 import ui.PaintPanel;
 
 public class ClassConstructorPaintComponent extends DataTextIOPaintComponent
@@ -39,12 +39,12 @@ private void init() {
 		// parameters take place from line 1 to length
 		Class[] paramTypes = displayingConstructor.getParameterTypes();
 		for (int i = 0; i < paramTypes.length; i++) {
-			addToPoint(i + 1, paramTypes[i].getName());
+			addToPoint(i + 1, new JavaType(paramTypes[i]));
 		}
 
 		// constructed instance take line length+1
 		addFromPoint(this, paramTypes.length + 1,
-				this.displayingConstructor.getDeclaringClass().getName());
+				new JavaType(this.displayingConstructor.getDeclaringClass()));
 
 		// prepare String
 		StringBuilder s = new StringBuilder();
diff --git a/src/paintcomponents/java/lazy/ClassPaintComponent.java b/src/paintcomponents/java/lazy/ClassPaintComponent.java
@@ -8,7 +8,7 @@
 
 import paintcomponents.data.DataFromPoint;
 import paintcomponents.data.DataInputTextfieldPaintComponent;
-import paintcomponents.data.DataTextIOPaintComponent;
+import typesystem.JavaType;
 import ui.PaintPanel;
 
 public class ClassPaintComponent extends DataInputTextfieldPaintComponent{
@@ -26,7 +26,7 @@ public ClassPaintComponent(Class displayingClass, int x, int y) {
 		super(displayingClass.getName(), x, y);
 		this.displayingClass = displayingClass;
 		//make sure we set correct type for outgoint edges
-		this.getFromPoints().get(0).setExpectedType(displayingClass.getClass().getName());
+		this.getFromPoints().get(0).setExpectedType(new JavaType(displayingClass.getClass()));
 	}
 
 	@Override
@@ -64,7 +64,7 @@ public ClassPaintComponent(Element rootElement, PaintPanel panel) {
 			this.displayingClass = Class.forName(classNameElem.getTextContent());
 			this.setDisplayingText(this.displayingClass.getName());
 			//make sure we set correct type for outgoint edges
-			this.getFromPoints().get(0).setExpectedType(displayingClass.getClass().getName());
+			this.getFromPoints().get(0).setExpectedType(new JavaType(displayingClass.getClass()));
 			
 			//no linking since Data Text filed already linked
 
diff --git a/src/paintcomponents/java/lazy/FieldsPaintComponent.java b/src/paintcomponents/java/lazy/FieldsPaintComponent.java
@@ -15,6 +15,7 @@
 import paintcomponents.data.DataFromPointNoDataProviderException;
 import paintcomponents.data.DataFromPointProviderCannotProvideDataException;
 import paintcomponents.data.DataTextIOPaintComponent;
+import typesystem.JavaType;
 import ui.PaintPanel;
 
 public class FieldsPaintComponent extends DataTextIOPaintComponent implements DataFromPointDataProvider{
@@ -37,11 +38,11 @@ private void init() {
 		Field[] fields = displayingClass.getFields();
 		
 		//the left receiving instance
-		addToPoint(1, displayingClass.getName());
+		addToPoint(1, new JavaType(displayingClass));
 		
 		for (int i = 0; i < fields.length; i++) {
 			//the type is the type of the field
-			addFromPoint(this, i + 2, fields[i].getType().getName());
+			addFromPoint(this, i + 2, new JavaType(fields[i].getType()));
 		}
 		
 		
diff --git a/src/paintcomponents/java/lazy/MethodPaintComponent.java b/src/paintcomponents/java/lazy/MethodPaintComponent.java
@@ -19,6 +19,7 @@
 import paintcomponents.data.DataFromPointProviderCannotProvideDataException;
 import paintcomponents.data.DataTextIOPaintComponent;
 import paintcomponents.data.DataToPoint;
+import typesystem.JavaType;
 import ui.PaintPanel;
 
 public class MethodPaintComponent extends DataTextIOPaintComponent
@@ -57,18 +58,18 @@ private void init() {
 
 		// line 0 is signature
 		// line 1 is the operating instance
-		addToPoint(1, this.displayingMethod.getDeclaringClass().getName());
+		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++) {
-			addToPoint(i + 2, paramTypes[i].getName());
+			addToPoint(i + 2, new JavaType(paramTypes[i]));
 		}
 
 		//the instance after performing this method after taking in
-		addFromPoint(this, 1, displayingMethod.getDeclaringClass().getName());
+		addFromPoint(this, 1, new JavaType(displayingMethod.getDeclaringClass()));
 
 		// method's return value take line length+2
-		addFromPoint(this, paramTypes.length + 2, displayingMethod.getReturnType().getName());
+		addFromPoint(this, paramTypes.length + 2, new JavaType(displayingMethod.getReturnType()));
 		
 		
 
diff --git a/src/typesystem/HaskellType.java b/src/typesystem/HaskellType.java
@@ -0,0 +1,15 @@
+package typesystem;
+
+public class HaskellType extends Type {
+	
+	public  HaskellType(String s) {
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public boolean canBeAssignedFrom(Type type) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+}
diff --git a/src/typesystem/JavaType.java b/src/typesystem/JavaType.java
diff --git a/src/typesystem/Type.java b/src/typesystem/Type.java

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import org.w3c.dom.Element;`
`5`	`5`
`6`	`6`	`import paintcomponents.SimplePoint;`
	`7`	`+import typesystem.Type;`
`7`	`8`	`import ui.PaintPanel;`
`8`	`9`
`9`	`10`	`/**`
`@@ -17,7 +18,7 @@ public class DataFromPoint extends SimplePoint {`
`17`	`18`
`18`	`19`	`private DataLineSegment lineSegment;`
`19`	`20`	`private DataFromPointDataProvider provider;`
`20`		`- private String expectedType;`
	`21`	`+ private Type expectedType;`
`21`	`22`
`22`	`23`	`/**`
`23`	`24`	`* @return the lineSegment`
`@@ -34,7 +35,7 @@ public void setLineSegment(DataLineSegment lineSegment) {`
`34`	`35`	`this.lineSegment = lineSegment;`
`35`	`36`	`}`
`36`	`37`
`37`		`- public DataFromPoint(int x, int y, String expectedType) {`
	`38`	`+ public DataFromPoint(int x, int y, Type expectedType) {`
`38`	`39`	`super(x, y);`
`39`	`40`	`this.expectedType = expectedType;`
`40`	`41`	`}`
`@@ -65,11 +66,11 @@ public void setProvider(DataFromPointDataProvider provider) {`
`65`	`66`	`this.provider = provider;`
`66`	`67`	`}`
`67`	`68`
`68`		`- public String getExpectedType() {`
	`69`	`+ public Type getExpectedType() {`
`69`	`70`	`return expectedType;`
`70`	`71`	`}`
`71`	`72`
`72`		`- public void setExpectedType(String expectedType) {`
	`73`	`+ public void setExpectedType(Type expectedType) {`
`73`	`74`	`this.expectedType = expectedType;`
`74`	`75`	`}`
`75`	`76`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`import paintcomponents.NoConnectingLineSegmentException;`
`9`	`9`	`import paintcomponents.SimplePoint;`
	`10`	`+import typesystem.Type;`
`10`	`11`	`import ui.PaintPanel;`
`11`	`12`
`12`	`13`	`/**`
`@@ -19,7 +20,7 @@ public class DataToPoint extends SimplePoint {`
`19`	`20`
`20`	`21`
`21`	`22`	`DataLineSegment lineSegment;`
`22`		`- private String expectedType;`
	`23`	`+ private Type expectedType;`
`23`	`24`
`24`	`25`	`/**`
`25`	`26`	`* @return the lineSegment`
`@@ -35,7 +36,7 @@ public void setLineSegment(DataLineSegment lineSegment) {`
`35`	`36`	`this.lineSegment = lineSegment;`
`36`	`37`	`}`
`37`	`38`
`38`		`- public DataToPoint(int x, int y, String expectedType) {`
	`39`	`+ public DataToPoint(int x, int y, Type expectedType) {`
`39`	`40`	`super(x, y);`
`40`	`41`	`this.expectedType = expectedType;`
`41`	`42`	`}`
`@@ -58,11 +59,11 @@ public Object fetchData() throws NoConnectingLineSegmentException, NoSuchElement`
`58`	`59`
`59`	`60`	`}`
`60`	`61`
`61`		`- public String getExpectedType() {`
	`62`	`+ public Type getExpectedType() {`
`62`	`63`	`return expectedType;`
`63`	`64`	`}`
`64`	`65`
`65`		`- public void setExpectedType(String expectedType) {`
	`66`	`+ public void setExpectedType(Type expectedType) {`
`66`	`67`	`this.expectedType = expectedType;`
`67`	`68`	`}`
`68`	`69`