Reset project

src/de/oszimt/ls/aliendefence/controller/AlienDefenceController.java

@@ -1,8 +1,8 @@
-package controller;
+package de.oszimt.ls.aliendefence.controller;
 
-import model.Level;
-import model.persistence.IPersistance;
-import toDo.User;
+import de.oszimt.ls.aliendefence.model.Level;
+import de.oszimt.ls.aliendefence.model.persistence.IPersistance;
+import de.oszimt.ls.aliendefence.toDo.User;
 
 public class AlienDefenceController {
 	

src/de/oszimt/ls/aliendefence/controller/AttemptController.java

@@ -1,10 +1,10 @@
-package controller;
+package de.oszimt.ls.aliendefence.controller;
 
 import java.util.Vector;
 
-import model.Level;
-import model.persistence.IAttemptPersistance;
-import model.persistence.IPersistance;
+import de.oszimt.ls.aliendefence.model.Level;
+import de.oszimt.ls.aliendefence.model.persistence.IAttemptPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.IPersistance;
 
 public class AttemptController {
 

src/de/oszimt/ls/aliendefence/controller/GameController.java

@@ -1,13 +1,13 @@
-package controller;
+package de.oszimt.ls.aliendefence.controller;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import model.Level;
-import model.Point;
-import model.Target;
-import toDo.User;
-import view.menue.Highscore;
+import de.oszimt.ls.aliendefence.model.Level;
+import de.oszimt.ls.aliendefence.model.Point;
+import de.oszimt.ls.aliendefence.model.Target;
+import de.oszimt.ls.aliendefence.toDo.User;
+import de.oszimt.ls.aliendefence.view.menue.Highscore;
 
 public class GameController {
 

src/de/oszimt/ls/aliendefence/controller/HitCounter.java

@@ -1,4 +1,4 @@
-package controller;
+package de.oszimt.ls.aliendefence.controller;
 
 public class HitCounter {
 

src/de/oszimt/ls/aliendefence/controller/LevelController.java

@@ -1,14 +1,14 @@
-package controller;
+package de.oszimt.ls.aliendefence.controller;
 
 import java.util.List;
 
-import model.Level;
-import model.persistence.ILevelPersistance;
-import model.persistence.IPersistance;
+import de.oszimt.ls.aliendefence.model.Level;
+import de.oszimt.ls.aliendefence.model.persistence.ILevelPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.IPersistance;
 
 public class LevelController {
 
-	private ILevelPersistance levelPersistance;
+	private final ILevelPersistance levelPersistance;
 	public final String DEFAULT_LEVELNAME = "unnamed";
 	public final String DEFAULT_BACKGROUND_PICTURE_URL = "background_1.jpg";
 	public final long DEFAULT_DURATION = 90000L;

src/de/oszimt/ls/aliendefence/controller/TargetController.java

@@ -1,12 +1,12 @@
-package controller;
+package de.oszimt.ls.aliendefence.controller;
 
 import java.util.List;
 import java.util.ListIterator;
 
-import model.Level;
-import model.Target;
-import model.persistence.IPersistance;
-import model.persistence.ITargetPersistance;
+import de.oszimt.ls.aliendefence.model.Level;
+import de.oszimt.ls.aliendefence.model.Target;
+import de.oszimt.ls.aliendefence.model.persistence.IPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.ITargetPersistance;
 
 public class TargetController {
 

src/de/oszimt/ls/aliendefence/model/Attempt.java

@@ -1,9 +1,9 @@
-package model;
+package de.oszimt.ls.aliendefence.model;
 
 import java.time.LocalDateTime;
 import java.util.Vector;
 
-import toDo.User;
+import de.oszimt.ls.aliendefence.toDo.User;
 
 public class Attempt {
 

src/de/oszimt/ls/aliendefence/model/Hitbox.java

@@ -1,4 +1,4 @@
-package model;
+package de.oszimt.ls.aliendefence.model;
 
 import java.util.Random;
 

src/de/oszimt/ls/aliendefence/model/Level.java

@@ -1,4 +1,4 @@
-package model;
+package de.oszimt.ls.aliendefence.model;
 
 import java.util.ArrayList;
 import java.util.List;

src/de/oszimt/ls/aliendefence/model/Point.java

@@ -1,4 +1,4 @@
-package model;
+package de.oszimt.ls.aliendefence.model;
 
 public class Point {
 	private int x;

src/de/oszimt/ls/aliendefence/model/Target.java

@@ -1,4 +1,4 @@
-package model;
+package de.oszimt.ls.aliendefence.model;
 
 import java.util.Random;
 

src/de/oszimt/ls/aliendefence/model/persistence/IAttemptPersistance.java

@@ -1,8 +1,8 @@
-package model.persistence;
+package de.oszimt.ls.aliendefence.model.persistence;
 
 import java.util.Vector;
 
-import model.Level;
+import de.oszimt.ls.aliendefence.model.Level;
 
 public interface IAttemptPersistance {
 

src/de/oszimt/ls/aliendefence/model/persistence/ILevelPersistance.java

@@ -1,8 +1,8 @@
-package model.persistence;
+package de.oszimt.ls.aliendefence.model.persistence;
 
 import java.util.List;
 
-import model.Level;
+import de.oszimt.ls.aliendefence.model.Level;
 
 public interface ILevelPersistance {
 

src/de/oszimt/ls/aliendefence/model/persistence/IPersistance.java

@@ -1,4 +1,4 @@
-package model.persistence;
+package de.oszimt.ls.aliendefence.model.persistence;
 
 public interface IPersistance {
 

src/de/oszimt/ls/aliendefence/model/persistence/ITargetPersistance.java

@@ -1,8 +1,8 @@
-package model.persistence;
+package de.oszimt.ls.aliendefence.model.persistence;
 
 import java.util.List;
 
-import model.Target;
+import de.oszimt.ls.aliendefence.model.Target;
 
 public interface ITargetPersistance {
 

src/de/oszimt/ls/aliendefence/model/persistence/IUserPersistance.java

@@ -0,0 +1,9 @@
+package de.oszimt.ls.aliendefence.model.persistence;
+
+import de.oszimt.ls.aliendefence.toDo.User;
+
+public interface IUserPersistance {
+
+	User readUser(String username);
+
+}

src/de/oszimt/ls/aliendefence/model/persistenceDB/AccessDB.java

@@ -1,4 +1,4 @@
-package model.persistenceDB;
+package de.oszimt.ls.aliendefence.model.persistenceDB;
 
 public class AccessDB {
 

src/de/oszimt/ls/aliendefence/model/persistenceDB/AttemptDB.java

@@ -1,4 +1,4 @@
-package model.persistenceDB;
+package de.oszimt.ls.aliendefence.model.persistenceDB;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -11,10 +11,10 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Vector;
 
-import model.Attempt;
-import model.Level;
-import model.persistence.IAttemptPersistance;
-import toDo.User;
+import de.oszimt.ls.aliendefence.model.Attempt;
+import de.oszimt.ls.aliendefence.model.Level;
+import de.oszimt.ls.aliendefence.model.persistence.IAttemptPersistance;
+import de.oszimt.ls.aliendefence.toDo.User;
 
 public class AttemptDB implements IAttemptPersistance {
 

src/de/oszimt/ls/aliendefence/model/persistenceDB/LevelDB.java

@@ -1,4 +1,4 @@
-package model.persistenceDB;
+package de.oszimt.ls.aliendefence.model.persistenceDB;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -9,9 +9,9 @@ import java.sql.Statement;
 import java.util.List;
 import java.util.Vector;
 
-import model.Level;
-import model.persistence.ILevelPersistance;
-import model.persistence.ITargetPersistance;
+import de.oszimt.ls.aliendefence.model.Level;
+import de.oszimt.ls.aliendefence.model.persistence.ILevelPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.ITargetPersistance;
 
 public class LevelDB implements ILevelPersistance {
 

src/de/oszimt/ls/aliendefence/model/persistenceDB/PersistanceDB.java

@@ -1,11 +1,11 @@
-package model.persistenceDB;
+package de.oszimt.ls.aliendefence.model.persistenceDB;
 
-import model.persistence.IAttemptPersistance;
-import model.persistence.ILevelPersistance;
-import model.persistence.IPersistance;
-import model.persistence.ITargetPersistance;
-import model.persistence.IUserPersistance;
-import toDo.UserDB;
+import de.oszimt.ls.aliendefence.model.persistence.IAttemptPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.ILevelPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.IPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.ITargetPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.IUserPersistance;
+import de.oszimt.ls.aliendefence.toDo.UserDB;
 
 public class PersistanceDB implements IPersistance{
 

src/de/oszimt/ls/aliendefence/model/persistenceDB/TargetDB.java

@@ -1,4 +1,4 @@
-package model.persistenceDB;
+package de.oszimt.ls.aliendefence.model.persistenceDB;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -9,9 +9,9 @@ import java.sql.Statement;
 import java.util.List;
 import java.util.Vector;
 
-import model.Hitbox;
-import model.Target;
-import model.persistence.ITargetPersistance;
+import de.oszimt.ls.aliendefence.model.Hitbox;
+import de.oszimt.ls.aliendefence.model.Target;
+import de.oszimt.ls.aliendefence.model.persistence.ITargetPersistance;
 
 public class TargetDB implements ITargetPersistance {
 	private AccessDB dbAccess;

src/de/oszimt/ls/aliendefence/model/persistenceDummy/AttemptDummy.java

@@ -1,9 +1,9 @@
-package model.persistenceDummy;
+package de.oszimt.ls.aliendefence.model.persistenceDummy;
 
 import java.util.Vector;
 
-import model.Level;
-import model.persistence.IAttemptPersistance;
+import de.oszimt.ls.aliendefence.model.Level;
+import de.oszimt.ls.aliendefence.model.persistence.IAttemptPersistance;
 
 /**
  * Klasse mit Dummywerten zum Testen der View und des Controllers

src/de/oszimt/ls/aliendefence/model/persistenceDummy/LevelDummy.java

@@ -1,11 +1,11 @@
-package model.persistenceDummy;
+package de.oszimt.ls.aliendefence.model.persistenceDummy;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import model.Level;
-import model.Target;
-import model.persistence.ILevelPersistance;
+import de.oszimt.ls.aliendefence.model.Level;
+import de.oszimt.ls.aliendefence.model.Target;
+import de.oszimt.ls.aliendefence.model.persistence.ILevelPersistance;
 
 public class LevelDummy implements ILevelPersistance {
 

src/de/oszimt/ls/aliendefence/model/persistenceDummy/PersistanceDummy.java

@@ -1,10 +1,10 @@
-package model.persistenceDummy;
+package de.oszimt.ls.aliendefence.model.persistenceDummy;
 
-import model.persistence.IAttemptPersistance;
-import model.persistence.ILevelPersistance;
-import model.persistence.IPersistance;
-import model.persistence.ITargetPersistance;
-import model.persistence.IUserPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.IAttemptPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.ILevelPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.IPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.ITargetPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.IUserPersistance;
 
 public class PersistanceDummy implements IPersistance{
 

src/de/oszimt/ls/aliendefence/model/persistenceDummy/TargetDummy.java

@@ -1,10 +1,10 @@
-package model.persistenceDummy;
+package de.oszimt.ls.aliendefence.model.persistenceDummy;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import model.Target;
-import model.persistence.ITargetPersistance;
+import de.oszimt.ls.aliendefence.model.Target;
+import de.oszimt.ls.aliendefence.model.persistence.ITargetPersistance;
 
 public class TargetDummy implements ITargetPersistance {
 

src/de/oszimt/ls/aliendefence/model/persistenceDummy/UserDummy.java

@@ -1,9 +1,9 @@
-package model.persistenceDummy;
+package de.oszimt.ls.aliendefence.model.persistenceDummy;
 
 import java.time.LocalDate;
 
-import model.persistence.IUserPersistance;
-import toDo.User;
+import de.oszimt.ls.aliendefence.model.persistence.IUserPersistance;
+import de.oszimt.ls.aliendefence.toDo.User;
 
 /**
  * Dummyklasse zum Testen

src/de/oszimt/ls/aliendefence/toDo/CreateUserWindow.java

@@ -1,4 +1,4 @@
-package toDo;
+package de.oszimt.ls.aliendefence.toDo;
 
 //TODO create a usermanagement
 public class CreateUserWindow {

src/de/oszimt/ls/aliendefence/toDo/User.java

@@ -1,4 +1,4 @@
-package toDo;
+package de.oszimt.ls.aliendefence.toDo;
 
 import java.time.LocalDate;
 

src/de/oszimt/ls/aliendefence/toDo/UserController.java

@@ -1,9 +1,9 @@
-package toDo;
+package de.oszimt.ls.aliendefence.toDo;
 
-import model.persistence.IUserPersistance;
+import de.oszimt.ls.aliendefence.model.persistence.IUserPersistance;
 
 /**
- * controller for users
+ * de.oszimt.ls.aliendefence.controller for users
  * @author Clara Zufall
  * TODO implement this class
  */

src/de/oszimt/ls/aliendefence/toDo/UserDB.java

@@ -1,4 +1,4 @@
-package toDo;
+package de.oszimt.ls.aliendefence.toDo;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -6,8 +6,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import model.persistence.IUserPersistance;
-import model.persistenceDB.AccessDB;
+import de.oszimt.ls.aliendefence.model.persistence.IUserPersistance;
+import de.oszimt.ls.aliendefence.model.persistenceDB.AccessDB;
 
 /**
  * databaseconnection for userobjects, Story usermanagement

src/de/oszimt/ls/aliendefence/view/StartAlienDefence.java

@@ -0,0 +1,16 @@
+package de.oszimt.ls.aliendefence.view;
+
+import de.oszimt.ls.aliendefence.controller.AlienDefenceController;
+import de.oszimt.ls.aliendefence.model.persistence.IPersistance;
+import de.oszimt.ls.aliendefence.model.persistenceDummy.PersistanceDummy;
+import de.oszimt.ls.aliendefence.view.menue.MainMenu;
+
+public class StartAlienDefence {
+
+	public static void main(String[] args) {
+		
+		IPersistance 		   alienDefenceModel      = new PersistanceDummy();//TODO new PersistanceDB();
+		AlienDefenceController alienDefenceController = new AlienDefenceController(alienDefenceModel);
+		MainMenu.show(alienDefenceController);
+	}
+}

src/de/oszimt/ls/aliendefence/view/game/GameGUI.java

@@ -1,4 +1,4 @@
-package view.game;
+package de.oszimt.ls.aliendefence.view.game;
 
 import java.awt.Color;
 import java.awt.Point;
@@ -7,7 +7,8 @@ import java.awt.Toolkit;
 import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 
-import controller.GameController;
+import de.oszimt.ls.aliendefence.controller.GameController;
+import pictures._Res;
 
 /**
  * GUI der Klasse _______
@@ -28,7 +29,7 @@ public class GameGUI extends JFrame {
 	public GameGUI(GameController gc) {
 		super("Spiel v0.0 - FPS: ");
 
-		setCursor(Toolkit.getDefaultToolkit().createCustomCursor(new ImageIcon("pictures/crosshair.png").getImage(),
+		setCursor(Toolkit.getDefaultToolkit().createCustomCursor(_Res.image("crosshair.png"),
 				new Point(10, 10), "Cursor"));
 
 		// Fenstergestaltung
@@ -45,6 +46,7 @@ public class GameGUI extends JFrame {
 
 		spielfeld = new GameJPanel(gc);
 		getContentPane().add(spielfeld);
+		setLocationRelativeTo(null);
 		setVisible(true);
 
 		// Startzeit setzen

src/de/oszimt/ls/aliendefence/view/game/GameJPanel.java

@@ -1,21 +1,19 @@
-package view.game;
+package de.oszimt.ls.aliendefence.view.game;
 
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.imageio.ImageIO;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 
-import controller.GameController;
-import model.Target;
+import de.oszimt.ls.aliendefence.controller.GameController;
+import de.oszimt.ls.aliendefence.model.Target;
+import pictures._Res;
 
 @SuppressWarnings("serial")
 public class GameJPanel extends JPanel {
@@ -25,7 +23,7 @@ public class GameJPanel extends JPanel {
 	private GameController gc;
 	private MouseClickListener mouseClickListener;
 	private List<TargetPainter> rechteckePainter;
-	private BufferedImage img, win, loose;
+	private BufferedImage img, win, lose;
 	private JLabel lblTimeleft;
 
 	public GameJPanel(GameController gc) {
@@ -45,14 +43,9 @@ public class GameJPanel extends JPanel {
 	 * Spielfläche initialisieren
 	 */
 	public void init() {
-		try {
-			this.img = ImageIO.read(new File("./pictures/" + this.gc.getCurrLevel().getBackgroundImage()));
-			this.win = ImageIO.read(new File("./pictures/YouWin.png"));
-			this.loose = ImageIO.read(new File("./pictures/YouLoose.png"));
-
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+			this.img = _Res.bimage(this.gc.getCurrLevel().getBackgroundImage());
+			this.win = _Res.bimage("YouWin.png");
+			this.lose = _Res.bimage("YouLoose.png");
 
 		LinkedList<TargetPainter> rechteckePainter = new LinkedList<TargetPainter>();
 		for (Target t : gc.getTargets()) {
@@ -71,7 +64,7 @@ public class GameJPanel extends JPanel {
 			if (gc.isHasWon()) {
 				g.drawImage(this.win, 300, 120, null);
 			} else {
-				g.drawImage(this.loose, 300, 120, null);
+				g.drawImage(this.lose, 300, 120, null);
 			}
 			g.setFont(new Font("Arial", Font.PLAIN, 16));
 			// g.drawString(gc.getShotsFired() + " Schüsse mit " + gc.getAccuracy() + " %

src/de/oszimt/ls/aliendefence/view/game/MouseClickListener.java

@@ -1,9 +1,9 @@
-package view.game;
+package de.oszimt.ls.aliendefence.view.game;
 
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
-import controller.GameController;
+import de.oszimt.ls.aliendefence.controller.GameController;
 
 public class MouseClickListener extends MouseAdapter {
 

src/de/oszimt/ls/aliendefence/view/game/TargetPainter.java

@@ -1,4 +1,4 @@
-package view.game;
+package de.oszimt.ls.aliendefence.view.game;
 
 import java.awt.Graphics;
 import java.awt.image.BufferedImage;
@@ -7,7 +7,8 @@ import java.io.IOException;
 
 import javax.imageio.ImageIO;
 
-import model.Target;
+import de.oszimt.ls.aliendefence.model.Target;
+import pictures._Res;
 
 public class TargetPainter {
 
@@ -17,17 +18,8 @@ public class TargetPainter {
 
 	public TargetPainter(Target target) {
 		this.target = target;
-		try {
-			this.image = ImageIO.read(new File("./pictures/" + target.getImageAddress()));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		try {
-			this.imageDestroyed = ImageIO.read(new File("./pictures/explosion.png"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+		this.image = _Res.bimage(target.getImageAddress());
+		this.imageDestroyed = _Res.bimage("explosion.png");
 
 	}
 

src/de/oszimt/ls/aliendefence/view/menue/Highscore.java

@@ -1,4 +1,4 @@
-package view.menue;
+package de.oszimt.ls.aliendefence.view.menue;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -12,8 +12,8 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 
-import controller.AttemptController;
-import model.Level;
+import de.oszimt.ls.aliendefence.controller.AttemptController;
+import de.oszimt.ls.aliendefence.model.Level;
 
 public class Highscore extends JFrame {
 
@@ -70,7 +70,8 @@ public class Highscore extends JFrame {
 		pnlSouth.add(btnZielndern);
 
 		// fügt Panel mit Button hinzu
-		add(pnlSouth, BorderLayout.SOUTH); 
+		add(pnlSouth, BorderLayout.SOUTH);
+		this.setLocationRelativeTo(null);
 	}
 
 	public void btnAendern_Clicked(ActionEvent evt) {

src/de/oszimt/ls/aliendefence/view/menue/LevelChoice.form

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.oszimt.ls.aliendefence.view.menue.LevelChoice">
+  <grid id="27dc6" binding="panel" layout-manager="BorderLayout" hgap="0" vgap="0">
+    <constraints>
+      <xy x="20" y="20" width="500" height="400"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="6dda1" layout-manager="FlowLayout" hgap="5" vgap="5" flow-align="1">
+        <constraints border-constraint="South"/>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="c85bc" class="javax.swing.JButton" binding="btnNewLevel">
+            <constraints/>
+            <properties>
+              <text value="Neues Level"/>
+            </properties>
+          </component>
+          <component id="9382c" class="javax.swing.JButton" binding="btnUpdateLevel">
+            <constraints/>
+            <properties>
+              <text value="Ausgewähltes Level bearbeiten"/>
+            </properties>
+          </component>
+          <component id="5f096" class="javax.swing.JButton" binding="btnDeleteLevel">
+            <constraints/>
+            <properties>
+              <text value="Level löschen"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+      <component id="fc00" class="javax.swing.JLabel">
+        <constraints border-constraint="North"/>
+        <properties>
+          <font size="18" style="1"/>
+          <horizontalAlignment value="0"/>
+          <text value="Levelauswahl"/>
+        </properties>
+      </component>
+      <scrollpane id="231d4">
+        <constraints border-constraint="Center"/>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="28513" class="javax.swing.JTable" binding="tblLevels">
+            <constraints/>
+            <properties/>
+          </component>
+        </children>
+      </scrollpane>
+    </children>
+  </grid>
+</form>

src/de/oszimt/ls/aliendefence/view/menue/LevelChoice.java

@@ -0,0 +1,90 @@
+package de.oszimt.ls.aliendefence.view.menue;
+
+import de.oszimt.ls.aliendefence.controller.LevelController;
+import de.oszimt.ls.aliendefence.model.Level;
+
+import javax.swing.*;
+import javax.swing.table.DefaultTableModel;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.List;
+
+public class LevelChoice {
+    private JPanel panel;
+    private JButton btnNewLevel;
+    private JButton btnUpdateLevel;
+    private JTable tblLevels;
+    private JButton btnDeleteLevel;
+
+    private final LevelController lvlControl;
+    private final LeveldesignWindow leveldesignWindow;
+    private DefaultTableModel jTableData;
+
+    /**
+     * Create the panel
+     * @param lvlControl
+     * @param leveldesignWindow
+     */
+    public LevelChoice(LevelController lvlControl, LeveldesignWindow leveldesignWindow) {
+        this.lvlControl = lvlControl;
+        this.leveldesignWindow = leveldesignWindow;
+
+        btnNewLevel.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent arg0) {
+                btnNewLevel_Clicked();
+            }
+        });
+
+        btnUpdateLevel.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                btnUpdateLevel_Clicked();
+            }
+        });
+
+        btnDeleteLevel.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                btnDeleteLevel_Clicked();
+            }
+        });
+
+        tblLevels.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        this.updateTableData();
+    }
+
+    private String[][] getLevelsAsTableModel() {
+        List<Level> levels = this.lvlControl.readAllLevels();
+        String[][] result = new String[levels.size()][];
+        int i = 0;
+        for (Level l : levels) {
+            result[i++] = l.getData();
+        }
+        return result;
+    }
+
+    public void updateTableData() {
+        this.jTableData = new DefaultTableModel(this.getLevelsAsTableModel(), Level.getLevelDescriptions());
+        this.tblLevels.setModel(jTableData);
+    }
+
+    public void btnNewLevel_Clicked() {
+        this.leveldesignWindow.startLevelEditor();
+    }
+
+    public void btnUpdateLevel_Clicked() {
+        int level_id = Integer
+                .parseInt((String) this.tblLevels.getModel().getValueAt(this.tblLevels.getSelectedRow(), 0));
+        this.leveldesignWindow.startLevelEditor(level_id);
+    }
+
+    public void btnDeleteLevel_Clicked() {
+        int level_id = Integer
+                .parseInt((String) this.tblLevels.getModel().getValueAt(this.tblLevels.getSelectedRow(), 0));
+        this.lvlControl.deleteLevel(level_id);
+        this.updateTableData();
+    }
+
+    public JPanel getPanel() {
+        return panel;
+    }
+}

src/de/oszimt/ls/aliendefence/view/menue/LevelChooserOld.java

@@ -1,4 +1,4 @@
-package view.menue;
+package de.oszimt.ls.aliendefence.view.menue;
 
 import java.awt.BorderLayout;
 import java.awt.Font;
@@ -6,20 +6,14 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.List;
 
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingConstants;
+import javax.swing.*;
 import javax.swing.table.DefaultTableModel;
 
-import controller.LevelController;
-import model.Level;
+import de.oszimt.ls.aliendefence.controller.LevelController;
+import de.oszimt.ls.aliendefence.model.Level;
 
 @SuppressWarnings("serial")
-public class LevelChooser extends JPanel {
+public class LevelChooserOld extends JPanel {
 
 	private LevelController lvlControl;
 	private LeveldesignWindow leveldesignWindow;
@@ -31,7 +25,7 @@ public class LevelChooser extends JPanel {
 	 * 
 	 * @param leveldesignWindow
 	 */
-	public LevelChooser(LevelController lvlControl, LeveldesignWindow leveldesignWindow) {
+	public LevelChooserOld(LevelController lvlControl, LeveldesignWindow leveldesignWindow) {
 		this.lvlControl = lvlControl;
 		this.leveldesignWindow = leveldesignWindow;
 

src/de/oszimt/ls/aliendefence/view/menue/LevelEditor.java

@@ -1,4 +1,4 @@
-package view.menue;
+package de.oszimt.ls.aliendefence.view.menue;
 
 import java.awt.BorderLayout;
 import java.awt.Font;
@@ -20,10 +20,10 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableModel;
 
-import controller.LevelController;
-import controller.TargetController;
-import model.Level;
-import model.Target;
+import de.oszimt.ls.aliendefence.controller.LevelController;
+import de.oszimt.ls.aliendefence.controller.TargetController;
+import de.oszimt.ls.aliendefence.model.Level;
+import de.oszimt.ls.aliendefence.model.Target;
 
 @SuppressWarnings("serial")
 public class LevelEditor extends JPanel {

src/de/oszimt/ls/aliendefence/view/menue/LeveldesignWindow.java

@@ -1,4 +1,4 @@
-package view.menue;
+package de.oszimt.ls.aliendefence.view.menue;
 
 import java.awt.CardLayout;
 
@@ -6,16 +6,16 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.border.EmptyBorder;
 
-import controller.LevelController;
-import controller.TargetController;
-import model.Level;
+import de.oszimt.ls.aliendefence.controller.LevelController;
+import de.oszimt.ls.aliendefence.controller.TargetController;
+import de.oszimt.ls.aliendefence.model.Level;
 
 @SuppressWarnings("serial")
 public class LeveldesignWindow extends JFrame {
 
 	private LevelController lvlControl;
 	private JPanel contentPane;
-	private LevelChooser cardChooseLevel;
+	private LevelChoice cardChooseLevel;
 	private LevelEditor cardLevelEditor;
 
 	private CardLayout cards;
@@ -35,13 +35,14 @@ public class LeveldesignWindow extends JFrame {
 		this.cards = new CardLayout();
 		contentPane.setLayout(cards);
 
-		this.cardChooseLevel = new LevelChooser(lvlControl, this);
-		contentPane.add(cardChooseLevel, "levelChooser");
+		this.cardChooseLevel = new LevelChoice(lvlControl, this);
+		contentPane.add(cardChooseLevel.getPanel(), "levelChooser");
 
 		this.cardLevelEditor = new LevelEditor(this, lvlControl, targetControl, Level.getDefaultLevel());
 		contentPane.add(cardLevelEditor, "levelEditor");
 
 		this.showLevelChooser();
+		this.setLocationRelativeTo(null);
 		this.setVisible(true);
 	}
 

src/de/oszimt/ls/aliendefence/view/menue/MainMenu.form

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.oszimt.ls.aliendefence.view.menue.MainMenu">
+  <grid id="27dc6" binding="main" layout-manager="GridLayoutManager" row-count="13" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
+    <constraints>
+      <xy x="20" y="20" width="326" height="715"/>
+    </constraints>
+    <properties>
+      <background color="-16777216"/>
+      <foreground color="-1"/>
+    </properties>
+    <border type="empty">
+      <size top="5" left="5" bottom="5" right="5"/>
+    </border>
+    <children>
+      <component id="c5b1d" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="1" fill="0" indent="0" use-parent-layout="false">
+            <preferred-size width="177" height="9"/>
+          </grid>
+        </constraints>
+        <properties>
+          <font size="26" style="1"/>
+          <foreground color="-16711936"/>
+          <text value="Alien Defence"/>
+        </properties>
+      </component>
+      <component id="8961e" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="1" use-parent-layout="false">
+            <preferred-size width="200" height="103"/>
+          </grid>
+        </constraints>
+        <properties>
+          <enabled value="true"/>
+          <foreground color="-3552823"/>
+          <icon value="pictures/logo200.png"/>
+          <text value=""/>
+        </properties>
+      </component>
+      <component id="965b" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font size="14" style="1"/>
+          <foreground color="-256"/>
+          <text value="Login:"/>
+        </properties>
+      </component>
+      <component id="14947" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font size="14" style="1"/>
+          <foreground color="-256"/>
+          <text value="Passwort:"/>
+        </properties>
+      </component>
+      <component id="b84a7" class="javax.swing.JPasswordField" binding="passwordTextField">
+        <constraints>
+          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
+        </constraints>
+        <properties/>
+      </component>
+      <component id="4aca1" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font size="14" style="1"/>
+          <foreground color="-256"/>
+          <text value="Level:"/>
+        </properties>
+      </component>
+      <component id="a16d0" class="javax.swing.JComboBox" binding="level">
+        <constraints>
+          <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+      </component>
+      <component id="39eaf" class="javax.swing.JButton" binding="playButton">
+        <constraints>
+          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <actionCommand value=""/>
+          <text value="Spielen"/>
+        </properties>
+      </component>
+      <component id="6cda2" class="javax.swing.JButton" binding="testButton">
+        <constraints>
+          <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Testen"/>
+        </properties>
+      </component>
+      <component id="9d215" class="javax.swing.JTextField" binding="loginTextField">
+        <constraints>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
+        </constraints>
+        <properties/>
+      </component>
+      <component id="e66c9" class="javax.swing.JButton" binding="highscoreButton" default-binding="true">
+        <constraints>
+          <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Highscore"/>
+        </properties>
+      </component>
+      <component id="7ae73" class="javax.swing.JButton" binding="levelEditorButton" default-binding="true">
+        <constraints>
+          <grid row="11" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <background color="-256"/>
+          <enabled value="true"/>
+          <text value="LevelEditor"/>
+        </properties>
+      </component>
+      <component id="ef1af" class="javax.swing.JButton" binding="exitButton">
+        <constraints>
+          <grid row="12" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <background color="-3552823"/>
+          <enabled value="true"/>
+          <text value="Beenden"/>
+        </properties>
+      </component>
+    </children>
+  </grid>
+</form>

src/de/oszimt/ls/aliendefence/view/menue/MainMenu.java

@@ -0,0 +1,124 @@
+package de.oszimt.ls.aliendefence.view.menue;
+
+import de.oszimt.ls.aliendefence.controller.AlienDefenceController;
+import de.oszimt.ls.aliendefence.controller.GameController;
+import de.oszimt.ls.aliendefence.model.Level;
+import de.oszimt.ls.aliendefence.toDo.User;
+import de.oszimt.ls.aliendefence.view.game.GameGUI;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.List;
+
+public class MainMenu {
+
+    private JPanel main;
+    private JTextField loginTextField;
+    private JComboBox level;
+    private JButton playButton;
+    private JButton testButton;
+    private JButton highscoreButton;
+    private JButton levelEditorButton;
+    private JButton exitButton;
+    private JPasswordField passwordTextField;
+
+    public MainMenu(AlienDefenceController alienDefenceController) {
+
+        //fill level chooser
+        // Levelliste für die ComboBox abrufen
+        List<Level> arrLevel = alienDefenceController.getLevelController().readAllLevels();
+        String[] arrLevelNames = getLevelNames(arrLevel);
+        level.setModel(new DefaultComboBoxModel<String>(arrLevelNames));
+
+        // Button Spielen - ActionListener
+        playButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                // User aus Datenbank holen
+                User user = alienDefenceController.getAlienDefenceModel().getUserPersistance().readUser(loginTextField.getText());
+
+                // Spielstarten, wenn Nutzer existiert und Passwort übereinstimmt
+                if (user != null && user.getPassword().equals(new String(passwordTextField.getPassword()))) {
+
+                    Thread t = new Thread("GameThread") {
+                        @Override
+                        public void run() {
+
+                            GameController gameController = alienDefenceController.startGame(arrLevel.get(level.getSelectedIndex()), user);
+                            new GameGUI(gameController).start();
+                        }
+                    };
+                    t.start();
+                } else {
+                    // Fehlermeldung - Zugangsdaten fehlerhaft
+                    JOptionPane.showMessageDialog(null, "Zugangsdaten nicht korrekt", "Fehler",
+                            JOptionPane.ERROR_MESSAGE);
+                }
+            }
+        });
+
+        // Button Testen - ActionListener
+        testButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                // Erstellt Modell von aktuellen Nutzer
+                User user = new User(1, "test", "pass");
+
+                Thread t = new Thread("GameThread") {
+
+                    @Override
+                    public void run() {
+                        GameController gameController = alienDefenceController.startGame(arrLevel.get(level.getSelectedIndex()), user);
+                        new GameGUI(gameController).start();
+                    }
+                };
+                t.start();
+            }
+        });
+
+        // Button Highscore
+        highscoreButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                new Highscore(alienDefenceController.getAttemptController(), arrLevel.get(level.getSelectedIndex()));
+            }
+        });
+
+        // Button Leveleditor
+        levelEditorButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                new LeveldesignWindow(alienDefenceController.getLevelController(), alienDefenceController.getTargetController());
+            }
+        });
+
+        // Button Beenden
+        exitButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                System.exit(0);
+            }
+        });
+    }
+
+
+    private String[] getLevelNames(List<Level> arrLevel) {
+        String[] arrLevelNames = new String[arrLevel.size()];
+
+        for (int i = 0; i < arrLevel.size(); i++) {
+            arrLevelNames[i] = arrLevel.get(i).getName(); // Array aus Arraylist erstellt
+        }
+
+        return arrLevelNames;
+    }
+
+    public static void show(AlienDefenceController alienDefenceController) {
+        JFrame frame = new JFrame("AlienDefence");
+        frame.setContentPane(new MainMenu(alienDefenceController).main);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+}

src/main/java/model/persistence/IUserPersistance.java

@@ -1,9 +0,0 @@
-package model.persistence;
-
-import toDo.User;
-
-public interface IUserPersistance {
-
-	User readUser(String username);
-
-}

src/main/java/view/StartAlienDefence.java

@@ -1,18 +0,0 @@
-package view;
-
-import controller.AlienDefenceController;
-import model.persistence.IPersistance;
-import model.persistenceDummy.PersistanceDummy;
-import view.menue.MainMenu;
-
-public class StartAlienDefence {
-
-	public static void main(String[] args) {
-		
-		IPersistance 		   alienDefenceModel      = new PersistanceDummy();//TODO new PersistanceDB();
-		AlienDefenceController alienDefenceController = new AlienDefenceController(alienDefenceModel);
-		MainMenu mainMenu = new MainMenu(alienDefenceController);
-		
-		mainMenu.setVisible(true);
-	}
-}

src/main/java/view/menue/MainMenu.java

@@ -1,237 +0,0 @@
-package view.menue;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Image;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.List;
-
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JTextField;
-import javax.swing.border.EmptyBorder;
-
-import controller.AlienDefenceController;
-import controller.GameController;
-import model.Level;
-import model.persistenceDB.PersistanceDB;
-import toDo.User;
-import view.game.GameGUI;
-
-@SuppressWarnings("serial")
-public class MainMenu extends JFrame {
-
-	private AlienDefenceController alienDefenceController;
-	private JTextField loginTextField;
-	private JPasswordField passwordTextField;
-	private int selectedLevel = 0;
-
-	private String[] getLevelNames(List<Level> arrLevel) {
-		String[] arrLevelNames = new String[arrLevel.size()];
-
-		for (int i = 0; i < arrLevel.size(); i++) {
-			arrLevelNames[i] = arrLevel.get(i).getName(); // Array aus Arraylist erstellt
-		}
-		
-		return arrLevelNames;
-	}
-	
-	// Konstruktor
-	public MainMenu(AlienDefenceController alienDefenceController) {
-		
-		this.alienDefenceController = alienDefenceController;		
-
-		// Frame Formatierungen
-		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		setBounds(100, 100, 450, 300);
-		JPanel contentPane = new JPanel();
-		contentPane.setBackground(new Color(0, 0, 0));
-		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
-		setContentPane(contentPane);
-		contentPane.setLayout(new GridBagLayout()); // GridBagLayout
-		GridBagConstraints c = new GridBagConstraints();
-		c.fill = GridBagConstraints.HORIZONTAL;
-
-		// JLable mit üBerschrift
-		JLabel lblheadline = new JLabel("  ALIEN DEFENCE");
-		lblheadline.setForeground(new Color(124, 252, 0));
-		lblheadline.setFont(new Font("Yu Gothic UI", Font.BOLD, 20));
-		c.gridx = 0;
-		c.gridy = 0;
-		contentPane.add(lblheadline, c);
-
-		// JPanel mit Logo
-		JPanel p = new JPanel() {
-			private static final long serialVersionUID = 1L;
-
-			private ImageIcon imageIcon = new ImageIcon("./pictures/logo.png");
-			private Image image = imageIcon.getImage();
-
-			@Override
-			protected void paintComponent(Graphics g) {
-				super.paintComponent(g);
-				if (image != null) {
-					g.drawImage(image, 5, 8, 145, 145, this);
-				}
-			}
-		};
-		c.ipady = 150; // make this component tall
-		c.ipadx = 120;
-		c.weightx = 0.0;
-		c.gridwidth = 15;
-		c.gridx = 0;
-		c.gridy = 1;
-		contentPane.add(p, c);
-
-		// Text Login
-		JLabel loginText = new JLabel("Login: "); // Einfacher Text
-		loginText.setForeground(Color.orange);
-		c.ipady = 0;
-		c.ipadx = 0;
-		c.gridwidth = 0;
-		c.gridx = 0;
-		c.gridy = 2;
-		contentPane.add(loginText, c);
-
-		// Textfeld
-		loginTextField = new JTextField(15);
-		c.gridy = 3;
-		contentPane.add(loginTextField, c);
-
-		// Text Passwort
-		JLabel passwordText = new JLabel("Passwort: "); // Einfacher Text
-		passwordText.setForeground(Color.orange);
-		c.gridy = 4;
-		contentPane.add(passwordText, c);
-
-		// Textfeld
-		passwordTextField = new JPasswordField(15);
-		c.gridy = 5;
-		contentPane.add(passwordTextField, c);
-
-		// Text Level
-		JLabel levelText = new JLabel("Level: "); // Einfacher Text
-		levelText.setForeground(Color.orange);
-		c.gridy = 6;
-		contentPane.add(levelText, c);
-
-		// Levelliste für die ComboBox abrufen
-		List<Level> arrLevel = this.alienDefenceController.getLevelController().readAllLevels();
-		String[] arrLevelNames = getLevelNames(arrLevel);
-		
-		// Level Auswahlbox - ActionListener
-		JComboBox<String> combo = new JComboBox<String>(arrLevelNames);
-		c.gridy = 7;
-		contentPane.add(combo, c);
-		ActionListener actLisCombo = new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				selectedLevel = combo.getSelectedIndex();
-			}
-		};
-		combo.addActionListener(actLisCombo); // Listener
-
-		// Button Spielen - ActionListener
-		JButton btnNewButton = new JButton("Spielen");
-		btnNewButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-
-				// User aus Datenbank holen
-				User user = alienDefenceController.getAlienDefenceModel().getUserPersistance().readUser(loginTextField.getText());
-
-				// Spielstarten, wenn Nutzer existiert und Passwort übereinstimmt
-				if (user != null && user.getPassword().equals(new String(passwordTextField.getPassword()))) {
-
-					Thread t = new Thread("GameThread") {
-						@Override
-						public void run() {
-
-							GameController gameController = alienDefenceController.startGame(arrLevel.get(selectedLevel), user);
-							new GameGUI(gameController).start();
-						}
-					};
-					t.start();
-				} else {
-					// Fehlermeldung - Zugangsdaten fehlerhaft
-					JOptionPane.showMessageDialog(null, "Zugangsdaten nicht korrekt", "Fehler",
-							JOptionPane.ERROR_MESSAGE);
-				}
-			}
-		});
-		c.gridy = 8;
-		contentPane.add(btnNewButton, c);
-
-		// Button Testen - ActionListener
-		JButton btnTestButton = new JButton("Testen");
-		btnTestButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-
-				// Erstellt Modell von aktuellen Nutzer
-				User user = new User(1, "test", "pass");
-
-				Thread t = new Thread("GameThread") {
-
-					@Override
-					public void run() {
-
-						List<Level> arrLevel = alienDefenceController.getLevelController().readAllLevels();
-
-						GameController gameController = alienDefenceController.startGame(arrLevel.get(selectedLevel), user);
-						new GameGUI(gameController).start();
-					}
-				};
-				t.start();
-			}
-		});
-		c.gridy = 9;
-		contentPane.add(btnTestButton, c);
-
-		// Button Highscore
-		JButton btnNewButton_2 = new JButton("Highscore");
-
-		btnNewButton_2.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				new Highscore(alienDefenceController.getAttemptController(), arrLevel.get(selectedLevel));
-			}
-		});
-		// selectedLevel
-
-		c.gridy = 10;
-		contentPane.add(btnNewButton_2, c);
-
-		// Button Leveleditor
-		JButton btnNewButton_1 = new JButton("Leveleditor");
-		btnNewButton_1.setBackground(Color.ORANGE);
-		btnNewButton_1.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				new LeveldesignWindow(alienDefenceController.getLevelController(), alienDefenceController.getTargetController());
-			}
-		});
-		c.gridy = 11;
-		contentPane.add(btnNewButton_1, c);
-
-		// Button Beenden
-		JButton btnNewButton_3 = new JButton("Beenden");
-		btnNewButton_3.setBackground(Color.GRAY);
-		btnNewButton_3.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				System.exit(0);
-			}
-		});
-		c.gridy = 12;
-		c.anchor = GridBagConstraints.PAGE_END;
-		contentPane.add(btnNewButton_3, c);
-		this.pack();
-	}
-
-}

src/pictures/_Res.java

@@ -0,0 +1,22 @@
+package pictures;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+public class _Res {
+    public static Image image(String name){
+        return new ImageIcon(_Res.class.getResource(name)).getImage();
+    }
+    public static BufferedImage bimage(String name){
+        try {
+            return ImageIO.read(_Res.class.getResource(name));
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}