Simple Modifications

Author: UltimatePea

src/paintcomponents/SimplePoint.java

@@ -25,6 +25,10 @@ public SimplePoint(int x, int y, int radius, Color color, Color selectedColor) {
 		this.selectedColor = selectedColor;
 	}
 
+	/**
+	 * Returns a deep copy of this object
+	 * @param p
+	 */
 	public SimplePoint(SimplePoint p) {
 		this(p.getX(), p.getY(), p.radius, p.color, p.selectedColor);
 	}

src/painttools/toolbar/ToolBar.java

@@ -16,6 +16,7 @@
 import painttools.tools.DotTool;
 import painttools.tools.PaintTool;
 import painttools.tools.SelectTool;
+import ui.PaintPanel;
 
 public class ToolBar extends JPanel {
 
@@ -25,13 +26,13 @@ public class ToolBar extends JPanel {
 	/**
 	 * Creates a default toolbar and add necessary tools
 	 */
-	public ToolBar() {
+	public ToolBar(PaintPanel panel) {
 		listeners = new ArrayList<>();
 
 		//sets the box layout
 		setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
 
-		selectTool = new SelectTool();
+		selectTool = new SelectTool(panel);
 		addTool(new DotTool());
 		addTool(selectTool);
 	}

src/painttools/tools/DotTool.java

@@ -10,7 +10,7 @@
 import paintcomponents.SimplePoint;
 import ui.PaintPanel;
 
-public class DotTool extends PaintTool<SimplePoint> {
+public class DotTool extends PaintTool {
 
 	SimplePoint p;
 	private PaintPanel panel;
@@ -54,7 +54,14 @@ public int getIconHeight() {
 
 	@Override
 	public void mouseClicked(MouseEvent e) {
-		panel.addPaintComponent(new SimplePoint(p));
+
+		SimplePoint pointToAdd = new SimplePoint(p);
+		
+		//change selection to be only the added point
+		panel.getSelectTool().clearSelection();
+		panel.getSelectTool().selectComponent(pointToAdd);
+
+		panel.addPaintComponent(pointToAdd);
 	}
 
 	@Override
@@ -89,12 +96,21 @@ public void mouseDragged(MouseEvent e) {
 
 	@Override
 	public void mouseMoved(MouseEvent e) {
-		// TODO Auto-generated method stub
 		p.setX(e.getX());
 		p.setY(e.getY());
 		panel.repaint();
 	}
 
+
+
+	@Override
+	public void reset() {
+		//do nothing on reset
+		//temporary component will automatically be removed
+		
+		
+	}
+
 
 
 }

src/painttools/tools/PaintTool.java

@@ -10,14 +10,20 @@
 import paintcomponents.PaintComponent;
 import ui.PaintPanel;
 
-public abstract class PaintTool<T extends PaintComponent> implements MouseListener, MouseMotionListener {
+public abstract class PaintTool implements MouseListener, MouseMotionListener {
 
 
 	/**
 	 * Set the start condition of this paint tool
 	 */
 	public abstract void start(PaintPanel panel);
 
+	/**
+	 * Resets all the pending states, called when a new tool is selected
+	 * or when esc is pressed.
+	 */
+	public abstract void reset();
+	
 
 	public JButton getButton() {
 		return new JButton(this.getClass().getName());

src/painttools/tools/SelectTool.java

@@ -37,33 +37,77 @@ public ArrayList<PaintComponent> getSelectedComponents() {
 		return selectedComponents;
 	}
 
-	public SelectTool() {
+	public SelectTool(PaintPanel panel) {
 		selectedComponents = new ArrayList<>();
 		listeners = new ArrayList<>();
+		this.panel = panel;
 	}
 
 	@Override
 	public void mouseClicked(MouseEvent e) {
-		//select or deselect component under cursor on mouse clicked
+		// select or deselect component under cursor on mouse clicked
 
 		PaintComponent comp = panel.componentUnderPoint(e.getX(), e.getY());
 		if (comp != null) {
 			if (comp.isSelected()) {
-				comp.deselect();
-				selectedComponents.remove(comp);
+				deselectComponent(comp);
 			} else {
-				comp.select();
-				selectedComponents.add(comp);
-			}
-			for (SelectionToolListener selectionToolListener : listeners) {
-				selectionToolListener.selectionChanged();
+				selectComponent(comp);
 			}
-			panel.repaint();
 
 		}
 
 	}
 
+	/**
+	 * Selects a component, changes selection
+	 * All listeners are informed.
+	 * Panel are repainted
+	 * @param comp
+	 */
+	public void selectComponent(PaintComponent comp) {
+		comp.select();
+		selectedComponents.add(comp);
+		for (SelectionToolListener selectionToolListener : listeners) {
+			selectionToolListener.selectionChanged();
+		}
+		panel.repaint();
+	}
+	
+	/**
+	 * Deselect a component, changes selection
+	 * All listeners are informed.
+	 * Panel are repainted
+	 * @param comp
+	 */
+	public void deselectComponent(PaintComponent comp){
+		comp.deselect();
+		selectedComponents.remove(comp);
+		for (SelectionToolListener selectionToolListener : listeners) {
+			selectionToolListener.selectionChanged();
+		}
+		panel.repaint();
+		
+	}
+	
+	/**
+	 * Deselect ALL components, changes selection
+	 * All listeners are informed.
+	 * Panel are repainted
+	 */
+	public void clearSelection(){
+		// remove all selection
+		for (PaintComponent component : selectedComponents) {
+			component.deselect();
+		}
+		selectedComponents.clear();
+		
+		for (SelectionToolListener selectionToolListener : listeners) {
+			selectionToolListener.selectionChanged();
+		}
+		panel.repaint();
+	}
+
 	@Override
 	public void mousePressed(MouseEvent e) {
 		// TODO Auto-generated method stub
@@ -96,7 +140,7 @@ public void mouseDragged(MouseEvent e) {
 
 	@Override
 	public void mouseMoved(MouseEvent e) {
-		//shows a left arrow if cursor hits something
+		// shows a left arrow if cursor hits something
 		PaintComponent comp = panel.componentUnderPoint(e.getX(), e.getY());
 		if (comp != null) {
 
@@ -107,14 +151,14 @@ public void mouseMoved(MouseEvent e) {
 					Defaults.sharedDefaults().defaultColorForSelectToolIcon());
 			arrow.setX(e.getX());
 			arrow.setY(e.getY());
-			
-			//add arrow by setting the temp component
+
+			// add arrow by setting the temp component
 			panel.setTempComponent(arrow);
-			
+
 			panel.repaint();
 
 		} else {
-			//remove arrow
+			// remove arrow
 			panel.setTempComponent(null);
 			panel.showCursor();
 			panel.repaint();
@@ -136,4 +180,11 @@ public JButton getButton() {
 		return button;
 	}
 
+	@Override
+	public void reset() {
+		
+		clearSelection();
+
+	}
+
 }

src/ui/MainFrame.java

@@ -14,8 +14,8 @@ public class MainFrame extends JFrame{
 	public MainFrame(){
 
 		//set up toolbar and main panel
-		ToolBar toolBar = new ToolBar();
 		PaintPanel paintPanel = new PaintPanel();
+		ToolBar toolBar = new ToolBar(paintPanel);
 
 		//link select tool
 		paintPanel.setSelectTool(toolBar.getSelectTool());

src/ui/PaintPanel.java

@@ -69,6 +69,7 @@ private void resetTool() {
 		this.tempComponent = null;
 		this.removeMouseListener(this.tool);
 		this.removeMouseMotionListener(this.tool);
+		this.tool.reset();
 		this.tool = null;
 		showCursor();
 		this.state = State.DEFAULT;