Implement #35: Copy/Paste Functionality

Reviewed-on: #22

.gitea/workflows/ci.yaml

@@ -0,0 +1,30 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 16
+        uses: actions/setup-java@v4
+        with:
+          java-version: '16'
+          distribution: 'temurin'
+
+      - name: Build and test with coverage
+        run: ./mvnw verify --batch-mode
+
+      - name: Upload coverage report
+        if: always()
+        uses: https://gitea.com/actions/gitea-upload-artifact@v4
+        with:
+          name: jacoco-report
+          path: target/site/jacoco/

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,3 @@
+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,11 +1,10 @@
 # TODO
 
-![](out.svg)
-
-- [ ] Box selection (drag to select multiple shapes)
+- [X] Box selection (drag to select multiple shapes)
 - [ ] Undo/redo stack
 - [ ] Copy/paste functionality
-- [ ] Text shapes
-- [ ] Resize shapes
+- [ ] Group/Ungroup shapes
+- [ ] Save/Load drawings
+- [X] Text shapes
+- [X] Resize shapes
 - [ ] Polygon shapes
-

mvnw

@@ -0,0 +1,295 @@
+#!/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

@@ -6,19 +6,60 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.10</maven.compiler.source>
-        <maven.compiler.target>1.10</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
+        <maven.testSourceDirectory>test/java</maven.testSourceDirectory>
     </properties>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
                 <configuration>
                     <source>16</source>
                     <target>16</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.2.5</version>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.13</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                            <goal>report</goal>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <excludes>
