Merge branch 'main' of https://gitty.informatik.hs-mannheim.de/3020772/Schach.git into main

Reviewed-on: #28

quellen

@@ -1,2 +1,5 @@
 JFileChoser in UI: (mit GPT)
-Prompt: "Wie kann ich in swing in java Files aus einem Explorer auswählen und speichern?".
+Prompt: "Wie kann ich in swing in java Files aus einem Explorer auswählen und speichern?".
+
+JButton mit Text und Icon gleichzeitig belegen:
+Pompt: "Kann ich einem button einen text und ein bild gleichzeigtig geben?".

src/main/java/de/mannheim/th/chess/App.java

@@ -1,25 +1,32 @@
 package de.mannheim.th.chess;
 
-import de.mannheim.th.chess.ui.MainFrame;
+import java.io.IOException;
 
-import org.apache.logging.log4j.LogManager;
+import de.mannheim.th.chess.ui.MainFrame;
-import org.apache.logging.log4j.Logger;
+import de.mannheim.th.chess.utl.OpeningRecognizer;
+
+// import org.apache.logging.log4j.LogManager;
+// import org.apache.logging.log4j.Logger;
 
 /**
- * Eine einfache Schach App mithilfe von {@linkplain https://github.com/bhlangonijr/chesslib} entwickelt.
+ * Eine einfache Schach App mithilfe von
+ * {@linkplain https://github.com/bhlangonijr/chesslib} entwickelt.
+ * 
  * @author Matias Mas Viehl, Dominik Stuck und Marius Guendel
  * @version 0.0.1
  */
 public class App {
-	
+
-	private static final Logger logger = LogManager.getLogger(App.class);
+  // private static final Logger logger = LogManager.getLogger(App.class);
-	
+
-	private static MainFrame userinterface;
+  /**
-	/**
+   * Main-Methode.
-	 * Main-Methode.
+   * 
-	 * @param args
+   * @param args
-	 */
+ * @throws IOException 
-    public static void main(String[] args) {
+   */
-        userinterface = new MainFrame();
+  public static void main(String[] args) throws IOException {
-    }
+	OpeningRecognizer.loadOpenings();
+	new MainFrame();
+  }
 }

src/main/java/de/mannheim/th/chess/controller/ButtonAufgebenListener.java

@@ -5,17 +5,50 @@ import java.awt.event.ActionListener;
 
 import javax.swing.JFrame;
 
