Board : constructeur par fichier ; Car : ajout de static pour l'Orientation

src/model/Board.java

 package model;
 
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+
 public class Board {
-	
+
 	private int[][] board;
 	private Car[] cars;
 	private Position exit;
 
 	public Board(int size, int nbcars){
+		initTab(size);
+		cars = new Car[nbcars];
+	}
+
+	private void initTab(int size){
 		board = new int[size][size];
-		
+
 		for ( int i=0 ; i < size ; i++){
 			for ( int j=0 ; j< size ; j++){
 				board[i][j] = -1;
 			}
 		}
+	}
+	//filelevel : ligne 1 : taille
+	//ligne 2 : x et y de la sortie
+	//ligne 3 : nombre de voitures
+	//après : les voitures : xfront yfront xback yback
+	
+	public Board(String filelevel) throws IOException{
+
+		BufferedReader br = new BufferedReader( new FileReader(filelevel) );
 		
-		cars = new Car[nbcars];
+		int size = Integer.valueOf(br.readLine());
+		
+		initTab(size);
+		
+		String[]line2 = br.readLine().split(" ");
+		exit = new Position(Integer.valueOf(line2[0]), Integer.valueOf(line2[1]));
+		
+		int car_number = Integer.valueOf(br.readLine());
+		
+		cars = new Car[car_number];
+
+		String l = br.readLine();
+		int i = 0;
+		
+		while(l != null){
+			
+			String[] splitl = l.split(" ");
+			Position pos1 = new Position(Integer.valueOf(splitl[0]), Integer.valueOf(splitl[1]));
+			Position pos2 = new Position(Integer.valueOf(splitl[2]), Integer.valueOf(splitl[3]));
+			
+			Car.Orientation or ;
+
+			if(splitl[4].equals("HORIZONTAL")){
+				or  = Car.Orientation.HORIZONTAL; 
+			} else {
+				or = Car.Orientation.VERTICAL;
+			}
+
+			cars[i] = new Car(i, pos1, pos2, or);
+			
+			l = br.readLine();
+			i++;
+		}
+
 	}
 
-	
+
 	public boolean isSolved(){
-		
+
 		return board[exit.getX()][exit.getY()] == 0;
 	}
-	
-	
+
+
 	//getAllPossibleMoves();
 
-    public int getSize() {
-        return board.length;
+	public int getSize() {
+		return board.length;
 	}
 
 	public int getCarsNumber() {
 		return cars.length;
 	}
+	
+	
 }

src/model/Car.java

@@ -215,7 +215,7 @@ public class Car
 		return number;
 	}
 
-	public enum Orientation
+	public static enum Orientation
 	{
 		HORIZONTAL, VERTICAL;
 	}