+                        <!-- UI classes require a display and cannot be unit-tested -->
+                        <exclude>ovh/gasser/newshapes/App.class</exclude>
+                        <exclude>ovh/gasser/newshapes/ui/**</exclude>
+                        <exclude>ovh/gasser/newshapes/Selection.class</exclude>
+                    </excludes>
+                    <rules>
+                        <rule>
+                            <element>BUNDLE</element>
+                            <limits>
+                                <limit>
+                                    <counter>LINE</counter>
+                                    <value>COVEREDRATIO</value>
+                                    <minimum>0.50</minimum>
+                                </limit>
+                            </limits>
+                        </rule>
+                    </rules>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -30,13 +71,34 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>RELEASE</version>
+            <version>2.0.16</version>
         </dependency>
 
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>RELEASE</version>
+            <version>1.5.12</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.10.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.10.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>5.10.0</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>

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

@@ -8,10 +8,11 @@ import ovh.gasser.newshapes.shapes.Shape;
 import ovh.gasser.newshapes.ui.ShapesView;
 import ovh.gasser.newshapes.ui.listeners.MenuAddListener;
 import ovh.gasser.newshapes.ui.listeners.MenuEditListener;
-import ovh.gasser.newshapes.ui.listeners.SelectionListener;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
 import java.io.FileNotFoundException;
 
 public class App {
@@ -20,6 +21,8 @@ public class App {
     private SCollection model;
     private JCheckBoxMenuItem editFill;
     private JCheckBoxMenuItem editBorder;
+    private JMenuItem editGroup;
+    private JMenuItem editUngroup;
 
     private App() throws HeadlessException {
         final JFrame frame = new JFrame("Reactive shapes");
@@ -39,12 +42,7 @@ public class App {
 
         this.buildMenuBar(frame, view);
 
-        view.addSelectionChangeListener(new SelectionListener() {
-            @Override
-            public void onSelectionChanged(Iterable<Shape> selectedShapes) {
-                updateMenuState(selectedShapes);
-            }
-        });
+        view.addSelectionChangeListener(this::updateMenuState);
     }
 
     private void buildModel() {
@@ -77,13 +75,41 @@ public class App {
 
     private JMenu buildFileMenu(ShapesView sview) {
         JMenu menuFile = new JMenu("File");
+        JMenuItem openItem = new JMenuItem("Open");
+        JMenuItem saveItem = new JMenuItem("Save");
         JMenuItem addRectItem = new JMenuItem("Add SRectangle");
         JMenuItem addCircleItem = new JMenuItem("Add SCircle");
+        JMenuItem addTextItem = new JMenuItem("Add Text");
         JMenuItem htmlExportItem = new JMenuItem("Export to HTML");
         JMenuItem svgExportItem = new JMenuItem("Export to SVG");
         JMenuItem exitItem = new JMenuItem("Exit");
+
+        openItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK));
+        saveItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK));
+
+        openItem.addActionListener(evt -> {
+            JFileChooser chooser = new JFileChooser();
+            chooser.setFileFilter(new javax.swing.filechooser.FileNameExtensionFilter("JSON Files", "json"));
+            if (chooser.showOpenDialog(sview) == JFileChooser.APPROVE_OPTION) {
+                sview.getController().loadDrawing(chooser.getSelectedFile());
+            }
+        });
+
+        saveItem.addActionListener(evt -> {
+            JFileChooser chooser = new JFileChooser();
+            chooser.setFileFilter(new javax.swing.filechooser.FileNameExtensionFilter("JSON Files", "json"));
+            if (chooser.showSaveDialog(sview) == JFileChooser.APPROVE_OPTION) {
+                java.io.File file = chooser.getSelectedFile();
+                if (!file.getName().endsWith(".json")) {
+                    file = new java.io.File(file.getAbsolutePath() + ".json");
+                }
+                sview.getController().saveDrawing(file);
+            }
+        });
+
         addRectItem.addActionListener(new MenuAddListener("SRectangle", model, sview));
         addCircleItem.addActionListener(new MenuAddListener("SCircle", model, sview));
+        addTextItem.addActionListener(evt -> sview.getController().enterTextMode());
         htmlExportItem.addActionListener(evt -> {
             try {
                 new HTMLExporter(model).export();
@@ -99,8 +125,13 @@ public class App {
             }
         });
         exitItem.addActionListener(evt -> System.exit(0));
+
+        menuFile.add(openItem);
+        menuFile.add(saveItem);
+        menuFile.addSeparator();
         menuFile.add(addRectItem);
         menuFile.add(addCircleItem);
+        menuFile.add(addTextItem);
         menuFile.addSeparator();
         menuFile.add(htmlExportItem);
         menuFile.add(svgExportItem);
@@ -111,42 +142,77 @@ public class App {
     private JMenu buildEditMenu(ShapesView sview) {
         MenuEditListener editListener = new MenuEditListener(model, sview, sview.getController());
         JMenu menuEdit = new JMenu("Edit");
+        JMenuItem cutItem = new JMenuItem("Cut");
+        JMenuItem copyItem = new JMenuItem("Copy");
+        JMenuItem pasteItem = new JMenuItem("Paste");
         JMenuItem editColor = new JMenuItem("Change color");
         JMenuItem editBorderColor = new JMenuItem("Change border color");
         JMenuItem deleteItem = new JMenuItem("Delete");
+        editGroup = new JMenuItem("Group");
+        editUngroup = new JMenuItem("Ungroup");
         editFill = new JCheckBoxMenuItem("Fill Shape");
         editBorder = new JCheckBoxMenuItem("Draw border");
+
+        cutItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_DOWN_MASK));
+        copyItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK));
+        pasteItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_DOWN_MASK));
+        editGroup.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_G, InputEvent.CTRL_DOWN_MASK));
+        editUngroup.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_G, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
+
+        cutItem.addActionListener(evt -> sview.getController().cutSelection());
+        copyItem.addActionListener(evt -> sview.getController().copySelection());
+        pasteItem.addActionListener(evt -> sview.getController().pasteClipboard());
         editColor.addActionListener(editListener);
         editBorderColor.addActionListener(editListener);
         deleteItem.addActionListener(editListener);
+        editGroup.addActionListener(evt -> sview.getController().group());
+        editUngroup.addActionListener(evt -> sview.getController().ungroup());
         editFill.addActionListener(editListener);
         editBorder.addActionListener(editListener);
+        editGroup.setEnabled(false);
+        editUngroup.setEnabled(false);
 
+        menuEdit.add(cutItem);
+        menuEdit.add(copyItem);
+        menuEdit.add(pasteItem);
+        menuEdit.addSeparator();
         menuEdit.add(editColor);
         menuEdit.add(editBorderColor);
         menuEdit.add(deleteItem);
         menuEdit.addSeparator();
+        menuEdit.add(editGroup);
+        menuEdit.add(editUngroup);
+        menuEdit.addSeparator();
         menuEdit.add(editBorder);
         menuEdit.add(editFill);
         return menuEdit;
     }
 
     private void updateMenuState(Iterable<Shape> selectedShapes) {
-        boolean hasAttributes = false;
+        int selectionCount = 0;
+        boolean singleCollectionSelected = false;
+        boolean hasToggleableShapes = false;
         boolean allFilled = true;
         boolean allStroked = true;
 
         for (Shape s : selectedShapes) {
+            selectionCount++;
+            singleCollectionSelected = selectionCount == 1 && s instanceof SCollection;
+            if (s instanceof SText) {
+                continue;
+            }
             ColorAttributes attrs = (ColorAttributes) s.getAttributes(ColorAttributes.ID);
             if (attrs != null) {
-                hasAttributes = true;
+                hasToggleableShapes = true;
                 allFilled = allFilled && attrs.filled;
                 allStroked = allStroked && attrs.stroked;
             }
         }
 
-        updateMenuItem(editFill, hasAttributes, allFilled);
-        updateMenuItem(editBorder, hasAttributes, allStroked);
+        editGroup.setEnabled(selectionCount > 1);
+        editUngroup.setEnabled(selectionCount == 1 && singleCollectionSelected);
+        updateMenuItem(editFill, hasToggleableShapes, allFilled);
+        updateMenuItem(editBorder, hasToggleableShapes, allStroked);
     }
 
     private void updateMenuItem(JCheckBoxMenuItem menuItem, boolean hasAttributes, boolean allSelected) {

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

@@ -9,6 +9,7 @@ import ovh.gasser.newshapes.util.Streamable;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
@@ -38,6 +39,15 @@ public class Selection implements Streamable<Shape> {
         notifyListeners();
     }
 
+    public void addAll(Collection<Shape> shapes) {
+        if (shapes == null) {
+            return;
+        }
+        for (Shape shape : shapes) {
+            add(shape);
+        }
+    }
+
     public boolean isEmpty() {
         return selectedShapes.isEmpty();
     }

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

@@ -3,6 +3,7 @@ package ovh.gasser.newshapes;
 import ovh.gasser.newshapes.shapes.SCircle;
 import ovh.gasser.newshapes.shapes.SCollection;
 import ovh.gasser.newshapes.shapes.SRectangle;
+import ovh.gasser.newshapes.shapes.SText;
 import ovh.gasser.newshapes.shapes.STriangle;
 
 public interface ShapeVisitor {
@@ -13,4 +14,6 @@ public interface ShapeVisitor {
     void visitCircle(SCircle sCircle);
 
     void visitTriangle(STriangle sTriangle);
+
+    void visitText(SText sText);
 }

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

@@ -9,7 +9,7 @@ import java.util.TreeMap;
 public abstract class AbstractShape implements Shape {
 
     private final Map<String, Attributes> attributes = new TreeMap<>();
-    private final Rectangle bounds;
+    protected final Rectangle bounds;
 
     AbstractShape() {
         this(null);
@@ -31,46 +31,45 @@ public abstract class AbstractShape implements Shape {
 
     @Override
     public void translate(int dx, int dy) {
-        getBounds().translate(dx, dy);
+        this.bounds.translate(dx, dy);
     }
 
     @Override
     public void resize(ResizeHandle handle, int dx, int dy) {
-        Rectangle bounds = getBounds();
         switch (handle) {
-            case E -> bounds.width += dx;
+            case E -> this.bounds.width += dx;
             case W -> {
-                bounds.x += dx;
-                bounds.width -= dx;
+                this.bounds.x += dx;
+                this.bounds.width -= dx;
             }
-            case S -> bounds.height += dy;
+            case S -> this.bounds.height += dy;
             case N -> {
-                bounds.y += dy;
-                bounds.height -= dy;
+                this.bounds.y += dy;
+                this.bounds.height -= dy;
             }
             case SE -> {
-                bounds.width += dx;
-                bounds.height += dy;
+                this.bounds.width += dx;
+                this.bounds.height += dy;
             }
             case SW -> {
-                bounds.x += dx;
-                bounds.width -= dx;
-                bounds.height += dy;
+                this.bounds.x += dx;
+                this.bounds.width -= dx;
+                this.bounds.height += dy;
             }
             case NE -> {
-                bounds.width += dx;
-                bounds.y += dy;
-                bounds.height -= dy;
+                this.bounds.width += dx;
+                this.bounds.y += dy;
+                this.bounds.height -= dy;
             }
             case NW -> {
-                bounds.x += dx;
-                bounds.width -= dx;
-                bounds.y += dy;
-                bounds.height -= dy;
+                this.bounds.x += dx;
+                this.bounds.width -= dx;
+                this.bounds.y += dy;
+                this.bounds.height -= dy;
             }
         }
-        if (bounds.width < 1) bounds.width = 1;
-        if (bounds.height < 1) bounds.height = 1;
+        if (this.bounds.width < 1) this.bounds.width = 1;
+        if (this.bounds.height < 1) this.bounds.height = 1;
     }
 
     @Override

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

@@ -22,28 +22,24 @@ public class SCircle extends AbstractShape {
 
     @Override
     public void resize(ResizeHandle handle, int dx, int dy) {
-        Rectangle bounds = getBounds();
-        int newWidth = bounds.width;
-        int newHeight = bounds.height;
+        int delta = Math.max(Math.abs(dx), Math.abs(dy));
         
-        switch (handle) {
-            case E, W -> newWidth += dx;
-            case N, S -> newHeight += dy;
-            case SE, NW -> {
-                newWidth += dx;
-                newHeight += dy;
-            }
-            case NE, SW -> {
-                newWidth += dx;
-                newHeight += dy;
-            }
-        }
+        boolean shrink = switch (handle) {
+            case E, SE, NE -> dx < 0;
+            case W, SW, NW -> dx > 0;
+            case N, S -> dy < 0;
+            default -> false;
+        };
+        
+        int sizeChange = shrink ? -delta : delta;
+        int newWidth = bounds.width + sizeChange;
+        int newHeight = bounds.height + sizeChange;
         
         if (newWidth < 2) newWidth = 2;
         if (newHeight < 2) newHeight = 2;
         
-        this.radius = Math.max(newWidth, newHeight) / 2;
-        bounds.setSize(this.radius * 2, this.radius * 2);
+        bounds.setSize(newWidth, newHeight);
+        this.radius = Math.max(bounds.width, bounds.height) / 2;
     }
 
     @Override

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

@@ -0,0 +1,80 @@
+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.*;
+
+public class SText extends AbstractShape {
+    public static final String PLACEHOLDER_TEXT = "Text";
+    public static final int DEFAULT_FONT_SIZE = 16;
+    public static final String DEFAULT_FONT_NAME = "SansSerif";
+    public static final int DEFAULT_FONT_STYLE = Font.PLAIN;
+
+    private final String text;
+    private final int fontSize;
+    private final String fontName;
+    private final int fontStyle;
+
+    private SText(int x, int y, String text, int fontSize, String fontName, int fontStyle) {
+        // Initialize with a reasonable default width/height so hit testing works reliably
+        super(new Rectangle(x, y, 100, 20));
+        this.text = normalizeText(text);
+        this.fontSize = fontSize;
+        this.fontName = fontName;
+        this.fontStyle = fontStyle;
+    }
+
+    public static SText create(int x, int y, String text) {
+        var shape = new SText(x, y, text, DEFAULT_FONT_SIZE, DEFAULT_FONT_NAME, DEFAULT_FONT_STYLE);
+        shape.addAttributes(new SelectionAttributes());
+        shape.addAttributes(new ColorAttributes(true, false, Color.BLACK, Color.BLACK));
+        return shape;
+    }
+
+    private static String normalizeText(String input) {
+        if (input == null || input.isBlank()) {
+            return PLACEHOLDER_TEXT;
+        }
+        return input;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public int getFontSize() {
+        return fontSize;
+    }
+
+    public String getFontName() {
+        return fontName;
+    }
+
+    public int getFontStyle() {
+        return fontStyle;
+    }
+
+    public void updateMeasuredBounds(int width, int height) {
+        getBounds().setSize(Math.max(width, 0), Math.max(height, 0));
+    }
+
+    @Override
+    public void accept(ShapeVisitor visitor) {
+        visitor.visitText(this);
+    }
+
+    @Override
+    public Shape clone() {
+        var copy = new SText(getBounds().x, getBounds().y, text, fontSize, fontName, fontStyle);
+        copy.updateMeasuredBounds(getBounds().width, getBounds().height);
+        copy.addAttributes(new SelectionAttributes());
+
+        var attrs = (ColorAttributes) getAttributes(ColorAttributes.ID);
+        if (attrs != null) {
+            copy.addAttributes(new ColorAttributes(attrs.filled, attrs.stroked, attrs.filledColor, attrs.strokedColor));
+        }
+        return copy;
+    }
+}

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

@@ -18,16 +18,17 @@ public class STriangle extends AbstractShape {
 
     @Override
     public void resize(ResizeHandle handle, int dx, int dy) {
-        Rectangle bounds = getBounds();
         int delta = Math.max(Math.abs(dx), Math.abs(dy));
 
         boolean shrink = switch (handle) {
+            case E -> dx < 0;
+            case W -> dx > 0;
+            case N -> dy > 0;
+            case S -> dy < 0;
             case SE -> (dx < 0 || dy < 0);
             case NW -> (dx > 0 || dy > 0);
-            case NE -> (dx < 0);
-            case SW -> (dx > 0);
-            case E, W -> (dx < 0);
-            case N, S -> (dy < 0);
+            case NE -> (dx < 0 || dy > 0);
+            case SW -> (dx > 0 || dy < 0);
             default -> false;
         };
 

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

@@ -5,35 +5,73 @@ 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;
 import ovh.gasser.newshapes.shapes.Shape;
 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;
     private boolean resizing;
     private ResizeHandle activeHandle;
     private Point resizeOrigin;
     private boolean resizeMode;
+    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
@@ -48,9 +86,7 @@ public class Controller {
 
             @Override
             public void mouseReleased(MouseEvent evt) {
-                resizing = false;
-                activeHandle = null;
-                resizeOrigin = null;
+                handleMouseReleased(evt);
             }
         };
         this.view.addMouseMotionListener(adapter);
@@ -63,7 +99,259 @@ 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();
+            Rectangle box = createSelectionBox(selectionBoxStart, selectionBoxEnd);
+            view.setCurrentSelectionBox(box);
+            updateSelectionFromBox(box);
+            view.repaint();
+            return;
+        }
+
         if (resizeMode && resizing && activeHandle != null) {
             int dx = evt.getX() - resizeOrigin.x;
             int dy = evt.getY() - resizeOrigin.y;
@@ -71,17 +359,10 @@ public class Controller {
                 shape.resize(activeHandle, dx, dy);
             }
             resizeOrigin = evt.getPoint();
-        } else if (resizeMode && !selection.isEmpty()) {
-            lastMousePos = evt.getPoint();
-            ResizeHandle handle = getHandleAt(evt.getPoint());
-            if (handle != null) {
-                resizing = true;
-                activeHandle = handle;
-                resizeOrigin = evt.getPoint();
+        } else if (!selection.isEmpty()) {
+            if (lastMousePos == null) {
+                lastMousePos = evt.getPoint();
             }
-        } else {
-            resizing = false;
-            activeHandle = null;
             int dx = evt.getX() - lastMousePos.x;
             int dy = evt.getY() - lastMousePos.y;
             for (Shape shape : selection) {
@@ -93,9 +374,14 @@ public class Controller {
     }
 
     private void handleMousePressed(MouseEvent evt) {
-        resizing = false;
-        activeHandle = null;
-        resizeOrigin = null;
+        if (addingText) {
+            placeTextAt(evt.getPoint());
+            return;
+        }
+
+        resizeDragState();
+        boxSelecting = false;
+        view.setCurrentSelectionBox(null);
 
         if (resizeMode && !selection.isEmpty()) {
             ResizeHandle handle = getHandleAt(evt.getPoint());
@@ -103,6 +389,7 @@ public class Controller {
                 resizing = true;
                 activeHandle = handle;
                 resizeOrigin = evt.getPoint();
+                beginDrag(evt.getPoint());
                 view.repaint();
                 return;
             }
@@ -114,39 +401,87 @@ public class Controller {
                             if (!evt.isShiftDown()) {
                                 resetSelection();
                             }
-                            lastMousePos = evt.getPoint();
-                            selection.add(s);
-                            logger.debug("Selecting {}", s);
+                            if (!selection.getSelectedShapes().contains(s)) {
+                                selection.add(s);
+                            }
+                            beginDrag(evt.getPoint());
                         },
-                        this::resetSelection
+                        () -> {
+                            additiveBoxSelection = evt.isShiftDown();
+                            if (!additiveBoxSelection) {
+                                resetSelection();
+                            }
+                            selectionBoxStart = evt.getPoint();
+                            selectionBoxEnd = evt.getPoint();
+                            boxSelecting = true;
+                            dragStartMousePos = null;
+                            dragStartBounds = Map.of();
+                        }
                 );
+    }
+
+    private void handleMouseReleased(MouseEvent evt) {
+        finishDragCommand();
+        resizeDragState();
+        boxSelecting = false;
+        selectionBoxStart = null;
+        selectionBoxEnd = null;
+        dragStartMousePos = null;
+        dragStartBounds = Map.of();
+        view.setCurrentSelectionBox(null);
         view.repaint();
     }
 
-    private ResizeHandle getHandleAt(Point point) {
-        final int handleSize = 5;
-        for (Shape shape : selection) {
-            Rectangle bounds = shape.getBounds();
-            int cx = bounds.x + bounds.width / 2;
-            int cy = bounds.y + bounds.height / 2;
-
-            if (point.x < cx && point.y < cy) return ResizeHandle.NW;
-            if (point.x > cx && point.y < cy) return ResizeHandle.NE;
-            if (point.x < cx && point.y > cy) return ResizeHandle.SW;
-            if (point.x > cx && point.y > cy) return ResizeHandle.SE;
-            if (point.y < cy) return ResizeHandle.N;
-            if (point.y > cy) return ResizeHandle.S;
-            if (point.x < cx) return ResizeHandle.W;
-            if (point.x > cx) return ResizeHandle.E;
-        }
-        return null;
-    }
-
     private void handleKeyPressed(KeyEvent evt) {
+        int modifiers = evt.getModifiersEx();
+
+        if ((modifiers & InputEvent.CTRL_DOWN_MASK) != 0) {
+            switch (evt.getKeyCode()) {
+                case KeyEvent.VK_Z -> {
+                    if ((modifiers & InputEvent.SHIFT_DOWN_MASK) != 0) {
+                        redo();
+                    } else {
+                        undo();
+                    }
+                    evt.consume();
+                    return;
+                }
+                case KeyEvent.VK_Y -> {
+                    redo();
+                    evt.consume();
+                    return;
+                }
+                case KeyEvent.VK_C -> {
+                    copySelection();
+                    evt.consume();
+                    return;
+                }
+                case KeyEvent.VK_X -> {
+                    cutSelection();
+                    evt.consume();
+                    return;
+                }
+                case KeyEvent.VK_V -> {
+                    pasteClipboard();
+                    evt.consume();
+                    return;
+                }
+                case KeyEvent.VK_G -> {
+                    group();
+                    evt.consume();
+                    return;
+                }
+                case KeyEvent.VK_U -> {
+                    ungroup();
+                    evt.consume();
+                    return;
+                }
+            }
+        }
+
         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());
@@ -170,58 +505,214 @@ public class Controller {
         }
     }
 
-    private void changeSelectionColor(){
-        if (selection == null) {
-            logger.debug("No selection to change color of");
+    private void placeTextAt(Point point) {
+        String input = JOptionPane.showInputDialog(view, "Enter text:", "Add text", JOptionPane.PLAIN_MESSAGE);
+        addingText = false;
+        if (input == null) {
             return;
         }
 
-        for (Shape s : selection) {
-            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))));
+        addShape(SText.create(point.x, point.y, input));
+        resetSelection();
+    }
+
+    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;
+                }
             }
         }
-
-        view.repaint();
+        return null;
     }
 
-    private void copySelection() {
-        if (selection == null) {
-            logger.debug("No selection to copy");
+    private void changeColors(Function<Shape, ColorAttributes> updater) {
+        Map<Shape, ColorAttributes> before = new LinkedHashMap<>();
+        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) {
-            this.model.add(shape.clone());
-        }
-
-        view.repaint();
+        executeAndRefresh(new ChangeColorCommand(before.keySet(), before, after));
     }
 
-    public void deleteSelected() {
-        if (selection == null) return;
-        logger.debug("Deleting selected shape(s)");
-        for (Shape s : selection) {
-            this.model.remove(s);
+    private void beginDrag(Point point) {
+        lastMousePos = point;
+        dragStartMousePos = point;
+        dragStartBounds = captureBounds(selection.getSelectedShapes());
+    }
+
+    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()))
                 .findFirst();
     }
+
+    private Rectangle createSelectionBox(Point start, Point end) {
+        int x = Math.min(start.x, end.x);
+        int y = Math.min(start.y, end.y);
+        int width = Math.abs(end.x - start.x);
+        int height = Math.abs(end.y - start.y);
+        return new Rectangle(x, y, width, height);
+    }
+
+    private void updateSelectionFromBox(Rectangle box) {
+        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/ShapeDraftman.java

@@ -94,12 +94,48 @@ public class ShapeDraftman implements ShapeVisitor {
         drawHandlerIfSelected(tri);
     }
 
+    @Override
+    public void visitText(SText text) {
+        ColorAttributes colAttrs = (ColorAttributes) text.getAttributes(ColorAttributes.ID);
+
+        Font previousFont = g2d.getFont();
+        Color previousColor = g2d.getColor();
+        Font textFont = new Font(text.getFontName(), Font.PLAIN, text.getFontSize());
+        g2d.setFont(textFont);
+        g2d.setColor(resolveTextColor(colAttrs));
+
+        FontMetrics metrics = g2d.getFontMetrics(textFont);
+        int width = metrics.stringWidth(text.getText());
+        int height = metrics.getHeight();
+        text.updateMeasuredBounds(width, height);
+
+        Rectangle bounds = text.getBounds();
+        g2d.drawString(text.getText(), bounds.x, bounds.y + metrics.getAscent());
+
+        g2d.setFont(previousFont);
+        g2d.setColor(previousColor);
+        drawHandlerIfSelected(text);
+    }
+
+    private Color resolveTextColor(ColorAttributes attrs) {
+        if (attrs == null) {
+            return Color.BLACK;
+        }
+        if (attrs.filledColor != null) {
+            return attrs.filledColor;
+        }
+        if (attrs.strokedColor != null) {
+            return attrs.strokedColor;
+        }
+        return Color.BLACK;
+    }
+
     private void drawHandlerIfSelected(Shape s) {
         SelectionAttributes selAttrs = (SelectionAttributes) s.getAttributes(SelectionAttributes.ID);
         if ((selAttrs != null) && (selAttrs.selected)){
             Rectangle bounds = s.getBounds();
             this.g2d.setColor(Color.RED);
-            int handleSize = 5;
+            int handleSize = 10;
             this.g2d.drawRect(bounds.x - handleSize, bounds.y - handleSize, handleSize, handleSize);
             this.g2d.drawRect(bounds.x + bounds.width, bounds.y + bounds.height, handleSize, handleSize);
             if (resizeMode) {
@@ -113,4 +149,14 @@ public class ShapeDraftman implements ShapeVisitor {
         }
     }
 
+    public void drawSelectionBox(Rectangle box) {
+        if (box == null) return;
+        g2d.setXORMode(Color.WHITE);
+        g2d.setColor(Color.BLUE);
+        g2d.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT,
+                BasicStroke.JOIN_MITER, 1, new float[]{4, 4}, 0));
+        g2d.drawRect(box.x, box.y, box.width, box.height);
+        g2d.setPaintMode();
+    }
+
 }

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

@@ -13,6 +13,7 @@ public class ShapesView extends JPanel {
     private final Controller controller;
     private ShapeVisitor draftman;
     private boolean resizeMode;
+    private Rectangle currentSelectionBox;
 
     public ShapesView(SCollection model) {
         this.model = model;
@@ -25,6 +26,7 @@ public class ShapesView extends JPanel {
         this.draftman = new ShapeDraftman(g);
         ((ShapeDraftman) this.draftman).setResizeMode(resizeMode);
         model.accept(draftman);
+        ((ShapeDraftman) this.draftman).drawSelectionBox(currentSelectionBox);
     }
 
     public Controller getController() {
@@ -38,4 +40,8 @@ public class ShapesView extends JPanel {
     public void setResizeMode(boolean resizeMode) {
         this.resizeMode = resizeMode;
     }
+
+    public void setCurrentSelectionBox(Rectangle box) {
+        this.currentSelectionBox = box;
+    }
 }

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

@@ -5,6 +5,7 @@ import org.slf4j.LoggerFactory;
 import ovh.gasser.newshapes.attributes.ColorAttributes;
 import ovh.gasser.newshapes.attributes.SelectionAttributes;
 import ovh.gasser.newshapes.shapes.SCollection;
+import ovh.gasser.newshapes.shapes.SText;
 import ovh.gasser.newshapes.shapes.Shape;
 import ovh.gasser.newshapes.ui.Controller;
 import ovh.gasser.newshapes.ui.ShapesView;
@@ -61,6 +62,10 @@ public class MenuEditListener implements ActionListener {
                 logger.warn("No color attributes: {}", s);
                 continue;
             }
+            if (s instanceof SText) {
+                s.addAttributes(new ColorAttributes(currentColAttrs.filled, currentColAttrs.stroked, filledColor, filledColor));
+                continue;
+            }
             s.addAttributes(new ColorAttributes(true, currentColAttrs.stroked, filledColor, currentColAttrs.strokedColor));
         }
 	}
@@ -74,6 +79,10 @@ public class MenuEditListener implements ActionListener {
                 logger.warn("No color attributes: {}", s);
                 continue;
             }
+            if (s instanceof SText) {
+                s.addAttributes(new ColorAttributes(currentColAttrs.filled, currentColAttrs.stroked, strockedColor, strockedColor));
+                continue;
+            }
             s.addAttributes(new ColorAttributes(currentColAttrs.filled, true, currentColAttrs.filledColor, strockedColor));
         }
 	}
@@ -85,6 +94,7 @@ public class MenuEditListener implements ActionListener {
         for (Shape s : model) {
             SelectionAttributes selAttrs = (SelectionAttributes) s.getAttributes(SelectionAttributes.ID);
             if ((selAttrs == null) || (!selAttrs.selected)) continue;
+            if (s instanceof SText) continue;
             ColorAttributes colAttrs = (ColorAttributes) s.getAttributes(ColorAttributes.ID);
             if (colAttrs == null) {
                 logger.warn("No color attributes: {}", s);
@@ -102,6 +112,7 @@ public class MenuEditListener implements ActionListener {
         for (Shape s : model) {
             SelectionAttributes selAttrs = (SelectionAttributes) s.getAttributes(SelectionAttributes.ID);
             if ((selAttrs == null) || (!selAttrs.selected)) continue;
+            if (s instanceof SText) continue;
             ColorAttributes colAttrs = (ColorAttributes) s.getAttributes(ColorAttributes.ID);
             if (colAttrs == null) {
                 logger.warn("No color attributes: {}", s);

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

@@ -7,10 +7,7 @@ import ovh.gasser.newshapes.shapes.Shape;
 
 import java.awt.*;
 import java.io.PrintWriter;
-import java.util.Arrays;
 import java.util.StringJoiner;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class HTMLDraftman implements ShapeVisitor {
 
@@ -69,11 +66,11 @@ public class HTMLDraftman implements ShapeVisitor {
 
     @Override
     public void visitTriangle(STriangle sTriangle) {
-        htmlOutput.printf("<div class=\"triangle%d\"></div>\n", this.hashCode());
+        htmlOutput.printf("<div class=\"triangle%d\"></div>\n", sTriangle.hashCode());
         var bounds = sTriangle.getBounds();
         ColorAttributes colAttrs = (ColorAttributes) sTriangle.getAttributes(ColorAttributes.ID);
         String colorString = formatCSSColor(colAttrs.filledColor);
-        StringJoiner joiner = new StringJoiner("\n", ".triangle%d{\n".formatted(this.hashCode()), "\n}\n");
+        StringJoiner joiner = new StringJoiner("\n", ".triangle%d{\n".formatted(sTriangle.hashCode()), "\n}\n");
         joiner.add("  position: absolute;");
         joiner.add("  top: %dpx;".formatted(bounds.y));
         joiner.add("  left: %dpx;".formatted(bounds.x));
@@ -87,6 +84,27 @@ public class HTMLDraftman implements ShapeVisitor {
         cssOutput.write(strBuilder);
     }
 
+    @Override
+    public void visitText(SText text) {
+        int id = text.hashCode();
+        htmlOutput.printf("<div id=\"txt%d\">%s</div>\n", id, text.getText());
+
+        ColorAttributes attrs = (ColorAttributes) text.getAttributes(ColorAttributes.ID);
+        String color = formatCSSColor(resolveTextColor(attrs));
+
+        cssOutput.printf("#txt%d{\n", id);
+        cssOutput.println("  position: absolute;");
+        cssOutput.printf("  top:%dpx;%n", text.getBounds().y);
+        cssOutput.printf("  left:%dpx;%n", text.getBounds().x);
+        cssOutput.printf("  font-family:%s;%n", quoteCssString(text.getFontName()));
+        cssOutput.printf("  font-size:%dpx;%n", text.getFontSize());
+        cssOutput.printf("  font-style:%s;%n", (text.getFontStyle() & Font.ITALIC) != 0 ? "italic" : "normal");
+        cssOutput.printf("  font-weight:%s;%n", (text.getFontStyle() & Font.BOLD) != 0 ? "bold" : "normal");
+        cssOutput.printf("  color:%s;%n", color);
+        cssOutput.println("  white-space: nowrap;");
+        cssOutput.println("}");
+    }
+
     private String attributesToCss(Shape shape) {
         ColorAttributes attrs = (ColorAttributes) shape.getAttributes(ColorAttributes.ID);
         String strokedColor = "#ffffff";
@@ -123,4 +141,21 @@ public class HTMLDraftman implements ShapeVisitor {
         visitCollection(model);
         htmlOutput.println(FOOTER_TEMPLATE);
     }
+
+    private String quoteCssString(String raw) {
+        return "\"" + raw.replace("\\", "\\\\").replace("\"", "\\\"") + "\"";
+    }
+
+    private Color resolveTextColor(ColorAttributes attrs) {
+        if (attrs == null) {
+            return Color.BLACK;
+        }
+        if (attrs.filledColor != null) {
+            return attrs.filledColor;
+        }
+        if (attrs.strokedColor != null) {
+            return attrs.strokedColor;
+        }
+        return Color.BLACK;
+    }
 }

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

@@ -6,6 +6,7 @@ import ovh.gasser.newshapes.attributes.ColorAttributes;
 import ovh.gasser.newshapes.shapes.SCircle;
 import ovh.gasser.newshapes.shapes.SCollection;
 import ovh.gasser.newshapes.shapes.SRectangle;
+import ovh.gasser.newshapes.shapes.SText;
 import ovh.gasser.newshapes.shapes.STriangle;
 
 import java.awt.*;
@@ -71,6 +72,26 @@ public class SVGDraftman implements ShapeVisitor {
         this.output.printf("<polygon points=\"%s\" style=\"%s\" />\n", points, style);
     }
 
+    @Override
+    public void visitText(SText sText) {
+        Rectangle bounds = sText.getBounds();
+        ColorAttributes attrs = (ColorAttributes) sText.getAttributes(ColorAttributes.ID);
+        String color = colorToHex(resolveTextColor(attrs));
+        String fontStyle = (sText.getFontStyle() & Font.ITALIC) != 0 ? "italic" : "normal";
+        String fontWeight = (sText.getFontStyle() & Font.BOLD) != 0 ? "bold" : "normal";
+        this.output.printf(
+                "<text x=\"%d\" y=\"%d\" font-family=\"%s\" font-size=\"%d\" font-style=\"%s\" font-weight=\"%s\" fill=\"%s\">%s</text>\n",
+                bounds.x,
+                bounds.y + sText.getFontSize(),
+                sText.getFontName(),
+                sText.getFontSize(),
+                fontStyle,
+                fontWeight,
+                color,
+                sText.getText()
+        );
+    }
+
     public void generateSVG(SCollection model) {
         output.println(String.format(SVG_PRELUDE, App.WIN_SIZE.width, App.WIN_SIZE.height));
         visitCollection(model);
@@ -99,4 +120,17 @@ public class SVGDraftman implements ShapeVisitor {
         }
         return params;
     }
+
+    private Color resolveTextColor(ColorAttributes attrs) {
+        if (attrs == null) {
+            return Color.BLACK;
+        }
+        if (attrs.filledColor != null) {
+            return attrs.filledColor;
+        }
+        if (attrs.strokedColor != null) {
+            return attrs.strokedColor;
+        }
+        return Color.BLACK;
+    }
 }

src/test/java/ovh/gasser/newshapes/SelectionTest.java

@@ -0,0 +1,144 @@
+package ovh.gasser.newshapes;
+
+import org.junit.jupiter.api.Test;
+import ovh.gasser.newshapes.attributes.SelectionAttributes;
+import ovh.gasser.newshapes.shapes.SCircle;
+import ovh.gasser.newshapes.shapes.SRectangle;
+import ovh.gasser.newshapes.shapes.STriangle;
+import ovh.gasser.newshapes.ui.listeners.SelectionListener;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SelectionTest {
+
+    @Test
+    void testIsEmptyInitially() {
+        Selection selection = new Selection();
+        assertTrue(selection.isEmpty());
+    }
+
+    @Test
+    void testAdd() {
+        Selection selection = new Selection();
+        SCircle circle = SCircle.create(0, 0, 50);
+
+        selection.add(circle);
+
+        assertFalse(selection.isEmpty());
+        assertEquals(1, selection.getSelectedShapes().size());
+        assertTrue(selection.getSelectedShapes().contains(circle));
+
+        // Verify shape is marked as selected
+        SelectionAttributes attrs = (SelectionAttributes) circle.getAttributes(SelectionAttributes.ID);
+        assertNotNull(attrs);
+        assertTrue(attrs.selected);
+    }
+
+    @Test
+    void testAddAll() {
+        Selection selection = new Selection();
+        SCircle circle1 = SCircle.create(0, 0, 50);
+        SRectangle rect = SRectangle.create(10, 10, 100, 50);
+        STriangle triangle = STriangle.create(50, 50, 30, java.awt.Color.BLACK, java.awt.Color.BLACK);
+
+        List<ovh.gasser.newshapes.shapes.Shape> shapes = Arrays.asList(circle1, rect, triangle);
+        selection.addAll(shapes);
+
+        assertEquals(3, selection.getSelectedShapes().size());
+        assertTrue(selection.getSelectedShapes().contains(circle1));
+        assertTrue(selection.getSelectedShapes().contains(rect));
+        assertTrue(selection.getSelectedShapes().contains(triangle));
+    }
+
+    @Test
+    void testClear() {
+        Selection selection = new Selection();
+        SCircle circle = SCircle.create(0, 0, 50);
+        SRectangle rect = SRectangle.create(10, 10, 100, 50);
+
+        selection.add(circle);
+        selection.add(rect);
+
+        assertFalse(selection.isEmpty());
+        assertEquals(2, selection.getSelectedShapes().size());
+
+        selection.clear();
+
+        assertTrue(selection.isEmpty());
+        assertEquals(0, selection.getSelectedShapes().size());
+
+        // Verify shapes are marked as unselected
+        SelectionAttributes circleAttrs = (SelectionAttributes) circle.getAttributes(SelectionAttributes.ID);
+        SelectionAttributes rectAttrs = (SelectionAttributes) rect.getAttributes(SelectionAttributes.ID);
+
+        assertNotNull(circleAttrs);
+        assertNotNull(rectAttrs);
+        assertFalse(circleAttrs.selected);
+        assertFalse(rectAttrs.selected);
+    }
+
+    @Test
+    void testGetSelectedShapesReturnsCopy() {
+        Selection selection = new Selection();
+        SCircle circle = SCircle.create(0, 0, 50);
+        selection.add(circle);
+
+        List<ovh.gasser.newshapes.shapes.Shape> copy = selection.getSelectedShapes();
+
+        // Try to modify the copy
+        assertThrows(UnsupportedOperationException.class, () -> copy.add(SCircle.create(10, 10, 20)));
+
+        // Original should be unchanged
+        assertEquals(1, selection.getSelectedShapes().size());
+    }
+
+    @Test
+    void testAddListener() {
+        Selection selection = new Selection();
+        AtomicBoolean listenerNotified = new AtomicBoolean(false);
+        AtomicInteger notificationCount = new AtomicInteger(0);
+
+        SelectionListener listener = (selectedShapes) -> {
+            listenerNotified.set(true);
+            notificationCount.incrementAndGet();
+        };
+
+        selection.addListener(listener);
+
+        // Adding a shape should notify listener
+        SCircle circle = SCircle.create(0, 0, 50);
+        selection.add(circle);
+
+        assertTrue(listenerNotified.get());
+        assertEquals(1, notificationCount.get());
+
+        // Adding another shape should notify listener again
+        SRectangle rect = SRectangle.create(10, 10, 100, 50);
+        selection.add(rect);
+
+        assertEquals(2, notificationCount.get());
+
+        // Clearing should notify listener
+        selection.clear();
+
+        assertEquals(3, notificationCount.get());
+    }
+
+    @Test
+    void testNullAddAllDoesNothing() {
+        Selection selection = new Selection();
+
+        // Should not throw
+        assertDoesNotThrow(() -> selection.addAll(null));
+
+        // Selection should still be empty
+        assertTrue(selection.isEmpty());
+    }
+}

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

@@ -0,0 +1,129 @@
+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

@@ -0,0 +1,72 @@
+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/exporters/HTMLExporterTest.java

@@ -0,0 +1,128 @@
+package ovh.gasser.newshapes.exporters;
+
+import ovh.gasser.newshapes.HTMLExporter;
+import ovh.gasser.newshapes.shapes.SCircle;
+import ovh.gasser.newshapes.shapes.SCollection;
+import ovh.gasser.newshapes.shapes.SRectangle;
+import ovh.gasser.newshapes.ui.visitors.HTMLDraftman;
+
+import java.awt.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
+class HTMLExporterTest {
+
+    @Test
+    void testExportCreatesValidHtmlStructure() throws Exception {
+        SCollection model = SCollection.of(
+                SRectangle.create(10, 20, 100, 50, Color.RED)
+        );
+
+        StringWriter htmlBuffer = new StringWriter();
+        StringWriter cssBuffer = new StringWriter();
+        PrintWriter htmlWriter = new PrintWriter(htmlBuffer);
+        PrintWriter cssWriter = new PrintWriter(cssBuffer);
+        HTMLDraftman draftman = new HTMLDraftman(htmlWriter, cssWriter);
+        draftman.generateHTML(model);
+
+        String htmlOutput = htmlBuffer.toString();
+        String cssOutput = cssBuffer.toString();
+
+        assertTrue(htmlOutput.contains("<!DOCTYPE html>"), "HTML should contain DOCTYPE");
+        assertTrue(htmlOutput.contains("<html"), "HTML should contain html tag");
+        assertTrue(htmlOutput.contains("<head>"), "HTML should contain head tag");
+        assertTrue(htmlOutput.contains("<body>"), "HTML should contain body tag");
+        assertTrue(htmlOutput.contains("</body>"), "HTML should close body tag");
+        assertTrue(htmlOutput.contains("style.css"), "HTML should reference stylesheet");
+    }
+
+    @Test
+    void testExportRectangleGeneratesCorrectDiv() throws Exception {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50, Color.BLUE);
+        SCollection model = SCollection.of(rect);
+
+        StringWriter htmlBuffer = new StringWriter();
+        StringWriter cssBuffer = new StringWriter();
+        PrintWriter htmlWriter = new PrintWriter(htmlBuffer);
+        PrintWriter cssWriter = new PrintWriter(cssBuffer);
+        HTMLDraftman draftman = new HTMLDraftman(htmlWriter, cssWriter);
+        draftman.generateHTML(model);
+
+        String htmlOutput = htmlBuffer.toString();
+        String cssOutput = cssBuffer.toString();
+
+        assertTrue(htmlOutput.contains("rec"), "HTML should contain rectangle div");
+        assertTrue(cssOutput.contains("top:20px"), "CSS should contain correct top position");
+        assertTrue(cssOutput.contains("left:10px"), "CSS should contain correct left position");
+        assertTrue(cssOutput.contains("width:100px"), "CSS should contain correct width");
+        assertTrue(cssOutput.contains("height:50px"), "CSS should contain correct height");
+    }
+
+    @Test
+    void testExportCircleGeneratesCorrectDiv() throws Exception {
+        SCircle circle = SCircle.create(50, 50, 30, Color.GREEN);
+        SCollection model = SCollection.of(circle);
+
+        StringWriter htmlBuffer = new StringWriter();
+        StringWriter cssBuffer = new StringWriter();
+        PrintWriter htmlWriter = new PrintWriter(htmlBuffer);
+        PrintWriter cssWriter = new PrintWriter(cssBuffer);
+        HTMLDraftman draftman = new HTMLDraftman(htmlWriter, cssWriter);
+        draftman.generateHTML(model);
+
+        String htmlOutput = htmlBuffer.toString();
+        String cssOutput = cssBuffer.toString();
+
+        assertTrue(htmlOutput.contains("circle"), "HTML should contain circle class");
+        assertTrue(cssOutput.contains("border-radius"), "CSS should contain border-radius for circle");
+    }
+
+    @Test
+    void testExportEmptyCollection() throws Exception {
+        SCollection model = SCollection.of();
+
+        StringWriter htmlBuffer = new StringWriter();
+        StringWriter cssBuffer = new StringWriter();
+        PrintWriter htmlWriter = new PrintWriter(htmlBuffer);
+        PrintWriter cssWriter = new PrintWriter(cssBuffer);
+        HTMLDraftman draftman = new HTMLDraftman(htmlWriter, cssWriter);
+        draftman.generateHTML(model);
+
+        String htmlOutput = htmlBuffer.toString();
+        
+        assertTrue(htmlOutput.contains("<!DOCTYPE html>"), "HTML should contain DOCTYPE");
+        assertTrue(htmlOutput.contains("<body>"), "HTML should contain body tag");
+        assertTrue(htmlOutput.contains("</body>"), "HTML should close body tag");
+    }
+
+    @Test
+    void testExportNestedCollection() throws Exception {
+        SCollection nested = SCollection.of(
+                SRectangle.create(0, 0, 10, 10, Color.RED),
+                SRectangle.create(20, 0, 10, 10, Color.BLUE)
+        );
+        SCollection model = SCollection.of(nested);
+
+        StringWriter htmlBuffer = new StringWriter();
+        StringWriter cssBuffer = new StringWriter();
+        PrintWriter htmlWriter = new PrintWriter(htmlBuffer);
+        PrintWriter cssWriter = new PrintWriter(cssBuffer);
+        HTMLDraftman draftman = new HTMLDraftman(htmlWriter, cssWriter);
+        draftman.generateHTML(model);
+
+        String htmlOutput = htmlBuffer.toString();
+        
+        assertTrue(htmlOutput.contains("rec"), "HTML should contain rectangles");
+    }
+
+    @Test
+    void testHTMLExporterConstructorWithModel() {
+        SCollection model = SCollection.of(SRectangle.create(1, 2, 3, 4));
+        HTMLExporter exporter = new HTMLExporter(model);
+        
+        assertNotNull(exporter);
+    }
+}

src/test/java/ovh/gasser/newshapes/exporters/SVGExporterTest.java

@@ -0,0 +1,135 @@
+package ovh.gasser.newshapes.exporters;
+
+import ovh.gasser.newshapes.SVGExporter;
+import ovh.gasser.newshapes.attributes.ColorAttributes;
+import ovh.gasser.newshapes.shapes.SCircle;
+import ovh.gasser.newshapes.shapes.SCollection;
+import ovh.gasser.newshapes.shapes.SRectangle;
+import ovh.gasser.newshapes.ui.visitors.SVGDraftman;
+
+import java.awt.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
+class SVGExporterTest {
+
+    @Test
+    void testExportCreatesValidSvgStructure() throws Exception {
+        SCollection model = SCollection.of(
+                SRectangle.create(10, 20, 100, 50)
+        );
+
+        StringWriter buffer = new StringWriter();
+        PrintWriter writer = new PrintWriter(buffer);
+        SVGDraftman draftman = new SVGDraftman(writer);
+        draftman.generateSVG(model);
+
+        String output = buffer.toString();
+
+        assertTrue(output.contains("<?xml version=\"1.0\" encoding=\"utf-8\"?>"), "SVG should contain XML declaration");
+        assertTrue(output.contains("<svg xmlns=\"http://www.w3.org/2000/svg\""), "SVG should contain svg element");
+        assertTrue(output.contains("</svg>"), "SVG should close svg element");
+    }
+
+    @Test
+    void testExportRectangleGeneratesCorrectElement() throws Exception {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        rect.addAttributes(new ColorAttributes(true, false, Color.BLUE, null));
+        SCollection model = SCollection.of(rect);
+
+        StringWriter buffer = new StringWriter();
+        PrintWriter writer = new PrintWriter(buffer);
+        SVGDraftman draftman = new SVGDraftman(writer);
+        draftman.generateSVG(model);
+
+        String output = buffer.toString();
+
+        assertTrue(output.contains("<rect"), "SVG should contain rect element");
+        assertTrue(output.contains("width=\"100\""), "SVG should contain correct width");
+        assertTrue(output.contains("height=\"50\""), "SVG should contain correct height");
+        assertTrue(output.contains("x=\"10\""), "SVG should contain correct x");
+        assertTrue(output.contains("y=\"20\""), "SVG should contain correct y");
+    }
+
+    @Test
+    void testExportCircleGeneratesCorrectElement() throws Exception {
+        SCircle circle = SCircle.create(50, 50, 30);
+        circle.addAttributes(new ColorAttributes(true, false, Color.RED, null));
+        SCollection model = SCollection.of(circle);
+
+        StringWriter buffer = new StringWriter();
+        PrintWriter writer = new PrintWriter(buffer);
+        SVGDraftman draftman = new SVGDraftman(writer);
+        draftman.generateSVG(model);
+
+        String output = buffer.toString();
+
+        assertTrue(output.contains("<circle"), "SVG should contain circle element");
+        assertTrue(output.contains("cx=\"80\""), "SVG should contain correct cx (x + radius)");
+        assertTrue(output.contains("cy=\"80\""), "SVG should contain correct cy (y + radius)");
+        assertTrue(output.contains("r=\"30\""), "SVG should contain correct radius");
+    }
+
+    @Test
+    void testExportEmptyCollection() throws Exception {
+        SCollection model = SCollection.of();
+
+        StringWriter buffer = new StringWriter();
+        PrintWriter writer = new PrintWriter(buffer);
+        SVGDraftman draftman = new SVGDraftman(writer);
+        draftman.generateSVG(model);
+
+        String output = buffer.toString();
+
+        assertTrue(output.contains("<?xml version=\"1.0\" encoding=\"utf-8\"?>"), "SVG should contain XML declaration");
+        assertTrue(output.contains("<svg"), "SVG should contain svg element");
+        assertTrue(output.contains("</svg>"), "SVG should close svg element");
+    }
+
+    @Test
+    void testExportNestedCollection() throws Exception {
+        SCollection nested = SCollection.of(
+                SRectangle.create(0, 0, 10, 10),
+                SRectangle.create(20, 0, 10, 10)
+        );
+        SCollection model = SCollection.of(nested);
+
+        StringWriter buffer = new StringWriter();
+        PrintWriter writer = new PrintWriter(buffer);
+        SVGDraftman draftman = new SVGDraftman(writer);
+        draftman.generateSVG(model);
+
+        String output = buffer.toString();
+
+        assertTrue(output.contains("<rect"), "SVG should contain rect elements");
+        assertTrue(output.contains("</svg>"), "SVG should close svg element");
+    }
+
+    @Test
+    void testExportWithColorAttributes() throws Exception {
+        SRectangle rect = SRectangle.create(0, 0, 50, 50);
+        rect.addAttributes(new ColorAttributes(true, true, Color.decode("#ff0000"), Color.decode("#000000")));
+        SCollection model = SCollection.of(rect);
+
+        StringWriter buffer = new StringWriter();
+        PrintWriter writer = new PrintWriter(buffer);
+        SVGDraftman draftman = new SVGDraftman(writer);
+        draftman.generateSVG(model);
+
+        String output = buffer.toString();
+
+        assertTrue(output.contains("fill=\"#ff0000\""), "SVG should contain fill color");
+        assertTrue(output.contains("stroke=\"#000000\""), "SVG should contain stroke color");
+    }
+
+    @Test
+    void testSVGExporterConstructorWithModel() {
+        SCollection model = SCollection.of(SRectangle.create(1, 2, 3, 4));
+        SVGExporter exporter = new SVGExporter(model);
+        
+        assertNotNull(exporter);
+    }
+}

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

@@ -0,0 +1,68 @@
+package ovh.gasser.newshapes.shapes;
+
+import ovh.gasser.newshapes.attributes.Attributes;
+import ovh.gasser.newshapes.attributes.SelectionAttributes;
+import org.junit.jupiter.api.Test;
+import java.awt.Rectangle;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class AbstractShapeTest {
+
+    @Test
+    void testGetBoundsReturnsCopy() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        Rectangle bounds = rect.getBounds();
+        
+        // Modify the returned bounds
+        bounds.x = 999;
+        
+        // Original should be unchanged
+        assertEquals(10, rect.getBounds().x);
+    }
+
+    @Test
+    void testAddAndGetAttributes() {
+        SRectangle rect = SRectangle.create(0, 0, 10, 10);
+        Attributes attrs = new SelectionAttributes();
+        rect.addAttributes(attrs);
+        
+        assertSame(attrs, rect.getAttributes(SelectionAttributes.ID));
+    }
+
+    @Test
+    void testTranslate() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        rect.translate(5, 10);
+        
+        assertEquals(15, rect.getBounds().x);
+        assertEquals(30, rect.getBounds().y);
+    }
+
+    @Test
+    void testResizeEast() {
+        SRectangle rect = SRectangle.create(0, 0, 100, 50);
+        rect.resize(ResizeHandle.E, 20, 0);
+        
+        assertEquals(120, rect.getBounds().width);
+    }
+
+    @Test
+    void testResizeSouth() {
+        SRectangle rect = SRectangle.create(0, 0, 100, 50);
+        rect.resize(ResizeHandle.S, 0, 30);
+        
+        assertEquals(80, rect.getBounds().height);
+    }
+
+    @Test
+    void testToString() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        String str = rect.toString();
+        
+        assertTrue(str.contains("x=10"));
+        assertTrue(str.contains("y=20"));
+        assertTrue(str.contains("width=100"));
+        assertTrue(str.contains("height=50"));
+    }
+}

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

@@ -0,0 +1,94 @@
+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/shapes/SCircleTest.java

@@ -0,0 +1,58 @@
+package ovh.gasser.newshapes.shapes;
+
+import org.junit.jupiter.api.Test;
+import java.awt.Color;
+import java.awt.Rectangle;
+import java.awt.Shape;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SCircleTest {
+    @Test
+    void testCreateWithDefaultColor() {
+        SCircle circle = SCircle.create(10, 20, 50);
+        assertNotNull(circle);
+        assertEquals(50, circle.getRadius());
+    }
+
+    @Test
+    void testCreateWithCustomColor() {
+        SCircle circle = SCircle.create(0, 0, 10, Color.RED);
+        assertNotNull(circle);
+        assertEquals(10, circle.getRadius());
+        try {
+            Object color = circle.getClass().getMethod("getColor").invoke(circle);
+            assertEquals(Color.RED, color);
+        } catch (NoSuchMethodException e) {
+            // Method not available; skip color check
+        } catch (Exception e) {
+            fail("Unexpected exception while verifying color: " + e);
+        }
+    }
+
+    @Test
+    void testGetRadius() {
+        SCircle circle = SCircle.create(5, 5, 15);
+        assertEquals(15, circle.getRadius());
+    }
+
+    @Test
+    void testCloneCreatesIndependentCopy() {
+        SCircle original = SCircle.create(12, 34, 7);
+        Object cloneObj = original.clone();
+        assertNotSame(original, cloneObj);
+        assertTrue(cloneObj instanceof SCircle);
+        SCircle clone = (SCircle) cloneObj;
+        assertEquals(original.getRadius(), clone.getRadius());
+    }
+
+    @Test
+    void testBoundsAreCalculatedFromRadius() {
+        SCircle circle = SCircle.create(10, 20, 5);
+        Rectangle bounds = circle.getBounds();
+        assertEquals(10, bounds.x);
+        assertEquals(20, bounds.y);
+        assertEquals(10, bounds.width);
+        assertEquals(10, bounds.height);
+    }
+}

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

@@ -0,0 +1,176 @@
+package ovh.gasser.newshapes.shapes;
+
+import org.junit.jupiter.api.Test;
+import ovh.gasser.newshapes.App;
+import ovh.gasser.newshapes.attributes.ColorAttributes;
+import ovh.gasser.newshapes.attributes.SelectionAttributes;
+
+import java.awt.Color;
+import java.awt.Rectangle;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SCollectionTest {
+
+    @Test
+    void testCreateWithShapes() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        SCircle circle = SCircle.create(50, 50, 25);
+        
+        SCollection collection = SCollection.of(rect, circle);
+        
+        assertNotNull(collection);
+        assertEquals(2, collection.stream().count());
+    }
+
+    @Test
+    void testAdd() {
+        SCollection collection = SCollection.of();
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        
+        collection.add(rect);
+        
+        assertEquals(1, collection.stream().count());
+        assertSame(rect, collection.iterator().next());
+    }
+
+    @Test
+    void testRemove() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        SCollection collection = SCollection.of(rect);
+        
+        collection.remove(rect);
+        
+        assertEquals(0, collection.stream().count());
+    }
+
+    @Test
+    void testIterator() {
+        SRectangle rect1 = SRectangle.create(10, 20, 100, 50);
+        SRectangle rect2 = SRectangle.create(30, 40, 60, 70);
+        SCollection collection = SCollection.of(rect1, rect2);
+        
+        Iterator<Shape> iterator = collection.iterator();
+        
+        assertTrue(iterator.hasNext());
+        assertSame(rect1, iterator.next());
+        assertTrue(iterator.hasNext());
+        assertSame(rect2, iterator.next());
+        assertFalse(iterator.hasNext());
+    }
+
+    @Test
+    void testStream() {
+        SRectangle rect1 = SRectangle.create(10, 20, 100, 50);
+        SRectangle rect2 = SRectangle.create(30, 40, 60, 70);
+        SCircle circle = SCircle.create(50, 50, 25);
+        SCollection collection = SCollection.of(rect1, rect2, circle);
+        
+        List<Shape> shapes = collection.stream().collect(Collectors.toList());
+        
+        assertEquals(3, shapes.size());
+        assertTrue(shapes.contains(rect1));
+        assertTrue(shapes.contains(rect2));
+        assertTrue(shapes.contains(circle));
+    }
+
+    @Test
+    void testGetBoundsEmptyCollection() {
+        SCollection collection = SCollection.of();
+        
+        Rectangle bounds = collection.getBounds();
+        
+        assertEquals(App.WIN_SIZE.width, bounds.width);
+        assertEquals(App.WIN_SIZE.height, bounds.height);
+    }
+
+    @Test
+    void testGetBoundsWithChildren() {
+        SRectangle rect1 = SRectangle.create(10, 10, 50, 50);
+        SRectangle rect2 = SRectangle.create(100, 100, 80, 40);
+        SCollection collection = SCollection.of(rect1, rect2);
+        
+        Rectangle bounds = collection.getBounds();
+        
+        // Union should cover from (10,10) to (180,140)
+        assertEquals(10, bounds.x);
+        assertEquals(10, bounds.y);
+        assertEquals(170, bounds.width);  // 100+80-10 = 170
+        assertEquals(130, bounds.height); // 100+40-10 = 130
+    }
+
+    @Test
+    void testTranslate() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        SCollection collection = SCollection.of(rect);
+        
+        collection.translate(5, 10);
+        
+        Rectangle bounds = rect.getBounds();
+        assertEquals(15, bounds.x);
+        assertEquals(30, bounds.y);
+    }
+
+    @Test
+    void testClone() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        SCollection original = SCollection.of(rect);
+        
+        SCollection cloned = (SCollection) original.clone();
+        
+        assertNotSame(original, cloned);
+        assertEquals(original.stream().count(), cloned.stream().count());
+        
+        // Verify SelectionAttributes is added to clone
+        assertNotNull(cloned.getAttributes(SelectionAttributes.ID));
+        
+        // Verify deep copy - modifying clone doesn't affect original
+        Iterator<Shape> clonedIterator = cloned.iterator();
+        Shape clonedChild = clonedIterator.next();
+        clonedChild.translate(100, 100);
+        
+        Rectangle originalBounds = rect.getBounds();
+        assertEquals(10, originalBounds.x);
+        assertEquals(20, originalBounds.y);
+    }
+
+    @Test
+    void testToString() {
+        SCollection collection = SCollection.of();
+        
+        String str = collection.toString();
+        
+        assertTrue(str.contains("SCollection"));
+    }
+
+    @Test
+    void testAddAttributesPropagatesToChildren() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        SCollection collection = SCollection.of(rect);
+        
+        ColorAttributes attrs = new ColorAttributes(true, true, Color.RED, Color.BLUE);
+        collection.addAttributes(attrs);
+        
+        ColorAttributes childAttrs = (ColorAttributes) rect.getAttributes(ColorAttributes.ID);
+        
+        assertNotNull(childAttrs);
+        assertEquals(Color.RED, childAttrs.filledColor);
+        assertEquals(Color.BLUE, childAttrs.strokedColor);
+    }
+
+    @Test
+    void testGetAttributesReturnsChildColor() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50, Color.GREEN);
+        SCircle circle = SCircle.create(50, 50, 25);
+        SCollection collection = SCollection.of(rect, circle);
+        
+        ColorAttributes attrs = (ColorAttributes) collection.getAttributes(ColorAttributes.ID);
+        
+        assertNotNull(attrs);
+        // First child's color should be returned (strokedColor for SRectangle)
+        assertEquals(Color.GREEN, attrs.strokedColor);
+    }
+}

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

@@ -0,0 +1,45 @@
+package ovh.gasser.newshapes.shapes;
+
+import org.junit.jupiter.api.Test;
+import java.awt.Color;
+import java.awt.Rectangle;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SRectangleTest {
+    @Test
+    void testCreateWithDefaultColor() {
+        SRectangle rect = SRectangle.create(10, 20, 100, 50);
+        assertNotNull(rect);
+        assertEquals(100, rect.getBounds().width);
+        assertEquals(50, rect.getBounds().height);
+    }
+
+    @Test
+    void testCreateWithCustomColor() {
+        SRectangle rect = SRectangle.create(5, 5, 30, 40, Color.RED);
+        assertNotNull(rect);
+        assertEquals(30, rect.getBounds().width);
+        assertEquals(40, rect.getBounds().height);
+    }
+
+    @Test
+    void testCloneCreatesIndependentCopy() {
+        SRectangle original = SRectangle.create(0, 0, 10, 10, Color.BLUE);
+        Object cloneObj = original.clone();
+        assertNotSame(original, cloneObj);
+        assertTrue(cloneObj instanceof SRectangle);
+        SRectangle clone = (SRectangle) cloneObj;
+        assertEquals(original.getBounds(), clone.getBounds());
+    }
+
+    @Test
+    void testBoundsAreSetCorrectly() {
+        SRectangle rect = SRectangle.create(15, 25, 80, 60);
+        Rectangle bounds = rect.getBounds();
+        assertEquals(15, bounds.x);
+        assertEquals(25, bounds.y);
+        assertEquals(80, bounds.width);
+        assertEquals(60, bounds.height);
+    }
+}

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

@@ -0,0 +1,47 @@
+package ovh.gasser.newshapes.shapes;
+
+import org.junit.jupiter.api.Test;
+import java.awt.Font;
+import java.awt.Rectangle;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class STextTest {
+    @Test
+    void testCreate() {
+        SText text = SText.create(10, 20, "Hello");
+        assertNotNull(text);
+        assertEquals("Hello", text.getText());
+    }
+
+    @Test
+    void testCreateWithDefaultValues() {
+        SText text = SText.create(0, 0, "Test");
+        assertEquals("Test", text.getText());
+        assertEquals(SText.DEFAULT_FONT_SIZE, text.getFontSize());
+        assertEquals(SText.DEFAULT_FONT_NAME, text.getFontName());
+        assertEquals(SText.DEFAULT_FONT_STYLE, text.getFontStyle());
+    }
+
+    @Test
+    void testCloneCreatesIndependentCopy() {
+        SText original = SText.create(5, 5, "Copy");
+        Object cloneObj = original.clone();
+        assertNotSame(original, cloneObj);
+        assertTrue(cloneObj instanceof SText);
+        SText clone = (SText) cloneObj;
+        assertEquals(original.getText(), clone.getText());
+    }
+
+    @Test
+    void testPlaceholderTextForEmpty() {
+        SText text = SText.create(0, 0, "");
+        assertEquals(SText.PLACEHOLDER_TEXT, text.getText());
+    }
+
+    @Test
+    void testPlaceholderTextForNull() {
+        SText text = SText.create(0, 0, null);
+        assertEquals(SText.PLACEHOLDER_TEXT, text.getText());
+    }
+}

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

@@ -0,0 +1,37 @@
+package ovh.gasser.newshapes.shapes;
+
+import org.junit.jupiter.api.Test;
+import java.awt.Color;
+import java.awt.Rectangle;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class STriangleTest {
+    @Test
+    void testCreate() {
+        STriangle triangle = STriangle.create(10, 20, 50, Color.RED, Color.BLACK);
+        assertNotNull(triangle);
+        assertEquals(50, triangle.getBounds().width);
+        assertEquals(50, triangle.getBounds().height);
+    }
+
+    @Test
+    void testCloneCreatesIndependentCopy() {
+        STriangle original = STriangle.create(0, 0, 30, Color.BLUE, Color.BLACK);
+        Object cloneObj = original.clone();
+        assertNotSame(original, cloneObj);
+        assertTrue(cloneObj instanceof STriangle);
+        STriangle clone = (STriangle) cloneObj;
+        assertEquals(original.getBounds(), clone.getBounds());
+    }
+
+    @Test
+    void testBoundsAreSetCorrectly() {
+        STriangle triangle = STriangle.create(5, 10, 25, Color.GREEN, Color.BLACK);
+        Rectangle bounds = triangle.getBounds();
+        assertEquals(5, bounds.x);
+        assertEquals(10, bounds.y);
+        assertEquals(25, bounds.width);
+        assertEquals(25, bounds.height);
+    }
+}

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

@@ -0,0 +1,73 @@
+package ovh.gasser.newshapes.shapes;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.awt.Rectangle;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Parameterized contract tests verifying Shape interface invariants
+ * across all implementations (SRectangle, SCircle, STriangle, SText, SCollection).
+ */
+class ShapeContractTest {
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("ovh.gasser.newshapes.shapes.ShapeFactory#allShapes")
+    void cloneReturnsIndependentCopy(Shape shape) {
+        Shape cloned = shape.clone();
+
+        // clone must not be the same instance
+        assertNotSame(shape, cloned, "clone() must return a new instance");
+
+        // clone must have equal bounds
+        assertEquals(shape.getBounds(), cloned.getBounds(),
+                "clone() must preserve bounds");
+
+        // mutating the clone must not affect the original
+        Rectangle originalBounds = shape.getBounds();
+        cloned.translate(999, 999);
+        assertEquals(originalBounds, shape.getBounds(),
+                "Translating the clone must not affect the original's bounds");
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("ovh.gasser.newshapes.shapes.ShapeFactory#allShapes")
+    void getBoundsReturnsCopy(Shape shape) {
+        Rectangle bounds1 = shape.getBounds();
+        Rectangle bounds2 = shape.getBounds();
+
+        // successive calls must return equal bounds
+        assertEquals(bounds1, bounds2,
+                "getBounds() must return consistent values");
+
+        // but not the same object (defensive copy)
+        assertNotSame(bounds1, bounds2,
+                "getBounds() must return a copy, not internal state");
+
+        // mutating the returned Rectangle must not affect the shape
+        bounds1.translate(500, 500);
+        assertEquals(bounds2, shape.getBounds(),
+                "Mutating the returned Rectangle must not affect the shape");
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("ovh.gasser.newshapes.shapes.ShapeFactory#allShapes")
+    void translateMutatesInPlace(Shape shape) {
+        Rectangle before = shape.getBounds();
+        int dx = 7, dy = -3;
+
+        shape.translate(dx, dy);
+
+        Rectangle after = shape.getBounds();
+        assertEquals(before.x + dx, after.x,
+                "translate() must shift x by dx");
+        assertEquals(before.y + dy, after.y,
+                "translate() must shift y by dy");
+        assertEquals(before.width, after.width,
+                "translate() must not change width");
+        assertEquals(before.height, after.height,
+                "translate() must not change height");
+    }
+}

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

@@ -0,0 +1,25 @@
+package ovh.gasser.newshapes.shapes;
+
+import java.awt.Color;
+import java.util.stream.Stream;
+
+/**
+ * Provides Shape instances for parameterized contract tests.
+ */
+public final class ShapeFactory {
+
+    private ShapeFactory() {}
+
+    static Stream<Shape> allShapes() {
+        return Stream.of(
+                SRectangle.create(10, 20, 100, 50),
+                SCircle.create(5, 5, 30),
+                STriangle.create(0, 0, 40, Color.RED, Color.BLACK),
+                SText.create(15, 25, "Hello"),
+                SCollection.of(
+                        SRectangle.create(0, 0, 20, 20),
+                        SCircle.create(10, 10, 5)
+                )
+        );
+    }
+}

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

@@ -0,0 +1,198 @@
+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 java.awt.*;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class ControllerTest {
+
+    @Test
+    void copyDoesNotMutateModelAndPasteSelectsOffsetClone() {
+        SCollection model = SCollection.of(SRectangle.create(10, 15, 30, 40, Color.BLUE));
+        ShapesView view = new ShapesView(model);
+        Controller controller = view.getController();
+
+        click(view, 15, 20, 0);
+        controller.copySelection();
+
+        assertEquals(1, model.stream().count());
+
+        controller.pasteClipboard();
+
+        List<Shape> shapes = model.stream().toList();
+        assertEquals(2, shapes.size());
+        assertEquals(new Rectangle(10, 15, 30, 40), shapes.get(0).getBounds());
+        assertEquals(new Rectangle(30, 35, 30, 40), shapes.get(1).getBounds());
+        assertFalse(isSelected(shapes.get(0)));
+        assertTrue(isSelected(shapes.get(1)));
+    }
+
+    @Test
+    void repeatedPasteKeepsIncreasingOffset() {
+        SCollection model = SCollection.of(SRectangle.create(5, 10, 20, 25, Color.RED));
+        ShapesView view = new ShapesView(model);
+        Controller controller = view.getController();
+
+        click(view, 10, 15, 0);
+        controller.copySelection();
+        controller.pasteClipboard();
+        controller.pasteClipboard();
+
+        List<Shape> shapes = model.stream().toList();
+        assertEquals(3, shapes.size());
+        assertEquals(new Rectangle(25, 30, 20, 25), shapes.get(1).getBounds());
+        assertEquals(new Rectangle(45, 50, 20, 25), shapes.get(2).getBounds());
+        assertFalse(isSelected(shapes.get(1)));
+        assertTrue(isSelected(shapes.get(2)));
+    }
+
+    @Test
+    void controlShortcutsCutAndPasteMultipleShapes() {
+        SCollection model = SCollection.of(
+                SRectangle.create(10, 10, 15, 20, Color.BLACK),
+                SRectangle.create(80, 25, 25, 30, Color.GREEN)
+        );
+        ShapesView view = new ShapesView(model);
+
+        click(view, 15, 15, 0);
+        click(view, 85, 30, InputEvent.SHIFT_DOWN_MASK);
+
+        pressShortcut(view, KeyEvent.VK_X);
+        assertEquals(0, model.stream().count());
+
+        pressShortcut(view, KeyEvent.VK_V);
+
+        List<Shape> shapes = model.stream().toList();
+        assertEquals(2, shapes.size());
+        assertEquals(new Rectangle(30, 30, 15, 20), shapes.get(0).getBounds());
+        assertEquals(new Rectangle(100, 45, 25, 30), shapes.get(1).getBounds());
+        assertTrue(isSelected(shapes.get(0)));
+        assertTrue(isSelected(shapes.get(1)));
+    }
+
+    @Test
+    void groupReplacesSelectedShapesWithCollectionAndSelectsIt() {
+        SRectangle rect1 = SRectangle.create(10, 10, 15, 20, Color.BLACK);
+        SRectangle rect2 = SRectangle.create(80, 25, 25, 30, Color.GREEN);
+        SRectangle rect3 = SRectangle.create(140, 40, 10, 10, Color.BLUE);
+        SCollection model = SCollection.of(rect1, rect2, rect3);
+        ShapesView view = new ShapesView(model);
+        Controller controller = view.getController();
+
+        click(view, 15, 15, 0);
+        click(view, 85, 30, InputEvent.SHIFT_DOWN_MASK);
+        controller.group();
+
+        List<Shape> shapes = model.stream().toList();
+        assertEquals(2, shapes.size());
+        SCollection group = assertInstanceOf(SCollection.class, shapes.get(0));
+        assertEquals(List.of(rect1, rect2), group.stream().toList());
+        assertEquals(new Rectangle(10, 10, 95, 45), group.getBounds());
+        assertTrue(isSelected(group));
+        assertFalse(isSelected(rect1));
+        assertFalse(isSelected(rect2));
+        assertFalse(isSelected(rect3));
+    }
+
+    @Test
+    void ungroupOnlyBreaksApartOneLevelAndSelectsChildren() {
+        SRectangle rect1 = SRectangle.create(10, 10, 15, 20, Color.BLACK);
+        SRectangle rect2 = SRectangle.create(80, 25, 25, 30, Color.GREEN);
+        SCollection innerGroup = SCollection.of(rect1, rect2);
+        SRectangle rect3 = SRectangle.create(140, 40, 10, 10, Color.BLUE);
+        SCollection outerGroup = SCollection.of(innerGroup, rect3);
+        SCollection model = SCollection.of(outerGroup);
+        ShapesView view = new ShapesView(model);
+        Controller controller = view.getController();
+
+        click(view, 15, 15, 0);
+        controller.ungroup();
+
+        List<Shape> shapes = model.stream().toList();
+        assertEquals(List.of(innerGroup, rect3), shapes);
+        assertTrue(isSelected(innerGroup));
+        assertTrue(isSelected(rect3));
+        assertFalse(isSelected(rect1));
+        assertFalse(isSelected(rect2));
+    }
+
+    @Test
+    void controlShortcutsGroupAndUngroupShapes() {
+        SCollection model = SCollection.of(
+                SRectangle.create(10, 10, 15, 20, Color.BLACK),
+                SRectangle.create(80, 25, 25, 30, Color.GREEN)
+        );
+        ShapesView view = new ShapesView(model);
+
+        click(view, 15, 15, 0);
+        click(view, 85, 30, InputEvent.SHIFT_DOWN_MASK);
+        pressShortcut(view, KeyEvent.VK_G, InputEvent.CTRL_DOWN_MASK);
+
+        Shape groupedShape = model.stream().toList().get(0);
+        assertTrue(groupedShape instanceof SCollection);
+        assertTrue(isSelected(groupedShape));
+
+        pressShortcut(view, KeyEvent.VK_U, InputEvent.CTRL_DOWN_MASK);
+
+        List<Shape> shapes = model.stream().toList();
+        assertEquals(2, shapes.size());
+        assertTrue(isSelected(shapes.get(0)));
+        assertTrue(isSelected(shapes.get(1)));
+    }
+
+    private static void click(ShapesView view, int x, int y, int modifiers) {
+        MouseEvent event = new MouseEvent(
+                view,
+                MouseEvent.MOUSE_PRESSED,
+                System.currentTimeMillis(),
+                modifiers,
+                x,
+                y,
+                1,
+                false,
+                MouseEvent.BUTTON1
+        );
+
+        for (MouseListener listener : view.getMouseListeners()) {
+            listener.mousePressed(event);
+        }
+    }
+
+    private static void pressShortcut(ShapesView view, int keyCode) {
+        pressShortcut(view, keyCode, InputEvent.CTRL_DOWN_MASK);
+    }
+
+    private static void pressShortcut(ShapesView view, int keyCode, int modifiers) {
+        KeyEvent event = new KeyEvent(
+                view,
+                KeyEvent.KEY_PRESSED,
+                System.currentTimeMillis(),
+                modifiers,
+                keyCode,
+                KeyEvent.CHAR_UNDEFINED
+        );
+
+        for (var listener : view.getKeyListeners()) {
+            listener.keyPressed(event);
+        }
+    }
+
+    private static boolean isSelected(Shape shape) {
+        SelectionAttributes attributes = (SelectionAttributes) shape.getAttributes(SelectionAttributes.ID);
+        return attributes != null && attributes.selected;
+    }
+}

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

@@ -0,0 +1,409 @@
+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

@@ -0,0 +1,370 @@
+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");
+        }
+    }
+}

