Implement #33: Box Selection (drag to select multiple shapes)

.gitignore

@@ -33,4 +33,3 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 .mvn/wrapper/maven-wrapper.jar
-new-shapes.wiki/

src/main/java/ovh/gasser/newshapes/ShapeVisitor.java

@@ -2,7 +2,6 @@ package ovh.gasser.newshapes;
 
 import ovh.gasser.newshapes.shapes.SCircle;
 import ovh.gasser.newshapes.shapes.SCollection;
-import ovh.gasser.newshapes.shapes.SPolygon;
 import ovh.gasser.newshapes.shapes.SRectangle;
 import ovh.gasser.newshapes.shapes.SText;
 import ovh.gasser.newshapes.shapes.STriangle;
@@ -17,6 +16,4 @@ public interface ShapeVisitor {
     void visitTriangle(STriangle sTriangle);
 
     void visitText(SText sText);
-
-    void visitPolygon(SPolygon sPolygon);
 }

src/main/java/ovh/gasser/newshapes/shapes/SPolygon.java

@@ -1,110 +0,0 @@
-package ovh.gasser.newshapes.shapes;
-
-import ovh.gasser.newshapes.ShapeVisitor;
-import ovh.gasser.newshapes.attributes.ColorAttributes;
-import ovh.gasser.newshapes.attributes.SelectionAttributes;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class SPolygon extends AbstractShape {
-    private final List<Point> points;
-
-    private SPolygon(List<Point> points) {
-        super(calculateBounds(points));
-        this.points = new ArrayList<>(points);
-    }
-
-    @Override
-    public void accept(ShapeVisitor visitor) {
-        visitor.visitPolygon(this);
-    }
-
-    @Override
-    public void translate(int dx, int dy) {
-        super.translate(dx, dy);
-        for (Point p : points) {
-            p.translate(dx, dy);
-        }
-    }
-
-    @Override
-    public void resize(ResizeHandle handle, int dx, int dy) {
-        Rectangle oldBounds = getBounds();
-        super.resize(handle, dx, dy);
-        Rectangle newBounds = getBounds();
-
-        if (oldBounds.width == 0 || oldBounds.height == 0) {
-            return;
-        }
-
-        double scaleX = (double) newBounds.width / oldBounds.width;
-        double scaleY = (double) newBounds.height / oldBounds.height;
-
-        for (Point p : points) {
-            int relativeX = p.x - oldBounds.x;
-            int relativeY = p.y - oldBounds.y;
-            p.x = newBounds.x + (int) (relativeX * scaleX);
-            p.y = newBounds.y + (int) (relativeY * scaleY);
-        }
-    }
-
-    @Override
-    public Shape clone() {
-        List<Point> clonedPoints = points.stream()
-                .map(p -> new Point(p.x, p.y))
-                .toList();
-        SPolygon clone = new SPolygon(clonedPoints);
-        ColorAttributes color = (ColorAttributes) this.getAttributes(ColorAttributes.ID);
-        if (color != null) {
-            clone.addAttributes(new ColorAttributes(color.filled, color.stroked, color.filledColor, color.strokedColor));
-        }
-        clone.addAttributes(new SelectionAttributes());
-        return clone;
-    }
-
-    public List<Point> getPoints() {
-        return Collections.unmodifiableList(points);
-    }
-
-    public static SPolygon create(List<Point> points) {
-        if (points == null || points.size() < 3) {
-            throw new IllegalArgumentException("Polygon must have at least 3 points");
-        }
-        SPolygon polygon = new SPolygon(points);
-        polygon.addAttributes(new SelectionAttributes());
-        polygon.addAttributes(new ColorAttributes(false, true, Color.BLACK, Color.BLACK));
-        return polygon;
-    }
-
-    public static SPolygon create(Point... points) {
-        return create(List.of(points));
-    }
-
-    private static Rectangle calculateBounds(List<Point> points) {
-        if (points == null || points.isEmpty()) {
-            return new Rectangle(0, 0, 0, 0);
-        }
-
-        int minX = points.get(0).x;
-        int minY = points.get(0).y;
-        int maxX = points.get(0).x;
-        int maxY = points.get(0).y;
-
-        for (Point p : points) {
-            minX = Math.min(minX, p.x);
-            minY = Math.min(minY, p.y);
-            maxX = Math.max(maxX, p.x);
-            maxY = Math.max(maxY, p.y);
-        }
-
-        return new Rectangle(minX, minY, maxX - minX, maxY - minY);
-    }
-
-    @Override
-    public String toString() {
-        return "SPolygon{points=" + points.size() + ", bounds=" + super.toString() + "}";
-    }
-}

src/main/java/ovh/gasser/newshapes/ui/Controller.java

@@ -5,6 +5,15 @@ import org.slf4j.LoggerFactory;
 import ovh.gasser.newshapes.HTMLExporter;
 import ovh.gasser.newshapes.Selection;
 import ovh.gasser.newshapes.attributes.ColorAttributes;
+import ovh.gasser.newshapes.persistence.DrawingSerializer;
+import ovh.gasser.newshapes.command.AddShapeCommand;
+import ovh.gasser.newshapes.command.ChangeColorCommand;
+import ovh.gasser.newshapes.command.Command;
+import ovh.gasser.newshapes.command.CommandHistory;
+import ovh.gasser.newshapes.command.CommandHistoryListener;
+import ovh.gasser.newshapes.command.MoveShapeCommand;
+import ovh.gasser.newshapes.command.RemoveShapeCommand;
+import ovh.gasser.newshapes.command.ResizeShapeCommand;
 import ovh.gasser.newshapes.shapes.ResizeHandle;
 import ovh.gasser.newshapes.shapes.SCollection;
 import ovh.gasser.newshapes.shapes.SText;
