Fix bugs: stroke condition, logging typo, NPE in clone(), mutable bounds

.gitea/workflows/ci.yaml

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

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

TODO.md

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

mvnw

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

pom.xml

@@ -6,9 +6,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.source>1.10</maven.compiler.source>
-        <maven.compiler.target>16</maven.compiler.target>
+        <maven.compiler.target>1.10</maven.compiler.target>
-        <maven.testSourceDirectory>test/java</maven.testSourceDirectory>
     </properties>
     <build>
         <plugins>
@@ -20,45 +19,6 @@
                     <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.11</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>
 
@@ -78,19 +38,5 @@
             <artifactId>logback-classic</artifactId>
             <version>RELEASE</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>
     </dependencies>
-</project>
+</project>

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

@@ -8,6 +8,7 @@ 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.*;
@@ -38,7 +39,12 @@ public class App {
 
         this.buildMenuBar(frame, view);
 
-        view.addSelectionChangeListener(this::updateMenuState);
+        view.addSelectionChangeListener(new SelectionListener() {
+            @Override
+            public void onSelectionChanged(Iterable<Shape> selectedShapes) {
+                updateMenuState(selectedShapes);
+            }
+        });
     }
 
     private void buildModel() {
@@ -73,13 +79,11 @@ public class App {
         JMenu menuFile = new JMenu("File");
         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");
         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();
@@ -97,7 +101,6 @@ public class App {
         exitItem.addActionListener(evt -> System.exit(0));
         menuFile.add(addRectItem);
         menuFile.add(addCircleItem);
-        menuFile.add(addTextItem);
         menuFile.addSeparator();
         menuFile.add(htmlExportItem);
         menuFile.add(svgExportItem);
@@ -129,24 +132,21 @@ public class App {
     }
 
     private void updateMenuState(Iterable<Shape> selectedShapes) {
-        boolean hasToggleableShapes = false;
+        boolean hasAttributes = false;
         boolean allFilled = true;
         boolean allStroked = true;
 
         for (Shape s : selectedShapes) {
-            if (s instanceof SText) {
-                continue;
-            }
             ColorAttributes attrs = (ColorAttributes) s.getAttributes(ColorAttributes.ID);
             if (attrs != null) {
-                hasToggleableShapes = true;
+                hasAttributes = true;
                 allFilled = allFilled && attrs.filled;
                 allStroked = allStroked && attrs.stroked;
             }
         }
 
-        updateMenuItem(editFill, hasToggleableShapes, allFilled);
+        updateMenuItem(editFill, hasAttributes, allFilled);
-        updateMenuItem(editBorder, hasToggleableShapes, allStroked);
+        updateMenuItem(editBorder, hasAttributes, allStroked);
     }
 
     private void updateMenuItem(JCheckBoxMenuItem menuItem, boolean hasAttributes, boolean allSelected) {

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

@@ -9,7 +9,6 @@ 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;
 
@@ -39,15 +38,6 @@ 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,7 +3,6 @@ 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 {
@@ -14,6 +13,4 @@ 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<>();
-    protected final Rectangle bounds;
+    private final Rectangle bounds;
 
     AbstractShape() {
         this(null);
@@ -31,45 +31,46 @@ public abstract class AbstractShape implements Shape {
 
     @Override
     public void translate(int dx, int dy) {
-        this.bounds.translate(dx, dy);
+        getBounds().translate(dx, dy);
     }
 
     @Override
     public void resize(ResizeHandle handle, int dx, int dy) {
+        Rectangle bounds = getBounds();
         switch (handle) {
-            case E -> this.bounds.width += dx;
+            case E -> bounds.width += dx;
             case W -> {
-                this.bounds.x += dx;
+                bounds.x += dx;
-                this.bounds.width -= dx;
+                bounds.width -= dx;
             }
-            case S -> this.bounds.height += dy;
+            case S -> bounds.height += dy;
             case N -> {
-                this.bounds.y += dy;
+                bounds.y += dy;
-                this.bounds.height -= dy;
+                bounds.height -= dy;
             }
             case SE -> {
-                this.bounds.width += dx;
+                bounds.width += dx;
-                this.bounds.height += dy;
+                bounds.height += dy;
             }
             case SW -> {
-                this.bounds.x += dx;
+                bounds.x += dx;
-                this.bounds.width -= dx;
+                bounds.width -= dx;
-                this.bounds.height += dy;
+                bounds.height += dy;
             }
             case NE -> {
-                this.bounds.width += dx;
+                bounds.width += dx;
-                this.bounds.y += dy;
+                bounds.y += dy;
-                this.bounds.height -= dy;
+                bounds.height -= dy;
             }
             case NW -> {
-                this.bounds.x += dx;
+                bounds.x += dx;
-                this.bounds.width -= dx;
+                bounds.width -= dx;
-                this.bounds.y += dy;
+                bounds.y += dy;
-                this.bounds.height -= dy;
+                bounds.height -= dy;
             }
         }
-        if (this.bounds.width < 1) this.bounds.width = 1;
+        if (bounds.width < 1) bounds.width = 1;
-        if (this.bounds.height < 1) this.bounds.height = 1;
+        if (bounds.height < 1) bounds.height = 1;
     }
 
     @Override

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

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

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

@@ -1,80 +0,0 @@
-package ovh.gasser.newshapes.shapes;
-
-import ovh.gasser.newshapes.ShapeVisitor;
-import ovh.gasser.newshapes.attributes.ColorAttributes;
-import ovh.gasser.newshapes.attributes.SelectionAttributes;
-
-import java.awt.*;
-
-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,22 +18,21 @@ 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 || dy > 0);
+            case NE -> (dx < 0);
-            case SW -> (dx > 0 || dy < 0);
+            case SW -> (dx > 0);
+            case E, W -> (dx < 0);
+            case N, S -> (dy < 0);
             default -> false;
         };
 
         int sizeChange = shrink ? -delta : delta;
-        
+
         switch (handle) {
             case SE, E, W -> {
                 bounds.width += sizeChange;

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

@@ -7,11 +7,9 @@ import ovh.gasser.newshapes.Selection;
 import ovh.gasser.newshapes.attributes.ColorAttributes;
 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.KeyAdapter;
 import java.awt.event.KeyEvent;
@@ -27,14 +25,10 @@ public class Controller {
     private final Selection selection;
 
     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;
 
     Controller(ShapesView view, SCollection model) {
         this.view = view;
@@ -57,11 +51,6 @@ public class Controller {
                 resizing = false;
                 activeHandle = null;
                 resizeOrigin = null;
-                boxSelecting = false;
-                selectionBoxStart = null;
-                selectionBoxEnd = null;
-                view.setCurrentSelectionBox(null);
-                view.repaint();
             }
         };
         this.view.addMouseMotionListener(adapter);
@@ -75,24 +64,10 @@ public class Controller {
     }
 
     private void handleMouseDragged(MouseEvent evt) {
-        if (boxSelecting) {
-            selectionBoxEnd = evt.getPoint();
-            Rectangle box = createSelectionBox(selectionBoxStart, selectionBoxEnd);
-            view.setCurrentSelectionBox(box);
-            updateSelectionFromBox(box);
-            view.repaint();
-            return;
-        }
-
-        boxSelecting = false;
-
         if (resizeMode && resizing && activeHandle != null) {
-            logger.debug("RESIZING with handle {} at ({}, {})", activeHandle, evt.getX(), evt.getY());
             int dx = evt.getX() - resizeOrigin.x;
             int dy = evt.getY() - resizeOrigin.y;
-            logger.debug("About to resize {} shapes, dx={}, dy={}", selection.getSelectedShapes().size(), dx, dy);
             for (Shape shape : selection) {
-                logger.debug("Calling resize on shape: {}", shape);
                 shape.resize(activeHandle, dx, dy);
             }
             resizeOrigin = evt.getPoint();
@@ -107,12 +82,8 @@ public class Controller {
         } else {
             resizing = false;
             activeHandle = null;
-            if (lastMousePos == null) {
-                lastMousePos = evt.getPoint();
-            }
             int dx = evt.getX() - lastMousePos.x;
             int dy = evt.getY() - lastMousePos.y;
-            logger.debug("MOVING shapes with delta ({}, {})", dx, dy);
             for (Shape shape : selection) {
                 shape.translate(dx, dy);
             }
@@ -122,19 +93,12 @@ public class Controller {
     }
 
     private void handleMousePressed(MouseEvent evt) {
-        if (addingText) {
-            placeTextAt(evt.getPoint());
-            return;
-        }
-
         resizing = false;
         activeHandle = null;
         resizeOrigin = null;
-        boxSelecting = false; // Clear box selection mode when clicking
 
         if (resizeMode && !selection.isEmpty()) {
             ResizeHandle handle = getHandleAt(evt.getPoint());
-            logger.debug("In resize mode, checking handle at ({}, {}): {}", evt.getX(), evt.getY(), handle);
             if (handle != null) {
                 resizing = true;
                 activeHandle = handle;
@@ -150,88 +114,30 @@ public class Controller {
                             if (!evt.isShiftDown()) {
                                 resetSelection();
                             }
-                            if (!selection.getSelectedShapes().contains(s)) {
+                            lastMousePos = evt.getPoint();
-                                lastMousePos = evt.getPoint();
+                            selection.add(s);
-                                selection.add(s);
+                            logger.debug("Selecting {}", s);
-                                logger.debug("Selecting {}", s);
-                            }
                         },
-                        () -> {
+                        this::resetSelection
-                            // Clicked on empty space - start box selection
-                            resetSelection();
-                            selectionBoxStart = evt.getPoint();
-                            boxSelecting = true;
-                        }
                 );
-    }
-
-    private void placeTextAt(Point point) {
-        String input = JOptionPane.showInputDialog(view, "Enter text:", "Add text", JOptionPane.PLAIN_MESSAGE);
-        addingText = false;
-        if (input == null) {
-            return;
-        }
-
-        model.add(SText.create(point.x, point.y, input));
-        resetSelection();
         view.repaint();
     }
 
-    public void enterTextMode() {
-        addingText = true;
-    }
-
     private ResizeHandle getHandleAt(Point point) {
-        final int handleSize = 10;
+        final int handleSize = 5;
         for (Shape shape : selection) {
             Rectangle bounds = shape.getBounds();
-            
+            int cx = bounds.x + bounds.width / 2;
-            // Always-present SE corner handle
+            int cy = bounds.y + bounds.height / 2;
-            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;
-            }
 
-            // Resize handles are only active in resize mode
+            if (point.x < cx && point.y < cy) return ResizeHandle.NW;
-            if (resizeMode) {
+            if (point.x > cx && point.y < cy) return ResizeHandle.NE;
-                // NW corner
+            if (point.x < cx && point.y > cy) return ResizeHandle.SW;
-                if (point.x >= bounds.x - handleSize && point.x <= bounds.x &&
+            if (point.x > cx && point.y > cy) return ResizeHandle.SE;
-                    point.y >= bounds.y - handleSize && point.y <= bounds.y) {
+            if (point.y < cy) return ResizeHandle.N;
-                    return ResizeHandle.NW;
+            if (point.y > cy) return ResizeHandle.S;
-                }
+            if (point.x < cx) return ResizeHandle.W;
-                // NE corner
+            if (point.x > cx) return ResizeHandle.E;
-                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;
-                }
-                // SW corner
-                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;
-                }
-                // N edge
-                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;
-                }
-                // S edge
-                if (point.x >= edgeX && point.x <= edgeX + handleSize &&
-                    point.y >= bounds.y + bounds.height && point.y <= bounds.y + bounds.height + handleSize) {
-                    return ResizeHandle.S;
-                }
-                // W edge
-                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;
-                }
-                // E edge
-                if (point.x >= bounds.x + bounds.width && point.x <= bounds.x + bounds.width + handleSize &&
-                    point.y >= edgeY && point.y <= edgeY + handleSize) {
-                    return ResizeHandle.E;
-                }
-            }
         }
         return null;
     }
@@ -318,19 +224,4 @@ public class Controller {
                 .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) {
-        resetSelection();
-        model.stream()
-                .filter(s -> s.getBounds().intersects(box))
-                .forEach(selection::add);
-    }
 }

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

@@ -94,48 +94,12 @@ 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 = 10;
+            int handleSize = 5;
             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) {
@@ -149,14 +113,4 @@ 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,7 +13,6 @@ 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;
@@ -26,7 +25,6 @@ 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() {
@@ -40,8 +38,4 @@ 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,7 +5,6 @@ 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;
@@ -62,10 +61,6 @@ 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));
         }
 	}
@@ -79,10 +74,6 @@ 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));
         }
 	}
