Add parameterized ShapeContractTest for Shape interface invariants

Verify clone(), getBounds(), and translate() contracts across all Shape
implementations (SRectangle, SCircle, STriangle, SText, SCollection)
using @ParameterizedTest + @MethodSource.

Also adds junit-jupiter-params dependency to pom.xml.

Closes #8

.gitea/workflows/ci.yaml

@@ -20,11 +20,11 @@ jobs:
           distribution: 'temurin'
 
       - name: Build and test with coverage
-        run: ./mvnw verify --batch-mode
+        run: mvn verify --batch-mode
 
       - name: Upload coverage report
         if: always()
-        uses: https://gitea.com/actions/gitea-upload-artifact@v4
+        uses: actions/upload-artifact@v4
         with:
           name: jacoco-report
           path: target/site/jacoco/

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +0,0 @@
-wrapperVersion=3.3.4
-distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip

TODO.md

@@ -1,6 +1,6 @@
 # TODO
 
-- [X] Box selection (drag to select multiple shapes)
+- [ ] Box selection (drag to select multiple shapes)
 - [ ] Undo/redo stack
 - [ ] Copy/paste functionality
 - [ ] Group/Ungroup shapes

mvnw

@@ -1,295 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.3.4
-#
-# Optional ENV vars
-# -----------------
-#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
-#   MVNW_REPOURL - repo url base for downloading maven distribution
-#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
-#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
-# ----------------------------------------------------------------------------
-
-set -euf
-[ "${MVNW_VERBOSE-}" != debug ] || set -x
-
-# OS specific support.
-native_path() { printf %s\\n "$1"; }
-case "$(uname)" in
-CYGWIN* | MINGW*)
-  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
-  native_path() { cygpath --path --windows "$1"; }
-  ;;
-esac
-
-# set JAVACMD and JAVACCMD
-set_java_home() {
-  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
-  if [ -n "${JAVA_HOME-}" ]; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-      JAVACCMD="$JAVA_HOME/jre/sh/javac"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-      JAVACCMD="$JAVA_HOME/bin/javac"
-
-      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
-        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
-        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
-        return 1
-      fi
-    fi
-  else
-    JAVACMD="$(
-      'set' +e
-      'unset' -f command 2>/dev/null
-      'command' -v java
-    )" || :
-    JAVACCMD="$(
-      'set' +e
-      'unset' -f command 2>/dev/null
-      'command' -v javac
-    )" || :
-
-    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
-      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
-      return 1
-    fi
-  fi
-}
-
-# hash string like Java String::hashCode
-hash_string() {
-  str="${1:-}" h=0
-  while [ -n "$str" ]; do
-    char="${str%"${str#?}"}"
-    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
-    str="${str#?}"
-  done
-  printf %x\\n $h
-}
-
-verbose() { :; }
-[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
-
-die() {
-  printf %s\\n "$1" >&2
-  exit 1
-}
-
-trim() {
-  # MWRAPPER-139:
-  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
-  #   Needed for removing poorly interpreted newline sequences when running in more
-  #   exotic environments such as mingw bash on Windows.
-  printf "%s" "${1}" | tr -d '[:space:]'
-}
-
-scriptDir="$(dirname "$0")"
-scriptName="$(basename "$0")"
-
-# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
-while IFS="=" read -r key value; do
-  case "${key-}" in
-  distributionUrl) distributionUrl=$(trim "${value-}") ;;
-  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
-  esac
-done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
-[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
-
-case "${distributionUrl##*/}" in
-maven-mvnd-*bin.*)
-  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
-  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
-  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
-  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
-  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
-  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
-  *)
-    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
-    distributionPlatform=linux-amd64
-    ;;
-  esac
-  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
-  ;;
-maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
-*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
-esac
-
-# apply MVNW_REPOURL and calculate MAVEN_HOME
-# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
-[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
-distributionUrlName="${distributionUrl##*/}"
-distributionUrlNameMain="${distributionUrlName%.*}"
-distributionUrlNameMain="${distributionUrlNameMain%-bin}"
-MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
-MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
-
-exec_maven() {
-  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
-  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
-}
-
-if [ -d "$MAVEN_HOME" ]; then
-  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
-  exec_maven "$@"
-fi
-
-case "${distributionUrl-}" in
-*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
-*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
-esac
-
-# prepare tmp dir
-if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
-  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
-  trap clean HUP INT TERM EXIT
-else
-  die "cannot create temp dir"
-fi
-
-mkdir -p -- "${MAVEN_HOME%/*}"
-
-# Download and Install Apache Maven
-verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
-verbose "Downloading from: $distributionUrl"
-verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
-
-# select .zip or .tar.gz
-if ! command -v unzip >/dev/null; then
-  distributionUrl="${distributionUrl%.zip}.tar.gz"
-  distributionUrlName="${distributionUrl##*/}"
-fi
-
-# verbose opt
-__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
-[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
-
-# normalize http auth
-case "${MVNW_PASSWORD:+has-password}" in
-'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
-has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
-esac
-
-if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
-  verbose "Found wget ... using wget"
-  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
-elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
-  verbose "Found curl ... using curl"
-  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
-elif set_java_home; then
-  verbose "Falling back to use Java to download"
-  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
-  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
-  cat >"$javaSource" <<-END
-	public class Downloader extends java.net.Authenticator
-	{
-	  protected java.net.PasswordAuthentication getPasswordAuthentication()
-	  {
-	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
-	  }
-	  public static void main( String[] args ) throws Exception
-	  {
-	    setDefault( new Downloader() );
-	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
-	  }
-	}
-	END
-  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
-  verbose " - Compiling Downloader.java ..."
-  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
-  verbose " - Running Downloader.java ..."
-  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
-fi
-
-# If specified, validate the SHA-256 sum of the Maven distribution zip file
-if [ -n "${distributionSha256Sum-}" ]; then
-  distributionSha256Result=false
-  if [ "$MVN_CMD" = mvnd.sh ]; then
-    echo "Checksum validation is not supported for maven-mvnd." >&2
-    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
-    exit 1
-  elif command -v sha256sum >/dev/null; then
-    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
-      distributionSha256Result=true
-    fi
-  elif command -v shasum >/dev/null; then
-    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
-      distributionSha256Result=true
-    fi
-  else
-    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
-    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
-    exit 1
-  fi
-  if [ $distributionSha256Result = false ]; then
-    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
-    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
-    exit 1
-  fi
-fi
-
-# unzip and move
-if command -v unzip >/dev/null; then
-  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
-else
-  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
-fi
-
-# Find the actual extracted directory name (handles snapshots where filename != directory name)
-actualDistributionDir=""
-
-# First try the expected directory name (for regular distributions)
-if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
-  if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
-    actualDistributionDir="$distributionUrlNameMain"
-  fi
-fi
-
-# If not found, search for any directory with the Maven executable (for snapshots)
-if [ -z "$actualDistributionDir" ]; then
-  # enable globbing to iterate over items
-  set +f
-  for dir in "$TMP_DOWNLOAD_DIR"/*; do
-    if [ -d "$dir" ]; then
-      if [ -f "$dir/bin/$MVN_CMD" ]; then
-        actualDistributionDir="$(basename "$dir")"
-        break
-      fi
-    fi
-  done
-  set -f
-fi
-
-if [ -z "$actualDistributionDir" ]; then
-  verbose "Contents of $TMP_DOWNLOAD_DIR:"
-  verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
-  die "Could not find Maven distribution directory in extracted archive"
-fi
-
-verbose "Found extracted Maven distribution directory: $actualDistributionDir"
-printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
-mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
-
-clean || :
-exec_maven "$@"

pom.xml

@@ -15,7 +15,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
                 <configuration>
                     <source>16</source>
                     <target>16</target>
@@ -29,7 +28,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.13</version>
+                <version>0.8.11</version>
                 <executions>
                     <execution>
                         <goals>
@@ -71,13 +70,13 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.16</version>
+            <version>RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.5.12</version>
+            <version>RELEASE</version>
         </dependency>
 
         <dependency>

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

@@ -5,15 +5,6 @@ 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;
@@ -22,28 +13,18 @@ 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 static final Logger logger = LoggerFactory.getLogger(Controller.class);
+    private final static 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;
@@ -54,24 +35,11 @@ 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
@@ -86,7 +54,14 @@ public class Controller {
 
             @Override
             public void mouseReleased(MouseEvent evt) {
-                handleMouseReleased(evt);
+                resizing = false;
+                activeHandle = null;
+                resizeOrigin = null;
+                boxSelecting = false;
+                selectionBoxStart = null;
+                selectionBoxEnd = null;
+                view.setCurrentSelectionBox(null);
+                view.repaint();
             }
         };
         this.view.addMouseMotionListener(adapter);
@@ -99,249 +74,6 @@ 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();
@@ -352,19 +84,35 @@ 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 (!selection.isEmpty()) {
+        } else if (resizeMode && !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);
             }
@@ -379,17 +127,18 @@ public class Controller {
             return;
         }
 
-        resizeDragState();
+        resizing = false;
-        boxSelecting = false;
+        activeHandle = null;
-        view.setCurrentSelectionBox(null);
+        resizeOrigin = 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;
             }
@@ -402,86 +151,96 @@ public class Controller {
                                 resetSelection();
                             }
                             if (!selection.getSelectedShapes().contains(s)) {
+                                lastMousePos = evt.getPoint();
                                 selection.add(s);
+                                logger.debug("Selecting {}", s);
                             }
-                            beginDrag(evt.getPoint());
                         },
                         () -> {
-                            additiveBoxSelection = evt.isShiftDown();
+                            // Clicked on empty space - start box selection
-                            if (!additiveBoxSelection) {
+                            resetSelection();
-                                resetSelection();
-                            }
                             selectionBoxStart = evt.getPoint();
-                            selectionBoxEnd = evt.getPoint();
                             boxSelecting = true;
-                            dragStartMousePos = null;
-                            dragStartBounds = Map.of();
                         }
                 );
     }
 
-    private void handleMouseReleased(MouseEvent evt) {
+    private void placeTextAt(Point point) {
-        finishDragCommand();
+        String input = JOptionPane.showInputDialog(view, "Enter text:", "Add text", JOptionPane.PLAIN_MESSAGE);
-        resizeDragState();
+        addingText = false;
-        boxSelecting = false;
+        if (input == null) {
-        selectionBoxStart = null;
+            return;
-        selectionBoxEnd = null;
+        }
-        dragStartMousePos = null;
+
-        dragStartBounds = Map.of();
+        model.add(SText.create(point.x, point.y, input));
-        view.setCurrentSelectionBox(null);
+        resetSelection();
         view.repaint();
     }
 
-    private void handleKeyPressed(KeyEvent evt) {
+    public void enterTextMode() {
-        int modifiers = evt.getModifiersEx();
+        addingText = true;
+    }
 
-        if ((modifiers & InputEvent.CTRL_DOWN_MASK) != 0) {
+    private ResizeHandle getHandleAt(Point point) {
-            switch (evt.getKeyCode()) {
+        final int handleSize = 10;
-                case KeyEvent.VK_Z -> {
+        for (Shape shape : selection) {
-                    if ((modifiers & InputEvent.SHIFT_DOWN_MASK) != 0) {
+            Rectangle bounds = shape.getBounds();
-                        redo();
+            
-                    } else {
+            // Always-present SE corner handle
-                        undo();
+            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) {
-                    evt.consume();
+                return ResizeHandle.SE;
-                    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;
                 }
-                case KeyEvent.VK_Y -> {
+                // NE corner
-                    redo();
+                if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
-                    evt.consume();
+                    point.y >= bounds.y - handleSize && point.y <= bounds.y) {
-                    return;
+                    return ResizeHandle.NE;
                 }
-                case KeyEvent.VK_C -> {
+                // SW corner
-                    copySelection();
+                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
-                    evt.consume();
+                    point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
-                    return;
+                    return ResizeHandle.SW;
                 }
-                case KeyEvent.VK_X -> {
+                // N edge
-                    cutSelection();
+                int edgeX = bounds.x + bounds.width / 2 - handleSize / 2;
-                    evt.consume();
+                if (point.x >= edgeX && point.x <= edgeX + handleSize &&
-                    return;
+                    point.y >= bounds.y - handleSize && point.y <= bounds.y) {
+                    return ResizeHandle.N;
                 }
-                case KeyEvent.VK_V -> {
+                // S edge
-                    pasteClipboard();
+                if (point.x >= edgeX && point.x <= edgeX + handleSize &&
-                    evt.consume();
+                    point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
-                    return;
+                    return ResizeHandle.S;
                 }
-                case KeyEvent.VK_G -> {
+                // W edge
-                    group();
+                int edgeY = bounds.y + bounds.height / 2 - handleSize / 2;
-                    evt.consume();
+                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
-                    return;
+                    point.y >= edgeY && point.y <= edgeY + handleSize) {
+                    return ResizeHandle.W;
                 }
-                case KeyEvent.VK_U -> {
+                // E edge
-                    ungroup();
+                if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
-                    evt.consume();
+                    point.y >= edgeY && point.y <= edgeY + handleSize) {
-                    return;
+                    return ResizeHandle.E;
                 }
             }
         }
+        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());
@@ -505,134 +264,55 @@ public class Controller {
         }
     }
 
-    private void placeTextAt(Point point) {
+    private void changeSelectionColor(){
-        String input = JOptionPane.showInputDialog(view, "Enter text:", "Add text", JOptionPane.PLAIN_MESSAGE);
+        if (selection == null) {
-        addingText = false;
+            logger.debug("No selection to change color of");
-        if (input == null) {
             return;
         }
 
-        addShape(SText.create(point.x, point.y, input));
+        for (Shape s : selection) {
-        resetSelection();
+            if (s instanceof SCollection collection) {
+                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))));
+            }
+        }
+
+        view.repaint();
     }
 
-    private ResizeHandle getHandleAt(Point point) {
+    private void copySelection() {
-        final int handleSize = 10;
+        if (selection == null) {
+            logger.debug("No selection to copy");
+            return;
+        }
+
         for (Shape shape : selection) {
-            Rectangle bounds = shape.getBounds();
+            this.model.add(shape.clone());
-
-            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 changeColors(Function<Shape, ColorAttributes> updater) {
+    public void deleteSelected() {
-        Map<Shape, ColorAttributes> before = new LinkedHashMap<>();
+        if (selection == null) return;
-        Map<Shape, ColorAttributes> after = new LinkedHashMap<>();
+        logger.debug("Deleting selected shape(s)");
-        List<Shape> targets = flattenSelection(selection.getSelectedShapes());
+        for (Shape s : selection) {
-
+            this.model.remove(s);
-        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));
         }
-
+        resetSelection();
-        if (before.isEmpty()) {
-            return;
-        }
-
-        executeAndRefresh(new ChangeColorCommand(before.keySet(), before, after));
-    }
-
-    private void beginDrag(Point point) {
-        lastMousePos = point;
-        dragStartMousePos = point;
-        dragStartBounds = captureBounds(selection.getSelectedShapes());
-    }
-
-    private void finishDragCommand() {
-        if (boxSelecting || dragStartBounds.isEmpty()) {
-            return;
-        }
-
-        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()))
@@ -648,71 +328,9 @@ public class Controller {
     }
 
     private void updateSelectionFromBox(Rectangle box) {
-        if (!additiveBoxSelection) {
+        resetSelection();
-            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/ShapeDraftman.java

@@ -117,30 +117,6 @@ public class ShapeDraftman implements ShapeVisitor {
         drawHandlerIfSelected(text);
     }
 
-    @Override
-    public void visitPolygon(SPolygon polygon) {
-        ColorAttributes colAttrs = (ColorAttributes) polygon.getAttributes(ColorAttributes.ID);
-        if (colAttrs == null) {
-            colAttrs = DEFAULT_COLOR_ATTRIBUTES;
-        }
-
-        java.util.List<Point> points = polygon.getPoints();
-        int[] xPoints = points.stream().mapToInt(p -> p.x).toArray();
-        int[] yPoints = points.stream().mapToInt(p -> p.y).toArray();
-        int nPoints = points.size();
-
-        if (colAttrs.filled) {
-            this.g2d.setColor(colAttrs.filledColor);
-            this.g2d.fillPolygon(xPoints, yPoints, nPoints);
-        }
-        if (colAttrs.stroked) {
-            this.g2d.setColor(colAttrs.strokedColor);
-            this.g2d.drawPolygon(xPoints, yPoints, nPoints);
-        }
-
-        drawHandlerIfSelected(polygon);
-    }
-
     private Color resolveTextColor(ColorAttributes attrs) {
         if (attrs == null) {
             return Color.BLACK;

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

@@ -16,12 +16,8 @@ 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, onModelChanged);
+        this.controller = new Controller(this, model);
     }
 
     @Override

src/test/java/ovh/gasser/newshapes/attributes/ColorAttributesTest.java

@@ -1,129 +0,0 @@
-package ovh.gasser.newshapes.attributes;
-
-import org.junit.jupiter.api.Test;
-
-import java.awt.*;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class ColorAttributesTest {
-
-    @Test
-    void testConstructorStoresFilledFlag() {
-        ColorAttributes attrs = new ColorAttributes(true, false, Color.RED, Color.BLACK);
-        assertTrue(attrs.filled, "filled flag should be true when constructed with true");
-    }
-
-    @Test
-    void testConstructorStoresStrokedFlag() {
-        ColorAttributes attrs = new ColorAttributes(false, true, Color.RED, Color.BLACK);
-        assertTrue(attrs.stroked, "stroked flag should be true when constructed with true");
-    }
-
-    @Test
-    void testConstructorStoresFilledColor() {
-        ColorAttributes attrs = new ColorAttributes(true, false, Color.BLUE, Color.BLACK);
-        assertEquals(Color.BLUE, attrs.filledColor, "filledColor should match the constructor argument");
-    }
-
-    @Test
-    void testConstructorStoresStrokedColor() {
-        ColorAttributes attrs = new ColorAttributes(false, true, Color.RED, Color.GREEN);
-        assertEquals(Color.GREEN, attrs.strokedColor, "strokedColor should match the constructor argument");
-    }
-
-    @Test
-    void testFilledAndStrokedBothTrue() {
-        ColorAttributes attrs = new ColorAttributes(true, true, Color.RED, Color.BLUE);
-        assertTrue(attrs.filled);
-        assertTrue(attrs.stroked);
-    }
-
-    @Test
-    void testFilledAndStrokedBothFalse() {
-        ColorAttributes attrs = new ColorAttributes(false, false, Color.RED, Color.BLUE);
-        assertFalse(attrs.filled);
-        assertFalse(attrs.stroked);
-    }
-
-    @Test
-    void testNullFilledColor() {
-        ColorAttributes attrs = new ColorAttributes(true, false, null, Color.BLACK);
-        assertNull(attrs.filledColor, "filledColor should accept null");
-    }
-
-    @Test
-    void testNullStrokedColor() {
-        ColorAttributes attrs = new ColorAttributes(false, true, Color.RED, null);
-        assertNull(attrs.strokedColor, "strokedColor should accept null");
-    }
-
-    @Test
-    void testBothColorsNull() {
-        ColorAttributes attrs = new ColorAttributes(false, false, null, null);
-        assertNull(attrs.filledColor);
-        assertNull(attrs.strokedColor);
-    }
-
-    @Test
-    void testGetIDReturnsCorrectValue() {
-        ColorAttributes attrs = new ColorAttributes(false, false, Color.RED, Color.BLACK);
-        assertEquals(ColorAttributes.ID, attrs.getID());
-    }
-
-    @Test
-    void testIDConstant() {
-        assertEquals("COLOR_ATTRS", ColorAttributes.ID);
-    }
-
-    @Test
-    void testImplementsAttributes() {
-        ColorAttributes attrs = new ColorAttributes(false, false, Color.RED, Color.BLACK);
-        assertInstanceOf(Attributes.class, attrs);
-    }
-
-    @Test
-    void testToStringContainsAllFields() {
-        ColorAttributes attrs = new ColorAttributes(true, false, Color.RED, Color.BLUE);
-        String str = attrs.toString();
-        assertTrue(str.contains("filled=true"), "toString should contain filled value");
-        assertTrue(str.contains("stroked=false"), "toString should contain stroked value");
-        assertTrue(str.contains("filledColor"), "toString should contain filledColor");
-        assertTrue(str.contains("strokedColor"), "toString should contain strokedColor");
-    }
-
-    @Test
-    void testToStringWithNullColors() {
-        ColorAttributes attrs = new ColorAttributes(false, false, null, null);
-        String str = attrs.toString();
-        assertNotNull(str, "toString should not throw with null colors");
-        assertTrue(str.contains("filledColor=null"), "toString should show null filledColor");
-        assertTrue(str.contains("strokedColor=null"), "toString should show null strokedColor");
-    }
-
-    @Test
-    void testTwoInstancesAreIndependent() {
-        ColorAttributes attrs1 = new ColorAttributes(true, false, Color.RED, Color.BLACK);
-        ColorAttributes attrs2 = new ColorAttributes(false, true, Color.BLUE, Color.GREEN);
-
-        assertTrue(attrs1.filled);
-        assertFalse(attrs2.filled);
-        assertFalse(attrs1.stroked);
-        assertTrue(attrs2.stroked);
-        assertEquals(Color.RED, attrs1.filledColor);
-        assertEquals(Color.BLUE, attrs2.filledColor);
-    }
-
-    @Test
-    void testFieldsAreImmutable() {
-        Color fillColor = Color.RED;
-        Color strokeColor = Color.BLACK;
-        ColorAttributes attrs = new ColorAttributes(true, true, fillColor, strokeColor);
-
-        // Since fields are final, verify they retain their values
-        assertEquals(Color.RED, attrs.filledColor);
-        assertEquals(Color.BLACK, attrs.strokedColor);
-        assertTrue(attrs.filled);
-        assertTrue(attrs.stroked);
-    }
-}

src/test/java/ovh/gasser/newshapes/attributes/SelectionAttributesTest.java

@@ -1,72 +0,0 @@
-package ovh.gasser.newshapes.attributes;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class SelectionAttributesTest {
-
-    @Test
-    void testDefaultConstructorIsUnselected() {
-        SelectionAttributes attrs = new SelectionAttributes();
-        assertFalse(attrs.selected, "Default constructor should create unselected state");
-    }
-
-    @Test
-    void testConstructorWithTrue() {
-        SelectionAttributes attrs = new SelectionAttributes(true);
-        assertTrue(attrs.selected, "Constructor with true should create selected state");
-    }
-
-    @Test
-    void testConstructorWithFalse() {
-        SelectionAttributes attrs = new SelectionAttributes(false);
-        assertFalse(attrs.selected, "Constructor with false should create unselected state");
-    }
-
-    @Test
-    void testGetIDReturnsCorrectValue() {
-        SelectionAttributes attrs = new SelectionAttributes();
-        assertEquals(SelectionAttributes.ID, attrs.getID());
-    }
-
-    @Test
-    void testIDConstant() {
-        assertEquals("SELECTION_ATTRS", SelectionAttributes.ID);
-    }
-
-    @Test
-    void testImplementsAttributes() {
-        SelectionAttributes attrs = new SelectionAttributes();
-        assertInstanceOf(Attributes.class, attrs);
-    }
-
-    @Test
-    void testSelectedFieldCanBeToggled() {
-        SelectionAttributes attrs = new SelectionAttributes(false);
-        assertFalse(attrs.selected);
-
-        attrs.selected = true;
-        assertTrue(attrs.selected);
-
-        attrs.selected = false;
-        assertFalse(attrs.selected);
-    }
-
-    @Test
-    void testTwoInstancesAreIndependent() {
-        SelectionAttributes attrs1 = new SelectionAttributes(true);
-        SelectionAttributes attrs2 = new SelectionAttributes(false);
-
-        assertNotEquals(attrs1.selected, attrs2.selected);
-
-        attrs2.selected = true;
-        assertTrue(attrs1.selected);
-        assertTrue(attrs2.selected);
-
-        // Mutating one doesn't affect the other
-        attrs1.selected = false;
-        assertFalse(attrs1.selected);
-        assertTrue(attrs2.selected);
-    }
-}

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

@@ -1,94 +0,0 @@
-package ovh.gasser.newshapes.shapes;
-
-import org.junit.jupiter.api.Test;
-import java.awt.Cursor;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class ResizeHandleTest {
-
-    @Test
-    void testEightHandlesExist() {
-        assertEquals(8, ResizeHandle.values().length,
-                "ResizeHandle enum should define exactly 8 handles");
-    }
-
-    @Test
-    void testAllHandleNamesExist() {
-        assertNotNull(ResizeHandle.valueOf("NW"), "Handle NW should exist");
-        assertNotNull(ResizeHandle.valueOf("N"),  "Handle N should exist");
-        assertNotNull(ResizeHandle.valueOf("NE"), "Handle NE should exist");
-        assertNotNull(ResizeHandle.valueOf("E"),  "Handle E should exist");
-        assertNotNull(ResizeHandle.valueOf("SE"), "Handle SE should exist");
-        assertNotNull(ResizeHandle.valueOf("S"),  "Handle S should exist");
-        assertNotNull(ResizeHandle.valueOf("SW"), "Handle SW should exist");
-        assertNotNull(ResizeHandle.valueOf("W"),  "Handle W should exist");
-    }
-
-    @Test
-    void testNwMapsToCorrectCursorType() {
-        assertEquals(Cursor.NW_RESIZE_CURSOR, ResizeHandle.NW.getCursorType(),
-                "NW handle should map to Cursor.NW_RESIZE_CURSOR");
-    }
-
-    @Test
-    void testNMapsToCorrectCursorType() {
-        assertEquals(Cursor.N_RESIZE_CURSOR, ResizeHandle.N.getCursorType(),
-                "N handle should map to Cursor.N_RESIZE_CURSOR");
-    }
-
-    @Test
-    void testNeMapsToCorrectCursorType() {
-        assertEquals(Cursor.NE_RESIZE_CURSOR, ResizeHandle.NE.getCursorType(),
-                "NE handle should map to Cursor.NE_RESIZE_CURSOR");
-    }
-
-    @Test
-    void testEMapsToCorrectCursorType() {
-        assertEquals(Cursor.E_RESIZE_CURSOR, ResizeHandle.E.getCursorType(),
-                "E handle should map to Cursor.E_RESIZE_CURSOR");
-    }
-
-    @Test
-    void testSeMapsToCorrectCursorType() {
-        assertEquals(Cursor.SE_RESIZE_CURSOR, ResizeHandle.SE.getCursorType(),
-                "SE handle should map to Cursor.SE_RESIZE_CURSOR");
-    }
-
-    @Test
-    void testSMapsToCorrectCursorType() {
-        assertEquals(Cursor.S_RESIZE_CURSOR, ResizeHandle.S.getCursorType(),
-                "S handle should map to Cursor.S_RESIZE_CURSOR");
-    }
-
-    @Test
-    void testSwMapsToCorrectCursorType() {
-        assertEquals(Cursor.SW_RESIZE_CURSOR, ResizeHandle.SW.getCursorType(),
-                "SW handle should map to Cursor.SW_RESIZE_CURSOR");
-    }
-
-    @Test
-    void testWMapsToCorrectCursorType() {
-        assertEquals(Cursor.W_RESIZE_CURSOR, ResizeHandle.W.getCursorType(),
-                "W handle should map to Cursor.W_RESIZE_CURSOR");
-    }
-
-    @Test
-    void testValueOfReturnsCorrectConstant() {
-        assertSame(ResizeHandle.NW, ResizeHandle.valueOf("NW"), "valueOf(\"NW\") should return ResizeHandle.NW");
-        assertSame(ResizeHandle.N,  ResizeHandle.valueOf("N"),  "valueOf(\"N\") should return ResizeHandle.N");
-        assertSame(ResizeHandle.NE, ResizeHandle.valueOf("NE"), "valueOf(\"NE\") should return ResizeHandle.NE");
-        assertSame(ResizeHandle.E,  ResizeHandle.valueOf("E"),  "valueOf(\"E\") should return ResizeHandle.E");
-        assertSame(ResizeHandle.SE, ResizeHandle.valueOf("SE"), "valueOf(\"SE\") should return ResizeHandle.SE");
-        assertSame(ResizeHandle.S,  ResizeHandle.valueOf("S"),  "valueOf(\"S\") should return ResizeHandle.S");
-        assertSame(ResizeHandle.SW, ResizeHandle.valueOf("SW"), "valueOf(\"SW\") should return ResizeHandle.SW");
-        assertSame(ResizeHandle.W,  ResizeHandle.valueOf("W"),  "valueOf(\"W\") should return ResizeHandle.W");
-    }
-
-    @Test
-    void testValueOfWithInvalidNameThrowsIllegalArgumentException() {
-        assertThrows(IllegalArgumentException.class,
-                () -> ResizeHandle.valueOf("INVALID"),
-                "valueOf() with an unknown name should throw IllegalArgumentException");
-    }
-}

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

@@ -1,128 +0,0 @@
-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/visitors/HTMLDraftmanTest.java

@@ -1,409 +0,0 @@
-package ovh.gasser.newshapes.ui.visitors;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import ovh.gasser.newshapes.attributes.ColorAttributes;
-import ovh.gasser.newshapes.shapes.*;
-
-import java.awt.*;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class HTMLDraftmanTest {
-
-    private StringWriter htmlBuffer;
-    private StringWriter cssBuffer;
-    private PrintWriter htmlWriter;
-    private PrintWriter cssWriter;
-    private HTMLDraftman draftman;
-
-    @BeforeEach
-    void setUp() {
-        htmlBuffer = new StringWriter();
-        cssBuffer = new StringWriter();
-        htmlWriter = new PrintWriter(htmlBuffer);
-        cssWriter = new PrintWriter(cssBuffer);
-        draftman = new HTMLDraftman(htmlWriter, cssWriter);
-    }
-
-    private String html() {
-        htmlWriter.flush();
-        return htmlBuffer.toString();
-    }
-
-    private String css() {
-        cssWriter.flush();
-        return cssBuffer.toString();
-    }
-
-    // ── visitRectangle ──────────────────────────────────────────────
-
-    @Nested
-    class VisitRectangleTests {
-
-        @Test
-        void testRectangleProducesDivWithId() {
-            SRectangle rect = SRectangle.create(10, 20, 100, 50);
-            draftman.visitRectangle(rect);
-
-            assertTrue(html().contains("<div id=\"rec"), "Should produce a div with rec id");
-        }
-
-        @Test
-        void testRectangleCssContainsCorrectPosition() {
-            SRectangle rect = SRectangle.create(10, 20, 100, 50);
-            draftman.visitRectangle(rect);
-
-            String cssOut = css();
-            assertTrue(cssOut.contains("top:20px"), "CSS should contain correct top");
-            assertTrue(cssOut.contains("left:10px"), "CSS should contain correct left");
-        }
-
-        @Test
-        void testRectangleCssContainsCorrectDimensions() {
-            SRectangle rect = SRectangle.create(10, 20, 100, 50);
-            draftman.visitRectangle(rect);
-
-            String cssOut = css();
-            assertTrue(cssOut.contains("width:100px"), "CSS should contain correct width");
-            assertTrue(cssOut.contains("height:50px"), "CSS should contain correct height");
-        }
-
-        @Test
-        void testRectangleCssPositionIsAbsolute() {
-            SRectangle rect = SRectangle.create(0, 0, 30, 30);
-            draftman.visitRectangle(rect);
-
-            assertTrue(css().contains("position:absolute"), "CSS should use absolute positioning");
-        }
-
-        @Test
-        void testRectangleHtmlIdMatchesCssSelector() {
-            SRectangle rect = SRectangle.create(0, 0, 30, 30);
-            draftman.visitRectangle(rect);
-
-            String id = "rec" + rect.hashCode();
-            assertTrue(html().contains("id=\"" + id + "\""), "HTML should contain div with correct id");
-            assertTrue(css().contains("#" + id), "CSS should reference same id");
-        }
-
-        @Test
-        void testRectangleFilledAndStroked() {
-            SRectangle rect = SRectangle.create(0, 0, 30, 30);
-            rect.addAttributes(new ColorAttributes(true, true, Color.RED, Color.BLUE));
-            draftman.visitRectangle(rect);
-
-            String cssOut = css();
-            assertTrue(cssOut.contains("background:"), "CSS should contain background");
-            assertTrue(cssOut.contains("border:"), "CSS should contain border");
-        }
-
-        @Test
-        void testRectangleFilledOnly() {
-            SRectangle rect = SRectangle.create(0, 0, 30, 30);
-            rect.addAttributes(new ColorAttributes(true, false, Color.RED, Color.BLACK));
-            draftman.visitRectangle(rect);
-
-            String cssOut = css();
-            assertTrue(cssOut.contains("background:"), "CSS should contain background for filled");
-            assertFalse(cssOut.contains("border:"), "CSS should not contain border when not stroked");
-        }
-
-        @Test
-        void testRectangleStrokedOnly() {
-            SRectangle rect = SRectangle.create(0, 0, 30, 30);
-            rect.addAttributes(new ColorAttributes(false, true, Color.RED, Color.BLUE));
-            draftman.visitRectangle(rect);
-
-            String cssOut = css();
-            assertTrue(cssOut.contains("border:"), "CSS should contain border for stroked");
-            assertTrue(cssOut.contains("background:#ffffff"), "CSS should have white background when not filled");
-        }
-
-        @Test
-        void testRectangleNeitherFilledNorStroked() {
-            SRectangle rect = SRectangle.create(0, 0, 30, 30);
-            rect.addAttributes(new ColorAttributes(false, false, Color.RED, Color.BLUE));
-            draftman.visitRectangle(rect);
-
-            String cssOut = css();
-            assertFalse(cssOut.contains("background:"), "CSS should not contain background");
-            assertFalse(cssOut.contains("border:"), "CSS should not contain border");
-        }
-    }
-
-    // ── visitCircle ─────────────────────────────────────────────────
-
-    @Nested
-    class VisitCircleTests {
-
-        @Test
-        void testCircleProducesDivWithClass() {
-            SCircle circle = SCircle.create(50, 60, 30);
-            draftman.visitCircle(circle);
-
-            assertTrue(html().contains("circle"), "HTML should contain circle class div");
-        }
-
-        @Test
-        void testCircleCssContainsBorderRadius() {
-            SCircle circle = SCircle.create(50, 60, 30);
-            draftman.visitCircle(circle);
-
-            String cssOut = css();
-            assertTrue(cssOut.contains("border-radius:"), "CSS should contain border-radius");
-            assertTrue(cssOut.contains("-webkit-border-radius:"), "CSS should contain webkit prefix");
-            assertTrue(cssOut.contains("-moz-border-radius:"), "CSS should contain moz prefix");
-        }
-
-        @Test
-        void testCircleCssContainsCorrectPosition() {
-            SCircle circle = SCircle.create(50, 60, 30);
-            draftman.visitCircle(circle);
-
-            String cssOut = css();
-            assertTrue(cssOut.contains("top:60px"), "CSS should contain correct top");
-            assertTrue(cssOut.contains("left:50px"), "CSS should contain correct left");
-        }
-
-        @Test
-        void testCircleHtmlClassMatchesCssSelector() {
-            SCircle circle = SCircle.create(0, 0, 20);
-            draftman.visitCircle(circle);
-
-            String className = "circle" + circle.hashCode();
-            assertTrue(html().contains(className), "HTML should have circle class");
-            assertTrue(css().contains("." + className), "CSS should reference same class");
-        }
-    }
-
-    // ── visitTriangle ───────────────────────────────────────────────
-
-    @Nested
-    class VisitTriangleTests {
-
-        @Test
-        void testTriangleProducesDivWithClass() {
-            STriangle tri = STriangle.create(10, 20, 40, Color.RED, Color.BLACK);
-            draftman.visitTriangle(tri);
-
-            assertTrue(html().contains("triangle"), "HTML should contain triangle class div");
-        }
-
-        @Test
-        void testTriangleCssContainsBorderTrick() {
-            STriangle tri = STriangle.create(10, 20, 40, Color.RED, Color.BLACK);
-            draftman.visitTriangle(tri);
-
-            String cssOut = css();
-            assertTrue(cssOut.contains("border-left-width:"), "CSS should use border-left-width");
-            assertTrue(cssOut.contains("border-right-width:"), "CSS should use border-right-width");
-            assertTrue(cssOut.contains("border-bottom:"), "CSS should use border-bottom");
-            assertTrue(cssOut.contains("width: 0px"), "CSS should set width to 0");
-            assertTrue(cssOut.contains("height: 0px"), "CSS should set height to 0");
-        }
-
-        @Test
-        void testTriangleCssContainsCorrectPosition() {
-            STriangle tri = STriangle.create(10, 20, 40, Color.RED, Color.BLACK);
-            draftman.visitTriangle(tri);
-
-            String cssOut = css();
-            assertTrue(cssOut.contains("top: 20px"), "CSS should contain correct top");
-            assertTrue(cssOut.contains("left: 10px"), "CSS should contain correct left");
-        }
-
-        @Test
-        void testTriangleCssContainsFillColor() {
-            STriangle tri = STriangle.create(0, 0, 20, Color.BLUE, Color.BLACK);
-            tri.addAttributes(new ColorAttributes(true, false, Color.BLUE, Color.BLACK));
-            draftman.visitTriangle(tri);
-
-            assertTrue(css().contains("#0000ff"), "CSS should contain the triangle fill color");
-        }
-
-        @Test
-        void testTriangleHtmlClassMatchesCssSelector_regressionHashCode() {
-            // Regression test: visitTriangle previously used this.hashCode()
-            // instead of sTriangle.hashCode(), causing HTML class and CSS
-            // selector mismatch when rendered by a different draftman instance.
-            STriangle tri = STriangle.create(5, 5, 30, Color.RED, Color.BLACK);
-            draftman.visitTriangle(tri);
-
-            String htmlOut = html();
-            String cssOut = css();
-
-            // Extract the class name from HTML: class="triangleNNN"
-            int classStart = htmlOut.indexOf("triangle");
-            assertNotEquals(-1, classStart, "HTML should contain triangle class");
-            int classEnd = htmlOut.indexOf("\"", classStart);
-            String htmlClassName = htmlOut.substring(classStart, classEnd);
-
-            // CSS should use the same class name
-            assertTrue(cssOut.contains("." + htmlClassName),
-                    "CSS selector should match HTML class — " +
-                    "if this fails, visitTriangle may be using this.hashCode() instead of sTriangle.hashCode()");
-        }
-    }
-
-    // ── visitText ───────────────────────────────────────────────────
-
-    @Nested
-    class VisitTextTests {
-
-        @Test
-        void testTextProducesDivWithContent() {
-            SText text = SText.create(10, 20, "Hello");
-            draftman.visitText(text);
-
-            assertTrue(html().contains(">Hello</div>"), "HTML should contain text content in div");
-        }
-
-        @Test
-        void testTextHtmlIdMatchesCssSelector() {
-            SText text = SText.create(0, 0, "Test");
-            draftman.visitText(text);
-
-            String id = "txt" + text.hashCode();
-            assertTrue(html().contains("id=\"" + id + "\""), "HTML should contain text div with correct id");
-            assertTrue(css().contains("#" + id), "CSS should reference same text id");
-        }
-
-        @Test
-        void testTextCssContainsPosition() {
-            SText text = SText.create(15, 25, "Pos");
-            draftman.visitText(text);
-
-            String cssOut = css();
-            assertTrue(cssOut.contains("top:25px"), "CSS should contain correct top");
-            assertTrue(cssOut.contains("left:15px"), "CSS should contain correct left");
-        }
-
-        @Test
-        void testTextCssContainsDefaultFontAttributes() {
-            SText text = SText.create(0, 0, "Font");
-            draftman.visitText(text);
-
-            String cssOut = css();
-            assertTrue(cssOut.contains("font-family:"), "CSS should contain font-family");
-            assertTrue(cssOut.contains("font-size:16px"), "CSS should contain default font size");
-            assertTrue(cssOut.contains("font-style:normal"), "CSS should contain normal font style");
-            assertTrue(cssOut.contains("font-weight:normal"), "CSS should contain normal font weight");
-        }
-
-        @Test
-        void testTextCssContainsColor() {
-            SText text = SText.create(0, 0, "Colored");
-            text.addAttributes(new ColorAttributes(true, false, Color.RED, Color.BLACK));
-            draftman.visitText(text);
-
-            assertTrue(css().contains("color:#ff0000"), "CSS should contain fill color as text color");
-        }
-
-        @Test
-        void testTextCssWhiteSpaceNowrap() {
-            SText text = SText.create(0, 0, "NoWrap");
-            draftman.visitText(text);
-
-            assertTrue(css().contains("white-space: nowrap"), "CSS should prevent text wrapping");
-        }
-
-        @Test
-        void testTextWithNullColorAttributesFallsBackToBlack() {
-            SText text = SText.create(0, 0, "Fallback");
-            text.addAttributes(new ColorAttributes(false, false, null, null));
-            draftman.visitText(text);
-
-            assertTrue(css().contains("color:#000000"), "Should fall back to black with null colors");
-        }
-    }
-
-    // ── visitCollection ─────────────────────────────────────────────
-
-    @Nested
-    class VisitCollectionTests {
-
-        @Test
-        void testEmptyCollection() {
-            SCollection empty = SCollection.of();
-            draftman.visitCollection(empty);
-
-            assertEquals("", html(), "Empty collection should produce no HTML");
-            assertEquals("", css(), "Empty collection should produce no CSS");
-        }
-
-        @Test
-        void testCollectionVisitsAllChildren() {
-            SCollection coll = SCollection.of(
-                    SRectangle.create(0, 0, 10, 10),
-                    SCircle.create(20, 20, 5)
-            );
-            draftman.visitCollection(coll);
-
-            assertTrue(html().contains("rec"), "Should visit rectangle");
-            assertTrue(html().contains("circle"), "Should visit circle");
-        }
-
-        @Test
-        void testNestedCollectionVisitsAllDescendants() {
-            SCollection inner = SCollection.of(
-                    SRectangle.create(0, 0, 5, 5)
-            );
-            SCollection outer = SCollection.of(
-                    inner,
-                    SCircle.create(10, 10, 3)
-            );
-            draftman.visitCollection(outer);
-
-            assertTrue(html().contains("rec"), "Should visit nested rectangle");
-            assertTrue(html().contains("circle"), "Should visit circle at outer level");
-        }
-    }
-
-    // ── generateHTML ────────────────────────────────────────────────
-
-    @Nested
-    class GenerateHTMLTests {
-
-        @Test
-        void testGenerateHTMLIncludesDoctype() {
-            SCollection model = SCollection.of();
-            draftman.generateHTML(model);
-
-            assertTrue(html().contains("<!DOCTYPE html>"), "Should include DOCTYPE");
-        }
-
-        @Test
-        void testGenerateHTMLIncludesHtmlStructure() {
-            SCollection model = SCollection.of();
-            draftman.generateHTML(model);
-
-            String htmlOut = html();
-            assertTrue(htmlOut.contains("<html"), "Should include html tag");
-            assertTrue(htmlOut.contains("<head>"), "Should include head tag");
-            assertTrue(htmlOut.contains("<body>"), "Should include body tag");
-            assertTrue(htmlOut.contains("</body>"), "Should close body tag");
-        }
-
-        @Test
-        void testGenerateHTMLReferencesStylesheet() {
-            SCollection model = SCollection.of();
-            draftman.generateHTML(model);
-
-            assertTrue(html().contains("style.css"), "Should reference CSS stylesheet");
-        }
-
-        @Test
-        void testGenerateHTMLIncludesShapeContent() {
-            SCollection model = SCollection.of(
-                    SRectangle.create(1, 2, 3, 4)
-            );
-            draftman.generateHTML(model);
-
-            assertTrue(html().contains("<div id=\"rec"), "Should include shape elements");
-        }
-    }
-}

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

@@ -1,370 +0,0 @@
-package ovh.gasser.newshapes.ui.visitors;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import ovh.gasser.newshapes.attributes.ColorAttributes;
-import ovh.gasser.newshapes.shapes.*;
-
-import java.awt.*;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class SVGDraftmanTest {
-
-    private StringWriter buffer;
-    private PrintWriter writer;
-    private SVGDraftman draftman;
-
-    @BeforeEach
-    void setUp() {
-        buffer = new StringWriter();
-        writer = new PrintWriter(buffer);
-        draftman = new SVGDraftman(writer);
-    }
-
-    private String output() {
-        writer.flush();
-        return buffer.toString();
-    }
-
-    // ── visitRectangle ──────────────────────────────────────────────
-
-    @Nested
-    class VisitRectangleTests {
-
-        @Test
-        void testRectangleElementWithCorrectDimensions() {
-            SRectangle rect = SRectangle.create(10, 20, 100, 50);
-            draftman.visitRectangle(rect);
-
-            String svg = output();
-            assertTrue(svg.contains("<rect"), "Should produce a <rect> element");
-            assertTrue(svg.contains("width=\"100\""), "Should have correct width");
-            assertTrue(svg.contains("height=\"50\""), "Should have correct height");
-            assertTrue(svg.contains("x=\"10\""), "Should have correct x");
-            assertTrue(svg.contains("y=\"20\""), "Should have correct y");
-        }
-
-        @Test
-        void testRectangleFilledOnly() {
-            SRectangle rect = SRectangle.create(0, 0, 30, 30);
-            rect.addAttributes(new ColorAttributes(true, false, Color.RED, Color.BLACK));
-            draftman.visitRectangle(rect);
-
-            String svg = output();
-            assertTrue(svg.contains("fill=\"#ff0000\""), "Should contain fill color");
-            assertFalse(svg.contains("stroke="), "Should not contain stroke when stroked=false");
-        }
-
-        @Test
-        void testRectangleStrokedOnly() {
-            SRectangle rect = SRectangle.create(0, 0, 30, 30);
-            rect.addAttributes(new ColorAttributes(false, true, Color.RED, Color.BLUE));
-            draftman.visitRectangle(rect);
-
-            String svg = output();
-            assertTrue(svg.contains("stroke=\"#0000ff\""), "Should contain stroke color");
-            assertTrue(svg.contains("stroke-width=\"1\""), "Should contain stroke-width");
-            assertTrue(svg.contains("fill=\"none\""), "Should have fill=none when not filled");
-        }
-
-        @Test
-        void testRectangleFilledAndStroked() {
-            SRectangle rect = SRectangle.create(0, 0, 30, 30);
-            rect.addAttributes(new ColorAttributes(true, true, Color.RED, Color.BLUE));
-            draftman.visitRectangle(rect);
-
-            String svg = output();
-            assertTrue(svg.contains("fill=\"#ff0000\""), "Should contain fill color");
-            assertTrue(svg.contains("stroke=\"#0000ff\""), "Should contain stroke color");
-        }
-
-        @Test
-        void testRectangleNeitherFilledNorStroked() {
-            SRectangle rect = SRectangle.create(0, 0, 30, 30);
-            rect.addAttributes(new ColorAttributes(false, false, Color.RED, Color.BLUE));
-            draftman.visitRectangle(rect);
-
-            String svg = output();
-            assertTrue(svg.contains("fill=\"none\""), "Should have fill=none");
-            assertFalse(svg.contains("stroke="), "Should not have stroke attribute");
-        }
-    }
-
-    // ── visitCircle ─────────────────────────────────────────────────
-
-    @Nested
-    class VisitCircleTests {
-
-        @Test
-        void testCircleElementWithCorrectAttributes() {
-            SCircle circle = SCircle.create(50, 60, 30);
-            draftman.visitCircle(circle);
-
-            String svg = output();
-            assertTrue(svg.contains("<circle"), "Should produce a <circle> element");
-            // cx = x + r = 50 + 30 = 80, cy = y + r = 60 + 30 = 90
-            assertTrue(svg.contains("cx=\"80\""), "cx should be x + radius");
-            assertTrue(svg.contains("cy=\"90\""), "cy should be y + radius");
-            assertTrue(svg.contains("r=\"30\""), "Should have correct radius");
-        }
-
-        @Test
-        void testCircleFilledOnly() {
-            SCircle circle = SCircle.create(0, 0, 20);
-            circle.addAttributes(new ColorAttributes(true, false, Color.GREEN, Color.BLACK));
-            draftman.visitCircle(circle);
-
-            String svg = output();
-            assertTrue(svg.contains("fill=\"#00ff00\""), "Should contain fill color");
-            assertFalse(svg.contains("stroke="), "Should not contain stroke");
-        }
-
-        @Test
-        void testCircleStrokedOnly() {
-            SCircle circle = SCircle.create(0, 0, 20);
-            circle.addAttributes(new ColorAttributes(false, true, Color.RED, Color.MAGENTA));
-            draftman.visitCircle(circle);
-
-            String svg = output();
-            assertTrue(svg.contains("stroke=\"#ff00ff\""), "Should contain stroke color");
-            assertTrue(svg.contains("fill=\"none\""), "Should have fill=none");
-        }
-
-        @Test
-        void testCircleFilledAndStroked() {
-            SCircle circle = SCircle.create(0, 0, 15);
-            circle.addAttributes(new ColorAttributes(true, true, Color.YELLOW, Color.BLACK));
-            draftman.visitCircle(circle);
-
-            String svg = output();
-            assertTrue(svg.contains("fill=\"#ffff00\""), "Should contain fill color");
-            assertTrue(svg.contains("stroke=\"#000000\""), "Should contain stroke color");
-        }
-    }
-
-    // ── visitTriangle ───────────────────────────────────────────────
-
-    @Nested
-    class VisitTriangleTests {
-
-        @Test
-        void testTriangleProducesPolygonElement() {
-            STriangle tri = STriangle.create(10, 20, 40, Color.RED, Color.BLACK);
-            draftman.visitTriangle(tri);
-
-            String svg = output();
-            assertTrue(svg.contains("<polygon"), "Should produce a <polygon> element");
-            assertTrue(svg.contains("points="), "Should have points attribute");
-        }
-
-        @Test
-        void testTrianglePointsAreCorrect() {
-            STriangle tri = STriangle.create(10, 20, 40, Color.RED, Color.BLACK);
-            draftman.visitTriangle(tri);
-
-            String svg = output();
-            // bottom-left: (x, y+size) = (10, 60)
-            assertTrue(svg.contains("10,60"), "Should contain bottom-left point");
-            // top-center: (x + size/2, y) = (30, 20)
-            assertTrue(svg.contains("30,20"), "Should contain top-center point");
-            // bottom-right: (x + size, y + size) = (50, 60)
-            assertTrue(svg.contains("50,60"), "Should contain bottom-right point");
-        }
-
-        @Test
-        void testTriangleFilledOnly() {
-            STriangle tri = STriangle.create(0, 0, 20, Color.BLUE, Color.BLACK);
-            tri.addAttributes(new ColorAttributes(true, false, Color.BLUE, Color.BLACK));
-            draftman.visitTriangle(tri);
-
-            String svg = output();
-            assertTrue(svg.contains("fill:#0000ff"), "Should contain fill style");
-            assertFalse(svg.contains("stroke:"), "Should not contain stroke style when not stroked");
-        }
-
-        @Test
-        void testTriangleStrokedAndFilled() {
-            STriangle tri = STriangle.create(0, 0, 20, Color.RED, Color.GREEN);
-            tri.addAttributes(new ColorAttributes(true, true, Color.RED, Color.GREEN));
-            draftman.visitTriangle(tri);
-
-            String svg = output();
-            assertTrue(svg.contains("fill:#ff0000"), "Should contain fill style");
-            assertTrue(svg.contains("stroke:#00ff00"), "Should contain stroke style");
-        }
-
-        @Test
-        void testTriangleNotFilled() {
-            STriangle tri = STriangle.create(0, 0, 20, Color.RED, Color.BLACK);
-            tri.addAttributes(new ColorAttributes(false, true, Color.RED, Color.BLACK));
-            draftman.visitTriangle(tri);
-
-            String svg = output();
-            assertTrue(svg.contains("fill:none"), "Should have fill:none when not filled");
-        }
-    }
-
-    // ── visitText ───────────────────────────────────────────────────
-
-    @Nested
-    class VisitTextTests {
-
-        @Test
-        void testTextElementWithCorrectContent() {
-            SText text = SText.create(10, 20, "Hello");
-            draftman.visitText(text);
-
-            String svg = output();
-            assertTrue(svg.contains("<text"), "Should produce a <text> element");
-            assertTrue(svg.contains(">Hello</text>"), "Should contain the text content");
-        }
-
-        @Test
-        void testTextPositionIncludesFontSizeOffset() {
-            SText text = SText.create(10, 20, "Hi");
-            draftman.visitText(text);
-
-            String svg = output();
-            assertTrue(svg.contains("x=\"10\""), "x should match bounds.x");
-            // y = bounds.y + fontSize = 20 + 16 = 36
-            assertTrue(svg.contains("y=\"36\""), "y should be bounds.y + fontSize");
-        }
-
-        @Test
-        void testTextDefaultFontAttributes() {
-            SText text = SText.create(0, 0, "Test");
-            draftman.visitText(text);
-
-            String svg = output();
-            assertTrue(svg.contains("font-family=\"SansSerif\""), "Should use default font family");
-            assertTrue(svg.contains("font-size=\"16\""), "Should use default font size");
-            assertTrue(svg.contains("font-style=\"normal\""), "Default style should be normal");
-            assertTrue(svg.contains("font-weight=\"normal\""), "Default weight should be normal");
-        }
-
-        @Test
-        void testTextDefaultColorIsBlack() {
-            SText text = SText.create(0, 0, "Test");
-            // default ColorAttributes: filled=true, filledColor=BLACK
-            draftman.visitText(text);
-
-            String svg = output();
-            assertTrue(svg.contains("fill=\"#000000\""), "Default text color should be black");
-        }
-
-        @Test
-        void testTextWithCustomFillColor() {
-            SText text = SText.create(0, 0, "Colored");
-            text.addAttributes(new ColorAttributes(true, false, Color.RED, Color.BLACK));
-            draftman.visitText(text);
-
-            String svg = output();
-            assertTrue(svg.contains("fill=\"#ff0000\""), "Text should use filledColor");
-        }
-
-        @Test
-        void testTextWithNullColorAttributesFallsBackToBlack() {
-            SText text = SText.create(0, 0, "NoColor");
-            text.addAttributes(new ColorAttributes(false, false, null, null));
-            draftman.visitText(text);
-
-            String svg = output();
-            assertTrue(svg.contains("fill=\"#000000\""), "Should fall back to black with null colors");
-        }
-    }
-
-    // ── visitCollection ─────────────────────────────────────────────
-
-    @Nested
-    class VisitCollectionTests {
-
-        @Test
-        void testEmptyCollection() {
-            SCollection empty = SCollection.of();
-            draftman.visitCollection(empty);
-
-            String svg = output();
-            assertEquals("", svg, "Empty collection should produce no output");
-        }
-
-        @Test
-        void testCollectionVisitsAllChildren() {
-            SCollection coll = SCollection.of(
-                    SRectangle.create(0, 0, 10, 10),
-                    SCircle.create(20, 20, 5)
-            );
-            draftman.visitCollection(coll);
-
-            String svg = output();
-            assertTrue(svg.contains("<rect"), "Should visit rectangle");
-            assertTrue(svg.contains("<circle"), "Should visit circle");
-        }
-
-        @Test
-        void testNestedCollectionVisitsAllDescendants() {
-            SCollection inner = SCollection.of(
-                    SRectangle.create(0, 0, 5, 5)
-            );
-            SCollection outer = SCollection.of(
-                    inner,
-                    SCircle.create(10, 10, 3)
-            );
-            draftman.visitCollection(outer);
-
-            String svg = output();
-            assertTrue(svg.contains("<rect"), "Should visit nested rectangle");
-            assertTrue(svg.contains("<circle"), "Should visit circle at outer level");
-        }
-    }
-
-    // ── generateSVG ─────────────────────────────────────────────────
-
-    @Nested
-    class GenerateSVGTests {
-
-        @Test
-        void testGenerateSVGIncludesXmlDeclaration() {
-            SCollection model = SCollection.of();
-            draftman.generateSVG(model);
-
-            String svg = output();
-            assertTrue(svg.contains("<?xml version=\"1.0\" encoding=\"utf-8\"?>"),
-                    "Should include XML declaration");
-        }
-
-        @Test
-        void testGenerateSVGIncludesSvgNamespace() {
-            SCollection model = SCollection.of();
-            draftman.generateSVG(model);
-
-            String svg = output();
-            assertTrue(svg.contains("xmlns=\"http://www.w3.org/2000/svg\""),
-                    "Should include SVG namespace");
-        }
-
-        @Test
-        void testGenerateSVGClosesSvgTag() {
-            SCollection model = SCollection.of();
-            draftman.generateSVG(model);
-
-            String svg = output();
-            assertTrue(svg.contains("</svg>"), "Should close <svg> tag");
-        }
-
-        @Test
-        void testGenerateSVGIncludesShapeContent() {
-            SCollection model = SCollection.of(
-                    SRectangle.create(1, 2, 3, 4)
-            );
-            draftman.generateSVG(model);
-
-            String svg = output();
-            assertTrue(svg.contains("<rect"), "Should include shape elements");
-            assertTrue(svg.contains("</svg>"), "Should close SVG after shapes");
-        }
-    }
-}