From e954360bbec76df3ad797286f5cca32609c79e8b Mon Sep 17 00:00:00 2001
From: Hugo <hugo.debuyser.etu@univ-lille.fr>
Date: Sun, 7 Apr 2024 14:53:57 +0200
Subject: [PATCH] tpQU02::exo-WarriorCard

---
 src/tpQU/Event.java                           | 45 ------------
 src/tpQU/WarriorCard.java                     | 73 -------------------
 src/{ => tpQU}/tp01/Main.java                 |  0
 src/{ => tpQU}/tp01/controlepkg1/A.java       |  0
 src/{ => tpQU}/tp01/controlepkg2/B.java       |  0
 src/{ => tpQU}/tp01/controlepkg2/sspkg/C.java |  0
 src/{ => tpQU}/tp01/fifth/B.java              |  0
 src/{ => tpQU}/tp01/first/A.java              |  0
 src/{ => tpQU}/tp01/fourth/A.java             |  0
 src/{ => tpQU}/tp01/second/A.java             |  0
 src/{ => tpQU}/tp01/second/B.java             |  0
 src/{ => tpQU}/tp01/third/A.java              |  2 +-
 {lib => test/tpQU/tp02}/AgendaTest.java       |  2 -
 {lib => test/tpQU/tp02}/EventTest.java        |  2 -
 test/tpQU/{ => tp02}/WarriorCardTest.java     |  2 +-
 15 files changed, 2 insertions(+), 124 deletions(-)
 delete mode 100644 src/tpQU/Event.java
 delete mode 100644 src/tpQU/WarriorCard.java
 rename src/{ => tpQU}/tp01/Main.java (100%)
 rename src/{ => tpQU}/tp01/controlepkg1/A.java (100%)
 rename src/{ => tpQU}/tp01/controlepkg2/B.java (100%)
 rename src/{ => tpQU}/tp01/controlepkg2/sspkg/C.java (100%)
 rename src/{ => tpQU}/tp01/fifth/B.java (100%)
 rename src/{ => tpQU}/tp01/first/A.java (100%)
 rename src/{ => tpQU}/tp01/fourth/A.java (100%)
 rename src/{ => tpQU}/tp01/second/A.java (100%)
 rename src/{ => tpQU}/tp01/second/B.java (100%)
 rename src/{ => tpQU}/tp01/third/A.java (83%)
 rename {lib => test/tpQU/tp02}/AgendaTest.java (98%)
 mode change 100755 => 100644
 rename {lib => test/tpQU/tp02}/EventTest.java (99%)
 rename test/tpQU/{ => tp02}/WarriorCardTest.java (98%)
 mode change 100755 => 100644

