From f7c271b89e4071ee7737868821c34ceb2a9900bc Mon Sep 17 00:00:00 2001
From: t-moe <timolang@gmail.com>
Date: Fri, 27 May 2016 12:02:20 +0200
Subject: [PATCH] Integrating field rendering with game

---
 .../sevennotseven/{Field.java => FieldCanvas.java}    |  2 +-
 src/ch/bfh/sevennotseven/Game.java                    | 11 ++++++-----
 src/ch/bfh/sevennotseven/Window.java                  | 10 +++-------
 3 files changed, 10 insertions(+), 13 deletions(-)
 rename src/ch/bfh/sevennotseven/{Field.java => FieldCanvas.java} (95%)

diff --git a/src/ch/bfh/sevennotseven/Field.java b/src/ch/bfh/sevennotseven/FieldCanvas.java
similarity index 95%
rename from src/ch/bfh/sevennotseven/Field.java
rename to src/ch/bfh/sevennotseven/FieldCanvas.java
index 0d718e6..13b684a 100644
--- a/src/ch/bfh/sevennotseven/Field.java
+++ b/src/ch/bfh/sevennotseven/FieldCanvas.java
@@ -4,7 +4,7 @@ import java.awt.Canvas;
 import java.awt.Color;
 import java.awt.Graphics;
 
-public class Field extends Canvas {
+public class FieldCanvas extends Canvas {
 	
 	private int size;
 	private int[][] field;
diff --git a/src/ch/bfh/sevennotseven/Game.java b/src/ch/bfh/sevennotseven/Game.java
index cbc6738..ec50923 100644
--- a/src/ch/bfh/sevennotseven/Game.java
+++ b/src/ch/bfh/sevennotseven/Game.java
@@ -47,7 +47,7 @@ public class Game {
 	}
 	
 	public int[][] getField(){
-		return null;
+		return field;
 	
 	}
 	
@@ -115,10 +115,11 @@ public class Game {
 				field[x][y] = nextBlocks.remove(0); // fill with the first element of nextBlocks
 			}
 			
-			// add n new colors to nextBlocks according to the level number.
-			for(int i = 0; i < (level * 3); i++){
-				nextBlocks.add(rand.nextInt(numberOfColors));	
-			}
+		}
+		
+		// add n new colors to nextBlocks according to the level number.
+		for(int i = 0; i < (level * 3); i++){
+			nextBlocks.add(rand.nextInt(numberOfColors));	
 		}
 	}
 }
diff --git a/src/ch/bfh/sevennotseven/Window.java b/src/ch/bfh/sevennotseven/Window.java
index a1054db..4ff8d9d 100644
--- a/src/ch/bfh/sevennotseven/Window.java
+++ b/src/ch/bfh/sevennotseven/Window.java
@@ -17,7 +17,7 @@ import java.awt.event.WindowEvent;
 public class Window extends Frame {
 	
 	private Game game;
-	private Field field;
+	private FieldCanvas field;
 
 	/**
 	 * @param title
@@ -33,7 +33,7 @@ public class Window extends Frame {
 			}
 		});
 		
-		field = new Field();
+		field = new FieldCanvas();
 		field.setSize(7);
 		game = new Game();
 		
@@ -42,11 +42,7 @@ public class Window extends Frame {
 		this.setSize(400,400);
 		this.setVisible(true);
 		
-		
-		int [][] testfield = new int[7][7];
-		testfield[0][0] = 2;
-		testfield[1][3] = 4;
-		field.setField(testfield);
+		field.setField(game.getField());
 
 
 	}