Fixed several issues in view

Author: DylanVanAssche

bin/images/free.png

@@ -49,7 +49,7 @@ public static void main(String[] args) throws UnknownMovementDirection, WeHaveAW
 
 	public Controller() {
 		// Player name screen can be added in the future as extension
-		this.setMaze(new Maze("Hermanneke"));
+		this.setMaze(new Maze());
 		this.setMainFrame(new MainFrame(this));
 	}
 
@@ -70,8 +70,7 @@ public void exitApplication() {
 	}
 
 	public void newGame() {
-		this.setMaze(new Maze("Joske"));
-		System.out.println(this.getMaze().getPlayer().getName());
+		this.setMaze(new Maze());
 		this.getMainFrame().newGame();
 	}
 
@@ -87,4 +86,8 @@ public void movePlayer(MovementType movement) throws UnknownMovementDirection, B
 			throw new WeHaveAWinner(exception.getMessage());
 		}
 	}
+
+	public void setPlayerName(String name) {
+		this.getMaze().getPlayer().setName(name);
+	}
 }

bin/images/full_resolution/gold.png

@@ -53,7 +53,7 @@ public void setTiles(Tile[][] tiles) {
 	/*
 	 * @brief: constructs a new random Maze
 	 */
-	public Maze(String playerName) {
+	public Maze() {
 		// n^2 tiles
 		for(int i=0; i<mazeSize*2; i++) {
 			for(int j=0; j<mazeSize*2; j++) {
@@ -62,7 +62,7 @@ public Maze(String playerName) {
 		}
 
 		// create new player and enable gold and void collision
-		this.setPlayer(new Player(playerName));
+		this.setPlayer(new Player());
 		this.getTiles()[(int)(Math.random()*2*mazeSize)][(int)(Math.random()*2*mazeSize)].enableGold();
 		Tile target = this.getTiles()[(int)(Math.random()*2*mazeSize)][(int)(Math.random()*2*mazeSize)];
 		while(target.getMiddleSquare().getContent() == SquareType.GOLD) { // It's never possible that the content is WALL
@@ -227,7 +227,7 @@ else if(newSquare.isGold() == true)
 			this.getPlayer().setPosition(new Position(newSquare, newTile));
 			oldSquare.setContent(SquareType.FREE); // Player can only be on FREE Squares
 			newSquare.setContent(SquareType.PLAYER);
-			throw new WeHaveAWinner("You won!\nCongratulations!");
+			throw new WeHaveAWinner("You won!\nCongratulations " + this.getPlayer().getName() + "!");
 		}
 		else 
 		{

bin/images/full_resolution/player.png

@@ -22,7 +22,6 @@ public void setPosition(Position position) {
 		this.position = position;
 	}
 
-	public Player(String name) {
-		this.setName(name);
+	public Player() {
 	}
 }

bin/images/full_resolution/wall.png

@@ -22,7 +22,7 @@ public String toString() {
 			return "$";
 		}
 		else if(this.isWall()) {
-			return "▉";
+			return "#";
 		}
 		else if(this.isPlayer()) {
 			return "X";

bin/images/gold.png

@@ -1,6 +1,8 @@
 // Dylan Van Assche - 3 ABA EI
 package be.dylanvanassche.maze.view;
 
+import java.awt.BorderLayout;
+
 import javax.swing.*;
 import be.dylanvanassche.maze.controller.*;
 
@@ -35,20 +37,26 @@ public void setNavigationView(NavigationView navigationView) {
 
 	public MainFrame(final Controller c) {
 		this.setController(c);
-		this.getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS));
+		this.getContentPane().setLayout(new BorderLayout());
 		this.setNavigationView(new NavigationView(this.getController()));
 		this.newGame();
 		this.setDefaultCloseOperation(EXIT_ON_CLOSE);
 		this.setJMenuBar(new MenuBar(this.getController()));
 		this.pack();
+		this.setResizable(false);
 		this.setVisible(true);
 	}
 
 	public void newGame() {
+		String name = null;
+		while(name == null || name.length() == 0) {
+			name = JOptionPane.showInputDialog(this, "What's your name?");
+		}
+		this.getController().setPlayerName(name);
 		this.getContentPane().removeAll(); // clean it up
 		this.setMazeView(new MazeView(this.getController()));
-		this.getContentPane().add(this.getMazeView());
-		this.getContentPane().add(this.getNavigationView());
+		this.getContentPane().add(this.getMazeView(), BorderLayout.CENTER);
+		this.getContentPane().add(this.getNavigationView(), BorderLayout.SOUTH);
 		// Revalidates the component hierarchy, when adding/removing stuff at runtime you need to reload the UI, 
 		// this is NOT repaint since we add/remove the components completely without modifying their properties!
 		// If you modify their properties only, a repaint() is sufficient!

bin/images/player.png

@@ -22,7 +22,7 @@ public void setController(Controller controller) {
 
 	public MazeView(final Controller c) {
 		this.setController(c);
-		this.setLayout(new GridLayout(0,4));
+		this.setLayout(new GridLayout(0,4,0,0)); // gap = 0
 		this.newGame();
 		this.setVisible(true);
 	}

bin/images/wall.png

@@ -128,6 +128,10 @@ public void actionPerformed(ActionEvent event) {
 				}
 			}
 		});
+		this.getUpButton().setMnemonic(KeyEvent.VK_UP); // ALT required
+		this.getDownButton().setMnemonic(KeyEvent.VK_DOWN);
+		this.getLeftButton().setMnemonic(KeyEvent.VK_LEFT);
+		this.getRightButton().setMnemonic(KeyEvent.VK_RIGHT);
 		this.setVisible(true);
 	}
 

src/be/dylanvanassche/maze/controller/Controller.java

@@ -2,23 +2,27 @@
 package be.dylanvanassche.maze.view;
 
 import java.awt.*;
+import java.awt.image.*;
+import java.io.File;
+import java.io.IOException;
+import javax.imageio.ImageIO;
 import javax.swing.*;
-import be.dylanvanassche.maze.controller.*;
-import be.dylanvanassche.maze.model.Square;
+import be.dylanvanassche.maze.controller.Controller;
+import be.dylanvanassche.maze.model.*;
 import be.dylanvanassche.maze.view.*;
 
 public class SquareView extends JPanel {
-private Controller controller;
-private Square square;
-	
+	private Controller controller;
+	private Square square;
+
 	public Controller getController() {
 		return controller;
 	}
 
 	public void setController(Controller controller) {
 		this.controller = controller;
 	}
-	
+
 	public Square getSquare() {
 		return square;
 	}
@@ -31,7 +35,7 @@ public SquareView(final Controller c, Square s) {
 		this.setController(c);
 		this.setSquare(s);
 		this.setLayout(new FlowLayout());
-		this.add(new JLabel(this.getSquare().toString()));
+		this.add(new SquareViewElement(this.getSquare().getContent()));
 		this.setVisible(true);
 	}
 }

src/be/dylanvanassche/maze/model/Maze.java

@@ -0,0 +1,106 @@
+package be.dylanvanassche.maze.view;
+
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import be.dylanvanassche.maze.model.SquareType;
+
+
+public class SquareViewElement extends JComponent {
+	private SquareType content;
+	private static final String WALL_PATH = "src/images/wall.png";
+	private static final String PLAYER_PATH = "src/images/player.png";
+	private static final String GOLD_PATH = "src/images/gold.png";
+	private static final String FREE_PATH = "src/images/free.png";
+	private static final int IMG_SIZE = 64;
+	private BufferedImage wallImg;
+	private BufferedImage playerImg;
+	private BufferedImage goldImg;
+	private BufferedImage freeImg;
+	
+	public SquareType getContent() {
+		return content;
+	}
+
+	public void setContent(SquareType content) {
+		this.content = content;
+	}
+
+	public BufferedImage getWallImg() {
+		return wallImg;
+	}
+
+	public void setWallImg(BufferedImage wallImg) {
+		this.wallImg = wallImg;
+	}
+
+	public BufferedImage getPlayerImg() {
+		return playerImg;
+	}
+
+	public void setPlayerImg(BufferedImage playerImg) {
+		this.playerImg = playerImg;
+	}
+
+	public BufferedImage getGoldImg() {
+		return goldImg;
+	}
+
+	public void setGoldImg(BufferedImage goldImg) {
+		this.goldImg = goldImg;
+	}
+
+	public BufferedImage getFreeImg() {
+		return freeImg;
+	}
+
+	public void setFreeImg(BufferedImage freeImg) {
+		this.freeImg = freeImg;
+	}
+
+	public SquareViewElement(SquareType content) {
+		this.setContent(content);
+		try {
+			this.setWallImg(ImageIO.read(new File(WALL_PATH)));
+			this.setPlayerImg(ImageIO.read(new File(PLAYER_PATH)));
+			this.setGoldImg(ImageIO.read(new File(GOLD_PATH)));
+			this.setFreeImg(ImageIO.read(new File(FREE_PATH)));
+		} 
+		catch (IOException e) {
+			
+			e.printStackTrace();
+		}
+	}
+	
+	@Override
+	public Dimension getPreferredSize() {
+		return new Dimension(IMG_SIZE,IMG_SIZE);
+	}
+	
+	@Override
+	protected void paintComponent(Graphics graphics) {
+		//super.paintComponent(graphics);
+		switch(this.getContent())
+		{
+		case WALL:
+			graphics.drawImage(this.getWallImg(), 0, 0, IMG_SIZE, IMG_SIZE, null);
+			break;
+		case PLAYER:
+			graphics.drawImage(this.getPlayerImg(), 0, 0, IMG_SIZE, IMG_SIZE, this);
+			break;
+		case GOLD:
+			graphics.drawImage(this.getGoldImg(), 0, 0, IMG_SIZE, IMG_SIZE, this);
+			break;
+		default:
+		case FREE:
+			graphics.drawImage(this.getFreeImg(), 0, 0, IMG_SIZE, IMG_SIZE, this);
+			break;
+		}
+
+	}
+}

src/be/dylanvanassche/maze/model/Player.java

@@ -29,7 +29,7 @@ public void setTile(Tile tile) {
 	public TileView(final Controller c, Tile tile) {
 		this.setController(c);
 		this.setTile(tile);
-		this.setLayout(new GridLayout(0,3));
+		this.setLayout(new GridLayout(0,3,0,0)); // gap = 0
 		for(int i = 0; i < 9; i++) {
 			this.add(new SquareView(this.getController(), this.getTile().nextSquare()));
 		}