diff --git a/src/tpQU/Event.java b/src/tpQU/Event.java deleted file mode 100644 index d6394524cfdfc87526f083489b82d188e42d7520..0000000000000000000000000000000000000000 --- 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 9f5ad8cbb6eba55862a66b8270004e1302ef2288..0000000000000000000000000000000000000000 --- 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 3867c6617a799f3cc02a79d405ab3637ce40d0e5..a515633c82205e051acc18031af227907ac73829 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 e23d4ccc57b175bab70b40d94c42251e61b9133d..639d7888f9ef3f59c5465bdba10f7d181a39a1b5 --- 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 a4b7221e7e998ee24242a3d107f9e565d07d10fc..6784e94a7ae32dc79da8fc915c76a87b2d1d95a3 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 4a090856ef0a964c84c8bd8c82cf26160c524376..3c96f0cfa0009f020be864f34d18d2dd85bc131d --- 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;