www

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 257b95219a40ec35db2b58b789a3bd1cb61b03a5
parent 91b1fb2123d0803ec5fbd09c09e8d16856ac4c6d
Author: Bertrand BRUN <bertrand0brun@gmail.com>
Date:   Tue,  1 Feb 2011 23:57:53 +0100

Changement de nom de Game -> DownloadedGame
Diffstat:
Acode/PtiClic/src/org/pticlic/model/DownloadedGame.java | 153+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dcode/PtiClic/src/org/pticlic/model/Game.java | 142------------------------------------------------------------------------------
2 files changed, 153 insertions(+), 142 deletions(-)

diff --git a/code/PtiClic/src/org/pticlic/model/DownloadedGame.java b/code/PtiClic/src/org/pticlic/model/DownloadedGame.java @@ -0,0 +1,153 @@ +package org.pticlic.model; + +import java.io.Serializable; + + +/** + * @author Bertrand BRUN + * + * Classe metier reprensentant le jeu telecharger du serveur. + * + */ +public class DownloadedGame implements Serializable { + + private static final long serialVersionUID = 1L; + + public static class Word implements Serializable { + + private static final long serialVersionUID = 1L; + private int id; + private String name; + + public Word() {} + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + + private int id; + private int cat1; + private int cat2; + private int cat3; + private int cat4; + private Word center; + private Word[] cloud; + + + + public DownloadedGame(int id, int cat1, int cat2, int cat3, int cat4, Word center, + Word[] cloud) { + super(); + this.id = id; + this.cat1 = cat1; + this.cat2 = cat2; + this.cat3 = cat3; + this.cat4 = cat4; + this.center = center; + this.cloud = cloud; + } + + /** + * Permet de recupere le nombre de relation que l'on va utiliser. + * + * @return le nombre de relation + */ + public int getNbRelation() { + int res = 0; + + if (cat1 != -1) { + res++; + } + if (cat2 != -1) { + res++; + } + if (cat3 != -1) { + res++; + } + if (cat4 != -1) { + res++; + } + + return res; + } + + public static String getName(Word word) { + return word.getName(); + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getCat1() { + return cat1; + } + + public void setCat1(int cat1) { + this.cat1 = cat1; + } + + public int getCat2() { + return cat2; + } + + public void setCat2(int cat2) { + this.cat2 = cat2; + } + + public int getCat3() { + return cat3; + } + + public void setCat3(int cat3) { + this.cat3 = cat3; + } + + public int getCat4() { + return cat4; + } + + public void setCat4(int cat4) { + this.cat4 = cat4; + } + + public Word getCentre() { + return center; + } + + public void setCentre(Word center) { + this.center = center; + } + + public int getNbWord() { + return cloud.length; + } + + public Word getWordInCloud(int index) { + return cloud[index]; + } + + @Override + public String toString() { + return "Game [id=" + id + ", cat1=" + cat1 + ", cat2=" + cat2 + + ", cat3=" + cat3 + ", cat4=" + cat4 + ", center=" + center + + ", cloud=" + cloud + "]"; + } +} diff --git a/code/PtiClic/src/org/pticlic/model/Game.java b/code/PtiClic/src/org/pticlic/model/Game.java @@ -1,142 +0,0 @@ -package org.pticlic.model; - -import java.io.Serializable; - - -public class Game implements Serializable { - - private static final long serialVersionUID = 1L; - - public static class Word implements Serializable { - - private static final long serialVersionUID = 1L; - private int id; - private String name; - - public Word() {} - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - } - - private int id; - private int cat1; - private int cat2; - private int cat3; - private int cat4; - private Word center; - private Word[] cloud; - - - - public Game(int id, int cat1, int cat2, int cat3, int cat4, Word center, - Word[] cloud) { - super(); - this.id = id; - this.cat1 = cat1; - this.cat2 = cat2; - this.cat3 = cat3; - this.cat4 = cat4; - this.center = center; - this.cloud = cloud; - } - - public int getNbRelation() { - int res = 0; - - if (cat1 != -1) { - res++; - } - if (cat2 != -1) { - res++; - } - if (cat3 != -1) { - res++; - } - if (cat4 != -1) { - res++; - } - - return res; - } - - public static String getName(Word word) { - return word.getName(); - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public int getCat1() { - return cat1; - } - - public void setCat1(int cat1) { - this.cat1 = cat1; - } - - public int getCat2() { - return cat2; - } - - public void setCat2(int cat2) { - this.cat2 = cat2; - } - - public int getCat3() { - return cat3; - } - - public void setCat3(int cat3) { - this.cat3 = cat3; - } - - public int getCat4() { - return cat4; - } - - public void setCat4(int cat4) { - this.cat4 = cat4; - } - - public Word getCentre() { - return center; - } - - public void setCentre(Word center) { - this.center = center; - } - - public int getNbWord() { - return cloud.length; - } - - public Word getWordInCloud(int index) { - return cloud[index]; - } - - @Override - public String toString() { - return "Game [id=" + id + ", cat1=" + cat1 + ", cat2=" + cat2 - + ", cat3=" + cat3 + ", cat4=" + cat4 + ", center=" + center - + ", cloud=" + cloud + "]"; - } -}