diff --git a/src/tpQU/Event.java b/src/tpQU/Event.java
deleted file mode 100644
index d639452..0000000
--- a/src/tpQU/Event.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package tpQU;
-
-import java.time.LocalDate;
-
-import tpOO.tp03.ToDoList;
-
-/**
- * @author Hugo Debuyser
- */
-
-public class Event {
-    //Attributes
-    private String label;
-    private String place;
-    private LocalDate start;
-    private LocalDate end;
-    private ToDoList tasks;
-
-    //Constructor
-    Event(String label, String place, LocalDate start, LocalDate end, ToDoList tasks){
-        this.label = label;
-        this.place = place;
-        this.start = start;
-        this.end = end;
-        this.tasks = tasks;
-    }
-
-    Event(String label, String place, LocalDate start, LocalDate end){
-        this.label = label;
-        this.place = place;
-        this.start = start;
-        this.end = end;
-    }
-    Event(String label, String place, LocalDate start){
-        this.label = label;
-        this.place = place;
-        this.start = start;
-    }
-    Event(String label, String place){
-        this.label = label;
-        this.place = place;
-    }
-
-    //methods
-}
diff --git a/src/tpQU/WarriorCard.java b/src/tpQU/WarriorCard.java
deleted file mode 100644
index 9f5ad8c..0000000
--- a/src/tpQU/WarriorCard.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package tpQU;
-
-/**
- * 
- * @author Hugo DEBUYSER
- */
-
-public class WarriorCard {
-
-    /**
-    *Attributes
-    */
-    private String name;
-    private int strength;
-    private int agility;
-
-    /**
-    *Constructor
-    */
-    public WarriorCard(String name, int strength, int agility){
-        this.name = name;
-        this.strength = strength;
-        this.agility = agility;
-    }
-
-    /*
-    methods
-    */
-
-    /**
-     * Comparer le noms de 2 Cartes
-    * @param other Prend une autre carte
-    */
-    public boolean equals(WarriorCard other){
-        return other.name.equals(this.name);
-    }
-
-    /**
-    *Comparer la Strength de 2 Cartes
-    */
-
-    public int compareStrength(WarriorCard other){
-        if(other.strength == this.strength){
-            return 0;
-        }
-        if(other.strength>this.strength){
-            return -1;
-        }
-        return 1;   
-    }
-
-    /**
-    Comparer la Agility de 2 Cartes
-    */
-
-    public int compareAgility(WarriorCard other){
-        if(other.agility == this.agility){
-            return 0;
-        }
-        if(other.agility>this.agility){
-            return -1;
-        }
-        return 1;   
-    }
-
-    /**
-    *Renvoie la carte sous un certain format
-    */
-    public String toString(){
-        return this.name + "[S=" + this.strength + ",A=" + this.agility + "]";
-    }
-
-}
\ No newline at end of file
diff --git a/src/tp01/Main.java b/src/tpQU/tp01/Main.java
similarity index 100%
rename from src/tp01/Main.java
rename to src/tpQU/tp01/Main.java
diff --git a/src/tp01/controlepkg1/A.java b/src/tpQU/tp01/controlepkg1/A.java
similarity index 100%
rename from src/tp01/controlepkg1/A.java
rename to src/tpQU/tp01/controlepkg1/A.java
diff --git a/src/tp01/controlepkg2/B.java b/src/tpQU/tp01/controlepkg2/B.java
similarity index 100%
rename from src/tp01/controlepkg2/B.java
rename to src/tpQU/tp01/controlepkg2/B.java
diff --git a/src/tp01/controlepkg2/sspkg/C.java b/src/tpQU/tp01/controlepkg2/sspkg/C.java
similarity index 100%
rename from src/tp01/controlepkg2/sspkg/C.java
rename to src/tpQU/tp01/controlepkg2/sspkg/C.java
diff --git a/src/tp01/fifth/B.java b/src/tpQU/tp01/fifth/B.java
similarity index 100%
rename from src/tp01/fifth/B.java
rename to src/tpQU/tp01/fifth/B.java
diff --git a/src/tp01/first/A.java b/src/tpQU/tp01/first/A.java
similarity index 100%
rename from src/tp01/first/A.java
rename to src/tpQU/tp01/first/A.java
diff --git a/src/tp01/fourth/A.java b/src/tpQU/tp01/fourth/A.java
similarity index 100%
rename from src/tp01/fourth/A.java
rename to src/tpQU/tp01/fourth/A.java
diff --git a/src/tp01/second/A.java b/src/tpQU/tp01/second/A.java
similarity index 100%
rename from src/tp01/second/A.java
rename to src/tpQU/tp01/second/A.java
diff --git a/src/tp01/second/B.java b/src/tpQU/tp01/second/B.java
similarity index 100%
rename from src/tp01/second/B.java
rename to src/tpQU/tp01/second/B.java
diff --git a/src/tp01/third/A.java b/src/tpQU/tp01/third/A.java
similarity index 83%
rename from src/tp01/third/A.java
rename to src/tpQU/tp01/third/A.java
index 3867c66..a515633 100644
--- a/src/tp01/third/A.java
+++ b/src/tpQU/tp01/third/A.java
@@ -1,4 +1,4 @@
-package compil_src.third;
+package third;
 
 public class A {
     public static void main(String[] args) {
diff --git a/lib/AgendaTest.java b/test/tpQU/tp02/AgendaTest.java
old mode 100755
new mode 100644
similarity index 98%
rename from lib/AgendaTest.java
rename to test/tpQU/tp02/AgendaTest.java
index e23d4cc..639d788
--- a/lib/AgendaTest.java
+++ b/test/tpQU/tp02/AgendaTest.java
@@ -1,5 +1,3 @@
-package tpQU.tp02;
-
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/lib/EventTest.java b/test/tpQU/tp02/EventTest.java
similarity index 99%
rename from lib/EventTest.java
rename to test/tpQU/tp02/EventTest.java
index a4b7221..6784e94 100644
--- a/lib/EventTest.java
+++ b/test/tpQU/tp02/EventTest.java
@@ -1,5 +1,3 @@
-package tpQU.tp02;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/test/tpQU/WarriorCardTest.java b/test/tpQU/tp02/WarriorCardTest.java
old mode 100755
new mode 100644
similarity index 98%
rename from test/tpQU/WarriorCardTest.java
rename to test/tpQU/tp02/WarriorCardTest.java
index 4a09085..3c96f0c
--- a/test/tpQU/WarriorCardTest.java
+++ b/test/tpQU/tp02/WarriorCardTest.java
@@ -1,4 +1,4 @@
-package tp02;
+package tpQU.tp02;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-- 
GitLab