Merge pull request #149 from UCSDOalads/fixedBugsbyTanSu

Fixed bugsby tan su

Author: CVIllustrious

src/painttools/tools/AddClassTool.java

@@ -4,6 +4,8 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
 
+import javax.swing.SwingUtilities;
+
 import actions.AddLazyJavaClassAction;
 import buttons.ToolButton;
 import ui.PaintPanel;
@@ -62,8 +64,9 @@ public void mouseClicked(MouseEvent e) {
 			action.setXY(e.getX(), e.getY());
 			action.performAction();
 		}
-		panel.setDefaultSelectTool();
-
+		if (!SwingUtilities.isRightMouseButton(e)) {
+			panel.setDefaultSelectTool();
+		}
 	}
 
 	@Override

src/painttools/tools/AddInputBoxTool.java

@@ -4,6 +4,8 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
 
+import javax.swing.SwingUtilities;
+
 import actions.AddDataInputBoxAction;
 import buttons.ToolButton;
 import ui.PaintPanel;
@@ -62,7 +64,9 @@ public void mouseClicked(MouseEvent e) {
 			action.performAction();
 			action.setDefaultXY();
 		}
-		panel.setDefaultSelectTool();
+		if (!SwingUtilities.isRightMouseButton(e)) {
+			panel.setDefaultSelectTool();
+		}
 
 	}
 

src/painttools/tools/AddOutputBoxTool.java

@@ -4,6 +4,8 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
 
+import javax.swing.SwingUtilities;
+
 import actions.AddDataDisplayBoxAction;
 import buttons.ToolButton;
 import ui.PaintPanel;
@@ -63,7 +65,9 @@ public void mouseClicked(MouseEvent e) {
 			action.performAction();
 			action.setDefaultXY();
 		}
-		panel.setDefaultSelectTool();
+		if (!SwingUtilities.isRightMouseButton(e)) {
+			panel.setDefaultSelectTool();
+		}
 
 	}
 

src/painttools/tools/DotTool.java

@@ -3,6 +3,8 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
 
+import javax.swing.SwingUtilities;
+
 import buttons.ToolButton;
 import paintcomponents.SimplePoint;
 import ui.PaintPanel;
@@ -49,7 +51,9 @@ public void mouseClicked(MouseEvent e) {
 		panel.getSelectTool().selectComponent(pointToAdd);
 
 		panel.addPaintComponent(pointToAdd);
-		panel.toolSelected(panel.getSelectTool());
+		if (!SwingUtilities.isRightMouseButton(e)) {
+			panel.setDefaultSelectTool();
+		}
 
 	}
 

src/painttools/tools/LineTool.java

@@ -48,7 +48,6 @@ public ToolButton getButton() {
 
 	@Override
 	public void mouseClicked(MouseEvent e) {
-		System.out.print(panel.getSelectTool().getSelectedComponents() + "\n");
 		// If no point is selected, select the point(if any) at the mouse's
 		// location.
 		ArrayList<PaintComponent> items = panel.getSelectTool()
@@ -194,7 +193,7 @@ public void mouseReleased(MouseEvent e) {
 				panel.setTempComponent(null);
 				panel.showCursor();
 				panel.repaint();
-				panel.toolSelected(panel.getSelectTool());
+				panel.setDefaultSelectTool();
 			}
 		}
 

src/painttools/tools/SelectTool.java

@@ -4,7 +4,6 @@
 import java.awt.event.MouseWheelEvent;
 import java.util.ArrayList;
 
-
 import javax.swing.ImageIcon;
 
 import actions.ZoomInAction;
@@ -81,7 +80,9 @@ public void selectComponent(PaintComponent comp) {
 		}
 
 		// prompt data input if user double clicked on a selected data box
-		doubleClickAction(comp);
+		if(panel.getSelectTool().getButton().isSelected()) {
+			doubleClickAction(comp);
+		}
 
 		panel.repaint();
 	}
@@ -95,7 +96,9 @@ public void selectComponent(PaintComponent comp) {
 	public void deselectComponent(PaintComponent comp) {
 
 		// check if double clicked, if so perform the action on the data box
-		doubleClickAction(comp);
+		if(panel.getSelectTool().getButton().isSelected()) {
+			doubleClickAction(comp);
+		}
 
 		// then deselect the component
 		comp.deselect(this);

src/ui/PaintPanel.java

@@ -24,11 +24,10 @@ public class PaintPanel extends JPanel implements ToolBarListener {
 
 	private ArrayList<PaintComponent> components;
 
-	
 	enum State {
-		TOOLS, DEFAULT
+		TOOLS, DEFAULT;
 	}
-
+	
 	private State state = State.DEFAULT;
 	private PaintToolsInterface tool;
 	private PaintComponent tempComponent;
@@ -242,6 +241,4 @@ public void setSelectTool(SelectTool selectTool) {
 	public void setDefaultSelectTool(){
 		selectTool.getButton().doClick();
 	}
-
-
 }