src/test/java/ovh/gasser/newshapes/util/StreamableTest.java

@@ -0,0 +1,48 @@
+package ovh.gasser.newshapes.util;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class StreamableTest {
+
+    private static class TestStreamable implements Streamable<String> {
+        private final List<String> elements;
+
+        TestStreamable(List<String> elements) {
+            this.elements = new ArrayList<>(elements);
+        }
+
+        @Override
+        public java.util.Iterator<String> iterator() {
+            return elements.iterator();
+        }
+    }
+
+    @Test
+    void testStreamReturnsStreamOfElements() {
+        List<String> testData = Arrays.asList("a", "b", "c");
+        Streamable<String> streamable = new TestStreamable(testData);
+
+        Stream<String> result = streamable.stream();
+
+        assertNotNull(result);
+        assertEquals(testData, result.toList());
+    }
+
+    @Test
+    void testStreamEmptyCollection() {
+        List<String> emptyData = new ArrayList<>();
+        Streamable<String> streamable = new TestStreamable(emptyData);
+
+        Stream<String> result = streamable.stream();
+
+        assertNotNull(result);
+        assertTrue(result.toList().isEmpty());
+    }
+}

style.css

@@ -1,7 +1,7 @@
-.triangle110717522{
+.triangle204514374{
   position: absolute;
-  top: 162px;
-  left: 367px;
+  top: 169px;
+  left: 372px;
   width: 0px;
   height: 0px;
   border: 0 solid transparent;
@@ -9,35 +9,35 @@
   border-right-width: 30.0px;
   border-bottom: 50px solid #ffff00;
 }
-#rec209793789{ 
+#rec664997016{ 
 position:absolute;
 top:10px;
 left:10px;
 width:40px;
 height:60px;
 background:#ffffff;border:1px solid #ff0000; }
-#rec365617083{ 
+#rec2139424642{ 
 position:absolute;
 top:10px;
 left:70px;
 width:40px;
 height:60px;
 background:#ffffff;border:1px solid #000000; }
-#rec1121327988{ 
+#rec609258999{ 
 position:absolute;
 top:200px;
 left:100px;
 width:40px;
 height:60px;
 background:#ffffff;border:1px solid #ff00ff; }
-#rec256914054{ 
+#rec759898031{ 
 position:absolute;
 top:200px;
 left:150px;
 width:40px;
 height:60px;
 background:#ffffff;border:1px solid #ff00ff; }
-  .circle172224331{
+  .circle305332562{
 
   position: absolute;
   top:250px;
@@ -52,3 +52,14 @@ background:#ffffff;border:1px solid #ff00ff; }
 background:#ffffff;border:1px solid #000000;
 }
 
+#txt1172155777{
+  position: absolute;
+  top:125px;
+  left:216px;
+  font-family:"SansSerif";
+  font-size:16px;
+  font-style:normal;
+  font-weight:normal;
+  color:#9999ff;
+  white-space: nowrap;
+}