@@ -94,7 +85,6 @@ 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);
@@ -112,7 +102,6 @@ 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,7 +7,10 @@ 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 {
 
@@ -66,11 +69,11 @@ public class HTMLDraftman implements ShapeVisitor {
 
     @Override
     public void visitTriangle(STriangle sTriangle) {
-        htmlOutput.printf("<div class=\"triangle%d\"></div>\n", sTriangle.hashCode());
+        htmlOutput.printf("<div class=\"triangle%d\"></div>\n", this.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(sTriangle.hashCode()), "\n}\n");
+        StringJoiner joiner = new StringJoiner("\n", ".triangle%d{\n".formatted(this.hashCode()), "\n}\n");
         joiner.add("  position: absolute;");
         joiner.add("  top: %dpx;".formatted(bounds.y));
         joiner.add("  left: %dpx;".formatted(bounds.x));
@@ -84,27 +87,6 @@ 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";
@@ -141,21 +123,4 @@ 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,7 +6,6 @@ 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.*;
@@ -72,26 +71,6 @@ 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);
@@ -120,17 +99,4 @@ 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

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

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

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

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

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

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

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

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

@@ -1,37 +0,0 @@
-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/util/StreamableTest.java

@@ -1,48 +0,0 @@
-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 @@
-.triangle204514374{
+.triangle110717522{
   position: absolute;
-  top: 169px;
+  top: 162px;
-  left: 372px;
+  left: 367px;
   width: 0px;
   height: 0px;
   border: 0 solid transparent;
@@ -9,35 +9,35 @@
   border-right-width: 30.0px;
   border-bottom: 50px solid #ffff00;
 }
-#rec664997016{ 
+#rec209793789{ 
 position:absolute;
 top:10px;
 left:10px;
 width:40px;
 height:60px;
 background:#ffffff;border:1px solid #ff0000; }
-#rec2139424642{ 
+#rec365617083{ 
 position:absolute;
 top:10px;
 left:70px;
 width:40px;
 height:60px;
 background:#ffffff;border:1px solid #000000; }
-#rec609258999{ 
+#rec1121327988{ 
 position:absolute;
 top:200px;
 left:100px;
 width:40px;
 height:60px;
 background:#ffffff;border:1px solid #ff00ff; }
-#rec759898031{ 
+#rec256914054{ 
 position:absolute;
 top:200px;
 left:150px;
 width:40px;
 height:60px;
 background:#ffffff;border:1px solid #ff00ff; }
-  .circle305332562{
+  .circle172224331{
 
   position: absolute;
   top:250px;
@@ -52,14 +52,3 @@ 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;
-}