remove test button and fix play to give an actual user to LevelDesignWindow

VL_AlienDefence.iml

@@ -7,5 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="mysql:mysql-connector-java:8.0.25" level="project" />
   </component>
 </module>

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

@@ -3,6 +3,7 @@ package de.oszimt.ls.aliendefence.controller;
 import de.oszimt.ls.aliendefence.model.Level;
 import de.oszimt.ls.aliendefence.model.persistence.IPersistance;
 import de.oszimt.ls.aliendefence.model.User;
+import de.oszimt.ls.aliendefence.model.persistence.IUserPersistance;
 
 public class AlienDefenceController {
 	
@@ -11,23 +12,30 @@ public class AlienDefenceController {
 	private LevelController levelController;
 	private TargetController targetController;
 	private AttemptController attemptController;
-	//TODO UserController implementieren
+	private UserController userController;
 	
 	//Persistenz
 	private IPersistance alienDefenceModel;
+	private IUserPersistance userModel;
 
-	public AlienDefenceController(IPersistance alienDefenceModel) {
+	public AlienDefenceController(IPersistance alienDefenceModel, IUserPersistance userModel) {
 		super();
 		this.alienDefenceModel = alienDefenceModel;
+		this.userModel = userModel;
 		this.attemptController = new AttemptController(alienDefenceModel);
 		this.levelController = new LevelController(alienDefenceModel);
 		this.targetController = new TargetController(alienDefenceModel);
+		this.userController = new UserController(userModel);
 	}
 
 	public IPersistance getAlienDefenceModel() {
 		return alienDefenceModel;
 	}
 
+	public IUserPersistance getUserModel() {
+		return userModel;
+	}
+
 	public AttemptController getAttemptController() {
 		return attemptController;
 	}
@@ -40,6 +48,10 @@ public class AlienDefenceController {
 		return targetController;
 	}
 
+	public UserController getUserController() {
+		return userController;
+	}
+
 	public GameController startGame(Level selectedLevel, User user) {
 		this.gameController = new GameController(selectedLevel, user, this);
 		return this.gameController;

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

@@ -34,13 +34,13 @@ public class AttemptController {
 	}
 
 	/**
-	 * calculates points from attempt for highscore TODO create formula here
+	 * calculates points from attempt for highscore
 	 * 
 	 * @param level Levelobjekt
 	 * @param hitcounter Controllerobjekt das die Treffer und Reaktionszeiten misst
 	 * @return points 
 	 */
 	public int calculatePoints(Level level, HitCounter hitcounter) {
-		return -1;
+		return (int) ((hitcounter.getHit()/level.getTargets().size())* 400L +(hitcounter.getHit()/hitcounter.getShots())* 200L +(1000-(hitcounter.getReactionTime()/hitcounter.getSumReactionDiffernce())*400));
 	}
 }

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

@@ -7,6 +7,8 @@ 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.model.User;
+import de.oszimt.ls.aliendefence.model.persistence.IAttemptPersistance;
+import de.oszimt.ls.aliendefence.model.persistenceDB.AttemptDB;
 import de.oszimt.ls.aliendefence.view.menue.Highscore;
 
 public class GameController {
@@ -47,18 +49,15 @@ public class GameController {
 
 				setHighscore = false; //damit keine doppelten Eintrüge erzeugt werden
 
-				// TODO Highscoreeintrag erzeugen Highscore >> F_user_id, F_level_id, shots,
+				/*System.out.println("Highscoreeintrag für " + currentLevel.getName() + ": " + currentUser.getFirst_name()
-				// hits, reaction_time
-				System.out.println("Highscoreeintrag für " + currentLevel.getName() + ": " + currentUser.getFirst_name()
 						+ " hat " + this.getShotsFired() + " mal auf " + this.getTargets().size()
 						+ " Ziele gefeuert und " + this.getHits() + " mal getroffen.");
-				System.out.println("Highscorepunkte: " + alienDefenceController.getAttemptController().calculatePoints(this.currentLevel, this.hitCounter));
+				System.out.println("Highscorepunkte: " + alienDefenceController.getAttemptController().calculatePoints(this.currentLevel, this.hitCounter));*/
-				int insert_id = 0;
+				//int insert_id = 0;
-				// AttemptDB attemptDB =
+
-				// this.alienDefenceController.getAlienDefenceModel().getAttemptPersistance();
+				IAttemptPersistance attemptDB = this.alienDefenceController.getAlienDefenceModel().getAttemptPersistance();
-				// int insert_id = attemptDB.createHighscoreEntry(currentUser.getP_user_id(),
+				int insert_id = attemptDB.createHighscoreEntry(currentUser.getP_user_id(), currentLevel.getLevel_id(),
-				// currentLevel.getLevel_id(),
+				this.getShotsFired(), this.getHits(),  this.hitCounter.getReactionTime());
-				// this.getShotsFired(), this.getHits(), relReactionDiffernce);
 
 				new Highscore(this.alienDefenceController.getAttemptController(), currentLevel,
 						insert_id);

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

@@ -5,8 +5,7 @@ import de.oszimt.ls.aliendefence.model.persistence.IUserPersistance;
 
 /**
  * de.oszimt.ls.aliendefence.controller for users
- * @author Clara Zufall
+ * @author Joel Baldauf
- * TODO implement this class
  */
 public class UserController {
 
@@ -15,9 +14,14 @@ public class UserController {
 	public UserController(IUserPersistance userPersistance) {
 		this.userPersistance = userPersistance;
 	}
-	
+
+	/**
+	 * erstellt einen User in der Persistenzschicht
+	 * @param user Das zu erstellende Userobjekt
+	 *
+	 */
 	public void createUser(User user) {
-		
+		this.userPersistance.createUser(user);
 	}
 	
 	/**
@@ -26,19 +30,36 @@ public class UserController {
 	 * @param passwort das richtige Passwort
 	 * @return Userobjekt, null wenn der User nicht existiert
 	 */
+
 	public User readUser(String username, String passwort) {
-		return null;
+		if (checkPassword(username, passwort)) return this.userPersistance.readUser(username);
+		else return null;
 	}
-	
+
+	/**
+	 * verändert einen User in der Persistenzschicht
+	 * @param user zu aktualisierender User
+	 *
+	 */
 	public void changeUser(User user) {
-		
+		this.userPersistance.updateUser(user);
 	}
-	
+
+	/**
+	 * löscht einen User in der Persistenzschicht
+	 * @param user zu löschender User
+	 *
+	 */
 	public void deleteUser(User user) {
-		
+		this.userPersistance.deleteUser(user);
 	}
-	
+
+	/**
+	 * überprüft, ob das Passwort eines Benutzers richtig ist
+	 * @param username zu prüfender Nutzername
+	 * @param passwort zu prüfendes Passwort
+	 */
 	public boolean checkPassword(String username, String passwort) {
-		return false;
+		return this.userPersistance.readUser(username).getPassword().equals(passwort);
 	}
 }

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

@@ -5,5 +5,7 @@ import de.oszimt.ls.aliendefence.model.User;
 public interface IUserPersistance {
 
 	User readUser(String username);
-
+    int createUser(User user);
+    void updateUser(User user);
+    void deleteUser(User user);
 }

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

@@ -1,10 +1,6 @@
 package de.oszimt.ls.aliendefence.model.persistenceDB;
 
-import java.sql.Connection;
+import java.sql.*;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 
 import de.oszimt.ls.aliendefence.model.User;
 import de.oszimt.ls.aliendefence.model.persistence.IUserPersistance;
@@ -12,8 +8,7 @@ import de.oszimt.ls.aliendefence.model.persistenceDB.AccessDB;
 
 /**
  * databaseconnection for userobjects, Story usermanagement
- * @author Clara Zufall
+ * @author Joel Baldauf
- * TODO finish this class
  */
 public class UserDB implements IUserPersistance{
 
@@ -23,6 +18,47 @@ public class UserDB implements IUserPersistance{
 		this.dbAccess = dbAccess;
 	}
 
+	/**
+	 * insert new user into database
+	 *
+	 * @param user userobject to be inserted into database
+	 * @return lastKey
+	 */
+	public int createUser(User user) {
+		String sql = "INSERT INTO users (first_name, sur_name, birthday, street, house_number, postal_code, city, login_name, password, salary_expectations, marital_status, final_grade) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);";
+		int lastKey = -1;
+		try (Connection con = DriverManager.getConnection(this.dbAccess.getFullURL(), this.dbAccess.getUser(),
+				this.dbAccess.getPassword());
+			 PreparedStatement statement = con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);) {
+
+			//statement.setInt(1, level_id);
+			statement.setString(1, user.getFirst_name());
+			statement.setString(2, user.getSur_name());
+			statement.setDate(3, Date.valueOf(user.getBirthday()));
+			statement.setString(4, user.getStreet());
+			statement.setString(5, user.getHouse_number());
+			statement.setString(6, user.getPostal_code());
+			statement.setString(7, user.getCity());
+			statement.setString(8, user.getLoginname());
+			statement.setString(9, user.getPassword());
+			statement.setInt(10, user.getSalary_expectations());
+			statement.setString(11, user.getMarital_status());
+			statement.setDouble(12, user.getFinal_grade());
+			statement.execute();
+
+			ResultSet generatedKeys = statement.getGeneratedKeys();
+			if (generatedKeys.next()) {
+				lastKey = generatedKeys.getInt(1);
+			}
+			generatedKeys.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+		return lastKey;
+	}
+
+
 	/**
 	 * read userdata by unique username
 	 * 
@@ -54,4 +90,51 @@ public class UserDB implements IUserPersistance{
 		return user;
 	}
 
+	/**
+	 * update existing user
+	 *
+	 * @param user userobject to be updated
+	 */
+	public void updateUser (User user) {
+		String sql = "UPDATE users SET first_name = ?, sur_name = ?, birthday = ?, street = ?, house_number = ?, " +
+				"postal_code = ?, city = ?, login_name = ?, password = ?, salary_expectations = ?, marital_status = ?, final_grade = ? WHERE P_user_id = ?";
+		try (Connection con = DriverManager.getConnection(this.dbAccess.getFullURL(), this.dbAccess.getUser(),
+				this.dbAccess.getPassword()); PreparedStatement statement = con.prepareStatement(sql)) {
+
+			statement.setString(1, user.getFirst_name());
+			statement.setString(2, user.getSur_name());
+			statement.setDate(3, Date.valueOf(user.getBirthday()));
+			statement.setString(4, user.getStreet());
+			statement.setString(5, user.getHouse_number());
+			statement.setString(6, user.getPostal_code());
+			statement.setString(7, user.getCity());
+			statement.setString(8, user.getLoginname());
+			statement.setString(9, user.getPassword());
+			statement.setInt(10, user.getSalary_expectations());
+			statement.setString(11, user.getMarital_status());
+			statement.setDouble(12, user.getFinal_grade());
+			statement.setInt(13, user.getP_user_id());
+			statement.executeUpdate();
+
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * delete existing user
+	 *
+	 * @param user userobject to be deleted
+	 */
+	public void deleteUser (User user) {
+		String sql = "DELETE FROM users WHERE P_user_id = " + user.getP_user_id() + ";";
+
+		try (Connection con = DriverManager.getConnection(this.dbAccess.getFullURL(), this.dbAccess.getUser(),
+				this.dbAccess.getPassword()); Statement statement = con.createStatement()) {
+			statement.executeUpdate(sql);
+
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+	}
 }

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

@@ -15,5 +15,13 @@ public class UserDummy implements IUserPersistance {
 	public User readUser(String username) {
 		return new User(1, "Dummy", "Persistenz", LocalDate.now(), "Dummystr.", "12C", "11111", "Nowhere", username, "pass", 12000, "gefangen", 1.58);
 	}
-	
+	public  int createUser(User user) {
+		return 0;
+	}
+	public void deleteUser(User user) {
+		System.out.println("");
+	}
+	public void updateUser(User user) {
+		System.out.println("");
+	}
 }

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

@@ -2,15 +2,19 @@ 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.model.persistence.IUserPersistance;
+import de.oszimt.ls.aliendefence.model.persistenceDB.AccessDB;
+import de.oszimt.ls.aliendefence.model.persistenceDB.PersistanceDB;
+import de.oszimt.ls.aliendefence.model.persistenceDB.UserDB;
 import de.oszimt.ls.aliendefence.view.menue.MainMenu;
 
 public class StartAlienDefence {
 
 	public static void main(String[] args) {
-		
+		AccessDB               dbAccess               = new AccessDB();
-		IPersistance 		   alienDefenceModel      = new PersistanceDummy();//TODO new PersistanceDB();
+		IPersistance 		   alienDefenceModel      = new PersistanceDB();
-		AlienDefenceController alienDefenceController = new AlienDefenceController(alienDefenceModel);
+		IUserPersistance       userModel              = new UserDB(dbAccess);
+		AlienDefenceController alienDefenceController = new AlienDefenceController(alienDefenceModel, userModel);
 		MainMenu.show(alienDefenceController);
 	}
 }

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

@@ -1,6 +1,6 @@
 <?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="14" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="main" layout-manager="GridLayoutManager" row-count="13" column-count="3" 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"/>
@@ -75,14 +75,6 @@
           <text value="Spielen"/>
         </properties>
       </component>
-      <component id="6cda2" class="javax.swing.JButton" binding="testButton">
-        <constraints>
-          <grid row="10" column="1" 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="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false">
@@ -93,7 +85,7 @@
       </component>
       <component id="7ae73" class="javax.swing.JButton" binding="levelEditorButton" default-binding="true">
         <constraints>
-          <grid row="11" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="10" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <background color="-256"/>
@@ -103,7 +95,7 @@
       </component>
       <component id="ef1af" class="javax.swing.JButton" binding="exitButton">
         <constraints>
-          <grid row="12" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="11" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <background color="-3552823"/>
@@ -128,7 +120,7 @@
       </vspacer>
       <vspacer id="8c4ad">
         <constraints>
-          <grid row="13" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="12" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <vspacer id="109a4">

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

@@ -16,7 +16,6 @@ public class MainMenu {
     private JPanel main;
     private JTextField loginTextField;
     private JButton playButton;
-    private JButton testButton;
     private JButton levelEditorButton;
     private JButton exitButton;
     private JPasswordField passwordTextField;
@@ -40,7 +39,7 @@ public class MainMenu {
                     Thread t = new Thread("GameThread") {
                         @Override
                         public void run() {
-
+                            new LeveldesignWindow(alienDefenceController, user, LeveldesignWindow.TESTEN);
                             //GameController gameController = alienDefenceController.startGame(arrLevel.get(level.getSelectedIndex()), user);
                             //new GameGUI(gameController).start();
                         }
@@ -55,14 +54,14 @@ public class MainMenu {
         });
 
         // Button Testen - ActionListener
-        testButton.addActionListener(new ActionListener() {
+        /*testButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 // Erstellt Modell von aktuellen Nutzer
                 User user = new User(1, "test", "pass");
                 new LeveldesignWindow(alienDefenceController, user, LeveldesignWindow.TESTEN);
             }
-        });
+        });*/
 
         // Button Leveleditor
         levelEditorButton.addActionListener(new ActionListener() {