@@ -13,18 +22,28 @@ import ovh.gasser.newshapes.ui.listeners.SelectionListener;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.InputEvent;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 
 public class Controller {
-    private final static Logger logger = LoggerFactory.getLogger(Controller.class);
+    private static final Logger logger = LoggerFactory.getLogger(Controller.class);
+
     private final ShapesView view;
     private final SCollection model;
     private final Selection selection;
+    private final CommandHistory commandHistory;
 
     private Point lastMousePos;
     private boolean addingText;
@@ -35,11 +54,24 @@ public class Controller {
     private Point selectionBoxStart;
     private Point selectionBoxEnd;
     private boolean boxSelecting;
+    private Point dragStartMousePos;
+    private Map<Shape, Rectangle> dragStartBounds = Map.of();
+    private final Runnable onModelChanged;
+    private java.util.List<Shape> clipboard = java.util.List.of();
+    private int pasteCount = 0;
+    private static final int PASTE_OFFSET = 20;
+    private boolean additiveBoxSelection;
 
     Controller(ShapesView view, SCollection model) {
+        this(view, model, () -> { });
+    }
+
+    Controller(ShapesView view, SCollection model, Runnable onModelChanged) {
         this.view = view;
         this.model = model;
+        this.onModelChanged = onModelChanged;
         this.selection = new Selection();
+        this.commandHistory = new CommandHistory();
 
         var adapter = new MouseAdapter() {
             @Override
@@ -54,14 +86,7 @@ public class Controller {
 
             @Override
             public void mouseReleased(MouseEvent evt) {
-                resizing = false;
+                handleMouseReleased(evt);
-                activeHandle = null;
-                resizeOrigin = null;
-                boxSelecting = false;
-                selectionBoxStart = null;
-                selectionBoxEnd = null;
-                view.setCurrentSelectionBox(null);
-                view.repaint();
             }
         };
         this.view.addMouseMotionListener(adapter);
@@ -74,6 +99,249 @@ public class Controller {
         });
     }
 
+    public void addShape(Shape shape) {
+        executeAndRefresh(new AddShapeCommand(model, shape));
+    }
+
+    public void addSelectionChangeListener(SelectionListener listener) {
+        selection.addListener(listener);
+    }
+
+    public void addHistoryChangeListener(CommandHistoryListener listener) {
+        commandHistory.addListener(listener);
+    }
+
+    public boolean canUndo() {
+        return commandHistory.canUndo();
+    }
+
+    public boolean canRedo() {
+        return commandHistory.canRedo();
+    }
+
+    public void undo() {
+        if (!commandHistory.canUndo()) {
+            return;
+        }
+
+        resetSelection();
+        commandHistory.undo();
+        view.repaint();
+    }
+
+    public void redo() {
+        if (!commandHistory.canRedo()) {
+            return;
+        }
+
+        resetSelection();
+        commandHistory.redo();
+        view.repaint();
+    }
+
+    public void saveDrawing(java.io.File file) {
+        try {
+            new DrawingSerializer().save(model, file);
+            logger.info("Saved drawing to {}", file.getAbsolutePath());
+        } catch (java.io.IOException e) {
+            logger.error("Failed to save drawing: {}", e.getMessage());
+            JOptionPane.showMessageDialog(view, "Failed to save: " + e.getMessage(), "Save Error", JOptionPane.ERROR_MESSAGE);
+        }
+    }
+
+    public void loadDrawing(java.io.File file) {
+        try {
+            SCollection loaded = new DrawingSerializer().load(file);
+            model.stream().toList().forEach(model::remove);
+            loaded.forEach(model::add);
+            resetSelection();
+            view.repaint();
+            logger.info("Loaded drawing from {}", file.getAbsolutePath());
+        } catch (java.io.IOException e) {
+            logger.error("Failed to load drawing: {}", e.getMessage());
+            JOptionPane.showMessageDialog(view, "Failed to load: " + e.getMessage(), "Load Error", JOptionPane.ERROR_MESSAGE);
+        }
+    }
+
+    public void enterTextMode() {
+        addingText = true;
+    }
+
+    public void deleteSelected() {
+        List<Shape> selectedShapes = selection.getSelectedShapes();
+        if (selectedShapes.isEmpty()) {
+            return;
+        }
+
+        logger.debug("Deleting selected shape(s)");
+        executeAndRefresh(new RemoveShapeCommand(model, selectedShapes));
+        resetSelection();
+    }
+
+    public void copySelection() {
+        List<Shape> selectedShapes = selection.getSelectedShapes();
+        if (selectedShapes.isEmpty()) {
+            logger.debug("No selection to copy");
+            return;
+        }
+
+        clipboard = selectedShapes.stream()
+                .map(Shape::clone)
+                .toList();
+        pasteCount = 0;
+    }
+
+    public void cutSelection() {
+        List<Shape> selectedShapes = selection.getSelectedShapes();
+        if (selectedShapes.isEmpty()) {
+            logger.debug("No selection to cut");
+            return;
+        }
+
+        clipboard = selectedShapes.stream()
+                .map(Shape::clone)
+                .toList();
+        pasteCount = 0;
+
+        for (Shape shape : selectedShapes) {
+            model.remove(shape);
+        }
+        resetSelection();
+        onModelChanged.run();
+        view.repaint();
+    }
+
+    public void pasteClipboard() {
+        if (clipboard.isEmpty()) {
+            logger.debug("Clipboard is empty");
+            return;
+        }
+
+        pasteCount++;
+        int offset = PASTE_OFFSET * pasteCount;
+
+        resetSelection();
+
+        for (Shape original : clipboard) {
+            Shape clone = original.clone();
+            clone.translate(offset, offset);
+            model.add(clone);
+            selection.add(clone);
+        }
+
+        onModelChanged.run();
+        view.repaint();
+    }
+
+    public void group() {
+        List<Shape> selectedShapes = selection.getSelectedShapes();
+        if (selectedShapes.size() < 2) {
+            logger.debug("Need at least 2 shapes to group");
+            return;
+        }
+
+        int minIndex = selectedShapes.stream()
+                .mapToInt(model::indexOf)
+                .min()
+                .orElse(0);
+
+        for (Shape shape : selectedShapes) {
+            model.remove(shape);
+            shape.addAttributes(new ovh.gasser.newshapes.attributes.SelectionAttributes(false));
+        }
+
+        Shape[] shapesArray = selectedShapes.toArray(new Shape[0]);
+        SCollection group = SCollection.of(shapesArray);
+
+        model.insert(minIndex, group);
+        resetSelection();
+        selection.add(group);
+        onModelChanged.run();
+        view.repaint();
+    }
+
+    public void ungroup() {
+        List<Shape> selectedShapes = selection.getSelectedShapes();
+        if (selectedShapes.size() != 1) {
+            logger.debug("Can only ungroup a single selected group");
+            return;
+        }
+
+        Shape selected = selectedShapes.get(0);
+        if (!(selected instanceof SCollection group)) {
+            logger.debug("Selected shape is not a group");
+            return;
+        }
+
+        List<Shape> children = new ArrayList<>();
+        group.forEach(children::add);
+
+        model.remove(group);
+
+        for (Shape child : children) {
+            model.add(child);
+        }
+
+        resetSelection();
+        for (Shape child : children) {
+            selection.add(child);
+        }
+        onModelChanged.run();
+        view.repaint();
+    }
+
+    public void changeSelectionColor() {
+        changeColors(shape -> new ColorAttributes(false, true, Color.BLACK, randomColor()));
+    }
+
+    public void changeSelectionFillColor(Color filledColor) {
+        if (filledColor == null) {
+            return;
+        }
+
+        changeColors(shape -> {
+            ColorAttributes current = currentColor(shape);
+            if (shape instanceof SText) {
+                return new ColorAttributes(current.filled, current.stroked, filledColor, filledColor);
+            }
+            return new ColorAttributes(true, current.stroked, filledColor, current.strokedColor);
+        });
+    }
+
+    public void changeSelectionBorderColor(Color strokedColor) {
+        if (strokedColor == null) {
+            return;
+        }
+
+        changeColors(shape -> {
+            ColorAttributes current = currentColor(shape);
+            if (shape instanceof SText) {
+                return new ColorAttributes(current.filled, current.stroked, strokedColor, strokedColor);
+            }
+            return new ColorAttributes(current.filled, true, current.filledColor, strokedColor);
+        });
+    }
+
+    public void setSelectionBorder(boolean state) {
+        changeColors(shape -> {
+            if (shape instanceof SText) {
+                return null;
+            }
+            ColorAttributes current = currentColor(shape);
+            return new ColorAttributes(current.filled, state, current.filledColor, current.strokedColor);
+        });
+    }
+
+    public void setSelectionFilled(boolean state) {
+        changeColors(shape -> {
+            if (shape instanceof SText) {
+                return null;
+            }
+            ColorAttributes current = currentColor(shape);
+            return new ColorAttributes(state, current.stroked, current.filledColor, current.strokedColor);
+        });
+    }
+
     private void handleMouseDragged(MouseEvent evt) {
         if (boxSelecting) {
             selectionBoxEnd = evt.getPoint();
@@ -84,35 +352,19 @@ public class Controller {
             return;
         }
 
-        boxSelecting = false;
-
         if (resizeMode && resizing && activeHandle != null) {
-            logger.debug("RESIZING with handle {} at ({}, {})", activeHandle, evt.getX(), evt.getY());
             int dx = evt.getX() - resizeOrigin.x;
             int dy = evt.getY() - resizeOrigin.y;
-            logger.debug("About to resize {} shapes, dx={}, dy={}", selection.getSelectedShapes().size(), dx, dy);
             for (Shape shape : selection) {
-                logger.debug("Calling resize on shape: {}", shape);
                 shape.resize(activeHandle, dx, dy);
             }
             resizeOrigin = evt.getPoint();
-        } else if (resizeMode && !selection.isEmpty()) {
+        } else if (!selection.isEmpty()) {
-            lastMousePos = evt.getPoint();
-            ResizeHandle handle = getHandleAt(evt.getPoint());
-            if (handle != null) {
-                resizing = true;
-                activeHandle = handle;
-                resizeOrigin = evt.getPoint();
-            }
-        } else {
-            resizing = false;
-            activeHandle = null;
             if (lastMousePos == null) {
                 lastMousePos = evt.getPoint();
             }
             int dx = evt.getX() - lastMousePos.x;
             int dy = evt.getY() - lastMousePos.y;
-            logger.debug("MOVING shapes with delta ({}, {})", dx, dy);
             for (Shape shape : selection) {
                 shape.translate(dx, dy);
             }
@@ -127,18 +379,17 @@ public class Controller {
             return;
         }
 
-        resizing = false;
+        resizeDragState();
-        activeHandle = null;
+        boxSelecting = false;
-        resizeOrigin = null;
+        view.setCurrentSelectionBox(null);
-        boxSelecting = false; // Clear box selection mode when clicking
 
         if (resizeMode && !selection.isEmpty()) {
             ResizeHandle handle = getHandleAt(evt.getPoint());
-            logger.debug("In resize mode, checking handle at ({}, {}): {}", evt.getX(), evt.getY(), handle);
             if (handle != null) {
                 resizing = true;
                 activeHandle = handle;
                 resizeOrigin = evt.getPoint();
+                beginDrag(evt.getPoint());
                 view.repaint();
                 return;
             }
@@ -151,96 +402,86 @@ public class Controller {
                                 resetSelection();
                             }
                             if (!selection.getSelectedShapes().contains(s)) {
-                                lastMousePos = evt.getPoint();
                                 selection.add(s);
-                                logger.debug("Selecting {}", s);
                             }
+                            beginDrag(evt.getPoint());
                         },
                         () -> {
-                            // Clicked on empty space - start box selection
+                            additiveBoxSelection = evt.isShiftDown();
-                            resetSelection();
+                            if (!additiveBoxSelection) {
+                                resetSelection();
+                            }
                             selectionBoxStart = evt.getPoint();
+                            selectionBoxEnd = evt.getPoint();
                             boxSelecting = true;
+                            dragStartMousePos = null;
+                            dragStartBounds = Map.of();
                         }
                 );
     }
 
-    private void placeTextAt(Point point) {
+    private void handleMouseReleased(MouseEvent evt) {
-        String input = JOptionPane.showInputDialog(view, "Enter text:", "Add text", JOptionPane.PLAIN_MESSAGE);
+        finishDragCommand();
-        addingText = false;
+        resizeDragState();
-        if (input == null) {
+        boxSelecting = false;
-            return;
+        selectionBoxStart = null;
-        }
+        selectionBoxEnd = null;
-
+        dragStartMousePos = null;
-        model.add(SText.create(point.x, point.y, input));
+        dragStartBounds = Map.of();
-        resetSelection();
+        view.setCurrentSelectionBox(null);
         view.repaint();
     }
 
-    public void enterTextMode() {
+    private void handleKeyPressed(KeyEvent evt) {
-        addingText = true;
+        int modifiers = evt.getModifiersEx();
-    }
 
-    private ResizeHandle getHandleAt(Point point) {
+        if ((modifiers & InputEvent.CTRL_DOWN_MASK) != 0) {
-        final int handleSize = 10;
+            switch (evt.getKeyCode()) {
-        for (Shape shape : selection) {
+                case KeyEvent.VK_Z -> {
-            Rectangle bounds = shape.getBounds();
+                    if ((modifiers & InputEvent.SHIFT_DOWN_MASK) != 0) {
-            
+                        redo();
-            // Always-present SE corner handle
+                    } else {
-            if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
+                        undo();
-                point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
+                    }
-                return ResizeHandle.SE;
+                    evt.consume();
-            }
+                    return;
-
-            // Resize handles are only active in resize mode
-            if (resizeMode) {
-                // NW corner
-                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
-                    point.y >= bounds.y - handleSize && point.y <= bounds.y) {
-                    return ResizeHandle.NW;
                 }
-                // NE corner
+                case KeyEvent.VK_Y -> {
-                if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
+                    redo();
-                    point.y >= bounds.y - handleSize && point.y <= bounds.y) {
+                    evt.consume();
-                    return ResizeHandle.NE;
+                    return;
                 }
-                // SW corner
+                case KeyEvent.VK_C -> {
-                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
+                    copySelection();
-                    point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
+                    evt.consume();
-                    return ResizeHandle.SW;
+                    return;
                 }
-                // N edge
+                case KeyEvent.VK_X -> {
-                int edgeX = bounds.x + bounds.width / 2 - handleSize / 2;
+                    cutSelection();
-                if (point.x >= edgeX && point.x <= edgeX + handleSize &&
+                    evt.consume();
-                    point.y >= bounds.y - handleSize && point.y <= bounds.y) {
+                    return;
-                    return ResizeHandle.N;
                 }
-                // S edge
+                case KeyEvent.VK_V -> {
-                if (point.x >= edgeX && point.x <= edgeX + handleSize &&
+                    pasteClipboard();
-                    point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
+                    evt.consume();
-                    return ResizeHandle.S;
+                    return;
                 }
-                // W edge
+                case KeyEvent.VK_G -> {
-                int edgeY = bounds.y + bounds.height / 2 - handleSize / 2;
+                    group();
-                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
+                    evt.consume();
-                    point.y >= edgeY && point.y <= edgeY + handleSize) {
+                    return;
-                    return ResizeHandle.W;
                 }
-                // E edge
+                case KeyEvent.VK_U -> {
-                if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
+                    ungroup();
-                    point.y >= edgeY && point.y <= edgeY + handleSize) {
+                    evt.consume();
-                    return ResizeHandle.E;
+                    return;
                 }
             }
         }
-        return null;
-    }
 
-    private void handleKeyPressed(KeyEvent evt) {
         switch (evt.getKeyCode()) {
             case KeyEvent.VK_R -> toggleResizeMode();
             case KeyEvent.VK_DELETE -> deleteSelected();
-            case KeyEvent.VK_C -> copySelection();
             case KeyEvent.VK_A -> changeSelectionColor();
             case KeyEvent.VK_H -> exportHtml();
             default -> logger.warn("Pressed unhandled key: {}", evt.getKeyChar());
@@ -264,55 +505,134 @@ public class Controller {
         }
     }
 
-    private void changeSelectionColor(){
+    private void placeTextAt(Point point) {
-        if (selection == null) {
+        String input = JOptionPane.showInputDialog(view, "Enter text:", "Add text", JOptionPane.PLAIN_MESSAGE);
-            logger.debug("No selection to change color of");
+        addingText = false;
+        if (input == null) {
             return;
         }
 
-        for (Shape s : selection) {
+        addShape(SText.create(point.x, point.y, input));
-            if (s instanceof SCollection collection) {
+        resetSelection();
-                collection.forEach(shape -> shape.addAttributes(new ColorAttributes(false, true, Color.BLACK, new Color((int) (Math.random() * 0x1000000)))));
+    }
-            } else {
+
-                s.addAttributes(new ColorAttributes(false, true, Color.BLACK, new Color((int) (Math.random() * 0x1000000))));
+    private ResizeHandle getHandleAt(Point point) {
+        final int handleSize = 10;
+        for (Shape shape : selection) {
+            Rectangle bounds = shape.getBounds();
+
+            if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
+                    point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
+                return ResizeHandle.SE;
+            }
+
+            if (resizeMode) {
+                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
+                        point.y >= bounds.y - handleSize && point.y <= bounds.y) {
+                    return ResizeHandle.NW;
+                }
+                if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
+                        point.y >= bounds.y - handleSize && point.y <= bounds.y) {
+                    return ResizeHandle.NE;
+                }
+                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
+                        point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
+                    return ResizeHandle.SW;
+                }
+                int edgeX = bounds.x + bounds.width / 2 - handleSize / 2;
+                if (point.x >= edgeX && point.x <= edgeX + handleSize &&
+                        point.y >= bounds.y - handleSize && point.y <= bounds.y) {
+                    return ResizeHandle.N;
+                }
+                if (point.x >= edgeX && point.x <= edgeX + handleSize &&
+                        point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
+                    return ResizeHandle.S;
+                }
+                int edgeY = bounds.y + bounds.height / 2 - handleSize / 2;
+                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
+                        point.y >= edgeY && point.y <= edgeY + handleSize) {
+                    return ResizeHandle.W;
+                }
+                if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
+                        point.y >= edgeY && point.y <= edgeY + handleSize) {
+                    return ResizeHandle.E;
+                }
             }
         }
-
+        return null;
-        view.repaint();
     }
 
-    private void copySelection() {
+    private void changeColors(Function<Shape, ColorAttributes> updater) {
-        if (selection == null) {
+        Map<Shape, ColorAttributes> before = new LinkedHashMap<>();
-            logger.debug("No selection to copy");
+        Map<Shape, ColorAttributes> after = new LinkedHashMap<>();
+        List<Shape> targets = flattenSelection(selection.getSelectedShapes());
+
+        for (Shape shape : targets) {
+            ColorAttributes current = currentColor(shape);
+            if (current == null) {
+                continue;
+            }
+
+            ColorAttributes updated = updater.apply(shape);
+            if (updated == null || sameColor(current, updated)) {
+                continue;
+            }
+
+            before.put(shape, copy(current));
+            after.put(shape, copy(updated));
+        }
+
+        if (before.isEmpty()) {
             return;
         }
 
-        for (Shape shape : selection) {
+        executeAndRefresh(new ChangeColorCommand(before.keySet(), before, after));
-            this.model.add(shape.clone());
-        }
-
-        view.repaint();
     }
 
-    public void deleteSelected() {
+    private void beginDrag(Point point) {
-        if (selection == null) return;
+        lastMousePos = point;
-        logger.debug("Deleting selected shape(s)");
+        dragStartMousePos = point;
-        for (Shape s : selection) {
+        dragStartBounds = captureBounds(selection.getSelectedShapes());
-            this.model.remove(s);
+    }
+
+    private void finishDragCommand() {
+        if (boxSelecting || dragStartBounds.isEmpty()) {
+            return;
         }
-        resetSelection();
+
+        List<Shape> selectedShapes = selection.getSelectedShapes();
+        if (selectedShapes.isEmpty()) {
+            return;
+        }
+
+        if (resizing && boundsChanged(selectedShapes, dragStartBounds)) {
+            Map<Shape, Rectangle> afterBounds = captureBounds(selectedShapes);
+            Command command = new ResizeShapeCommand(selectedShapes, dragStartBounds, afterBounds);
+            command.undo();
+            executeAndRefresh(command);
+            return;
+        }
+
+        if (boundsChanged(selectedShapes, dragStartBounds)) {
+            Shape reference = selectedShapes.get(0);
+            Rectangle before = dragStartBounds.get(reference);
+            Rectangle after = reference.getBounds();
+            Command command = new MoveShapeCommand(selectedShapes, after.x - before.x, after.y - before.y);
+            command.undo();
+            executeAndRefresh(command);
+        }
+    }
+
+    private void executeAndRefresh(Command command) {
+        commandHistory.execute(command);
+        onModelChanged.run();
         view.repaint();
     }
 
     private void resetSelection() {
-        logger.debug("Resetting selection");
         selection.clear();
     }
 
-    public void addSelectionChangeListener(SelectionListener listener) {
-        selection.addListener(listener);
-    }
-
     private Optional<Shape> getTarget(MouseEvent evt, SCollection sc) {
         return sc.stream()
                 .filter(s -> s.getBounds().contains(evt.getPoint()))
@@ -328,9 +648,71 @@ public class Controller {
     }
 
     private void updateSelectionFromBox(Rectangle box) {
-        resetSelection();
+        if (!additiveBoxSelection) {
+            resetSelection();
+        }
         model.stream()
                 .filter(s -> s.getBounds().intersects(box))
                 .forEach(selection::add);
     }
+
+    private void resizeDragState() {
+        resizing = false;
+        activeHandle = null;
+        resizeOrigin = null;
+        lastMousePos = null;
+    }
+
+    private Map<Shape, Rectangle> captureBounds(Collection<Shape> shapes) {
+        Map<Shape, Rectangle> bounds = new LinkedHashMap<>();
+        for (Shape shape : shapes) {
+            bounds.put(shape, shape.getBounds());
+        }
+        return bounds;
+    }
+
+    private boolean boundsChanged(Collection<Shape> shapes, Map<Shape, Rectangle> before) {
+        for (Shape shape : shapes) {
+            Rectangle previous = before.get(shape);
+            if (previous != null && !previous.equals(shape.getBounds())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private List<Shape> flattenSelection(Collection<Shape> selectedShapes) {
+        LinkedHashSet<Shape> flattened = new LinkedHashSet<>();
+        for (Shape shape : selectedShapes) {
+            flattenShape(shape, flattened);
+        }
+        return new ArrayList<>(flattened);
+    }
+
+    private void flattenShape(Shape shape, Collection<Shape> flattened) {
+        if (shape instanceof SCollection collection) {
+            collection.forEach(child -> flattenShape(child, flattened));
+            return;
+        }
+        flattened.add(shape);
+    }
+
+    private ColorAttributes currentColor(Shape shape) {
+        return (ColorAttributes) shape.getAttributes(ColorAttributes.ID);
+    }
+
+    private ColorAttributes copy(ColorAttributes attrs) {
+        return new ColorAttributes(attrs.filled, attrs.stroked, attrs.filledColor, attrs.strokedColor);
+    }
+
+    private boolean sameColor(ColorAttributes left, ColorAttributes right) {
+        return left.filled == right.filled
+                && left.stroked == right.stroked
+                && left.filledColor.equals(right.filledColor)
+                && left.strokedColor.equals(right.strokedColor);
+    }
+
+    private Color randomColor() {
+        return new Color((int) (Math.random() * 0x1000000));
+    }
 }

src/main/java/ovh/gasser/newshapes/ui/ShapesView.java

@@ -16,8 +16,12 @@ public class ShapesView extends JPanel {
     private Rectangle currentSelectionBox;
 
     public ShapesView(SCollection model) {
+        this(model, () -> { });
+    }
+
+    public ShapesView(SCollection model, Runnable onModelChanged) {
         this.model = model;
-        this.controller = new Controller(this, model);
+        this.controller = new Controller(this, model, onModelChanged);
     }
 
     @Override

src/main/java/ovh/gasser/newshapes/ui/listeners/MenuAddListener.java

@@ -19,17 +19,11 @@ public class MenuAddListener implements ActionListener {
 	private final String shape;
 	private final ShapesView view;
 	private final SCollection model;
-	private final Runnable onModelChanged;
 
 	public MenuAddListener(String shape, SCollection model, ShapesView view) {
-		this(shape, model, view, () -> { });
-	}
-
-	public MenuAddListener(String shape, SCollection model, ShapesView view, Runnable onModelChanged) {
 		this.shape = shape;
 		this.model = model;
 		this.view = view;
-		this.onModelChanged = onModelChanged;
 	}
 	@Override
 	public void actionPerformed(ActionEvent e) {
@@ -47,7 +41,6 @@ public class MenuAddListener implements ActionListener {
 		s.addAttributes(new SelectionAttributes());
 		s.addAttributes(new ColorAttributes(true, false, randomColor(), Color.BLACK));
 		model.add(s);
-		onModelChanged.run();
 		view.repaint();
 	}
 	

src/main/java/ovh/gasser/newshapes/ui/visitors/HTMLDraftman.java

@@ -2,12 +2,7 @@ package ovh.gasser.newshapes.ui.visitors;
 
 import ovh.gasser.newshapes.ShapeVisitor;
 import ovh.gasser.newshapes.attributes.ColorAttributes;
-import ovh.gasser.newshapes.shapes.SCircle;
+import ovh.gasser.newshapes.shapes.*;
-import ovh.gasser.newshapes.shapes.SCollection;
-import ovh.gasser.newshapes.shapes.SPolygon;
-import ovh.gasser.newshapes.shapes.SRectangle;
-import ovh.gasser.newshapes.shapes.SText;
-import ovh.gasser.newshapes.shapes.STriangle;
 import ovh.gasser.newshapes.shapes.Shape;
 
 import java.awt.*;
@@ -110,36 +105,6 @@ public class HTMLDraftman implements ShapeVisitor {
         cssOutput.println("}");
     }
 
-    @Override
-    public void visitPolygon(SPolygon polygon) {
-        int id = polygon.hashCode();
-        Rectangle bounds = polygon.getBounds();
-        htmlOutput.printf("<svg class=\"poly%d\" viewBox=\"%d %d %d %d\">\n", id, bounds.x, bounds.y, bounds.width, bounds.height);
-
-        var points = new StringJoiner(" ");
-        for (var point : polygon.getPoints()) {
-            points.add("%d,%d".formatted(point.x, point.y));
-        }
-
-        ColorAttributes attrs = (ColorAttributes) polygon.getAttributes(ColorAttributes.ID);
-        String fill = attrs.filled ? formatCSSColor(attrs.filledColor) : "none";
-        String stroke = attrs.stroked ? formatCSSColor(attrs.strokedColor) : "none";
-        int strokeWidth = attrs.stroked ? 1 : 0;
-
-        htmlOutput.printf("  <polygon points=\"%s\" fill=\"%s\" stroke=\"%s\" stroke-width=\"%d\" />\n",
-                points, fill, stroke, strokeWidth);
-        htmlOutput.println("</svg>");
-
-        cssOutput.printf(".poly%d{\n", id);
-        cssOutput.println("  position: absolute;");
-        cssOutput.printf("  top: %dpx;\n", bounds.y);
-        cssOutput.printf("  left: %dpx;\n", bounds.x);
-        cssOutput.printf("  width: %dpx;\n", bounds.width);
-        cssOutput.printf("  height: %dpx;\n", bounds.height);
-        cssOutput.println("  overflow: visible;");
-        cssOutput.println("}");
-    }
-
     private String attributesToCss(Shape shape) {
         ColorAttributes attrs = (ColorAttributes) shape.getAttributes(ColorAttributes.ID);
         String strokedColor = "#ffffff";

src/main/java/ovh/gasser/newshapes/ui/visitors/SVGDraftman.java

@@ -5,7 +5,6 @@ import ovh.gasser.newshapes.ShapeVisitor;
 import ovh.gasser.newshapes.attributes.ColorAttributes;
 import ovh.gasser.newshapes.shapes.SCircle;
 import ovh.gasser.newshapes.shapes.SCollection;
-import ovh.gasser.newshapes.shapes.SPolygon;
 import ovh.gasser.newshapes.shapes.SRectangle;
 import ovh.gasser.newshapes.shapes.SText;
 import ovh.gasser.newshapes.shapes.STriangle;
@@ -93,21 +92,6 @@ public class SVGDraftman implements ShapeVisitor {
         );
     }
 
-    @Override
-    public void visitPolygon(SPolygon sPolygon) {
-        var points = new StringJoiner(" ");
-        for (var point : sPolygon.getPoints()) {
-            points.add("%d,%d".formatted(point.x, point.y));
-        }
-        ColorAttributes attrs = (ColorAttributes) sPolygon.getAttributes(ColorAttributes.ID);
-        var style = new StringJoiner(";", "fill:", "");
-        style.add(attrs.filled ? colorToHex(attrs.filledColor) : "none");
-        if (attrs.stroked) {
-            style.add("stroke:%s;stroke-width:1".formatted(colorToHex(attrs.strokedColor)));
-        }
-        this.output.printf("<polygon points=\"%s\" style=\"%s\" />\n", points, style);
-    }
-
     public void generateSVG(SCollection model) {
         output.println(String.format(SVG_PRELUDE, App.WIN_SIZE.width, App.WIN_SIZE.height));
         visitCollection(model);

src/test/java/ovh/gasser/newshapes/shapes/SPolygonTest.java

@@ -1,142 +0,0 @@
-package ovh.gasser.newshapes.shapes;
-
-import org.junit.jupiter.api.Test;
-import ovh.gasser.newshapes.attributes.ColorAttributes;
-import ovh.gasser.newshapes.attributes.SelectionAttributes;
-
-import java.awt.Color;
-import java.awt.Point;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
-class SPolygonTest {
-
-    private static final String POLYGON_CLASS = "ovh.gasser.newshapes.shapes.SPolygon";
-
-    @Test
-    void testCreateWithListOfPoints() {
-        assumeTrue(isPolygonAvailable(), "SPolygon is not present in this checkout");
-
-        var polygon = createPolygon(List.of(
-                new Point(10, 10),
-                new Point(20, 30),
-                new Point(40, 15)
-        ));
-
-        assertNotNull(polygon);
-        assertEquals(List.of(new Point(10, 10), new Point(20, 30), new Point(40, 15)), pointsOf(polygon));
-    }
-
-    @Test
-    void testCreateWithVarargs() {
-        assumeTrue(isPolygonAvailable(), "SPolygon is not present in this checkout");
-
-        var polygon = createPolygon(new Point(5, 5), new Point(15, 25), new Point(35, 10));
-
-        assertNotNull(polygon);
-        assertEquals(List.of(new Point(5, 5), new Point(15, 25), new Point(35, 10)), pointsOf(polygon));
-    }
-
-    @Test
-    void testDefaultAttributesAdded() {
-        assumeTrue(isPolygonAvailable(), "SPolygon is not present in this checkout");
-
-        var polygon = createPolygon(new Point(0, 0), new Point(10, 0), new Point(5, 10));
-
-        assertNotNull(getAttribute(polygon, SelectionAttributes.ID));
-        var colorAttrs = (ColorAttributes) getAttribute(polygon, ColorAttributes.ID);
-        assertNotNull(colorAttrs);
-        assertEquals(false, colorAttrs.filled);
-        assertEquals(true, colorAttrs.stroked);
-        assertEquals(Color.BLACK, colorAttrs.filledColor);
-        assertEquals(Color.BLACK, colorAttrs.strokedColor);
-    }
-
-    @Test
-    void testGetPointsReturnsUnmodifiableList() {
-        assumeTrue(isPolygonAvailable(), "SPolygon is not present in this checkout");
-
-        var polygon = createPolygon(new Point(0, 0), new Point(10, 0), new Point(5, 10));
-
-        assertThrows(UnsupportedOperationException.class,
-                () -> pointsOf(polygon).add(new Point(1, 1)));
-    }
-
-    @Test
-    void testGetPointsReturnsCorrectPoints() {
-        assumeTrue(isPolygonAvailable(), "SPolygon is not present in this checkout");
-
-        var polygon = createPolygon(Arrays.asList(
-                new Point(1, 2),
-                new Point(3, 4),
-                new Point(5, 6),
-                new Point(7, 8)
-        ));
-
-        assertEquals(Arrays.asList(
-                new Point(1, 2),
-                new Point(3, 4),
-                new Point(5, 6),
-                new Point(7, 8)
-        ), pointsOf(polygon));
-    }
-
-    private static Object createPolygon(Point... points) {
-        return createPolygon(Arrays.asList(points));
-    }
-
-    private static Object createPolygon(List<Point> points) {
-        try {
-            Class<?> polygonClass = Class.forName(POLYGON_CLASS);
-            try {
-                Method createWithList = polygonClass.getMethod("create", List.class);
-                return createWithList.invoke(null, points);
-            } catch (NoSuchMethodException ignored) {
-                Method createWithVarargs = polygonClass.getMethod("create", Point[].class);
-                return createWithVarargs.invoke(null, (Object) points.toArray(new Point[0]));
-            }
-        } catch (InvocationTargetException e) {
-            if (e.getCause() instanceof RuntimeException runtimeException) {
-                throw runtimeException;
-            }
-            throw new IllegalStateException(e.getCause());
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    private static boolean isPolygonAvailable() {
-        try {
-            Class.forName(POLYGON_CLASS);
-            return true;
-        } catch (ClassNotFoundException e) {
-            return false;
-        }
-    }
-
-    private static Object getAttribute(Object polygon, String id) {
-        try {
-            Method getAttributes = polygon.getClass().getMethod("getAttributes", String.class);
-            return getAttributes.invoke(polygon, id);
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private static List<Point> pointsOf(Object polygon) {
-        try {
-            Method getPoints = polygon.getClass().getMethod("getPoints");
-            return (List<Point>) getPoints.invoke(polygon);
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-}

src/test/java/ovh/gasser/newshapes/shapes/ShapeFactory.java

@@ -1,11 +1,6 @@
 package ovh.gasser.newshapes.shapes;
 
 import java.awt.Color;
-import java.awt.Point;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.stream.Stream;
 
 /**
@@ -21,100 +16,10 @@ public final class ShapeFactory {
                 SCircle.create(5, 5, 30),
                 STriangle.create(0, 0, 40, Color.RED, Color.BLACK),
                 SText.create(15, 25, "Hello"),
-                createPolygon(),
                 SCollection.of(
                         SRectangle.create(0, 0, 20, 20),
                         SCircle.create(10, 10, 5)
                 )
         );
     }
-
-    private static Shape createPolygon() {
-        List<Point> points = List.of(
-                new Point(0, 0),
-                new Point(10, 0),
-                new Point(5, 10)
-        );
-
-        try {
-            Class<?> polygonClass = Class.forName("ovh.gasser.newshapes.shapes.SPolygon");
-            try {
-                Method createWithList = polygonClass.getMethod("create", List.class);
-                return (Shape) createWithList.invoke(null, points);
-            } catch (NoSuchMethodException ignored) {
-                Method createWithVarargs = polygonClass.getMethod("create", Point[].class);
-                return (Shape) createWithVarargs.invoke(null, (Object) points.toArray(Point[]::new));
-            }
-        } catch (ClassNotFoundException | NoSuchMethodException |
-                 InvocationTargetException | IllegalAccessException e) {
-            return new FallbackPolygon(points);
-        }
-    }
-
-    private static final class FallbackPolygon implements Shape {
-
-        private final List<Point> points;
-
-        private FallbackPolygon(List<Point> points) {
-            this.points = copyPoints(points);
-        }
-
-        @Override
-        public void accept(ovh.gasser.newshapes.ShapeVisitor visitor) {
-        }
-
-        @Override
-        public void translate(int dx, int dy) {
-            for (Point point : points) {
-                point.translate(dx, dy);
-            }
-        }
-
-        @Override
-        public void resize(ResizeHandle handle, int dx, int dy) {
-        }
-
-        @Override
-        public ovh.gasser.newshapes.attributes.Attributes getAttributes(String key) {
-            return null;
-        }
-
-        @Override
-        public void addAttributes(ovh.gasser.newshapes.attributes.Attributes attr) {
-        }
-
-        @Override
-        public java.awt.Rectangle getBounds() {
-            return computeBounds(points);
-        }
-
-        @Override
-        public Shape clone() {
-            return new FallbackPolygon(points);
-        }
-
-        private static List<Point> copyPoints(List<Point> source) {
-            List<Point> copy = new ArrayList<>(source.size());
-            for (Point point : source) {
-                copy.add(new Point(point));
-            }
-            return copy;
-        }
-
-        private static java.awt.Rectangle computeBounds(List<Point> points) {
-            int minX = points.get(0).x;
-            int minY = points.get(0).y;
-            int maxX = points.get(0).x;
-            int maxY = points.get(0).y;
-
-            for (Point point : points) {
-                minX = Math.min(minX, point.x);
-                minY = Math.min(minY, point.y);
-                maxX = Math.max(maxX, point.x);
-                maxY = Math.max(maxY, point.y);
-            }
-
-            return new java.awt.Rectangle(minX, minY, maxX - minX, maxY - minY);
-        }
-    }
 }

src/test/java/ovh/gasser/newshapes/ui/BoxSelectionTest.java

@@ -0,0 +1,128 @@
+package ovh.gasser.newshapes.ui;
+
+import org.junit.jupiter.api.Test;
+import ovh.gasser.newshapes.attributes.SelectionAttributes;
+import ovh.gasser.newshapes.shapes.SCollection;
+import ovh.gasser.newshapes.shapes.SRectangle;
+import ovh.gasser.newshapes.shapes.Shape;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
+import java.lang.reflect.InvocationTargetException;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class BoxSelectionTest {
+
+    @Test
+    void draggingSelectionBoxSelectsAllIntersectingShapes() throws Exception {
+        SRectangle first = SRectangle.create(20, 20, 30, 30);
+        SRectangle second = SRectangle.create(80, 80, 30, 30);
+        SRectangle outside = SRectangle.create(160, 160, 30, 30);
+        ShapesView view = createView(first, second, outside);
+
+        dragSelection(view, new Point(5, 5), new Point(100, 100), 0);
+
+        assertTrue(isSelected(first));
+        assertTrue(isSelected(second));
+        assertFalse(isSelected(outside));
+    }
+
+    @Test
+    void shiftDraggingSelectionBoxAddsToExistingSelection() throws Exception {
+        SRectangle first = SRectangle.create(10, 10, 30, 30);
+        SRectangle second = SRectangle.create(80, 10, 30, 30);
+        SRectangle outside = SRectangle.create(160, 10, 30, 30);
+        ShapesView view = createView(first, second, outside);
+
+        click(view, new Point(20, 20), 0);
+        dragSelection(view, new Point(70, 5), new Point(120, 50), InputEvent.SHIFT_DOWN_MASK);
+
+        assertTrue(isSelected(first));
+        assertTrue(isSelected(second));
+        assertFalse(isSelected(outside));
+    }
+
+    @Test
+    void shapesViewPaintsSelectionBoxDuringRendering() throws Exception {
+        ShapesView view = createView();
+
+        BufferedImage withoutSelectionBox = paintView(view, null);
+        BufferedImage withSelectionBox = paintView(view, new Rectangle(10, 10, 40, 40));
+
+        assertTrue(imagesDiffer(withoutSelectionBox, withSelectionBox));
+    }
+
+    private ShapesView createView(Shape... shapes) throws InvocationTargetException, InterruptedException {
+        final ShapesView[] ref = new ShapesView[1];
+        SwingUtilities.invokeAndWait(() -> {
+            ref[0] = new ShapesView(SCollection.of(shapes));
+            ref[0].setOpaque(true);
+            ref[0].setBackground(Color.WHITE);
+            ref[0].setSize(240, 240);
+        });
+        return ref[0];
+    }
+
+    private void click(ShapesView view, Point point, int modifiers) throws InvocationTargetException, InterruptedException {
+        dispatch(view, MouseEvent.MOUSE_PRESSED, point, modifiers);
+        dispatch(view, MouseEvent.MOUSE_RELEASED, point, modifiers);
+    }
+
+    private void dragSelection(ShapesView view, Point start, Point end, int modifiers) throws InvocationTargetException, InterruptedException {
+        dispatch(view, MouseEvent.MOUSE_PRESSED, start, modifiers);
+        dispatch(view, MouseEvent.MOUSE_DRAGGED, end, modifiers);
+        dispatch(view, MouseEvent.MOUSE_RELEASED, end, modifiers);
+    }
+
+    private void dispatch(ShapesView view, int eventId, Point point, int modifiers)
+            throws InvocationTargetException, InterruptedException {
+        SwingUtilities.invokeAndWait(() -> view.dispatchEvent(new MouseEvent(
+                view,
+                eventId,
+                System.currentTimeMillis(),
+                modifiers,
+                point.x,
+                point.y,
+                1,
+                false,
+                MouseEvent.BUTTON1
+        )));
+    }
+
+    private BufferedImage paintView(ShapesView view, Rectangle box)
+            throws InvocationTargetException, InterruptedException {
+        final BufferedImage[] ref = new BufferedImage[1];
+        SwingUtilities.invokeAndWait(() -> {
+            view.setCurrentSelectionBox(box);
+            BufferedImage image = new BufferedImage(240, 240, BufferedImage.TYPE_INT_ARGB);
+            Graphics2D graphics = image.createGraphics();
+            try {
+                view.paint(graphics);
+            } finally {
+                graphics.dispose();
+            }
+            ref[0] = image;
+        });
+        return ref[0];
+    }
+
+    private boolean imagesDiffer(BufferedImage first, BufferedImage second) {
+        for (int y = 0; y < first.getHeight(); y++) {
+            for (int x = 0; x < first.getWidth(); x++) {
+                if (first.getRGB(x, y) != second.getRGB(x, y)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean isSelected(Shape shape) {
+        return ((SelectionAttributes) shape.getAttributes(SelectionAttributes.ID)).selected;
+    }
+}

src/test/java/ovh/gasser/newshapes/ui/ShapeDraftmanTest.java

@@ -1,507 +0,0 @@
-package ovh.gasser.newshapes.ui;
-
-import org.junit.jupiter.api.Test;
-import ovh.gasser.newshapes.attributes.ColorAttributes;
-
-import java.awt.*;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.ImageObserver;
-import java.awt.image.RenderedImage;
-import java.awt.image.renderable.RenderableImage;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.text.AttributedCharacterIterator;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
-class ShapeDraftmanTest {
-
-    private static final String POLYGON_CLASS = "ovh.gasser.newshapes.shapes.SPolygon";
-
-    @Test
-    void testVisitPolygonDrawsPolygon() {
-        assumeTrue(isVisitPolygonAvailable(), "SPolygon or ShapeDraftman.visitPolygon() is not present in this checkout");
-
-        RecordingGraphics2D graphics = new RecordingGraphics2D();
-        ShapeDraftman draftman = new ShapeDraftman(graphics);
-        Object polygon = createPolygon(new Point(10, 10), new Point(30, 10), new Point(20, 25));
-
-        invokeVisitPolygon(draftman, polygon);
-
-        assertEquals(1, graphics.drawPolygonCalls(), "Should draw the polygon once");
-    }
-
-    @Test
-    void testVisitPolygonWithColors() {
-        assumeTrue(isVisitPolygonAvailable(), "SPolygon or ShapeDraftman.visitPolygon() is not present in this checkout");
-
-        RecordingGraphics2D graphics = new RecordingGraphics2D();
-        ShapeDraftman draftman = new ShapeDraftman(graphics);
-        Object polygon = createPolygon(new Point(0, 0), new Point(20, 0), new Point(10, 20));
-        addColorAttributes(polygon, new ColorAttributes(true, true, Color.RED, Color.BLUE));
-
-        invokeVisitPolygon(draftman, polygon);
-
-        assertEquals(List.of(Color.RED, Color.BLUE), graphics.colors(), "Should set fill and stroke colors in order");
-        assertEquals(1, graphics.fillPolygonCalls(), "Should fill the polygon once");
-        assertEquals(1, graphics.drawPolygonCalls(), "Should stroke the polygon once");
-    }
-
-    private static void invokeVisitPolygon(ShapeDraftman draftman, Object polygon) {
-        try {
-            Method visitPolygon = draftman.getClass().getMethod("visitPolygon", polygon.getClass());
-            visitPolygon.invoke(draftman, polygon);
-        } catch (InvocationTargetException e) {
-            throw new IllegalStateException(e.getCause());
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    private static void addColorAttributes(Object polygon, ColorAttributes attributes) {
-        try {
-            Method addAttributes = polygon.getClass().getMethod("addAttributes", Class.forName("ovh.gasser.newshapes.attributes.Attributes"));
-            addAttributes.invoke(polygon, attributes);
-        } catch (InvocationTargetException e) {
-            throw new IllegalStateException(e.getCause());
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    private static Object createPolygon(Point... points) {
-        return createPolygon(Arrays.asList(points));
-    }
-
-    private static Object createPolygon(List<Point> points) {
-        try {
-            Class<?> polygonClass = Class.forName(POLYGON_CLASS);
-            try {
-                Method createWithList = polygonClass.getMethod("create", List.class);
-                return createWithList.invoke(null, points);
-            } catch (NoSuchMethodException ignored) {
-                Method createWithVarargs = polygonClass.getMethod("create", Point[].class);
-                return createWithVarargs.invoke(null, (Object) points.toArray(new Point[0]));
-            }
-        } catch (InvocationTargetException e) {
-            if (e.getCause() instanceof RuntimeException runtimeException) {
-                throw runtimeException;
-            }
-            throw new IllegalStateException(e.getCause());
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    private static boolean isVisitPolygonAvailable() {
-        try {
-            Class<?> polygonClass = Class.forName(POLYGON_CLASS);
-            return Arrays.stream(ShapeDraftman.class.getMethods())
-                    .anyMatch(method -> method.getName().equals("visitPolygon")
-                            && method.getParameterCount() == 1
-                            && method.getParameterTypes()[0].isAssignableFrom(polygonClass));
-        } catch (ClassNotFoundException e) {
-            return false;
-        }
-    }
-
-    private static final class RecordingGraphics2D extends Graphics2D {
-
-        private final Graphics2D delegate = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).createGraphics();
-        private final List<Color> colors = new ArrayList<>();
-        private int fillPolygonCalls;
-        private int drawPolygonCalls;
-
-        List<Color> colors() {
-            return List.copyOf(colors);
-        }
-
-        int fillPolygonCalls() {
-            return fillPolygonCalls;
-        }
-
-        int drawPolygonCalls() {
-            return drawPolygonCalls;
-        }
-
-        @Override
-        public void setColor(Color c) {
-            colors.add(c);
-            delegate.setColor(c);
-        }
-
-        @Override
-        public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints) {
-            fillPolygonCalls++;
-            delegate.fillPolygon(xPoints, yPoints, nPoints);
-        }
-
-        @Override
-        public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints) {
-            drawPolygonCalls++;
-            delegate.drawPolygon(xPoints, yPoints, nPoints);
-        }
-
-        @Override
-        public void addRenderingHints(Map<?, ?> hints) {
-            delegate.addRenderingHints(hints);
-        }
-
-        @Override
-        public void clip(Shape s) {
-            delegate.clip(s);
-        }
-
-        @Override
-        public void draw(Shape s) {
-            delegate.draw(s);
-        }
-
-        @Override
-        public void drawGlyphVector(GlyphVector g, float x, float y) {
-            delegate.drawGlyphVector(g, x, y);
-        }
-
-        @Override
-        public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs) {
-            return delegate.drawImage(img, xform, obs);
-        }
-
-        @Override
-        public void drawImage(BufferedImage img, BufferedImageOp op, int x, int y) {
-            delegate.drawImage(img, op, x, y);
-        }
-
-        @Override
-        public void drawRenderableImage(RenderableImage img, AffineTransform xform) {
-            delegate.drawRenderableImage(img, xform);
-        }
-
-        @Override
-        public void drawRenderedImage(RenderedImage img, AffineTransform xform) {
-            delegate.drawRenderedImage(img, xform);
-        }
-
-        @Override
-        public void drawString(String str, int x, int y) {
-            delegate.drawString(str, x, y);
-        }
-
-        @Override
-        public void drawString(String str, float x, float y) {
-            delegate.drawString(str, x, y);
-        }
-
-        @Override
-        public void drawString(AttributedCharacterIterator iterator, int x, int y) {
-            delegate.drawString(iterator, x, y);
-        }
-
-        @Override
-        public void drawString(AttributedCharacterIterator iterator, float x, float y) {
-            delegate.drawString(iterator, x, y);
-        }
-
-        @Override
-        public void fill(Shape s) {
-            delegate.fill(s);
-        }
-
-        @Override
-        public Color getBackground() {
-            return delegate.getBackground();
-        }
-
-        @Override
-        public Composite getComposite() {
-            return delegate.getComposite();
-        }
-
-        @Override
-        public GraphicsConfiguration getDeviceConfiguration() {
-            return delegate.getDeviceConfiguration();
-        }
-
-        @Override
-        public FontRenderContext getFontRenderContext() {
-            return delegate.getFontRenderContext();
-        }
-
-        @Override
-        public Paint getPaint() {
-            return delegate.getPaint();
-        }
-
-        @Override
-        public Object getRenderingHint(RenderingHints.Key hintKey) {
-            return delegate.getRenderingHint(hintKey);
-        }
-
-        @Override
-        public RenderingHints getRenderingHints() {
-            return delegate.getRenderingHints();
-        }
-
-        @Override
-        public Stroke getStroke() {
-            return delegate.getStroke();
-        }
-
-        @Override
-        public AffineTransform getTransform() {
-            return delegate.getTransform();
-        }
-
-        @Override
-        public boolean hit(Rectangle rect, Shape s, boolean onStroke) {
-            return delegate.hit(rect, s, onStroke);
-        }
-
-        @Override
-        public void rotate(double theta) {
-            delegate.rotate(theta);
-        }
-
-        @Override
-        public void rotate(double theta, double x, double y) {
-            delegate.rotate(theta, x, y);
-        }
-
-        @Override
-        public void scale(double sx, double sy) {
-            delegate.scale(sx, sy);
-        }
-
-        @Override
-        public void setBackground(Color color) {
-            delegate.setBackground(color);
-        }
-
-        @Override
-        public void setComposite(Composite comp) {
-            delegate.setComposite(comp);
-        }
-
-        @Override
-        public void setPaint(Paint paint) {
-            delegate.setPaint(paint);
-        }
-
-        @Override
-        public void setRenderingHint(RenderingHints.Key hintKey, Object hintValue) {
-            delegate.setRenderingHint(hintKey, hintValue);
-        }
-
-        @Override
-        public void setRenderingHints(Map<?, ?> hints) {
-            delegate.setRenderingHints(hints);
-        }
-
-        @Override
-        public void setStroke(Stroke s) {
-            delegate.setStroke(s);
-        }
-
-        @Override
-        public void setTransform(AffineTransform Tx) {
-            delegate.setTransform(Tx);
-        }
-
-        @Override
-        public void shear(double shx, double shy) {
-            delegate.shear(shx, shy);
-        }
-
-        @Override
-        public void transform(AffineTransform Tx) {
-            delegate.transform(Tx);
-        }
-
-        @Override
-        public void translate(int x, int y) {
-            delegate.translate(x, y);
-        }
-
-        @Override
-        public void translate(double tx, double ty) {
-            delegate.translate(tx, ty);
-        }
-
-        @Override
-        public void clearRect(int x, int y, int width, int height) {
-            delegate.clearRect(x, y, width, height);
-        }
-
-        @Override
-        public void clipRect(int x, int y, int width, int height) {
-            delegate.clipRect(x, y, width, height);
-        }
-
-        @Override
-        public void copyArea(int x, int y, int width, int height, int dx, int dy) {
-            delegate.copyArea(x, y, width, height, dx, dy);
-        }
-
-        @Override
-        public Graphics create() {
-            return delegate.create();
-        }
-
-        @Override
-        public void dispose() {
-            delegate.dispose();
-        }
-
-        @Override
-        public void drawArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
-            delegate.drawArc(x, y, width, height, startAngle, arcAngle);
-        }
-
-        @Override
-        public boolean drawImage(Image img, int x, int y, ImageObserver observer) {
-            return delegate.drawImage(img, x, y, observer);
-        }
-
-        @Override
-        public boolean drawImage(Image img, int x, int y, Color bgcolor, ImageObserver observer) {
-            return delegate.drawImage(img, x, y, bgcolor, observer);
-        }
-
-        @Override
-        public boolean drawImage(Image img, int x, int y, int width, int height, ImageObserver observer) {
-            return delegate.drawImage(img, x, y, width, height, observer);
-        }
-
-        @Override
-        public boolean drawImage(Image img, int x, int y, int width, int height, Color bgcolor, ImageObserver observer) {
-            return delegate.drawImage(img, x, y, width, height, bgcolor, observer);
-        }
-
-        @Override
-        public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2,
-                                 int sx1, int sy1, int sx2, int sy2, ImageObserver observer) {
-            return delegate.drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, observer);
-        }
-
-        @Override
-        public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2,
-                                 int sx1, int sy1, int sx2, int sy2, Color bgcolor, ImageObserver observer) {
-            return delegate.drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, bgcolor, observer);
-        }
-
-        @Override
-        public void drawLine(int x1, int y1, int x2, int y2) {
-            delegate.drawLine(x1, y1, x2, y2);
-        }
-
-        @Override
-        public void drawOval(int x, int y, int width, int height) {
-            delegate.drawOval(x, y, width, height);
-        }
-
-        @Override
-        public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints) {
-            delegate.drawPolyline(xPoints, yPoints, nPoints);
-        }
-
-        @Override
-        public void drawRect(int x, int y, int width, int height) {
-            delegate.drawRect(x, y, width, height);
-        }
-
-        @Override
-        public void drawRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) {
-            delegate.drawRoundRect(x, y, width, height, arcWidth, arcHeight);
-        }
-
-        @Override
-        public void fillArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
-            delegate.fillArc(x, y, width, height, startAngle, arcAngle);
-        }
-
-        @Override
-        public void fillOval(int x, int y, int width, int height) {
-            delegate.fillOval(x, y, width, height);
-        }
-
-        @Override
-        public void fillRect(int x, int y, int width, int height) {
-            delegate.fillRect(x, y, width, height);
-        }
-
-        @Override
-        public void fillRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) {
-            delegate.fillRoundRect(x, y, width, height, arcWidth, arcHeight);
-        }
-
-        @Override
-        public Shape getClip() {
-            return delegate.getClip();
-        }
-
-        @Override
-        public Rectangle getClipBounds() {
-            return delegate.getClipBounds();
-        }
-
-        @Override
-        public Color getColor() {
-            return delegate.getColor();
-        }
-
-        @Override
-        public Font getFont() {
-            return delegate.getFont();
-        }
-
-        @Override
-        public FontMetrics getFontMetrics(Font f) {
-            return delegate.getFontMetrics(f);
-        }
-
-        @Override
-        public void setClip(int x, int y, int width, int height) {
-            delegate.setClip(x, y, width, height);
-        }
-
-        @Override
-        public void setClip(Shape clip) {
-            delegate.setClip(clip);
-        }
-
-        @Override
-        public void setFont(Font font) {
-            delegate.setFont(font);
-        }
-
-        @Override
-        public void setPaintMode() {
-            delegate.setPaintMode();
-        }
-
-        @Override
-        public void setXORMode(Color c1) {
-            delegate.setXORMode(c1);
-        }
-
-        @Override
-        public void drawChars(char[] data, int offset, int length, int x, int y) {
-            delegate.drawChars(data, offset, length, x, y);
-        }
-
-        @Override
-        public void drawBytes(byte[] data, int offset, int length, int x, int y) {
-            delegate.drawBytes(data, offset, length, x, y);
-        }
-
-    }
-}

src/test/java/ovh/gasser/newshapes/ui/visitors/HTMLDraftmanTest.java

@@ -11,7 +11,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 class HTMLDraftmanTest {
 
@@ -250,152 +249,6 @@ class HTMLDraftmanTest {
         }
     }
 
-    // ── visitPolygon ────────────────────────────────────────────────
-
-    @Nested
-    class VisitPolygonTests {
-
-        private static final String POLYGON_CLASS = "ovh.gasser.newshapes.shapes.SPolygon";
-
-        @Test
-        void testPolygonProducesSvgElement() {
-            assumeTrue(isPolygonFeatureAvailable(), "SPolygon/visitPolygon is not present in this checkout");
-
-            Object polygon = createPolygon(
-                    new Point(10, 20),
-                    new Point(60, 20),
-                    new Point(40, 80)
-            );
-
-            invokeVisitPolygon(polygon);
-
-            String html = html();
-            assertTrue(html.contains("<svg") && html.contains("class=\"poly"), "HTML should contain svg element with poly class");
-            assertTrue(html.contains("<polygon"), "HTML should contain polygon element");
-            assertTrue(html.contains("</svg>"), "HTML should close svg element");
-        }
-
-        @Test
-        void testPolygonSvgContainsCorrectPoints() {
-            assumeTrue(isPolygonFeatureAvailable(), "SPolygon/visitPolygon is not present in this checkout");
-
-            Object polygon = createPolygon(
-                    new Point(10, 20),
-                    new Point(60, 20),
-                    new Point(40, 80)
-            );
-
-            invokeVisitPolygon(polygon);
-
-            String html = html();
-            assertTrue(html.contains("points=\"10,20 60,20 40,80\""), "SVG polygon should contain correct points");
-        }
-
-        @Test
-        void testPolygonCssContainsCorrectPosition() {
-            assumeTrue(isPolygonFeatureAvailable(), "SPolygon/visitPolygon is not present in this checkout");
-
-            Object polygon = createPolygon(
-                    new Point(10, 20),
-                    new Point(60, 20),
-                    new Point(40, 80)
-            );
-
-            invokeVisitPolygon(polygon);
-
-            String cssOut = css();
-            assertTrue(cssOut.contains("position:"), "CSS should contain position");
-            assertTrue(cssOut.contains("top:"), "CSS should contain top position");
-            assertTrue(cssOut.contains("left:"), "CSS should contain left position");
-            assertTrue(cssOut.contains("width:"), "CSS should contain width");
-            assertTrue(cssOut.contains("height:"), "CSS should contain height");
-        }
-
-        @Test
-        void testPolygonSvgContainsFillAndStrokeAttributes() {
-            assumeTrue(isPolygonFeatureAvailable(), "SPolygon/visitPolygon is not present in this checkout");
-
-            Object polygon = createPolygon(
-                    new Point(10, 20),
-                    new Point(60, 20),
-                    new Point(40, 80)
-            );
-            addColorAttributes(polygon, new ColorAttributes(true, true, Color.RED, Color.BLUE));
-
-            invokeVisitPolygon(polygon);
-
-            String html = html();
-            assertTrue(html.contains("fill=\"#ff0000\""), "SVG polygon should contain fill color");
-            assertTrue(html.contains("stroke=\"#0000ff\""), "SVG polygon should contain stroke color");
-        }
-
-        private static boolean isPolygonFeatureAvailable() {
-            try {
-                Class.forName(POLYGON_CLASS);
-            } catch (ClassNotFoundException e) {
-                return false;
-            }
-
-            for (var method : HTMLDraftman.class.getMethods()) {
-                if (method.getName().equals("visitPolygon") && method.getParameterCount() == 1) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private Object createPolygon(Point... points) {
-            return createPolygon(java.util.List.of(points));
-        }
-
-        private Object createPolygon(java.util.List<Point> points) {
-            try {
-                Class<?> polygonClass = Class.forName(POLYGON_CLASS);
-                try {
-                    return polygonClass.getMethod("create", java.util.List.class).invoke(null, points);
-                } catch (NoSuchMethodException ignored) {
-                    return polygonClass.getMethod("create", Point[].class).invoke(null, (Object) points.toArray(new Point[0]));
-                }
-            } catch (java.lang.reflect.InvocationTargetException e) {
-                if (e.getCause() instanceof RuntimeException runtimeException) {
-                    throw runtimeException;
-                }
-                throw new IllegalStateException(e.getCause());
-            } catch (ReflectiveOperationException e) {
-                throw new IllegalStateException(e);
-            }
-        }
-
-        private void addColorAttributes(Object polygon, ColorAttributes attrs) {
-            for (var method : polygon.getClass().getMethods()) {
-                if (method.getName().equals("addAttributes") && method.getParameterCount() == 1) {
-                    try {
-                        method.invoke(polygon, attrs);
-                        return;
-                    } catch (ReflectiveOperationException e) {
-                        throw new IllegalStateException(e);
-                    }
-                }
-            }
-
-            throw new IllegalStateException("No addAttributes method found on polygon");
-        }
-
-        private void invokeVisitPolygon(Object polygon) {
-            try {
-                for (var method : draftman.getClass().getMethods()) {
-                    if (method.getName().equals("visitPolygon") && method.getParameterCount() == 1) {
-                        method.invoke(draftman, polygon);
-                        return;
-                    }
-                }
-                throw new IllegalStateException("No visitPolygon method found on HTMLDraftman");
-            } catch (ReflectiveOperationException e) {
-                throw new IllegalStateException(e);
-            }
-        }
-    }
-
     // ── visitText ───────────────────────────────────────────────────
 
     @Nested

src/test/java/ovh/gasser/newshapes/ui/visitors/SVGDraftmanTest.java

@@ -1,18 +1,14 @@
 package ovh.gasser.newshapes.ui.visitors;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import ovh.gasser.newshapes.attributes.Attributes;
 import ovh.gasser.newshapes.attributes.ColorAttributes;
 import ovh.gasser.newshapes.shapes.*;
 
 import java.awt.*;
-import java.lang.reflect.Method;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -212,107 +208,6 @@ class SVGDraftmanTest {
         }
     }
 
-    @Nested
-    class VisitPolygonTests {
-
-        private Object createPolygon(Point... points) {
-            try {
-                Class<?> polygonClass = Class.forName("ovh.gasser.newshapes.shapes.SPolygon");
-                try {
-                    Method createWithList = polygonClass.getMethod("create", List.class);
-                    return createWithList.invoke(null, List.of(points));
-                } catch (NoSuchMethodException ignored) {
-                    Method createWithVarargs = polygonClass.getMethod("create", Point[].class);
-                    return createWithVarargs.invoke(null, (Object) points);
-                }
-            } catch (ClassNotFoundException e) {
-                Assumptions.assumeTrue(false, "SPolygon is not available locally");
-                return null;
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        private void visitPolygon(Object polygon) {
-            try {
-                Method visitPolygon = null;
-                for (Method method : draftman.getClass().getMethods()) {
-                    if (method.getName().equals("visitPolygon")
-                            && method.getParameterCount() == 1
-                            && method.getParameterTypes()[0].isAssignableFrom(polygon.getClass())) {
-                        visitPolygon = method;
-                        break;
-                    }
-                }
-                if (visitPolygon == null) {
-                    Assumptions.assumeTrue(false, "SVGDraftman.visitPolygon is not available locally");
-                    return;
-                }
-                visitPolygon.invoke(draftman, polygon);
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        @Test
-        void testPolygonElementWithCorrectPoints() {
-            Object polygon = createPolygon(new Point(10, 20), new Point(30, 40), new Point(50, 60));
-            visitPolygon(polygon);
-
-            String svg = output();
-            assertTrue(svg.contains("<polygon"), "Should produce a <polygon> element");
-            assertTrue(svg.contains("points=\"10,20 30,40 50,60\""), "Should contain the correct points");
-        }
-
-        @Test
-        void testPolygonFilledOnly() {
-            Object polygon = createPolygon(new Point(0, 0), new Point(20, 0), new Point(10, 10));
-            try {
-                Method addAttributes = polygon.getClass().getMethod("addAttributes", Attributes.class);
-                addAttributes.invoke(polygon, new ColorAttributes(true, false, Color.RED, Color.BLACK));
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException(e);
-            }
-            visitPolygon(polygon);
-
-            String svg = output();
-            assertTrue(svg.contains("fill:#ff0000"), "Should contain fill style");
-            assertFalse(svg.contains("stroke:"), "Should not contain stroke style when not stroked");
-        }
-
-        @Test
-        void testPolygonStrokedOnly() {
-            Object polygon = createPolygon(new Point(0, 0), new Point(20, 0), new Point(10, 10));
-            try {
-                Method addAttributes = polygon.getClass().getMethod("addAttributes", Attributes.class);
-                addAttributes.invoke(polygon, new ColorAttributes(false, true, Color.RED, Color.BLUE));
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException(e);
-            }
-            visitPolygon(polygon);
-
-            String svg = output();
-            assertTrue(svg.contains("stroke:#0000ff"), "Should contain stroke style");
-            assertTrue(svg.contains("fill:none"), "Should have fill:none when not filled");
-        }
-
-        @Test
-        void testPolygonFilledAndStroked() {
-            Object polygon = createPolygon(new Point(0, 0), new Point(20, 0), new Point(10, 10));
-            try {
-                Method addAttributes = polygon.getClass().getMethod("addAttributes", Attributes.class);
-                addAttributes.invoke(polygon, new ColorAttributes(true, true, Color.YELLOW, Color.BLACK));
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException(e);
-            }
-            visitPolygon(polygon);
-
-            String svg = output();
-            assertTrue(svg.contains("fill:#ffff00"), "Should contain fill style");
-            assertTrue(svg.contains("stroke:#000000"), "Should contain stroke style");
-        }
-    }
-
     // ── visitText ───────────────────────────────────────────────────
 
     @Nested