Added freeform shape tool

pom.xml

@@ -35,7 +35,7 @@
     <packaging>jar</packaging>
     <groupId>com.defano.jmonet</groupId>
     <artifactId>jmonet</artifactId>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/com/defano/jmonet/model/PaintToolType.java

@@ -14,6 +14,7 @@ public enum PaintToolType {
     LINE,
     POLYGON,
     SHAPE,
+    FREEFORM,
     SELECTION,
     LASSO,
     TEXT,
@@ -24,11 +25,18 @@ public enum PaintToolType {
     ROTATE,
     MAGNIFIER;
 
+    /**
+     * Determines if the given tool type draws closed-path "shapes" (i.e., elements which can be
+     * filled with paint.
+     *
+     * @return True if the tool draws shapes; false otherwise.
+     */
     public boolean isShapeTool() {
         return  this == RECTANGLE       ||
                 this == ROUND_RECTANGLE ||
                 this == OVAL            ||
                 this == POLYGON         ||
-                this == SHAPE;
+                this == SHAPE           ||
+                this == FREEFORM;
     }
 }

src/main/java/com/defano/jmonet/tools/FreeformShapeTool.java

@@ -0,0 +1,49 @@
+package com.defano.jmonet.tools;
+
+import com.defano.jmonet.model.PaintToolType;
+import com.defano.jmonet.tools.base.AbstractPathTool;
+
+import java.awt.*;
+import java.awt.geom.Path2D;
+
+/**
+ * Tool allowing user to draw a free-form path (like a paintbrush) that is closed upon completion
+ * and can thusly be filled with paint.
+ */
+public class FreeformShapeTool extends AbstractPathTool {
+
+    private Path2D path;
+
+    public FreeformShapeTool() {
+        super(PaintToolType.FREEFORM);
+    }
+
+    @Override
+    protected void startPath(Graphics2D g, Stroke stroke, Paint paint, Point initialPoint) {
+        path = new Path2D.Double();
+        path.moveTo(initialPoint.getX(), initialPoint.getY());
+    }
+
+    @Override
+    protected void addPoint(Graphics2D g, Stroke stroke, Paint paint, Point point) {
+        path.lineTo(point.getX(), point.getY());
+
+        g.setStroke(stroke);
+        g.setPaint(getStrokePaint());
+        g.draw(path);
+    }
+
+    @Override
+    protected void completePath(Graphics2D g, Stroke stroke, Paint paint) {
+        path.closePath();
+
+        if (getFillPaint() != null) {
+            g.setPaint(getFillPaint());
+            g.fill(path);
+        }
+
+        g.setStroke(stroke);
+        g.setPaint(getStrokePaint());
+        g.draw(path);
+    }
+}

src/main/java/com/defano/jmonet/tools/base/AbstractPathTool.java

@@ -15,6 +15,7 @@ public abstract class AbstractPathTool extends PaintTool {
 
     protected abstract void startPath(Graphics2D g, Stroke stroke, Paint paint, Point initialPoint);
     protected abstract void addPoint(Graphics2D g, Stroke stroke, Paint paint, Point point);
+    protected void completePath(Graphics2D g, Stroke stroke, Paint paint) {}
 
     public AbstractPathTool(PaintToolType type) {
         super(type);
@@ -41,6 +42,10 @@ public void mouseDragged(MouseEvent e, Point imageLocation) {
 
     @Override
     public void mouseReleased(MouseEvent e, Point imageLocation) {
+        Graphics2D g2d = (Graphics2D) getCanvas().getScratchImage().getGraphics();
+        completePath(g2d, getStroke(), getFillPaint());
+        g2d.dispose();
+
         getCanvas().commit(new ChangeSet(getCanvas().getScratchImage(), getComposite()));
     }
 

src/main/java/com/defano/jmonet/tools/builder/PaintToolBuilder.java

@@ -153,6 +153,9 @@ public PaintTool build() {
             case MAGNIFIER:
                 selectedTool = new MagnifierTool();
                 break;
+            case FREEFORM:
+                selectedTool = new FreeformShapeTool();
+                break;
 
             default:
                 throw new RuntimeException("Bug! Unimplemented builder for tool " + type);