Add Line Segment component, Add dragging functionality to Select Tool

Author: UltimatePea

src/actions/ConstructLineSegmentAction.java

@@ -0,0 +1,55 @@
+package actions;
+
+import java.util.ArrayList;
+
+import paintcomponents.LineSegment;
+import paintcomponents.PaintComponent;
+import paintcomponents.SimplePoint;
+import ui.PaintPanel;
+
+public class ConstructLineSegmentAction extends PaintAction {
+
+	public ConstructLineSegmentAction(PaintPanel panel) {
+		super(panel);
+	}
+
+	@Override
+	public boolean canPerformAction() {
+		//get selected components
+		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
+		//only two points can be selected
+		if(items.size() != 2) return false;
+		//selected component must be of type point
+		for (PaintComponent paintComponent : items) {
+			if(!(paintComponent instanceof SimplePoint)){
+				return false;
+			}
+		}
+		return true;
+		
+	}
+
+	@Override
+	public void performAction() {
+		//get selected components
+		ArrayList<PaintComponent> items = panel.getSelectTool().getSelectedComponents();
+		
+		//construct line segment
+		LineSegment lineSegment = new LineSegment((SimplePoint)(items.get(0)), (SimplePoint)(items.get(1)));
+		//add to panel
+		panel.addPaintComponent(lineSegment);
+		
+		//change selection
+		panel.getSelectTool().clearSelection();
+		panel.getSelectTool().selectComponent(lineSegment);
+		panel.repaint();
+		
+
+	}
+
+	@Override
+	public String locationString() {
+		return "Construct/Line Segment";
+	}
+
+}

src/actions/GeneratePolygonSourceJava.java

@@ -11,6 +11,7 @@
 import javax.swing.JOptionPane;
 
 import paintcomponents.PaintComponent;
