Merge branch 'develop' into improveLineSelectionbyTanSu

Improved the algorithm of determining the distance between given point and line.

Author: sutan1206

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(String.class.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/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();
 }