-public class ButtonAufgebenListener extends JFrame implements ActionListener{
+import org.apache.logging.log4j.LogManager;
-	
+import org.apache.logging.log4j.Logger;
-	private static final long serialVersionUID = 1L;
 
-	public ButtonAufgebenListener() {
+import de.mannheim.th.chess.App;
-		
+import de.mannheim.th.chess.domain.Game;
+import de.mannheim.th.chess.ui.SpielFrame;
+import de.mannheim.th.chess.ui.SpielFrame.BoardMode;
+
+public class ButtonAufgebenListener extends JFrame implements ActionListener {
+
+	private static final Logger logger = LogManager.getLogger(App.class);
+
+	private static final long serialVersionUID = 1L;
+	private SpielFrame sf;
+	private Game g;
+
+	public ButtonAufgebenListener(SpielFrame sf, Game g) {
+		this.sf = sf;
+		this.g = g;
 	}
 
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		// TODO Auto-generated method stub
+
+		Object source = e.getSource();
+		
+		g.stopClock();
+
+		// weil nur der aktive Spieler button drücken darf
+		if (source == sf.getAufgeben()) {
+			logger.info("Spieler 1 will aufgeben.");
+			sf.getAufgeben2().setEnabled(false);
+			sf.showResult("Spieler 2 hat gewonnen!");
+		} else if (source == sf.getAufgeben2()) {
+			logger.info("Spieler 2 will aufgeben.");
+			sf.getAufgeben().setEnabled(false);
+			sf.showResult("Spieler 1 hat gewonnen!");
+		}
+		
+		this.sf.setBoardMode(BoardMode.finished);
+		this.sf.enableControlPanelButtons();
+
+		sf.setButtonsActions();
 		
 	}
 

src/main/java/de/mannheim/th/chess/controller/ButtonFileLoaderListener.java

@@ -14,41 +14,43 @@ import javax.swing.JOptionPane;
 
 import de.mannheim.th.chess.ui.ModeSelectionFrame;
 
-public class ButtonFileLoaderListener implements ActionListener{
+public class ButtonFileLoaderListener implements ActionListener {
-	
-	private ModeSelectionFrame msf;
-	
-	public ButtonFileLoaderListener(ModeSelectionFrame msf) {
-		this.msf = msf;
-		
-	}
 
-	@Override
+  private ModeSelectionFrame msf;
-	public void actionPerformed(ActionEvent e) {
-		// TODO Auto-generated method stub
-		
-		JFileChooser dateiWaehler = new JFileChooser();
-		JFrame jfFile = new JFrame();
-		int auswahl = dateiWaehler.showOpenDialog(jfFile);
 
-		if (auswahl == JFileChooser.APPROVE_OPTION) {
+  public ButtonFileLoaderListener(ModeSelectionFrame msf) {
-			File ausgewaehlteDatei = dateiWaehler.getSelectedFile();
+    this.msf = msf;
-			JOptionPane.showMessageDialog(jfFile, "Gewählte Datei:\n" + ausgewaehlteDatei.getAbsolutePath());
 
-			try {
+  }
-				BufferedReader br = new BufferedReader(new FileReader(ausgewaehlteDatei));
+
-				
+  @Override
-				msf.setFen(br.readLine());
+  public void actionPerformed(ActionEvent e) {
-				
+    // TODO Auto-generated method stub
-			} catch (FileNotFoundException e1) {
+
-				// TODO Auto-generated catch block
+    JFileChooser dateiWaehler = new JFileChooser();
-				e1.printStackTrace();
+    JFrame jfFile = new JFrame();
-			} catch (IOException e1) {
+    int auswahl = dateiWaehler.showOpenDialog(jfFile);
-				// TODO Auto-generated catch block
+
-				e1.printStackTrace();
+    if (auswahl == JFileChooser.APPROVE_OPTION) {
-			}
+      File ausgewaehlteDatei = dateiWaehler.getSelectedFile();
-		}
+      JOptionPane.showMessageDialog(jfFile, "Gewählte Datei:\n" + ausgewaehlteDatei.getAbsolutePath());
-		
+
-	}
+      try {
+        BufferedReader br = new BufferedReader(new FileReader(ausgewaehlteDatei));
+
+        msf.setFen(br.readLine());
+
+        br.close();
+
+      } catch (FileNotFoundException e1) {
+        // TODO Auto-generated catch block
+        e1.printStackTrace();
+      } catch (IOException e1) {
+        // TODO Auto-generated catch block
+        e1.printStackTrace();
+      }
+    }
+
+  }
 
 }

src/main/java/de/mannheim/th/chess/controller/ButtonFileSaverListener.java

@@ -6,7 +6,6 @@ import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.util.List;
 
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
@@ -14,48 +13,46 @@ import javax.swing.JFrame;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.github.bhlangonijr.chesslib.move.Move;
-
 import de.mannheim.th.chess.App;
 import de.mannheim.th.chess.domain.Game;
 
-public class ButtonFileSaverListener implements ActionListener{
+public class ButtonFileSaverListener implements ActionListener {
-	
-	private static final Logger logger = LogManager.getLogger(App.class);
-	
-	private Game g;
-	private JFrame sf;
-	
-	public ButtonFileSaverListener(JFrame sf, Game g) {
-		this.sf = sf;
-		this.g = g;
-	}
 
-	@Override
+  private static final Logger logger = LogManager.getLogger(App.class);
-	public void actionPerformed(ActionEvent e) {
-		
-		logger.info("Spiel wird gespeichert.");
-		
-		JFileChooser chooser  = new JFileChooser();
-		chooser.setCurrentDirectory(new File(System.getProperty("user.home") + "/Documents"));
-		
-		chooser.setDialogTitle("Datei speichern");
-		int userSelection = chooser.showSaveDialog(sf);
 
-        if (userSelection == JFileChooser.APPROVE_OPTION) {
+  private Game g;
-            File fileToSave = chooser.getSelectedFile();
+  private JFrame sf;
 
-            try (BufferedWriter writer = new BufferedWriter(new FileWriter(fileToSave))) {
+  public ButtonFileSaverListener(JFrame sf, Game g) {
-                
+    this.sf = sf;
-               writer.write(g.getFen());
+    this.g = g;
-               
+  }
-               logger.info(g.getFen());
+
-            } catch (IOException e1) {
+  @Override
-                e1.printStackTrace();
+  public void actionPerformed(ActionEvent e) {
-            }
+
-        } else {
+    logger.info("Spiel wird gespeichert.");
-           logger.info("Speichern fehlgeschlagen.");
+
-        }
+    JFileChooser chooser = new JFileChooser();
-	}
+    chooser.setCurrentDirectory(new File(System.getProperty("user.home") + "/Documents"));
+
+    chooser.setDialogTitle("Datei speichern");
+    int userSelection = chooser.showSaveDialog(sf);
+
+    if (userSelection == JFileChooser.APPROVE_OPTION) {
+      File fileToSave = chooser.getSelectedFile();
+
+      try (BufferedWriter writer = new BufferedWriter(new FileWriter(fileToSave))) {
+
+        writer.write(g.getFen());
+
+        logger.info(g.getFen());
+      } catch (IOException e1) {
+        e1.printStackTrace();
+      }
+    } else {
+      logger.info("Speichern fehlgeschlagen.");
+    }
+  }
 
 }

src/main/java/de/mannheim/th/chess/controller/ButtonMovePieceListener.java

@@ -33,22 +33,27 @@ public class ButtonMovePieceListener implements ActionListener {
       this.game.stopClock();
       this.sf.setBoardMode(BoardMode.finished);
       this.sf.enableControlPanelButtons();
-      this.sf.showDraw();
+      this.sf.showResult("Unentschieden!");
     } else if (this.game.isMate()) {
       this.game.stopClock();
       this.sf.setBoardMode(BoardMode.finished);
       this.sf.enableControlPanelButtons();
-      this.sf.showWin(game.getActivePlayer());
+      this.sf.showResult("Spieler " + game.getActivePlayer() + " hat gewonnen!");
     } else {
       this.sf.setBoardMode(BoardMode.normal);
+      if (game.getLastMove() != null) {
+        sf.aktualisiereAusgabe();
+      }
     }
 
     this.sf.setCursor(null);
+
+    // hier rotieren markieren
+
+    if (game.isRotieren())
+      sf.setWechsel(!sf.isWechsel());
+
     this.sf.erstelleBrett();
 
-    if (game.getLastMove() != null) {
-
-      sf.aktualisiereAusgabe();
-    }
   }
 }

src/main/java/de/mannheim/th/chess/controller/ButtonToNormalListener.java

@@ -3,7 +3,6 @@ package de.mannheim.th.chess.controller;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import de.mannheim.th.chess.domain.Game;
 import de.mannheim.th.chess.ui.SpielFrame;
 import de.mannheim.th.chess.ui.SpielFrame.BoardMode;
 
@@ -20,7 +19,7 @@ public class ButtonToNormalListener implements ActionListener {
     this.sf.setSelectedSquare(null);
     this.sf.setCursor(null);
     this.sf.erstelleBrett();
-	
+
   }
 
 }

src/main/java/de/mannheim/th/chess/domain/Game.java

@@ -1,5 +1,6 @@
 package de.mannheim.th.chess.domain;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -13,7 +14,6 @@ import com.github.bhlangonijr.chesslib.Side;
 import com.github.bhlangonijr.chesslib.Square;
 import com.github.bhlangonijr.chesslib.move.Move;
 import com.github.bhlangonijr.chesslib.move.MoveList;
-import com.github.bhlangonijr.chesslib.pgn.PgnHolder;
 
 import de.mannheim.th.chess.App;
 import de.mannheim.th.chess.utl.Clock;
@@ -28,8 +28,9 @@ public class Game {
 
   private Board board;
   private Clock clock;
-  private String modus;
   private boolean rotieren, zuruecknahme;
+  
+  ArrayList<Piece> removedPieces;
 
   private MoveList movelist;
   private int viewPointer;
@@ -45,13 +46,13 @@ public class Game {
     this.board = new Board();
     this.movelist = new MoveList();
     this.startPosFen = this.board.getFen();
+    removedPieces = new ArrayList<>();
 
     clock = new Clock("blitz");
     clock.start();
   }
 
   public Game(String modus, boolean rotieren, boolean zuruecknahme, String fen) {
-    this.modus = modus;
     this.rotieren = rotieren;
     this.zuruecknahme = zuruecknahme;
 
@@ -66,6 +67,7 @@ public class Game {
     this.movelist = new MoveList();
 
     clock = new Clock(modus);
+    removedPieces = new ArrayList<>();
   }
 
   /**
@@ -97,10 +99,6 @@ public class Game {
 
     this.movelist = new MoveList();
     this.startPosFen = this.board.getFen();
-    // this.sp = new SpielFrame();
-
-    // this.clockPlayer1 = new Clock();
-    // this.clockPlayer2 = new Clock();
   }
 
   /**
@@ -109,6 +107,14 @@ public class Game {
    * @param move the move to be played
    */
   public void playMove(Move move) {
+	Piece removedPiece = board.getPiece(move.getTo());
+	if (removedPiece != Piece.NONE) {
+		int removedPiecesCount = removedPieces.size();
+		removedPieces.add(removedPiece);
+		if (removedPiecesCount + 1 < removedPieces.size()) {
+			removedPieces.removeLast();
+		}
+		}
     this.board.doMove(move);
     this.movelist.add(move);
     clock.pressClock();
@@ -123,7 +129,11 @@ public class Game {
 
   public void undo() {
     this.board.undoMove();
-    this.movelist.removeLast();
+    Move lastMove = this.movelist.removeLast();
+    Piece removedPiece = board.getPiece(lastMove.getTo());
+    if (removedPiece != Piece.NONE) {
+    	removedPieces.remove(removedPiece);
+    }
   }
 
   /**
@@ -160,16 +170,74 @@ public class Game {
   /**
    * Plays the move on the board and adds it to the movelist
    *
-   * @param origin     The square from wich it moves from.
+   * @param origin     The square from which it moves from.
    * @param desination The square where it will move to.
    */
   public void playMove(Square origin, Square desination) {
     Move move = new Move(origin, desination);
+    Piece removedPiece = board.getPiece(desination);
+    if (removedPiece != Piece.NONE) {
+    	int removedPiecesCount = removedPieces.size();
+    	removedPieces.add(removedPiece);
+    	if (removedPieces.size() > removedPiecesCount + 1) {
+    		removedPieces.removeLast();
+    	}
+    }
     this.board.doMove(move);
     this.movelist.add(move);
+    clock.pressClock();
 
   }
 
+  public void doPromotionMove(int piece, Square origin, Square destination) {
+    System.out.println(piece);
+    Piece promotedTo;
+    switch (piece) {
+      case 7:
+        promotedTo = Piece.BLACK_KNIGHT;
+        break;
+      case 4:
+        promotedTo = Piece.BLACK_QUEEN;
+        break;
+      case 5:
+        promotedTo = Piece.BLACK_ROOK;
+        break;
+      case 6:
+        promotedTo = Piece.BLACK_BISHOP;
+        break;
+      case 3:
+        promotedTo = Piece.WHITE_KNIGHT;
+        break;
+      case 0:
+        promotedTo = Piece.WHITE_QUEEN;
+        break;
+      case 1:
+        promotedTo = Piece.WHITE_ROOK;
+        break;
+      case 2:
+        promotedTo = Piece.WHITE_BISHOP;
+        break;
+      default:
+        promotedTo = Piece.WHITE_QUEEN;
+    }
+    Move promotionMove = new Move(origin, destination, promotedTo);
+    playMove(promotionMove);
+  }
+
+  /**
+   * Loads the current view
+   *
+   * @brief Creates a new gameboard from the start pos and playes moves until it
+   *        reaches the viewPointer
+   */
+  public void loadView() {
+    this.board = new Board();
+    this.board.loadFromFen(this.startPosFen);
+    for (int i = 0; i < this.viewPointer; i++) {
+      this.board.doMove(this.movelist.get(i));
+    }
+  }
+
   public boolean isMate() {
     return board.isMated();
   }
@@ -229,45 +297,6 @@ public class Game {
         .collect(Collectors.toList());
   }
 
-  public void doPromotionMove(int piece, Square origin, Square destination) {
-    System.out.println(piece);
-    Piece promotedTo;
-    switch (piece) {
-      case 7:
-        promotedTo = Piece.BLACK_KNIGHT;
-        break;
-      case 4:
-        promotedTo = Piece.BLACK_QUEEN;
-        break;
-      case 5:
-        promotedTo = Piece.BLACK_ROOK;
-        break;
-      case 6:
-        promotedTo = Piece.BLACK_BISHOP;
-        break;
-      case 3:
-        promotedTo = Piece.WHITE_KNIGHT;
-        break;
-      case 0:
-        promotedTo = Piece.WHITE_QUEEN;
-        break;
-      case 1:
-        promotedTo = Piece.WHITE_ROOK;
-        break;
-      case 2:
-        promotedTo = Piece.WHITE_BISHOP;
-        break;
-      default:
-        promotedTo = Piece.WHITE_QUEEN;
-    }
-    Move promotionMove = new Move(origin, destination, promotedTo);
-    playMove(promotionMove);
-  }
-
-  public void setModus(String modus) {
-    this.modus = modus;
-  }
-
   public Clock getClock() {
     return this.clock;
   }
@@ -297,7 +326,6 @@ public class Game {
   }
 
   public Board getBoard() {
-    // TODO Auto-generated method stub
     return this.board;
   }
 
@@ -306,10 +334,6 @@ public class Game {
     return board.getFen();
   }
 
-  // public Square getSelectedSquare() {
-  // return this.getSelectedSquare();
-  // }
-
   public String getUnicodeFromMove(Move move) {
     return board.getPiece(move.getTo()).getFanSymbol().toUpperCase();
   }
@@ -321,18 +345,13 @@ public class Game {
   public int getViewPointer() {
     return this.viewPointer;
   }
-
+  
-  /**
+  public ArrayList<Piece> getRemovedPieces() {
-   * Loads the current view
+	  return removedPieces;
-   *
-   * @brief Creates a new gameboard from the start pos and playes moves until it
-   *        reaches the viewPointer
-   */
-  public void loadView() {
-    this.board = new Board();
-    this.board.loadFromFen(this.startPosFen);
-    for (int i = 0; i < this.viewPointer; i++) {
-      this.board.doMove(this.movelist.get(i));
-    }
   }
+
+  public boolean isRotieren() {
+    return rotieren;
+  }
+
 }

src/main/java/de/mannheim/th/chess/domain/MoveChecker.java

@@ -1,8 +0,0 @@
-package de.mannheim.th.chess.domain;
-
-/**
- * Ueberprueft, ob ein Zug gueltig ist.
- */
-public class MoveChecker{
-	
-}

src/main/java/de/mannheim/th/chess/domain/MoveReader.java

@@ -1,8 +0,0 @@
-package de.mannheim.th.chess.domain;
-
-/**
- * Liest einen Zug ein.
- */
-public class MoveReader{
-	
-}

src/main/java/de/mannheim/th/chess/model/Database.java

@@ -1,11 +0,0 @@
-package de.mannheim.th.chess.model;
-
-/**
- * Speichert Spielstaende, bisher gespielte Spiele und weiteres in einem File.
- */
-public class Database{
-	
-	public Database() {
-		
-	}
-}

src/main/java/de/mannheim/th/chess/ui/Creator.java

@@ -1,11 +0,0 @@
-package de.mannheim.th.chess.ui;
-
-import de.mannheim.th.chess.model.Database;
-
-/**
- * ???
- */
-public class Creator{
-	
-	private Database database = new Database();
-}

src/main/java/de/mannheim/th/chess/ui/GameWindow.java

@@ -1,16 +0,0 @@
-package de.mannheim.th.chess.ui;
-
-import de.mannheim.th.chess.domain.Game;
-
-/**
- * Zeigt das Spielbrett mit den Stats rechts daneben an.
- */
-public class GameWindow{
-	
-	//private Game gamelogic = new Game();
-	
-	public GameWindow() {
-		
-	}
-	
-}

src/main/java/de/mannheim/th/chess/ui/MainFrame.java

@@ -4,28 +4,28 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.border.EmptyBorder;
 
-import org.apache.logging.log4j.LogManager;
+// import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+// import org.apache.logging.log4j.Logger;
 
-import de.mannheim.th.chess.App;
+// import de.mannheim.th.chess.App;
 import de.mannheim.th.chess.domain.Game;
 
 import javax.swing.JLabel;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.IOException;
 
 import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 
-import java.awt.Component;
 import java.awt.Font;
 import java.awt.Color;
 
 public class MainFrame extends JFrame {
 
-  private static final Logger logger = LogManager.getLogger(App.class);
+  // private static final Logger logger = LogManager.getLogger(App.class);
 
   private static final long serialVersionUID = 1L;
   private JPanel contentPane;
@@ -33,14 +33,16 @@ public class MainFrame extends JFrame {
 
   /**
    * Create the frame.
+ * @throws IOException 
    */
   public MainFrame() {
+	  
 
     setBackground(Color.LIGHT_GRAY);
     setResizable(true);
     setAlwaysOnTop(true);
     setTitle("Schach");
-    setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+    setDefaultCloseOperation(EXIT_ON_CLOSE);
     setBounds(100, 100, 500, 500);
 
     contentPane = new JPanel();
@@ -57,14 +59,14 @@ public class MainFrame extends JFrame {
     JLabel lblNewLabel = new JLabel("Schach");
     lblNewLabel.setForeground(Color.BLACK);
     lblNewLabel.setFont(new Font("Serif", Font.BOLD, 60));
-    lblNewLabel.setAlignmentX(Component.CENTER_ALIGNMENT);
+    lblNewLabel.setAlignmentX(CENTER_ALIGNMENT);
     contentPane.add(lblNewLabel);
 
     contentPane.add(Box.createVerticalStrut(10));
 
     JLabel lblNewLabel_1 = new JLabel("by Dominik, Marius und Matias");
     lblNewLabel_1.setFont(new Font("Calibri", Font.ITALIC, 24));
-    lblNewLabel_1.setAlignmentX(Component.CENTER_ALIGNMENT);
+    lblNewLabel_1.setAlignmentX(CENTER_ALIGNMENT);
     contentPane.add(lblNewLabel_1);
 
     contentPane.add(Box.createVerticalStrut(75));
@@ -74,7 +76,7 @@ public class MainFrame extends JFrame {
     btnNewButton.setBackground(Color.LIGHT_GRAY);
     btnNewButton.setForeground(Color.BLACK);
     btnNewButton.setFont(new Font("Tahoma", Font.BOLD, 16));
-    btnNewButton.setAlignmentX(Component.CENTER_ALIGNMENT);
+    btnNewButton.setAlignmentX(CENTER_ALIGNMENT);
     btnNewButton.addActionListener(new ActionListener() {
 
       @Override
@@ -88,6 +90,10 @@ public class MainFrame extends JFrame {
     contentPane.add(Box.createVerticalStrut(15));
 
     JButton pgnLoaderButton = new JButton("Lade aus PGN Datei");
+    pgnLoaderButton.setBackground(Color.LIGHT_GRAY);
+    pgnLoaderButton.setForeground(Color.BLACK);
+    pgnLoaderButton.setFont(new Font("Tahoma", Font.BOLD, 16));
+    pgnLoaderButton.setAlignmentX(CENTER_ALIGNMENT);
     pgnLoaderButton.addActionListener(e -> openPgnSelectFrame());
     contentPane.add(pgnLoaderButton);
 
@@ -98,7 +104,7 @@ public class MainFrame extends JFrame {
     btnNewButton_2.setBackground(Color.LIGHT_GRAY);
     btnNewButton_2.setForeground(Color.BLACK);
     btnNewButton_2.setFont(new Font("Tahoma", Font.BOLD, 16));
-    btnNewButton_2.setAlignmentX(Component.CENTER_ALIGNMENT);
+    btnNewButton_2.setAlignmentX(CENTER_ALIGNMENT);
     btnNewButton_2.addActionListener(new ActionListener() {
 
       @Override
@@ -114,11 +120,12 @@ public class MainFrame extends JFrame {
 
   /**
    * Starts the spielframe and game in playmode
+ * @throws IOException 
    */
   public void startGame() {
     if (this.game != null) {
-      this.game.stopClock();
+      //this.game.stopClock();
-      SpielFrame sf = new SpielFrame(this.game);
+      new SpielFrame(this.game);
     }
   }
 

src/main/java/de/mannheim/th/chess/ui/ModeSelectionFrame.java

@@ -3,36 +3,29 @@ package de.mannheim.th.chess.ui;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 
-import org.apache.logging.log4j.LogManager;
+// import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+// import org.apache.logging.log4j.Logger;
 
-import de.mannheim.th.chess.App;
+// import de.mannheim.th.chess.App;
 import de.mannheim.th.chess.controller.ButtonFileLoaderListener;
 import de.mannheim.th.chess.domain.Game;
 
 public class ModeSelectionFrame extends JFrame {
 
-  private static final Logger logger = LogManager.getLogger(App.class);
+  // private static final Logger logger = LogManager.getLogger(App.class);
 
   private static final long serialVersionUID = 1L;
   private final JPanel contentPane;
-  private final ArrayList<Game> spiele = new ArrayList<>();
   private String fen;
 
   public ModeSelectionFrame(MainFrame mf) {
     // Frame-Eigenschaften
     setTitle("Modusauswahl");
     setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-    setBounds(100, 100, 500, 500);
+    setBounds(100, 100, 600, 600);
     setResizable(true);
     setAlwaysOnTop(true);
 
@@ -47,7 +40,7 @@ public class ModeSelectionFrame extends JFrame {
     JLabel jl = new JLabel("Welchen Modus wollen Sie spielen?");
     jl.setFont(new Font("Calibri", Font.BOLD, 20));
     jl.setForeground(Color.BLACK);
-    jl.setAlignmentX(Component.CENTER_ALIGNMENT);
+    jl.setAlignmentX(CENTER_ALIGNMENT);
     contentPane.add(jl);
     contentPane.add(Box.createVerticalStrut(15));
 
@@ -55,7 +48,7 @@ public class ModeSelectionFrame extends JFrame {
     String[] modi = { "Blitz", "Schnellschach", "Klassisch" };
     JComboBox<String> jcb1 = new JComboBox<>(modi);
     jcb1.setMaximumSize(new Dimension(150, 30));
-    jcb1.setAlignmentX(Component.CENTER_ALIGNMENT);
+    jcb1.setAlignmentX(CENTER_ALIGNMENT);
     contentPane.add(jcb1);
     contentPane.add(Box.createVerticalStrut(15));
 
@@ -63,14 +56,14 @@ public class ModeSelectionFrame extends JFrame {
     JLabel jl2 = new JLabel("Soll das Spielbrett nach jedem Zug gedreht werden?");
     jl2.setFont(new Font("Calibri", Font.BOLD, 20));
     jl2.setForeground(Color.BLACK);
-    jl2.setAlignmentX(Component.CENTER_ALIGNMENT);
+    jl2.setAlignmentX(CENTER_ALIGNMENT);
     contentPane.add(jl2);
 
     JCheckBox jb1 = new JCheckBox();
     jb1.setOpaque(false);
     jb1.setFocusPainted(false);
     jb1.setForeground(Color.BLACK);
-    jb1.setAlignmentX(Component.CENTER_ALIGNMENT);
+    jb1.setAlignmentX(CENTER_ALIGNMENT);
     jb1.setMaximumSize(new Dimension(30, 30));
     contentPane.add(jb1);
     contentPane.add(Box.createVerticalStrut(15));
@@ -79,14 +72,14 @@ public class ModeSelectionFrame extends JFrame {
     JLabel jl3 = new JLabel("Sollen Zurücknahmen erlaubt sein?");
     jl3.setFont(new Font("Calibri", Font.BOLD, 20));
     jl3.setForeground(Color.BLACK);
-    jl3.setAlignmentX(Component.CENTER_ALIGNMENT);
+    jl3.setAlignmentX(CENTER_ALIGNMENT);
     contentPane.add(jl3);
 
     JCheckBox jb2 = new JCheckBox();
     jb2.setOpaque(false);
     jb2.setFocusPainted(false);
     jb2.setForeground(Color.BLACK);
-    jb2.setAlignmentX(Component.CENTER_ALIGNMENT);
+    jb2.setAlignmentX(CENTER_ALIGNMENT);
     jb2.setMaximumSize(new Dimension(30, 30));
     contentPane.add(jb2);
 
@@ -97,7 +90,7 @@ public class ModeSelectionFrame extends JFrame {
     btnNewButton_1.setBackground(Color.LIGHT_GRAY);
     btnNewButton_1.setForeground(Color.BLACK);
     btnNewButton_1.setFont(new Font("Tahoma", Font.BOLD, 16));
-    btnNewButton_1.setAlignmentX(Component.CENTER_ALIGNMENT);
+    btnNewButton_1.setAlignmentX(CENTER_ALIGNMENT);
     btnNewButton_1.addActionListener(new ButtonFileLoaderListener(this));
 
     contentPane.add(btnNewButton_1);
@@ -109,7 +102,7 @@ public class ModeSelectionFrame extends JFrame {
     btnNewButton.setBackground(Color.LIGHT_GRAY);
     btnNewButton.setForeground(Color.BLACK);
     btnNewButton.setFont(new Font("Tahoma", Font.BOLD, 16));
-    btnNewButton.setAlignmentX(Component.CENTER_ALIGNMENT);
+    btnNewButton.setAlignmentX(CENTER_ALIGNMENT);
     contentPane.add(btnNewButton);
 
     // Button-Listener

src/main/java/de/mannheim/th/chess/ui/PGNLoaderFrame.java

@@ -1,8 +1,6 @@
 package de.mannheim.th.chess.ui;
 
 import java.util.List;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.io.File;
 
 import javax.swing.BoxLayout;

src/main/java/de/mannheim/th/chess/utl/Clock.java

@@ -3,157 +3,152 @@ package de.mannheim.th.chess.utl;
 /**
  * Zeigt die Zeitangabe während eines Spiels eines Spielers an.
  */
-import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Font;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.swing.BorderFactory;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JSplitPane;
 import javax.swing.Timer;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import de.mannheim.th.chess.ui.SpielFrame;
-
 public class Clock extends Thread implements Runnable {
-	private volatile boolean whiteToMove = true;
+  private volatile boolean whiteToMove = true;
-	private volatile boolean gameHasFinished = false;
+  private volatile boolean gameHasFinished = false;
-	private static final Logger clockLogger = LogManager.getLogger(Clock.class);
+  private static final Logger clockLogger = LogManager.getLogger(Clock.class);
-	private int minutes;
+  private int minutes;
-	private StringBuilder clockShower;
+  private StringBuilder clockShower;
-	private JLabel clock1, clock2;
+  private JLabel clock1, clock2;
 
-	public Clock(String mode) {
+  public Clock(String mode) {
-		
-		setMode(mode);
-	}
 
-	public void pressClock() {
+    setMode(mode);
-		whiteToMove = !whiteToMove;
+  }
-		if (whiteToMove) {
-			clockLogger.info("Weiß ist am Zug");
-		} else {
-			clockLogger.info("Schwarz ist am Zug");
-		}
-	}
 
-	public void endGame() {
+  public void pressClock() {
-		gameHasFinished = true;
+    whiteToMove = !whiteToMove;
-	}
+    if (whiteToMove) {
+      clockLogger.info("Weiß ist am Zug");
+    } else {
+      clockLogger.info("Schwarz ist am Zug");
+    }
+  }
 
-	public void run() {
+  public void endGame() {
-//		JFrame clockFrame = new JFrame("Clock");
+    gameHasFinished = true;
-//		
+  }
-//		JPanel player1Panel = new JPanel();
-//		player1Panel.setBackground(Color.BLACK);
-//		JPanel player2Panel = new JPanel();
-//		player2Panel.setBackground(Color.BLACK);
-//		clockFrame.setBounds(1000, 500, 10000, 10000);
-//		clockFrame.setLayout(new BorderLayout());
-		clock1 = new JLabel("" + minutes + ":00 ");
-		clock1.setBorder(BorderFactory.createEmptyBorder(0, 40, 0, 0)); 
-		clock1.setForeground(Color.BLACK);
-		clock1.setFont(new Font("Calibri", Font.BOLD, 40));
-		clock1.setAlignmentX(Component.CENTER_ALIGNMENT);
-		
-		clock2 = new JLabel("" + minutes + ":00 ");
-		clock2.setBorder(BorderFactory.createEmptyBorder(0, 40, 0, 0)); 
-		clock2.setForeground(Color.BLACK);
-		clock2.setFont(new Font("Calibri", Font.BOLD, 40));
-		clock2.setAlignmentX(Component.CENTER_ALIGNMENT);
-//		player1Panel.add(clock1);
-//		player2Panel.add(clock2);
-//		JSplitPane split = new JSplitPane(JSplitPane.VERTICAL_SPLIT, player1Panel, player2Panel);
-//		split.setFont(new Font("Arial", Font.BOLD, 50));
-//		clockFrame.add(split);
 
-		var min1 = new AtomicInteger(minutes);
+  public void run() {
-		var sec1 = new AtomicInteger(0);
+    // JFrame clockFrame = new JFrame("Clock");
-		var min2 = new AtomicInteger(minutes);
+    //
-		var sec2 = new AtomicInteger(0);
+    // JPanel player1Panel = new JPanel();
+    // player1Panel.setBackground(Color.BLACK);
+    // JPanel player2Panel = new JPanel();
+    // player2Panel.setBackground(Color.BLACK);
+    // clockFrame.setBounds(1000, 500, 10000, 10000);
+    // clockFrame.setLayout(new BorderLayout());
+    clock1 = new JLabel("" + minutes + ":00 ");
+    clock1.setBorder(BorderFactory.createEmptyBorder(0, 40, 0, 0));
+    clock1.setForeground(Color.BLACK);
+    clock1.setFont(new Font("Calibri", Font.BOLD, 40));
+    clock1.setAlignmentX(Component.CENTER_ALIGNMENT);
 
-		var t = new Timer(1000, (ae) -> {
+    clock2 = new JLabel("" + minutes + ":00 ");
+    clock2.setBorder(BorderFactory.createEmptyBorder(0, 40, 0, 0));
+    clock2.setForeground(Color.BLACK);
+    clock2.setFont(new Font("Calibri", Font.BOLD, 40));
+    clock2.setAlignmentX(Component.CENTER_ALIGNMENT);
+    // player1Panel.add(clock1);
+    // player2Panel.add(clock2);
+    // JSplitPane split = new JSplitPane(JSplitPane.VERTICAL_SPLIT, player1Panel,
+    // player2Panel);
+    // split.setFont(new Font("Arial", Font.BOLD, 50));
+    // clockFrame.add(split);
 
-			if (!gameHasFinished) {
+    var min1 = new AtomicInteger(minutes);
+    var sec1 = new AtomicInteger(0);
+    var min2 = new AtomicInteger(minutes);
+    var sec2 = new AtomicInteger(0);
 
-				clockShower = new StringBuilder();
+    var t = new Timer(1000, (ae) -> {
-				if (whiteToMove) {
-					if (sec1.intValue() == 00) {
-						sec1.set(60);
-						min1.decrementAndGet();
-					}
-					if (min1.intValue() < 10) {
-						clockShower.append("0");
-					}
-					clockShower.append(min1.get());
-					clockShower.append(":");
-					if (sec1.intValue() < 10) {
-						clockShower.append("0");
-					}
-					clockShower.append(sec1.decrementAndGet());
-					clock1.setText(clockShower.toString());
 
-				} else {
+      if (!gameHasFinished) {
-					if (sec2.intValue() == 00) {
-						sec2.set(60);
-						min2.decrementAndGet();
-					}
-					if (min2.intValue() < 10) {
-						clockShower.append("0");
-					}
-					clockShower.append(min2.get());
-					clockShower.append(":");
-					if (sec2.intValue() < 10) {
-						clockShower.append("0");
-					}
-					clockShower.append(sec2.decrementAndGet());
-					clock2.setText(clockShower.toString());
-				}
-				//sp.repaint();
-				if ((sec1.intValue() == 0 && min1.intValue() == 0) || (sec2.intValue() == 0 && min2.intValue() == 0)) {
-					endGame();
-				}
-			}
-		});
 
-		t.start();
+        clockShower = new StringBuilder();
-	}
+        if (whiteToMove) {
+          if (sec1.intValue() == 00) {
+            sec1.set(60);
+            min1.decrementAndGet();
+          }
+          if (min1.intValue() < 10) {
+            clockShower.append("0");
+          }
+          clockShower.append(min1.get());
+          clockShower.append(":");
+          if (sec1.intValue() < 10) {
+            clockShower.append("0");
+          }
+          clockShower.append(sec1.decrementAndGet());
+          clock1.setText(clockShower.toString());
 
-	private void setMode(String mode) {
+        } else {
-		switch (mode.toLowerCase()) {
+          if (sec2.intValue() == 00) {
-		case "blitz":
+            sec2.set(60);
-			minutes = 5;
+            min2.decrementAndGet();
-			clockLogger.info("Neue Blitz-Uhr wurde erstellt");
+          }
-			break;
+          if (min2.intValue() < 10) {
-		case "schnellschach":
+            clockShower.append("0");
-			minutes = 10;
+          }
-			clockLogger.info("Neue Schnellschach-Uhr wurde erstellt");
+          clockShower.append(min2.get());
-			break;
+          clockShower.append(":");
-		case "klassisch":
+          if (sec2.intValue() < 10) {
-			minutes = 120;
+            clockShower.append("0");
-			clockLogger.info("Neue klassische Schachuhr wurde erstellt");
+          }
-			break;
+          clockShower.append(sec2.decrementAndGet());
-		}
+          clock2.setText(clockShower.toString());
-	}
+        }
-	
+        // sp.repaint();
-	public void switchClock() {
+        if ((sec1.intValue() == 0 && min1.intValue() == 0) || (sec2.intValue() == 0 && min2.intValue() == 0)) {
-		whiteToMove = !whiteToMove;
+          endGame();
-	}
+        }
+      }
+    });
 
-	public JLabel getClock1() {
+    t.start();
+  }
 
-		return clock1;
+  private void setMode(String mode) {
-	}
+    switch (mode.toLowerCase()) {
+      case "blitz":
+        minutes = 5;
+        clockLogger.info("Neue Blitz-Uhr wurde erstellt");
+        break;
+      case "schnellschach":
+        minutes = 10;
+        clockLogger.info("Neue Schnellschach-Uhr wurde erstellt");
+        break;
+      case "klassisch":
+        minutes = 120;
+        clockLogger.info("Neue klassische Schachuhr wurde erstellt");
+        break;
+    }
+  }
 
-	public JLabel getClock2() {
+  public void switchClock() {
-		
+    whiteToMove = !whiteToMove;
-		return clock2;
+  }
-	}
 
-}
+  public JLabel getClock1() {
+
+    return clock1;
+  }
+
+  public JLabel getClock2() {
+
+    return clock2;
+  }
+
+}

src/main/java/de/mannheim/th/chess/utl/GameReader.java

@@ -1,12 +0,0 @@
-package de.mannheim.th.chess.utl;
-
-import de.mannheim.th.chess.model.Database;
-
-/**
- * Liest ein schon vordefinierten Spielstand ein.
- */
-public class GameReader{
-	
-	private Database database = new Database();
-	
-}

src/main/java/de/mannheim/th/chess/utl/OpeningRecognizer.java

@@ -0,0 +1,64 @@
+package de.mannheim.th.chess.utl;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.github.bhlangonijr.chesslib.move.MoveList;
+
+public class OpeningRecognizer {
+	private static class Opening {
+		String name;
+		String moves;
+		
+		Opening(String name, String  moves) {
+			this.name = name;
+			this.moves = moves;
+		}
+	}
+	
+	private static List<Opening> openingList = new ArrayList<>();
+	
+	public static void loadOpenings() throws IOException {
+		BufferedReader openingReader = new BufferedReader(new FileReader("src/main/resources/openings.pgn"));
+		StringBuilder openingName = new StringBuilder();
+		String moves = null;
+		String line;
+		while ((line = openingReader.readLine()) != null) {
+			if ((line.startsWith("[Site") && openingName.toString().equals("")) || line.equals("") ) {
+				continue;
+			}
+			if (line.startsWith("[Site")) {
+				openingList.add(new Opening(openingName.toString(), moves));
+				moves = null;
+				openingName.delete(0, openingName.length());
+				continue;
+			}
+			if (line.startsWith("[White")) {
+				openingName.append(line.split("\"")[1].trim());
+				continue;
+			}
+			if (line.startsWith("[Black")) {
+				openingName.append(":").append(line.split("\"")[1].trim());
+				continue;
+			}
+			moves = line;
+			
+		}
+		openingReader.close();
+	}
+	
+	public static String compareOpening(MoveList moves, String openingBefore) {
+		for (Opening o: openingList) {
+			if (o.moves.equals(moves.toSanWithMoveNumbers().trim())) {
+				return o.name;
+					
+			}
+		}
+		return openingBefore;
+		
+	}
+
+}

src/test/java/de/mannheim/th/chess/utl/OpeningRecognizerTest.java

@@ -0,0 +1,32 @@
+package de.mannheim.th.chess.utl;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import com.github.bhlangonijr.chesslib.Square;
+import com.github.bhlangonijr.chesslib.move.Move;
+import com.github.bhlangonijr.chesslib.move.MoveList;
+
+
+
+class OpeningRecognizerTest {
+
+	@BeforeAll
+	static void prepareOpenings() throws IOException {
+		OpeningRecognizer.loadOpenings();
+	}
+	
+	@Test
+	void test() {
+		Move m = new Move(Square.E2, Square.E4);
+		MoveList moves = new MoveList();
+		moves.add(m);
+		assertEquals(OpeningRecognizer.compareOpening(moves, "Unknown"), "King's pawn Opening");
+		
+	}
+
+}