Add Select Tool

Author: UltimatePea

src/paintcomponents/PaintComponent.java

@@ -64,6 +64,14 @@ public void deselect(){
 		selected = false;
 	}
 
+	public void toggleSelect() {
+		selected = !selected;
+	}
+	
+	public boolean isSelected(){
+		return selected;
+	}
 	public abstract Rectangle getBounds();
 
+
 }

src/paintcomponents/SimplePoint.java

@@ -8,7 +8,6 @@
 public class SimplePoint extends PaintComponent {
 
 
-	private static final int DEFUALT_RADIUS = 10;
 	private int radius;
 	private Color color;
 	private Color selectedColor;

src/painttools/toolbar/ToolBar.java

@@ -1,47 +1,70 @@
 package painttools.toolbar;
+
 import java.awt.Button;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 
+import javax.swing.BoxLayout;
 import javax.swing.Icon;
 import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.tools.Tool;
 
 import painttools.tools.DotTool;
 import painttools.tools.PaintTool;
-
+import painttools.tools.SelectTool;
 
 public class ToolBar extends JPanel {
-	
-	
+
 	public ArrayList<ToolBarListener> listeners;
-	
-	public ToolBar(){
+
+	/**
+	 * Creates a default toolbar and add necessary tools
+	 */
+	public ToolBar() {
 		listeners = new ArrayList<>();
+		
+		//sets the box layout
+		setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+		
 		addTool(new DotTool());
+		addTool(new SelectTool());
 	}
 
+	/**
+	 * Adds a 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 addTool(PaintTool tool) {
 		JButton button = tool.getButton();
 		button.addActionListener(new ActionListener() {
-			
+
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				select(tool);
 			}
 		});
 		add(button);
 	}
-	
-	public void addToolBarListener(ToolBarListener listener){
+
+	/**
+	 * Adds a ToolBarListener to this toolbar
+	 * @param listener
+	 */
+	public void addToolBarListener(ToolBarListener listener) {
 		listeners.add(listener);
 	}
-	
-	private void select(PaintTool tool){
+
+	/**
+	 * this method should be invoked by the actionlistener when an tool button is selected
+	 * @param tool
+	 */
+	private void select(PaintTool tool) {
 		for (ToolBarListener toolBarListener : listeners) {
 			toolBarListener.toolSelected(tool);
 		}

src/painttools/tools/DotTool.java

@@ -19,17 +19,14 @@ public class DotTool extends PaintTool<SimplePoint> {
 	public void start(PaintPanel panel) {
 		this.panel = panel;
 
+		panel.hideCursor();
 		p = new SimplePoint(0, 0);
 		panel.setTempComponent(p);
 
 	}
 
 
-	@Override
-	public SimplePoint paintedComponent() {
-		return p;
-	}
-
+	
 	@Override
 	public JButton getButton() {
 		JButton button = super.getButton();

src/painttools/tools/PaintTool.java

@@ -13,35 +13,11 @@
 public abstract class PaintTool<T extends PaintComponent> implements MouseListener, MouseMotionListener {
 
 
-	//if this tool has finished
-	private boolean done;
-	
 	/**
 	 * Set the start condition of this paint tool
 	 */
 	public abstract void start(PaintPanel panel);
 
-	
-	/**
-	 * the completed component
-	 * @return
-	 */
-	public abstract T paintedComponent();
-
-	/**
-	 * @return whether this component has done painting
-	 */
-	public boolean isDone() {
-		return done;
-	}
-
-	/**
-	 * sets the done condition
-	 * @param 
-	 */
-	public void setDone(boolean done) {
-		this.done = done;
-	}
 
 	public JButton getButton() {
 		return new JButton(this.getClass().getName());

src/painttools/tools/SelectTool.java

@@ -0,0 +1,79 @@
+package painttools.tools;
+
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+
+import paintcomponents.PaintComponent;
+import ui.PaintPanel;
+
+public class SelectTool extends PaintTool {
+
+	private PaintPanel panel;
+	
+	private ArrayList<PaintComponent> selectedComponents;
+	
+	public SelectTool() {
+		selectedComponents = new ArrayList<>();
+	}
+
+	@Override
+	public void mouseClicked(MouseEvent e) {
+
+		PaintComponent comp = panel.componentUnderPoint(e.getX(), e.getY());
+		if(comp != null){
+			if(comp.isSelected()){
+				comp.deselect();
+				selectedComponents.remove(comp);
+			} else {
+				comp.select();
+				selectedComponents.add(comp);
+			}
+			panel.repaint();
+			
+		}
+
+	}
+
+	@Override
+	public void mousePressed(MouseEvent e) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void mouseReleased(MouseEvent e) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void mouseEntered(MouseEvent e) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void mouseExited(MouseEvent e) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void mouseDragged(MouseEvent e) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void mouseMoved(MouseEvent e) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void start(PaintPanel panel) {
+		this.panel = panel;
+
+	}
+
+}

src/settings/Defaults.java

@@ -6,6 +6,10 @@ public class Defaults {
 
 	public static Defaults defaults = new Defaults();
 
+	private static Color SIMPLE_POINT_COLOR = new Color(200, 41, 47); 
+	private static Color SIMPLE_POINT_SELECTED_COLOR = new Color(0, 0, 132);
+	private static int SIMPLE_POINT_DEFAULT_SIZE = 10;
+	
 	private Defaults(){
 
 	}
@@ -16,13 +20,13 @@ public static Defaults sharedDefaults(){
 	}
 
 	public int defaultSimplePointSize(){
-		return 10;
+		return SIMPLE_POINT_DEFAULT_SIZE;
 	}
 
 	public Color defaultSimplePointColor(){
-		return new Color(200, 41, 47); 
+		return SIMPLE_POINT_COLOR;
 	}
 	public Color defaultSimplePointSelectedColor(){
-		return new Color(136, 0, 32); 
+		return SIMPLE_POINT_SELECTED_COLOR;
 	}
 }

src/ui/PaintPanel.java

@@ -48,7 +48,6 @@ private void setTool(PaintTool tool) {
 		}
 		this.tool = tool;
 		this.tool.start(this);
-		hideCursor();
 		this.state = State.TOOLS;
 		this.addMouseListener(this.tool);
 		this.addMouseMotionListener(this.tool);
@@ -144,7 +143,8 @@ protected void paintComponent(Graphics g) {
 			paintComponent.paint(g);
 		}
 		if (state == State.TOOLS) {
-			tempComponent.paint(g);
+			if(tempComponent != null)
+				tempComponent.paint(g);
 		}
 	}
 
@@ -167,4 +167,19 @@ public void addPaintComponent(PaintComponent comp) {
 		components.add(comp);
 
 	}
+
+	/**
+	 * Returns the topmost component under a given point
+	 * @param x
+	 * @param y
+	 * @return null if there is no component under current point
+	 */
+	public PaintComponent componentUnderPoint(int x, int y) {
+		for (PaintComponent paintComponent : components) {
+			if(paintComponent.getBounds().contains(x, y)){
+				return paintComponent;
+			}
+		}
+		return null;
+	}
 }