Merge branch 'fix_#59_refactor_modul-b' into 'main'

fix_smell_Stack.java fix_smell_SquareBegin.java fix_smell_Square.java fix_smell_Question.java

Closes #59

See merge request !5

module-b/src/main/java/fr/unantes/sce/trivial/model/Question.java

@@ -2,6 +2,7 @@ package fr.unantes.sce.trivial.model;
 
 import java.io.Serializable;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
 
@@ -58,22 +59,23 @@ public class Question implements Serializable {
 				i++;
 			}
 		}
-		switch (i) {
-			case 1:
-				return true;
-			default:
-				return false;
+
+		if (i == 1) {
+			return true;
+		} else {
+			return false;
 		}
 	}
 
+
 	public boolean equals(Object o) {
-		if (o instanceof Question) {
-			Question q = (Question) o;
+		if (o instanceof Question q) {
 			return this.statement.equals(q.statement);
 		}
 		return false;
 	}
 
+
 	public String getAuthor() {
 		return author;
 	}
@@ -98,22 +100,23 @@ public class Question implements Serializable {
 		this.category = category;
 	}
 
-	public void setChoices(HashMap<String, Boolean> choices) {
-		this.choices = choices;
+	public void setChoices(Map<String, Boolean> choices) {
+		this.choices = new HashMap<>(choices);
 	}
 
-	public HashMap<String, Boolean> getChoices() {
-		HashMap<String, Boolean> map = new HashMap<>(4);
 
-		Set<Entry<String, Boolean>> entries = choices.entrySet();
+	public Map<String, Boolean> getChoices() {
+		Map<String, Boolean> map = new HashMap<>(4);
 
-		for (Entry<String, Boolean> e : entries) {
-			map.put(e.getKey(), e.getValue());
+		for (Entry<String, Boolean> entry : choices.entrySet()) {
+			map.put(entry.getKey(), entry.getValue());
 		}
 
 		return map;
 	}
 
+
+
 	public String toString() {
 		final String SEPARATOR = "\",\n";
 		StringBuilder tmp = new StringBuilder();

module-b/src/main/java/fr/unantes/sce/trivial/model/Square.java

@@ -10,11 +10,11 @@ import java.util.List;
  */
 public abstract class Square 
 {
-	private List<Piece>joueursSurLaCase;
-	private int id;
+	private final List<Piece>joueursSurLaCase;
+	private final int id;
 	private static int nbCase=0;
 	
-	public Square() 
+	protected Square()
 	{
 		joueursSurLaCase=new ArrayList<>();
 		id=nbCase;
@@ -23,7 +23,7 @@ public abstract class Square
 	
 	/**
 	 * add a piece on this square
-	 * @param Piece p
+	 * @param p p
 	 */
 	public void addPiece(Piece p){
 		if(!joueursSurLaCase.contains(p)){
@@ -33,12 +33,10 @@ public abstract class Square
 	
 	/**
 	 * remove a piece on this square
-	 * @param Piece p
+	 * @param p p
 	 */
 	public void removePiece(Piece p){
-		if(joueursSurLaCase.contains(p)){
-			joueursSurLaCase.remove(p);
-		}
+
 	}
 
 	public int getIdCase() {
@@ -57,7 +55,7 @@ public abstract class Square
 	
 	/**
 	 * This method check if the player is on this square
-	 * @param pie
+	 * @param pie p
 	 * @return boolean
 	 */
 	public boolean getThisPiece(Piece pie){

module-b/src/main/java/fr/unantes/sce/trivial/model/SquareBegin.java

 package fr.unantes.sce.trivial.model;
 
+
 import java.util.Random;
-/**
- * This class is an extend of the abstract class Square
- * It allows to create the beginning square
- * @author Thomas
- *
- */
+
 public class SquareBegin extends Square {
 
 	private Category cat;
-	
-	public SquareBegin(){
+	private Random random;
+
+	public SquareBegin() {
 		super();
+		random = new Random();
 	}
-	
-	public Category getCategorie(){
-		Random ran = new Random();
-		int valCat= ran.nextInt(6)+1;
-		for(Category c: Category.values()){
-			if(c.getId()==valCat){
-				cat=c;
+
+	public Category getCategorie() {
+		int valCat = random.nextInt(6) + 1;
+		for (Category c : Category.values()) {
+			if (c.getId() == valCat) {
+				cat = c;
 			}
 		}
 		return cat;

module-b/src/main/java/fr/unantes/sce/trivial/model/Stack.java

@@ -7,6 +7,8 @@ import java.util.Iterator;
 import java.util.List;
 
 import fr.unantes.sce.trivial.utility.Serialisation;
+
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class Stack extends Observable implements Serializable 
@@ -83,14 +85,18 @@ public class Stack extends Observable implements Serializable
 	{
 		
 		List<Question> list = new ArrayList<>();
-		
+
 		int i = 1;
 		for(Question q : listQuestion)
 		{
 			
 			list.add(new Question(q.getAuthor(),q.getStatement(),q.getCategory()));
 			list.get(list.indexOf(q)).setChoices(q.getChoices());
-			logger.info(i + q.getStatement());
+
+			if (logger.isLoggable(Level.INFO)) {
+				logger.info(String.format("%d. %s", i, q.getStatement()));
+			}
+
 			i++;
 		}
 		
@@ -190,13 +196,9 @@ public class Stack extends Observable implements Serializable
 	
 	public Question getRandomQuestionByCat(Category cat){
 		for(Question q: listQuestion){
-			if(q!= null)
-			{
-				if(q.getCategory().equals(cat))
-				{
-				
-					return q;
-				}
+
+			if (q != null && q.getCategory().equals(cat)) {
+				return q;
 			}
 		}