Timer changed from control to model

model/gameState/GameState.java

@@ -0,0 +1,22 @@
+package model.gameState;
+
+import java.awt.Graphics2D;
+import java.awt.event.KeyEvent;
+
+import control.GameStateManager;
+
+public abstract class GameState {
+
+	protected GameStateManager gsm;
+
+	public GameState(GameStateManager gsm) {
+		super();
+		this.gsm = gsm;
+	}
+	
+	public abstract void init();
+	public abstract void update();
+	public abstract void draw(Graphics2D g2);
+	public abstract void keyPressed(KeyEvent e);
+	public abstract void keyReleased(KeyEvent e);
+}

model/gameState/MenuState.java

@@ -0,0 +1,45 @@
+package model.gameState;
+
+import java.awt.Graphics2D;
+import java.awt.event.KeyEvent;
+
+import control.GameStateManager;
+
+public class MenuState extends GameState {
+
+	public MenuState(GameStateManager gsm) {
+		super(gsm);
+	}
+	@Override
+	public void init() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void update() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void draw(Graphics2D g2) {
+		g2.fillRect(10, 10, 100, 10);
+
+	}
+
+	@Override
+	public void keyPressed(KeyEvent e) {
+		if(e.getKeyCode() == KeyEvent.VK_Q){
+			gsm.next();
+		}
+
+	}
+
+	@Override
+	public void keyReleased(KeyEvent e) {
+		// TODO Auto-generated method stub
+
+	}
+
+}

model/gameState/PlayState.java

@@ -0,0 +1,54 @@
+package model.gameState;
+
+import java.awt.Graphics2D;
+import java.awt.event.KeyEvent;
+import java.awt.geom.Rectangle2D;
+
+import model.objects.InfoPanel;
+import model.objects.Lines;
+import control.GameStateManager;
+
+public class PlayState extends GameState{
+
+	public static final Rectangle2D borderRect = new Rectangle2D.Double(256, 0, 1024, 1024);
+	private Lines lines;
+	private InfoPanel hsb;
+	public PlayState(GameStateManager gsm) {
+		super(gsm);
+		lines = new Lines((int) borderRect.getX(),100);
+		hsb = new InfoPanel(0, 0);
+	}
+
+	@Override
+	public void init() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void update() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void draw(Graphics2D g2) {	
+		hsb.draw(g2);
+		g2.setClip(borderRect);	
+		lines.draw(g2);
+		
+	}
+
+	@Override
+	public void keyPressed(KeyEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void keyReleased(KeyEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+}