diff --git a/pom.xml b/Partie_1/pom.xml similarity index 100% rename from pom.xml rename to Partie_1/pom.xml diff --git a/src/main/java/ch/hepia/App.java b/Partie_1/src/main/java/ch/hepia/App.java similarity index 100% rename from src/main/java/ch/hepia/App.java rename to Partie_1/src/main/java/ch/hepia/App.java diff --git a/src/main/java/ch/hepia/Carte.java b/Partie_1/src/main/java/ch/hepia/Carte.java similarity index 89% rename from src/main/java/ch/hepia/Carte.java rename to Partie_1/src/main/java/ch/hepia/Carte.java index 55b6d09963cb5a07660ae8c1ccac488cba6e2c9c..ec1ce86a1852ccc4962b063ef394e780da30e370 100644 --- a/src/main/java/ch/hepia/Carte.java +++ b/Partie_1/src/main/java/ch/hepia/Carte.java @@ -58,7 +58,7 @@ public class Carte { public String getNomCouleur() { - String[] NOMS_COULEURS = { "Coeur", "Carreau", "Pique", "Trèfle" }; + String[] NOMS_COULEURS = { "♥", "♦", "♠", "♣" }; return NOMS_COULEURS[couleur.ordinal()]; } @@ -77,7 +77,7 @@ public class Carte { } else { - return getNomRang() + (getCouleur() == null ? "" : " de " + getNomCouleur()); + return getNomCouleur() + " - " + getNomRang(); } } diff --git a/src/main/java/ch/hepia/Hand.java b/Partie_1/src/main/java/ch/hepia/Hand.java similarity index 100% rename from src/main/java/ch/hepia/Hand.java rename to Partie_1/src/main/java/ch/hepia/Hand.java diff --git a/src/main/java/ch/hepia/JeudeCarte.java b/Partie_1/src/main/java/ch/hepia/JeudeCarte.java similarity index 100% rename from src/main/java/ch/hepia/JeudeCarte.java rename to Partie_1/src/main/java/ch/hepia/JeudeCarte.java diff --git a/src/test/java/ch/hepia/CarteTest.java b/Partie_1/src/test/java/ch/hepia/CarteTest.java similarity index 100% rename from src/test/java/ch/hepia/CarteTest.java rename to Partie_1/src/test/java/ch/hepia/CarteTest.java diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/Partie_1/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst similarity index 100% rename from target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst rename to Partie_1/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/Partie_1/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst similarity index 100% rename from target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst rename to Partie_1/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst diff --git a/Partie_1/target/test-classes/ch/hepia/CarteTest.class b/Partie_1/target/test-classes/ch/hepia/CarteTest.class new file mode 100644 index 0000000000000000000000000000000000000000..60dcda85d37ead5584d2ad54aaa8affb1935c4b2 Binary files /dev/null and b/Partie_1/target/test-classes/ch/hepia/CarteTest.class differ diff --git a/target/classes/ch/hepia/App.class b/target/classes/ch/hepia/App.class deleted file mode 100644 index 702482c8fd70123c6f1b10106e17ec61aef73af2..0000000000000000000000000000000000000000 Binary files a/target/classes/ch/hepia/App.class and /dev/null differ diff --git a/target/classes/ch/hepia/COULEUR.class b/target/classes/ch/hepia/COULEUR.class deleted file mode 100644 index c582fd28bd308c74abcc31d7c543625ab96af75b..0000000000000000000000000000000000000000 Binary files a/target/classes/ch/hepia/COULEUR.class and /dev/null differ diff --git a/target/classes/ch/hepia/Carte.class b/target/classes/ch/hepia/Carte.class deleted file mode 100644 index 8a0fd9ccdbb8968ac2f609091731dd205d5eb0d2..0000000000000000000000000000000000000000 Binary files a/target/classes/ch/hepia/Carte.class and /dev/null differ diff --git a/target/classes/ch/hepia/Hand$1.class b/target/classes/ch/hepia/Hand$1.class deleted file mode 100644 index 7f5a3d911ba36617faafa35f851ab6311d560287..0000000000000000000000000000000000000000 Binary files a/target/classes/ch/hepia/Hand$1.class and /dev/null differ diff --git a/target/classes/ch/hepia/Hand.class b/target/classes/ch/hepia/Hand.class deleted file mode 100644 index 80fa43d1bfba60969578d63306fe5fc7df58b3c3..0000000000000000000000000000000000000000 Binary files a/target/classes/ch/hepia/Hand.class and /dev/null differ diff --git a/target/classes/ch/hepia/JeudeCarte.class b/target/classes/ch/hepia/JeudeCarte.class deleted file mode 100644 index 61d9930e443646901579b26cc34c9e565e2bf61d..0000000000000000000000000000000000000000 Binary files a/target/classes/ch/hepia/JeudeCarte.class and /dev/null differ