+import paintcomponents.SimplePoint;
 import ui.PaintPanel;
 
 public class GeneratePolygonSourceJava extends PaintAction {
@@ -27,7 +28,8 @@ public boolean canPerformAction() {
 	@Override
 	public void performAction() {
 		try{
-			String str = generatePolygon(panel.getSelectTool().getSelectedComponents());
+			@SuppressWarnings("unchecked")
+			String str = generatePolygon((ArrayList)(panel.getSelectTool().getSelectedComponents()));
 
 
 			JOptionPane.showMessageDialog(panel, "Already Saved To Downloads: \n\n" + str);
@@ -39,7 +41,7 @@ public void performAction() {
 	}
 
 	private String generatePolygon(
-			ArrayList<PaintComponent> selectedComponents) {
+			ArrayList<SimplePoint> selectedComponents) {
 
 
 		//get width and height for target
@@ -55,7 +57,7 @@ private String generatePolygon(
 
 		//get a bounds for current polygon
 		Polygon poly = new Polygon();
-		for (PaintComponent paintComponent : selectedComponents) {
+		for (SimplePoint paintComponent : selectedComponents) {
 			poly.addPoint(paintComponent.getX(), paintComponent .getY());
 
 		}
@@ -64,7 +66,7 @@ private String generatePolygon(
 		double xfactor = (double)actual.getWidth() / width;
 		double yfactor = (double)actual.getHeight() / height;
 
-		for (PaintComponent paintComponent : selectedComponents) {
+		for (SimplePoint paintComponent : selectedComponents) {
 			int x = (int)((paintComponent.getX() - actual.getX()) / xfactor);
 			int y = (int)((paintComponent.getY() - actual.getY()) / yfactor);
 			builder.append("\t\tp.addPoint(" + x + ", " + y + ");\n");
@@ -92,7 +94,7 @@ private String generatePolygon(
 
 	@Override
 	public String locationString() {
-		return "Generate/Java Source File from Selection...";
+		return "Generate/Polygon Class Java Source File from Selection...";
 	}
 
 }

src/actions/ActionsMenuBar.java src/actions/menu/ActionsMenuBar.javasrc/actions/ActionsMenuBar.java renamed to src/actions/menu/ActionsMenuBar.java

@@ -1,4 +1,4 @@
-package actions;
+package actions.menu;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -7,13 +7,17 @@
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 
+import actions.ConstructLineSegmentAction;
+import actions.GeneratePolygonSourceJava;
+import actions.PaintAction;
 import painttools.tools.SelectionToolListener;
 import ui.PaintPanel;
 
 public class ActionsMenuBar extends JMenuBar implements SelectionToolListener{
 
 	public ActionsMenuBar(PaintPanel panel){
 		addAction(new GeneratePolygonSourceJava(panel));
+		addAction(new ConstructLineSegmentAction(panel));
 
 	}
 
@@ -35,6 +39,7 @@ private void addAction(PaintAction action) {
 		}
 
 		//assume 2 level depth
+		//TODO Change here
 		PaintActionMenuItem item = new PaintActionMenuItem(action);
 		item.setEnabled(action.canPerformAction());
 		item.setText(strings[1]);
@@ -56,7 +61,7 @@ public void selectionChanged() {
 		for (int i = 0; i < getMenuCount(); i++) {
 			JMenu menu = getMenu(i);
 			for(int j = 0; j < menu.getItemCount(); j++){
-				PaintActionMenuItem item = (PaintActionMenuItem) menu.getItem(i);
+				PaintActionMenuItem item = (PaintActionMenuItem) menu.getItem(j);
 				item.setEnabled(item.getAssociatedAction().canPerformAction());
 			}
 

src/actions/PaintActionMenuItem.java src/actions/menu/PaintActionMenuItem.javasrc/actions/PaintActionMenuItem.java renamed to src/actions/menu/PaintActionMenuItem.java

@@ -1,7 +1,9 @@
-package actions;
+package actions.menu;
 
 import javax.swing.JMenuItem;
 
+import actions.PaintAction;
+
 public class PaintActionMenuItem extends JMenuItem{
 
 

src/paintcomponents/LineSegment.java

@@ -0,0 +1,86 @@
+package paintcomponents;
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+
+import settings.Defaults;
+
+//TODO DEfault color, width selection
+public class LineSegment extends PaintComponent {
+
+	private SimplePoint fromPoint;
+	private SimplePoint toPoint;
+
+	private Color defaultColor;
+	private Color selectColor;
+
+	/**
+	 * @return the toPoint
+	 */
+	public SimplePoint getToPoint() {
+		return toPoint;
+	}
+
+	/**
+	 * @param toPoint
+	 *            the toPoint to set
+	 */
+	public void setToPoint(SimplePoint toPoint) {
+		this.toPoint = toPoint;
+	}
+
+	/**
+	 * @return the fromPoint
+	 */
+	public SimplePoint getFromPoint() {
+		return fromPoint;
+	}
+
+	/**
+	 * @param fromPoint
+	 *            the fromPoint to set
+	 */
+	public void setFromPoint(SimplePoint fromPoint) {
+		this.fromPoint = fromPoint;
+	}
+
+	public LineSegment(SimplePoint fromPoint, SimplePoint toPoint,
+			Color defaultColor, Color selectColor) {
+		super(0, 0);
+		this.fromPoint = fromPoint;
+		this.toPoint = toPoint;
+		this.defaultColor = defaultColor;
+		this.selectColor = selectColor;
+	}
+
+	public LineSegment(SimplePoint fromPoint, SimplePoint toPoint) {
+		this(fromPoint, toPoint,
+				Defaults.sharedDefaults().defaultColorForLineSegment(),
+				Defaults.sharedDefaults().defaultColorForSelectedLineSegment());
+
+	}
+
+	@Override
+	protected void paintNotSelected(Graphics g) {
+		g.setColor(defaultColor);
+		g.drawLine(fromPoint.getX(), fromPoint.getY(), toPoint.getX(),
+				toPoint.getY());
+
+	}
+
+	@Override
+	protected void paintSelected(Graphics g) {
+		g.setColor(selectColor);
+		g.drawLine(fromPoint.getX(), fromPoint.getY(), toPoint.getX(),
+				toPoint.getY());
+	}
+
+	@Override
+	public Rectangle getBounds() {
+		return new Rectangle(fromPoint.getX(), fromPoint.getY(),
+				toPoint.getX() - fromPoint.getX(),
+				toPoint.getY() - fromPoint.getY());
+	}
+
+}

src/paintcomponents/PaintComponent.java

@@ -73,5 +73,11 @@ public boolean isSelected(){
 	}
 	public abstract Rectangle getBounds();
 
+	public void translate(int i, int j) {
+		this.x+=i;
+		this.y+=j;
+		
+	}
+
 
 }