From 94d0c21537053a7cd7ce606ff7898dabf7c9e4f8 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 4 Dec 2016 23:42:53 +0100 Subject: [PATCH] =?UTF-8?q?D=C3=A9placement=20de=20la=20partie=20JavaIa=20?= =?UTF-8?q?vers=20l'emplacement=20appropri=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BoutsDeCode/DameRESTJava/.classpath | 37 -------- BoutsDeCode/DameRESTJava/.project | 42 ---------- BoutsDeCode/DameRESTJava/.settings/.jsdtscope | 13 --- .../.settings/org.eclipse.jdt.core.prefs | 8 -- .../.settings/org.eclipse.m2e.core.prefs | 4 - .../org.eclipse.wst.common.component | 10 --- ....eclipse.wst.common.project.facet.core.xml | 7 -- ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - .../org.eclipse.wst.validation.prefs | 2 - BoutsDeCode/DameRESTJava/pom.xml | 79 ------------------ .../src/main/java/config/AppConfig.java | 12 --- .../main/java/config/ServletInitializer.java | 21 ----- .../main/java/controller/DameController.java | 50 ----------- .../src/main/java/model/Board.java | 41 --------- .../src/main/java/model/CODEENDGAME.java | 7 -- .../src/main/java/model/Case.java | 20 ----- .../src/main/java/model/CodeFin.java | 7 -- .../src/main/java/model/Difficulte.java | 7 -- .../src/main/java/model/JeuModel.java | 23 ----- .../src/main/java/model/Joueur.java | 7 -- .../src/main/java/model/Status.java | 6 -- .../java/paquetsJSON/EntreeIaGamesEndId.java | 46 ---------- .../java/paquetsJSON/EntreeIaGamesStart.java | 43 ---------- .../main/java/paquetsJSON/EntreeIaStatus.java | 23 ----- .../paquetsJSON/EntreeRetourIaGamePlayId.java | 52 ------------ .../java/paquetsJSON/RetourIaGamesEndId.java | 34 -------- .../java/paquetsJSON/RetourIaGamesStart.java | 44 ---------- .../main/java/paquetsJSON/RetourIaStatus.java | 34 -------- .../target/classes/config/AppConfig.class | Bin 588 -> 0 bytes .../classes/config/ServletInitializer.class | Bin 805 -> 0 bytes .../classes/controller/DameController.class | Bin 2257 -> 0 bytes .../target/classes/model/Board.class | Bin 629 -> 0 bytes .../target/classes/model/Case.class | Bin 1264 -> 0 bytes .../target/classes/model/CodeFin.class | Bin 955 -> 0 bytes .../target/classes/model/Difficulte.class | Bin 805 -> 0 bytes .../target/classes/model/JeuModel.class | Bin 779 -> 0 bytes .../target/classes/model/Joueur.class | Bin 931 -> 0 bytes .../target/classes/model/Status.class | Bin 889 -> 0 bytes .../target/maven-archiver/pom.properties | 5 -- .../compile/default-compile/createdFiles.lst | 10 --- .../compile/default-compile/inputFiles.lst | 10 --- .../default-testCompile/inputFiles.lst | 0 43 files changed, 706 deletions(-) delete mode 100644 BoutsDeCode/DameRESTJava/.classpath delete mode 100644 BoutsDeCode/DameRESTJava/.project delete mode 100644 BoutsDeCode/DameRESTJava/.settings/.jsdtscope delete mode 100644 BoutsDeCode/DameRESTJava/.settings/org.eclipse.jdt.core.prefs delete mode 100644 BoutsDeCode/DameRESTJava/.settings/org.eclipse.m2e.core.prefs delete mode 100644 BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.common.component delete mode 100644 BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.jsdt.ui.superType.name delete mode 100644 BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.validation.prefs delete mode 100644 BoutsDeCode/DameRESTJava/pom.xml delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/config/AppConfig.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/config/ServletInitializer.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/controller/DameController.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/model/Board.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/model/CODEENDGAME.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/model/Case.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/model/CodeFin.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/model/Difficulte.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/model/JeuModel.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/model/Joueur.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/model/Status.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeIaGamesEndId.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeIaGamesStart.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeIaStatus.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeRetourIaGamePlayId.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/RetourIaGamesEndId.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/RetourIaGamesStart.java delete mode 100644 BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/RetourIaStatus.java delete mode 100644 BoutsDeCode/DameRESTJava/target/classes/config/AppConfig.class delete mode 100644 BoutsDeCode/DameRESTJava/target/classes/config/ServletInitializer.class delete mode 100644 BoutsDeCode/DameRESTJava/target/classes/controller/DameController.class delete mode 100644 BoutsDeCode/DameRESTJava/target/classes/model/Board.class delete mode 100644 BoutsDeCode/DameRESTJava/target/classes/model/Case.class delete mode 100644 BoutsDeCode/DameRESTJava/target/classes/model/CodeFin.class delete mode 100644 BoutsDeCode/DameRESTJava/target/classes/model/Difficulte.class delete mode 100644 BoutsDeCode/DameRESTJava/target/classes/model/JeuModel.class delete mode 100644 BoutsDeCode/DameRESTJava/target/classes/model/Joueur.class delete mode 100644 BoutsDeCode/DameRESTJava/target/classes/model/Status.class delete mode 100644 BoutsDeCode/DameRESTJava/target/maven-archiver/pom.properties delete mode 100644 BoutsDeCode/DameRESTJava/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst delete mode 100644 BoutsDeCode/DameRESTJava/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst delete mode 100644 BoutsDeCode/DameRESTJava/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst diff --git a/BoutsDeCode/DameRESTJava/.classpath b/BoutsDeCode/DameRESTJava/.classpath deleted file mode 100644 index 6acf3ee..0000000 --- a/BoutsDeCode/DameRESTJava/.classpath +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BoutsDeCode/DameRESTJava/.project b/BoutsDeCode/DameRESTJava/.project deleted file mode 100644 index 94c1f84..0000000 --- a/BoutsDeCode/DameRESTJava/.project +++ /dev/null @@ -1,42 +0,0 @@ - - - DameRESTJava - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/BoutsDeCode/DameRESTJava/.settings/.jsdtscope b/BoutsDeCode/DameRESTJava/.settings/.jsdtscope deleted file mode 100644 index f179e11..0000000 --- a/BoutsDeCode/DameRESTJava/.settings/.jsdtscope +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.jdt.core.prefs b/BoutsDeCode/DameRESTJava/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6e80039..0000000 --- a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.m2e.core.prefs b/BoutsDeCode/DameRESTJava/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.common.component b/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.common.component deleted file mode 100644 index a3c70d0..0000000 --- a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.common.project.facet.core.xml b/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index dd35fe2..0000000 --- a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.jsdt.ui.superType.container b/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.jsdt.ui.superType.name b/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.validation.prefs b/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8c..0000000 --- a/BoutsDeCode/DameRESTJava/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/BoutsDeCode/DameRESTJava/pom.xml b/BoutsDeCode/DameRESTJava/pom.xml deleted file mode 100644 index 310a846..0000000 --- a/BoutsDeCode/DameRESTJava/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - 4.0.0 - DameIaM2gil - DameRESTJava - 0.0.1-SNAPSHOT - war - - 1.8 - 4.12 - 4.1.3.RELEASE - 2.7.5 - 3.1.0 - - - - - - junit - junit - ${junit.version} - test - - - hamcrest-core - org.hamcrest - - - - - - org.springframework - spring-webmvc - ${spring.version} - - - - org.springframework - spring-jdbc - ${spring.version} - - - - javax.servlet - javax.servlet-api - ${servlet.api.version} - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - - - WebServiceIa - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - ${jdk.version} - ${jdk.version} - - - - - org.apache.maven.plugins - maven-war-plugin - - false - - - - - - \ No newline at end of file diff --git a/BoutsDeCode/DameRESTJava/src/main/java/config/AppConfig.java b/BoutsDeCode/DameRESTJava/src/main/java/config/AppConfig.java deleted file mode 100644 index 8ab5344..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/config/AppConfig.java +++ /dev/null @@ -1,12 +0,0 @@ -package config; - -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; -@Configuration -@EnableWebMvc -@ComponentScan(basePackages = {"controller"}) -public class AppConfig extends WebMvcConfigurerAdapter { - -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/config/ServletInitializer.java b/BoutsDeCode/DameRESTJava/src/main/java/config/ServletInitializer.java deleted file mode 100644 index d5da72f..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/config/ServletInitializer.java +++ /dev/null @@ -1,21 +0,0 @@ -package config; - -import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; - -import config.AppConfig; - -public class ServletInitializer extends - AbstractAnnotationConfigDispatcherServletInitializer{ - @Override - protected Class[] getRootConfigClasses() { - return new Class[0]; - } - @Override - protected Class[] getServletConfigClasses() { - return new Class[]{AppConfig.class}; - } - @Override - protected String[] getServletMappings() { - return new String[]{"/"}; - } -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/controller/DameController.java b/BoutsDeCode/DameRESTJava/src/main/java/controller/DameController.java deleted file mode 100644 index 7aa0b6f..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/controller/DameController.java +++ /dev/null @@ -1,50 +0,0 @@ -package controller; - -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; -import model.STATUS; -import paquetsJSON.EntreeIaGamesEndId; -import paquetsJSON.EntreeIaGamesStart; -import paquetsJSON.EntreeIaStatus; -import paquetsJSON.EntreeRetourIaGamePlayId; -import paquetsJSON.RetourIaGamesEndId; -import paquetsJSON.RetourIaGamesStart; -import paquetsJSON.RetourIaStatus; - - -@RestController -public class DameController { - - @RequestMapping(value = "/ai/status", method = RequestMethod.POST) - public RetourIaStatus status(@RequestBody EntreeIaStatus token) { - //TODO Demander l'état d'une IA - //test de retour - return new RetourIaStatus(token.getToken(), STATUS.available); - } - - - @RequestMapping(value="/ai/games/start/", method = RequestMethod.POST) - public RetourIaGamesStart beginGame(@RequestBody EntreeIaGamesStart e) { - //TODO Prévenir les IA qu’une partie les concernant va commencer - //test de retour - return new RetourIaGamesStart(e.getToken(), STATUS.available, "testTokenPartie"); - } - - @RequestMapping(value = "/ai/games/play/{game_id:.+}", method = RequestMethod.POST) - public EntreeRetourIaGamePlayId getMove(@PathVariable("game_id") String game_id, @RequestBody EntreeRetourIaGamePlayId e) { - // TODO: Demande de jouer un coup sur un plateau donnée sur une partie - //test de retour - return new EntreeRetourIaGamePlayId(e.getToken(), e.getDifficulty(), e.getPlayer(), e.getBoard()); - } - - @RequestMapping(value="/ai/games/end/{game_id:.+}", method=RequestMethod.POST) - public RetourIaGamesEndId endGame(@PathVariable("game_id") String game_id, @RequestBody EntreeIaGamesEndId e) { - // TODO: Annoncer la fin de partie avec code explicatif pour gérer les parties avortées et les parties standards. - //test de retour - return new RetourIaGamesEndId (game_id + " " + e.getToken(), STATUS.available); - } - -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/model/Board.java b/BoutsDeCode/DameRESTJava/src/main/java/model/Board.java deleted file mode 100644 index 7e3f163..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/model/Board.java +++ /dev/null @@ -1,41 +0,0 @@ -package model; - -public class Board { - private char[] board; - /* - Représentation : - 0 1 2 3 4 - 5 6 7 8 9 - 10 11 12 13 14 - 15 16 17 18 19 - 20 21 22 23 24 - 25 26 27 28 29 - 30 31 32 33 34 - 35 36 37 38 39 - 40 41 42 43 44 - 45 46 47 48 49 - */ - public Board() { - board = new char[50]; - for (int i = 0; i < 50; ++i) { - if (i <= 19) { - board[i] = CASE.BLACK_PAWN.getCharRepresentation(); - } - else if (i > 19 && i < 35) { - board[i] = CASE.EMPTY.getCharRepresentation(); - } - else { - board[i] = CASE.WHITE_PAWN.getCharRepresentation(); - } - } - } - - public Board(char[] tabB) { - board = tabB; - } - - public char[] getBoard() { - return board; - } - -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/model/CODEENDGAME.java b/BoutsDeCode/DameRESTJava/src/main/java/model/CODEENDGAME.java deleted file mode 100644 index a7f7352..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/model/CODEENDGAME.java +++ /dev/null @@ -1,7 +0,0 @@ -package model; - -public enum CODEENDGAME { - timeout, - surrender, - classical -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/model/Case.java b/BoutsDeCode/DameRESTJava/src/main/java/model/Case.java deleted file mode 100644 index 5409308..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/model/Case.java +++ /dev/null @@ -1,20 +0,0 @@ -package model; - -public enum CASE { - EMPTY('0'), // '\0' - BLACK_PAWN('1'), // '\1' - BLACK_DRAUGHT('2'), // '\2' - WHITE_PAWN('3'), // '\3' - WHITE_DRAUGHT('4'); // '\4' - - private char charRepresentation; - - private CASE(char c) { - charRepresentation = c; - } - - public char getCharRepresentation() { - return this.charRepresentation; - } - -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/model/CodeFin.java b/BoutsDeCode/DameRESTJava/src/main/java/model/CodeFin.java deleted file mode 100644 index e8fb1d0..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/model/CodeFin.java +++ /dev/null @@ -1,7 +0,0 @@ -package model; - -public enum CodeFin { - timeout, - surrender, - classical -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/model/Difficulte.java b/BoutsDeCode/DameRESTJava/src/main/java/model/Difficulte.java deleted file mode 100644 index e365856..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/model/Difficulte.java +++ /dev/null @@ -1,7 +0,0 @@ -package model; - -public enum DIFFICULTE { - EASY, - MEDIUM, - HARD; -} \ No newline at end of file diff --git a/BoutsDeCode/DameRESTJava/src/main/java/model/JeuModel.java b/BoutsDeCode/DameRESTJava/src/main/java/model/JeuModel.java deleted file mode 100644 index b1c8606..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/model/JeuModel.java +++ /dev/null @@ -1,23 +0,0 @@ -package model; - -public class JeuModel { - - String name; - String staffName[]; - - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String[] getStaffName() { - return staffName; - } - public void setStaffName(String[] staffName) { - this.staffName = staffName; - } - - //getter and setter methods - -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/model/Joueur.java b/BoutsDeCode/DameRESTJava/src/main/java/model/Joueur.java deleted file mode 100644 index 41e81cf..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/model/Joueur.java +++ /dev/null @@ -1,7 +0,0 @@ -package model; - -public enum JOUEUR { - J1, // joueur 1, blanc - J2, // joueur 2, noir - DRAW; // aucun des joueurs -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/model/Status.java b/BoutsDeCode/DameRESTJava/src/main/java/model/Status.java deleted file mode 100644 index 55b2a0a..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/model/Status.java +++ /dev/null @@ -1,6 +0,0 @@ -package model; - -public enum STATUS { - busy, - available -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeIaGamesEndId.java b/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeIaGamesEndId.java deleted file mode 100644 index 3390e22..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeIaGamesEndId.java +++ /dev/null @@ -1,46 +0,0 @@ -package paquetsJSON; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - -import model.CODEENDGAME; -import model.JOUEUR; - -public class EntreeIaGamesEndId { - - private String token; - private JOUEUR winner; - private CODEENDGAME code; - - @JsonCreator - public EntreeIaGamesEndId(@JsonProperty("token")String t, @JsonProperty("winner")JOUEUR w, @JsonProperty("code")CODEENDGAME c) { - token = t; - winner = w; - code = c; - } - - public String getToken() { - return token; - } - - public JOUEUR getWinner() { - return winner; - } - - public CODEENDGAME getCode() { - return code; - } - - public void setToken(String token) { - this.token = token; - } - - public void setWinner(JOUEUR winner) { - this.winner = winner; - } - - public void setCode(CODEENDGAME code) { - this.code = code; - } - -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeIaGamesStart.java b/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeIaGamesStart.java deleted file mode 100644 index 1553326..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeIaGamesStart.java +++ /dev/null @@ -1,43 +0,0 @@ -package paquetsJSON; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - -import model.DIFFICULTE; -import model.JOUEUR; - -public class EntreeIaGamesStart { - - private String token; - private DIFFICULTE difficulty; - private JOUEUR player; - - @JsonCreator - public EntreeIaGamesStart(@JsonProperty("token")String t, @JsonProperty("difficulty")DIFFICULTE d, @JsonProperty("player")JOUEUR p) { - token = t; - difficulty = d; - player = p; - } - - public String getToken() { - return token; - } - public DIFFICULTE getDifficulty() { - return difficulty; - } - public JOUEUR getPlayer() { - return player; - } - - public void setToken(String token) { - this.token = token; - } - - public void setDifficulty(DIFFICULTE difficulty) { - this.difficulty = difficulty; - } - - public void setPlayer(JOUEUR player) { - this.player = player; - } -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeIaStatus.java b/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeIaStatus.java deleted file mode 100644 index 902f000..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeIaStatus.java +++ /dev/null @@ -1,23 +0,0 @@ -package paquetsJSON; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - -public class EntreeIaStatus { - - private String token; - - @JsonCreator - public EntreeIaStatus(@JsonProperty("token")String t) { - token = t; - } - - public String getToken() { - return token; - } - - public void setToken(String token) { - this.token = token; - } - -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeRetourIaGamePlayId.java b/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeRetourIaGamePlayId.java deleted file mode 100644 index 108c817..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/EntreeRetourIaGamePlayId.java +++ /dev/null @@ -1,52 +0,0 @@ -package paquetsJSON; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - -import model.DIFFICULTE; -import model.JOUEUR; - -public class EntreeRetourIaGamePlayId { - private String token; - private DIFFICULTE difficulty; - private JOUEUR player; - private char[] board; - - @JsonCreator - public EntreeRetourIaGamePlayId (@JsonProperty("token")String t, @JsonProperty("difficulty")DIFFICULTE d, @JsonProperty("player")JOUEUR p, @JsonProperty("board")char[] b) { - token = t; - difficulty = d; - player = p; - board = b; - } - - public String getToken() { - return token; - } - public DIFFICULTE getDifficulty() { - return difficulty; - } - public JOUEUR getPlayer() { - return player; - } - - public char[] getBoard() { - return board; - } - - public void setToken(String token) { - this.token = token; - } - - public void setDifficulty(DIFFICULTE difficulty) { - this.difficulty = difficulty; - } - - public void setPlayer(JOUEUR player) { - this.player = player; - } - - public void setBoard(char[] board) { - this.board = board; - } -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/RetourIaGamesEndId.java b/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/RetourIaGamesEndId.java deleted file mode 100644 index 857785d..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/RetourIaGamesEndId.java +++ /dev/null @@ -1,34 +0,0 @@ -package paquetsJSON; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - -import model.STATUS; - -public class RetourIaGamesEndId { - - private String token; - private STATUS status; - - @JsonCreator - public RetourIaGamesEndId (@JsonProperty("token")String t, @JsonProperty("status")STATUS s) { - token = t; - status = s; - } - - public String getToken() { - return token; - } - - public STATUS getStatus() { - return status; - } - - public void setToken(String token) { - this.token = token; - } - - public void setStatus(STATUS status) { - this.status = status; - } -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/RetourIaGamesStart.java b/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/RetourIaGamesStart.java deleted file mode 100644 index 8ebd2cc..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/RetourIaGamesStart.java +++ /dev/null @@ -1,44 +0,0 @@ -package paquetsJSON; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - -import model.STATUS; - -public class RetourIaGamesStart { - - private String token; - private STATUS status; - private String tokenPartie; - - @JsonCreator - public RetourIaGamesStart(@JsonProperty("token")String t, @JsonProperty("status")STATUS s, @JsonProperty("tokenPartie")String tp) { - token = t; - status = s; - tokenPartie = tp; - } - - public String getToken() { - return token; - } - - public STATUS getStatus() { - return status; - } - - public String getTokenPartie() { - return tokenPartie; - } - - public void setToken(String token) { - this.token = token; - } - - public void setStatus(STATUS status) { - this.status = status; - } - - public void setTokenPartie(String tokenPartie) { - this.tokenPartie = tokenPartie; - } -} diff --git a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/RetourIaStatus.java b/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/RetourIaStatus.java deleted file mode 100644 index 55b0e20..0000000 --- a/BoutsDeCode/DameRESTJava/src/main/java/paquetsJSON/RetourIaStatus.java +++ /dev/null @@ -1,34 +0,0 @@ -package paquetsJSON; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - -import model.STATUS; - -public class RetourIaStatus { - - private String token; - private STATUS status; - - @JsonCreator - public RetourIaStatus(@JsonProperty("token")String t, @JsonProperty("status")STATUS s) { - token = t; - status = s; - } - - public String getToken() { - return token; - } - - public STATUS getStatus() { - return status; - } - - public void setToken(String token) { - this.token = token; - } - - public void setStatus(STATUS status) { - this.status = status; - } -} diff --git a/BoutsDeCode/DameRESTJava/target/classes/config/AppConfig.class b/BoutsDeCode/DameRESTJava/target/classes/config/AppConfig.class deleted file mode 100644 index cccad809afc1b8cfffa677ec11bed09080d7a800..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 588 zcmb7By-ve05I*-8LTF2YN{np4Ko-OTLPQlvNChE^%E08L*I=61k>j+y784Q!55Pkq z&S|L_DkN!Oe-&zBZX zG4L|flNgN!v3>r+xR7?92Mn$!Awm3uJ4uy9Y5F0TROkjg!&@GXd4x2BW82j#j#0Z% zfhvR6oO|&S46c^V`FFdsMt=rJ?GJfsP{S^i=vVDxw26>pjV!OQ0jdXYz+TBwf;!0> lxd9wlA?X(PDy))i<7 zfK**#R?QZ$t@)pKB2AT!sn`BvQ0Oe>2@`~7W+VAVwM&23wmEXw;&&tc>*(^k2t0y(sI_Y0BB}X+6jV0mqz?AU WU~cCj$s^MG5~;m{#PFnW)%^!-tgkQt diff --git a/BoutsDeCode/DameRESTJava/target/classes/controller/DameController.class b/BoutsDeCode/DameRESTJava/target/classes/controller/DameController.class deleted file mode 100644 index cc3b013b74b9caee737cb8ab1819e618870222e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2257 zcmb7F{ZkrO6g`ixMcgVy8)Ku1)oL(=tTCEcv1t`0sljLgX{r5M;6*lFcIoaTj{jAg z&S<8#o&MZEs?+-xf=F0F4DYE3BE&G9H7x$TSub;^pqEW9eMzID z?ih02-VCjIo+9ugrXq?kc@s6mWw?>OG$!I0sM&SG9F5QSi(ow0w1iRTMZ-17*Scld zLKlW@5$;OXb`CYSA%lJ4kXA>w^OJVO%Uap6s+!)ptL6C5O$uyBZ!}uM1YhZ9le{vG zAynt0W>*;=T^Y|aq!|29whCd~Vu;kZY1&gVaisns7aO+j5cDubS10LB&D$W8L9ML2 zM#Wny_?R}j&Lfz?oD}gkLoj}jmZ=MtTTs4(H1RG|etHl?%|=xh-$S`xM#ZxlNQ$;jg6)X6J!MFR2VYV+h&&9bxDuP9%q{?dytMRVt zYrU-0{{opWN|?tgKEvk>ikI^0ac@1h5gF9CHIb(rFbru0s>>X&G#i_`&=qVlB>Dv_ ztD4?2w}cc)6nMR1QnDjRBc|X9!&vY0-)I_Ul{*o9foBS~FSL$UgHVyh4srJ0!tM)( zxjrKFd6f}luq$=jWB8!kq}_Msi(yR5OL-Lq?9&UQcjtwh?036M_!dB$IprsVuT*@E zYxI_c-8z&Jf1~06-?qfe*v{KVxZMZ63p{P=uA4gO+G%H{JH$?+0NV@CE1{7 z?JF-*7s%U9r@}LaY?dPzyZAksr>pfYSDgO|r0@~7W>bX%<2l3Vj&{Xf;Qp z{DfkW-=O|VGarWJ+S`v}*xQlz)T7%r8jaE_c;^)F_nHiOCTi;fMlebjDe<^Qz+*JO zPOIxQA3p$d@gZ)|$T5LQk4}6k$K$=^o%J0-g>xLw^KI z{^}Ss~Q%am-cIWQ7&mr&jB>A~XnXf*9OE zf_@q9B1yO24fI}zkA?+`Op$Tkr-@8LhRFG7jGbYzlz5G$Q>>og)4wruPN uC=r!+)mfs7SSH60yVOaxNrf?s@9;fQlDhoh{rd1D(e^?2^pOFTf&Tzkx*uQw diff --git a/BoutsDeCode/DameRESTJava/target/classes/model/Board.class b/BoutsDeCode/DameRESTJava/target/classes/model/Board.class deleted file mode 100644 index 7b6fa175712462c432b788ffa65e7fb2a9d585ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 629 zcmYjO!AcuZ6g_v6ada}qF|nySLaCy}2&P&$VsK$ZXpQZ{#*M2tanRA2NF4hGeu);` zR!{_yZUsNdg?ipIN*U(8d(XS~o^#%Nc)I-uU;$$;(irYT3L_3i9Rvb9Y^%6!;`EjvU2X3~f`MAxihi6NhEeC23Y$c7wRS@_w^S$Ac^8yeAm7-P?8V1| z{@NkCo8=Wfe~I~Kq8bMq>d2Inp4`Rls^LjgxFYD?jS^GM8O3R>$K7n7bQ;lGtVvyS zHoLEWD-RBOJ=o|GWd5TO`1-iqRIT0e&u~9#B=}6XX}YIH-M}ctnEhP)nB6hAxUZLP zASHkP&c23~ss#T085RRSe~xVF3Rd9H)h{qk;17lZf8y*7{z5qOTJg1hDsu6Be`!cu zt|jO-M*(?w7~=NMn(j^1L5DqLKM}J7tpt Zws!dUeVi@>rpy@6#CCU#(1RxZ_yX^bT$2C* diff --git a/BoutsDeCode/DameRESTJava/target/classes/model/Case.class b/BoutsDeCode/DameRESTJava/target/classes/model/Case.class deleted file mode 100644 index 56cd136bd2dd1c74138f3b163dd39b1edea3f269..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1264 zcmZuv+foxj5IvJ@b~j-O5bg+wh?)c?qM&FZ5<`%b5h%i?Qa)HqT;o#9#!5DPiyz^G z1{F(7i)TN|vU?ICDDyBqXZm#a>7M!Z``b?db65#N!CVOQxTj%E!~GC?vB28{_B_0_K}W3wu?H3*gn=V%yvmbS|E^pzOhvlF!BeLSC*5=m^CXY5PFhNXP&*> zNbjx*bT+~AW_tVS>J~Y7S94q0zs@E&b@tn?XO*q$ruDXJ)hyRDJ-gxxh@5~nwUf?o zXA6|_#rb;bq3P7Enm|`H_K!=+kT7!OZP!|>AM9DxEpyMI8%@TnzZRH?=J(A*GvSzS zIZ^Pcwp&id&KHQ}D<#v}F{?HQw=yWMc|eIG|3?d`DciNZMS;N!lIL=<9RbCAW0PcI z3j_;x*)_d-mC`9u=^ZLtUhd*q_@gnJhMp=ptr~Pe`NrFHWZn8fs=b9pew9L{UM*QG zHn$(-r<&ou4UF<<7&Gt$8DgEiq=88+8@Pe2fe~EdQ`A5o`V9>5Hptr$Z^P&p2%k-n z>(lQjITe>`^+jWC+Sd2>t&&H2=G#Y;am-pR*+x5ki1S$~ZlFD`MWdN5&C<8*rH`&H z4YNpqEa{Y%q)JO_r6s|{^l@82_Xv-GZ~#G!<1*+^5Sk>*E7XAa0^bSz9|#Ftpj#qDDkfdoIqi|?;L-MZj2@i*Kl3>X{yAUpz|vH)B`c%)1${w<71zp zeUu!o8741BtLQ`rA< zBhxjd1zPEJByhVG{Emjh%lQta7}5RyV+4;7lBh#bBr+uG3xb^0^M@S`TG+|OPO6NE@?_5 diff --git a/BoutsDeCode/DameRESTJava/target/classes/model/CodeFin.class b/BoutsDeCode/DameRESTJava/target/classes/model/CodeFin.class deleted file mode 100644 index 972d1966d4903b0321e812fe0a454e914fa3da56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 955 zcmZuv+iuf95Iq|^vEw?Inovk7mtLSrS{ef3DN)s`DiTse9}JNqo*dT%SB@h&cE1Z! zi6RiF&wLbOW*gCju$Fc_J7>GhmOyr#M3EPsdJ+A*fioWat`kts zR`;;;?${P6zF$bnoI63{jRmYqbup?kJJ<3UlkTkT z4?-tSB4Sc19MIctFil>cp*{|iVf!Cp`!qJg9wm`WGvvO^={WbeClj~$f=VVDcrK8e z8@P!wUYK}*hb9Urnpoz|LQx=pGY~E+kamMnNbIFbbwR diff --git a/BoutsDeCode/DameRESTJava/target/classes/model/Difficulte.class b/BoutsDeCode/DameRESTJava/target/classes/model/Difficulte.class deleted file mode 100644 index e56347b5f5331c33ab5ff847cda35d4ae5e20faf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 805 zcmZuvO;6iE5Pch)Y+~FbH6P`xh0>HJRBD7oPl*r}P^pqt4uM>H+PF@-XyZtZ&F^Z9 zL=h5*bAMFDtg(nwVoPK1%$xUSp7!s*>stW3cvpmpmlj@OoukOHVS(ed4x1cr7v4Tif!2sL==ZaZ`3rp(DGEuSk34i1@WNulwptjvD(8p^!(3KuUsBm z_d#!Lqo6%6+Nk0!L*;*eZIrNOV-E8SrLjd?j$y`A!+=QVYxT@1$K5mEi%9rmcH;vj zMx$m1_UQ5?Yjb~xt^=o=!73|yIQlawT9^fcO{Y!z>c{#Gc8S~_jGuI3ct$aw)C|Ix zP)_l?$R%0JF}JTUa|cu7a})RqW$XtOp2JD%v@@Z!;tmXY0lxiy?GN(5l5$pV+|IFp lMXJ9@FiW(+GM3UoHWC4#VBEmG0Mk5^W9QPo6|5%xYxj$srf&cM diff --git a/BoutsDeCode/DameRESTJava/target/classes/model/JeuModel.class b/BoutsDeCode/DameRESTJava/target/classes/model/JeuModel.class deleted file mode 100644 index d8b1b2cfef2372ae676b9afad83f0b527a7a5a97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 779 zcmZ{h%TB^T6o&t4f!Z=$~cN#V(E)3!V!^YKs1xrdvO7Xcg(U`dK0emRq znF2v@T=aD2%zw`Rotdxik52$+II@t$o{0qZWjHW!XrRiF2*k)`C^U!SNjSa;22MK) zy@m{4!U3h^PH5hce)}dyX;|FS%YkGm(nvS||cqh7k+en*6! z+|QGV=+T=n{AUP$-7PeI&`Z`E~K#Ko> M$P1MqJMrkdKLtI10ssI2 diff --git a/BoutsDeCode/DameRESTJava/target/classes/model/Joueur.class b/BoutsDeCode/DameRESTJava/target/classes/model/Joueur.class deleted file mode 100644 index 72262e44b3d293bcab5d28ec3cfe84f12b912b47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 931 zcmZuv?{Csj6g{skZ7Jnf#VK>@#OZ*|A&Q?M%gCIG3vr264DnOJid{-c3fBw`tqr>91rr|MzbXaG|bVlP3u3tMGM{X20dGrZ`^89uC9fP*fZFk-t*bLeCmvQQe z<45jv>%a9>5Ez8k)A`aVT8QFZi@p;Yc1J10)fcYVIy&XP~iEI2O3MT5HO`7rbnkeF_i95J! zB8!}fJU=Yt=pHVX!8#H;1N#c;9P(%K7;e(3ikwXNB32jp z1|$(RET#GliE}6%FD>D3QN*01u!h?rPpcsm?^uUSKcH2&*3O`Q5$Slli*gO?TsrOv zObI&f3&EVmr9t@D{sEM zP84OI{ZZm`)8Nw01ai4~&U4Or&b`0?eE$Vt2hVkIY#Mlk$13V7o)|D;%a5aB(V(Iu z5lsy>xo)X=%D{(d{E4C38&BSQLA#%bB#k=^x;PbnAcld*pl%Lc_TC=!8EWsY;wq;i zNWGY$ZadeCe4j|EtLKN_VLBdq(VLtx>pJ?tuwnO3NU9x(a75~nAC5ZCRS~NjruAdV%^N zOvl}MU%M2O(VwJ|>%H=2P7Aa2T5=#0OY#irCZ3_iU>4&w(Lme8U96f|MAbwMRXT#p z9HbaS*$pNk(cZM3f{~-)iRUIH{h~P9ejwtwQ-J-8a-Oxbw@pWH(tT0(mZdmAE9nDE zE7CGmICNOJ0aB*j2CecjreI%Dx`6VTb_}=ZTghq);TyP}<9ATX{u&l!FMY+p%75Aid+|Mv;(6ElR+{hsfBA?a| z@MB9=&Y_(_&o&0nHVfsSR8ppN3y%4ej_(Xis?CP0W+pg=R3?iGnVYFRph)CE5B~xK CBdxmt diff --git a/BoutsDeCode/DameRESTJava/target/maven-archiver/pom.properties b/BoutsDeCode/DameRESTJava/target/maven-archiver/pom.properties deleted file mode 100644 index 1ef38bd..0000000 --- a/BoutsDeCode/DameRESTJava/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Sat Dec 03 11:53:07 CET 2016 -version=0.0.1-SNAPSHOT -groupId=DameIaM2gil -artifactId=DameRESTJava diff --git a/BoutsDeCode/DameRESTJava/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/BoutsDeCode/DameRESTJava/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 3548fcc..0000000 --- a/BoutsDeCode/DameRESTJava/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,10 +0,0 @@ -model\Joueur.class -model\Board.class -model\Case.class -controller\DameController.class -config\ServletInitializer.class -model\CodeFin.class -model\JeuModel.class -model\Status.class -config\AppConfig.class -model\Difficulte.class diff --git a/BoutsDeCode/DameRESTJava/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/BoutsDeCode/DameRESTJava/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 7b78dbf..0000000 --- a/BoutsDeCode/DameRESTJava/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,10 +0,0 @@ -C:\Users\Vigiii\workspace\DameRESTJava\src\main\java\model\Status.java -C:\Users\Vigiii\workspace\DameRESTJava\src\main\java\model\Case.java -C:\Users\Vigiii\workspace\DameRESTJava\src\main\java\model\Difficulte.java -C:\Users\Vigiii\workspace\DameRESTJava\src\main\java\config\AppConfig.java -C:\Users\Vigiii\workspace\DameRESTJava\src\main\java\model\CodeFin.java -C:\Users\Vigiii\workspace\DameRESTJava\src\main\java\config\ServletInitializer.java -C:\Users\Vigiii\workspace\DameRESTJava\src\main\java\model\JeuModel.java -C:\Users\Vigiii\workspace\DameRESTJava\src\main\java\model\Board.java -C:\Users\Vigiii\workspace\DameRESTJava\src\main\java\controller\DameController.java -C:\Users\Vigiii\workspace\DameRESTJava\src\main\java\model\Joueur.java diff --git a/BoutsDeCode/DameRESTJava/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/BoutsDeCode/DameRESTJava/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000