Merge branch 'improveLineSelectionbyTanSu' of https://github.com/UCSDOalads/JavaSketchPad into changeFieldsInputWindowByXYG

Author: x1gong

src/actions/AddLazyJavaMethodComponentAction.java

@@ -45,6 +45,7 @@ public void performAction() {
 
 		String desiaredConstructorIndex = JOptionPane.showInputDialog(
 						"Please enter the index of the constructor you would like to use: \n\n\n"
+
 								+ getMethodsSelectionUI(methods));
 		//call DialogInputChecker to check input
 		DialogInputChecker inputChecker = new DialogInputChecker();
@@ -55,7 +56,6 @@ public void performAction() {
 			assiciatedAction.setMethod(comp.getDisplayingClass().getMethods()[Integer.parseInt(desiaredConstructorIndex)]);
 			GlobalPaintActionExecuter.getSharedInstance().execute(assiciatedAction, panel);
 		}
-
 	}
 
 	public String getMethodsSelectionUI(Method[] methods) {

src/actions/global/globalactions/AddLazyJavaClassGlobalAction.java

@@ -25,6 +25,11 @@ protected void execute(PaintPanel panel) {
 		ClassPaintComponent comp = new ClassPaintComponent(classToCreate, x, y);
 		panel.addPaintComponent(comp);
 
+		if (panel.getSelectTool() != null) {
+			panel.getSelectTool().clearSelection();
+			panel.getSelectTool().selectComponent(comp);
+		}
+
 		// add action to undo redo manager
 		UndoRedoableInterface undoRedoBlock = new UndoRedoableInterface() {
 

src/actions/global/globalactions/ConstructDataLineSegmentGlobalAction.java

@@ -38,18 +38,37 @@ public DataLineSegment getLineSeg() {
 
 	@Override
 	protected void execute(PaintPanel panel) {
-
-		if (!toPoint.getExpectedType().canBeAssignedFrom(fromPoint.getExpectedType())) {
+		//Diagnostic
+		//System.out.println(fromPoint.getExpectedType().getCurClass().getName()); 
+		//System.out.println(toPoint.getExpectedType().getCurClass().getName());
+		/*if (!toPoint.getExpectedType().canBeAssignedFrom(fromPoint.getExpectedType())) {
+			
 			int result = JOptionPane.showConfirmDialog(panel,
 					"The source type is " + fromPoint.getExpectedType() + ", the destination type is "
 							+ toPoint.getExpectedType() + ". Do you want to proceed and create the connection anyway?",
 
 					"Type Mismatch", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
 			if (result == JOptionPane.NO_OPTION) {
 				return;
-			}
+			}*/
+			//Below method was deprecated
+		try{fromPoint.setExpectedType(toPoint.getExpectedType());}
+	
+		catch(ClassCastException e){
+			if (!toPoint.getExpectedType().canBeAssignedFrom(fromPoint.getExpectedType())) {
+				
+				int result = JOptionPane.showConfirmDialog(panel,
+						"The source type is " + fromPoint.getExpectedType() + ", the destination type is "
+								+ toPoint.getExpectedType() + ". Do you want to proceed and create the connection anyway?",
+
+						"Type Mismatch", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+				if (result == JOptionPane.NO_OPTION) {
+					return;
+				}
 
 		}
+		
+		}
 
 		DataLineSegment seg = new DataLineSegment(fromPoint, toPoint);
 		panel.addPaintComponent(seg);

src/paintcomponents/LineSegment.java

@@ -68,14 +68,15 @@ public LineSegment(SimplePoint fromPoint, SimplePoint toPoint,
 
 	/**
 	 * Constructs a line segment with default width and default height.
+	 * 
 	 * @param fromPoint
 	 * @param toPoint
 	 */
 	public LineSegment(SimplePoint fromPoint, SimplePoint toPoint) {
-		this(fromPoint, toPoint,
-				Defaults.sharedDefaults().defaultColorForLineSegment(),
-				Defaults.sharedDefaults().defaultColorForSelectedLineSegment(),
-				Defaults.sharedDefaults().defaultStrokeWidthForLineSegment());
+		this(fromPoint, toPoint, Defaults.sharedDefaults()
+				.defaultColorForLineSegment(), Defaults.sharedDefaults()
+				.defaultColorForSelectedLineSegment(), Defaults
+				.sharedDefaults().defaultStrokeWidthForLineSegment());
 
 	}
 
@@ -102,22 +103,20 @@ public boolean contains(int x, int y) {
 		if (fromPoint.contains(x, y) || toPoint.contains(x, y)) {
 			return false;
 		}
-		// else return the D(curPoint , fromPoint) + D(curPoint, toPoint) ==
-		// D(fromPoint, toPoint)
-		double distanceBetweenXYandFrom = Math
-				.sqrt(Math.pow(fromPoint.getX() - x, 2)
-						+ Math.pow(fromPoint.getY() - y, 2));
-		double distanceBetweenXYandTo = Math
-				.sqrt(Math.pow(toPoint.getX() - x, 2)
-						+ Math.pow(toPoint.getY() - y, 2));
-		double distanceBetweenFromAndTo = Math
-				.sqrt(Math.pow(toPoint.getX() - fromPoint.getX(), 2)
-						+ Math.pow(toPoint.getY() - fromPoint.getY(), 2));
-
-		// checking delta distance
-		// Note: this calculation is only an approximation
-		if (Math.abs(distanceBetweenFromAndTo - distanceBetweenXYandFrom
-				- distanceBetweenXYandTo) < Math.sqrt(strokeWidth)) {
+
+		double lineXDis = fromPoint.getX() - toPoint.getX();
+		double lineYDis = toPoint.getY() - fromPoint.getY();
+		double constantTerm = fromPoint.getY() * toPoint.getX()
+				- toPoint.getY() * fromPoint.getX();
+
+		// Calculate point to line distance with formula.
+		double pointToLineDis = Math
+				.abs((lineYDis * x + lineXDis * y + constantTerm)
+						/ Math.sqrt(Math.pow(lineYDis, 2)
+								+ Math.pow(lineXDis, 2)));
+
+		// If the point is within 3 pixels of the line, return true.
+		if (pointToLineDis <= 3 + strokeWidth / 2) {
 			return true;
 
 		}
@@ -128,86 +127,98 @@ public boolean contains(int x, int y) {
 	public void translate(int i, int j) {
 		super.translate(i, j);
 		// if from and to points are not selected, translate them as well
-		if (this.fromPoint.isSelected() == false){
+		if (this.fromPoint.isSelected() == false) {
 			this.fromPoint.translate(i, j);
 		}
-		if (this.toPoint.isSelected() == false){
+		if (this.toPoint.isSelected() == false) {
 			this.toPoint.translate(i, j);
 		}
 
 	}
-	
+
 	@Override
 	public void saveToElement(Element rootElement, Document doc) {
 		super.saveToElement(rootElement, doc);
-		
-		//build elements
+
+		// build elements
 		Element main = doc.createElement("linesegment");
 
 		Element fromPointElem = doc.createElement("frompoint");
 		Element toPointElem = doc.createElement("topoint");
 		Element defaultColorElem = doc.createElement("defaultcolor");
 		Element selectColorElem = doc.createElement("selectcolor");
 		Element strokeWidthElem = doc.createElement("strokewidth");
-		
-		//append relationship
+
+		// append relationship
 		main.appendChild(fromPointElem);
 		main.appendChild(toPointElem);
 		main.appendChild(defaultColorElem);
 		main.appendChild(selectColorElem);
 		main.appendChild(strokeWidthElem);
 		rootElement.appendChild(main);
-		
-		//fill data
-		fromPointElem.setAttribute("id", Long.toString(fromPoint.getComponentID()));
+
+		// fill data
+		fromPointElem.setAttribute("id",
+				Long.toString(fromPoint.getComponentID()));
 		toPointElem.setAttribute("id", Long.toString(toPoint.getComponentID()));
-		XMLEncodingUtilForPaintComponents.attachRGB(defaultColor, defaultColorElem, doc);
-		XMLEncodingUtilForPaintComponents.attachRGB(selectColor, selectColorElem, doc);
-		strokeWidthElem.appendChild(doc.createTextNode(Double.toString(strokeWidth)));
-		
+		XMLEncodingUtilForPaintComponents.attachRGB(defaultColor,
+				defaultColorElem, doc);
+		XMLEncodingUtilForPaintComponents.attachRGB(selectColor,
+				selectColorElem, doc);
+		strokeWidthElem.appendChild(doc.createTextNode(Double
+				.toString(strokeWidth)));
+
 	}
 
 	/**
 	 * 
-	 * Recover the line segment from a element that should be operated by saveToElement
+	 * Recover the line segment from a element that should be operated by
+	 * saveToElement
 	 * 
-	 * The implementation searches all panel's paintcomponents to find the matching ids using PanelIO.idMapping
+	 * The implementation searches all panel's paintcomponents to find the
+	 * matching ids using PanelIO.idMapping
 	 * 
 	 * @param rootElement
 	 * @param panel
 	 */
 	public LineSegment(Element rootElement, PaintPanel panel) {
 		super(rootElement, panel);
-		Element main = (Element) rootElement.getElementsByTagName("linesegment").item(0);
-		Element fromPointElement = (Element) main.getElementsByTagName("frompoint").item(0);
-		Element toPointElem = (Element) main.getElementsByTagName("topoint").item(0);
-		Element defaultColorElem = (Element) main.getElementsByTagName("defaultcolor").item(0);
-		Element selectColorElem = (Element) main.getElementsByTagName("selectcolor").item(0);
-		Element strokeWidthElem = (Element) main.getElementsByTagName("strokewidth").item(0);
-		
-		
-		defaultColor = XMLEncodingUtilForPaintComponents.getRGB(defaultColorElem);
+		Element main = (Element) rootElement
+				.getElementsByTagName("linesegment").item(0);
+		Element fromPointElement = (Element) main.getElementsByTagName(
+				"frompoint").item(0);
+		Element toPointElem = (Element) main.getElementsByTagName("topoint")
+				.item(0);
+		Element defaultColorElem = (Element) main.getElementsByTagName(
+				"defaultcolor").item(0);
+		Element selectColorElem = (Element) main.getElementsByTagName(
+				"selectcolor").item(0);
+		Element strokeWidthElem = (Element) main.getElementsByTagName(
+				"strokewidth").item(0);
+
+		defaultColor = XMLEncodingUtilForPaintComponents
+				.getRGB(defaultColorElem);
 		selectColor = XMLEncodingUtilForPaintComponents.getRGB(selectColorElem);
 		strokeWidth = Double.parseDouble(strokeWidthElem.getTextContent());
 		stroke = new BasicStroke((float) strokeWidth);
-		
-		//append from and to points
-		
+
+		// append from and to points
+
 		ArrayList<PaintComponent> paintComponents = panel.getPaintComponents();
-		
-		
-		//select only the paint components to check ID
-		long fromPointID = PanelIO.idMapping.get(Long.parseLong(fromPointElement.getAttribute("id")));
-		long toPointID = PanelIO.idMapping.get(Long.parseLong(toPointElem.getAttribute("id")));
-		
+
+		// select only the paint components to check ID
+		long fromPointID = PanelIO.idMapping.get(Long
+				.parseLong(fromPointElement.getAttribute("id")));
+		long toPointID = PanelIO.idMapping.get(Long.parseLong(toPointElem
+				.getAttribute("id")));
+
 		for (PaintComponent paintComponent : paintComponents) {
-			if(paintComponent.getComponentID() == fromPointID){
+			if (paintComponent.getComponentID() == fromPointID) {
 				fromPoint = (SimplePoint) paintComponent;
-			} else if (paintComponent.getComponentID() == toPointID){
-				toPoint  = (SimplePoint) paintComponent;
+			} else if (paintComponent.getComponentID() == toPointID) {
+				toPoint = (SimplePoint) paintComponent;
 			}
 		}
 	}
-	
 
 }

src/paintcomponents/data/DataToPoint.java

@@ -53,7 +53,7 @@ public DataToPoint(int x, int y, Type expectedType) {
 	public Object fetchData() throws NoConnectingLineSegmentException, NoSuchElementException, DataFromPointNoDataProviderException, DataFromPointProviderCannotProvideDataException{
 		if(this.lineSegment == null) throw new NoConnectingLineSegmentException();
 
-		Object returnVal = lineSegment.getFromPoint().getData();
+		Object returnVal = lineSegment.getFromPoint().getData().toString();
 		if(returnVal == null) throw new NoSuchElementException();
 		return returnVal;
 

src/painttools/toolbar/ToolBar.java

@@ -44,13 +44,13 @@ public ToolBar(PaintPanel panel) {
 		selectTool = new SelectTool(panel);
 		addTool(new DotTool());
 		addTool(selectTool);
+		addTool(new LineTool());
 
 
-		addTool(new AddClassTool(panel));
-		addTool(new AddInputBoxTool(panel));
-		addTool(new AddOutputBoxTool(panel));
+		addComponentTool(new AddClassTool(panel));
+		addComponentTool(new AddInputBoxTool(panel));
+		addComponentTool(new AddOutputBoxTool(panel));
 
-		addTool(new LineTool());
 
 		addSeprator();
 
@@ -80,6 +80,29 @@ public void actionPerformed(ActionEvent e) {
 		add(button);
 	}
 
+	/**
+	 * Adds a component tool to the toolbar. This method will add specific tool to the
+	 * tool bar, and an action listener associated with it
+	 * 
+	 * @param tool
+	 */
+	private void addComponentTool(PaintTool tool) {
+		ToolButton button = tool.getButton();
+		buttons.add(button);
+		button.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				setButtonSelection(e);
+				select(tool);
+				
+				buttons.get(1).doClick();
+			}
+		});
+		addSeprator();
+		add(button);
+	}
+	
 	/**
 	 * Adds a ToolBarListener to this toolbar
 	 * @param listener

src/typesystem/HaskellType.java

@@ -12,4 +12,10 @@ public boolean canBeAssignedFrom(Type type) {
 		return false;
 	}
 
+	@Override
+	public Class getCurClass() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }

src/typesystem/Type.java

@@ -3,4 +3,5 @@
 public abstract class Type {
 
 	public abstract boolean canBeAssignedFrom(Type type);
+	public abstract Class getCurClass();
 }