From f923dba578b59ff868e27f7d397a844fffaa7059 Mon Sep 17 00:00:00 2001
From: Emi Boucly <bouclyma@etu.univ-grenoble-alpes.fr>
Date: Thu, 27 Mar 2025 10:13:28 +0100
Subject: [PATCH] =?UTF-8?q?refactor:=20transformation=20de=20dupliqu=C3=A9?=
 =?UTF-8?q?=20en=20fonction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/emiko/graphicalapp/DrawController.java | 35 +++++++------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/graphical-app/src/main/java/fr/emiko/graphicalapp/DrawController.java b/graphical-app/src/main/java/fr/emiko/graphicalapp/DrawController.java
index 1425719..e0437b2 100644
--- a/graphical-app/src/main/java/fr/emiko/graphicalapp/DrawController.java
+++ b/graphical-app/src/main/java/fr/emiko/graphicalapp/DrawController.java
@@ -371,16 +371,18 @@ public class DrawController implements Initializable {
 
     private void printLine(MouseEvent mouseEvent) {
         Canvas currentLayer = layerListView.getSelectionModel().getSelectedItem();
+
+        GraphicsContext gc = currentLayer.getGraphicsContext2D();
+
+        if (posX == 0 || posY == 0) {
+            posX = mouseEvent.getX();
+            posY = mouseEvent.getY();
+        }
+
+        Stroke stroke = new Stroke(posX, posY, mouseEvent.getX(), mouseEvent.getY(), brushSizeSlider.getValue(), colorPicker.getValue());
+        strokes.add(stroke);
+
         if (mouseEvent.isPrimaryButtonDown()) {
-            GraphicsContext gc = currentLayer.getGraphicsContext2D();
-
-            if (posX == 0 || posY == 0) {
-                posX = mouseEvent.getX();
-                posY = mouseEvent.getY();
-            }
-
-            Stroke stroke = new Stroke(posX, posY, mouseEvent.getX(), mouseEvent.getY(), brushSizeSlider.getValue(), colorPicker.getValue());
-            strokes.add(stroke);
             stroke.draw(gc, colorPicker.getValue());
 
             posX = mouseEvent.getX();
@@ -388,15 +390,6 @@ public class DrawController implements Initializable {
 
 
         } else if (mouseEvent.isSecondaryButtonDown()) {
-            GraphicsContext gc = currentLayer.getGraphicsContext2D();
-
-            if (posX == 0 || posY == 0) {
-                posX = mouseEvent.getX();
-                posY = mouseEvent.getY();
-            }
-
-            Stroke stroke = new Stroke(posX, posY, mouseEvent.getX(), mouseEvent.getY(), brushSizeSlider.getValue(), colorPicker.getValue());
-            strokes.add(stroke);
             stroke.draw(gc, Color.WHITE);
 
             posX = mouseEvent.getX();
@@ -447,11 +440,7 @@ public class DrawController implements Initializable {
         lines.sort(new Comparator<Line>() {
             @Override
             public int compare(Line o1, Line o2) {
-                if (o1.getTimestamp() < o2.getTimestamp()) {
-                    return 1;
-                } else {
-                    return 0;
-                }
+                return Integer.compare(o2.getTimestamp(), o1.getTimestamp());
             }
         });
         for (Line line: lines) {