quellen

@@ -1,5 +1,2 @@
 JFileChoser in UI: (mit GPT)
 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,32 +1,25 @@
 package de.mannheim.th.chess;
 
-import java.io.IOException;
-
 import de.mannheim.th.chess.ui.MainFrame;
-import de.mannheim.th.chess.utl.OpeningRecognizer;
 
-// import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.LogManager;
-// import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 /**
- * Eine einfache Schach App mithilfe von
+ * Eine einfache Schach App mithilfe von {@linkplain https://github.com/bhlangonijr/chesslib} entwickelt.
- * {@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.
-   * 
 	 * @param args
- * @throws IOException 
 	 */
-  public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
-	OpeningRecognizer.loadOpenings();
+        userinterface = new MainFrame();
-	new MainFrame();
     }
 }

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

@@ -5,51 +5,18 @@ import java.awt.event.ActionListener;
 
 import javax.swing.JFrame;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-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) {
+	public ButtonAufgebenListener() {
-		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

@@ -40,8 +40,6 @@ public class ButtonFileLoaderListener implements ActionListener {
 				
 				msf.setFen(br.readLine());
 				
-        br.close();
-
 			} catch (FileNotFoundException e1) {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();

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

@@ -6,6 +6,7 @@ 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;
@@ -13,6 +14,8 @@ 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;
 

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

@@ -27,33 +27,22 @@ public class ButtonMovePieceListener implements ActionListener {
     else
       this.game.playMove(this.mv);
 
-    this.game.setViewPointer(this.game.getMoveList().size() - 1);
-
     if (this.game.isDraw()) {
       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);
+    this.sf.setCursor(null);
+    this.sf.erstelleBrett();
+    
     if (game.getLastMove() != null) {
+        
         sf.aktualisiereAusgabe();
     }
   }
-
-    this.sf.setCursor(null);
-
-    // hier rotieren markieren
-
-    if (game.isRotieren())
-      sf.setWechsel(!sf.isWechsel());
-
-    this.sf.erstelleBrett();
-
-  }
 }

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

@@ -1,4 +1,5 @@
-package de.mannheim.th.chess.controller.controlPanel;
+
+package de.mannheim.th.chess.controller;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

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

@@ -1,4 +1,4 @@
-package de.mannheim.th.chess.controller.controlPanel;
+package de.mannheim.th.chess.controller;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

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

@@ -3,6 +3,7 @@ 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;
 

src/main/java/de/mannheim/th/chess/controller/controlPanel/BaseButtonViewListener.java

@@ -1,24 +0,0 @@
-package de.mannheim.th.chess.controller.controlPanel;
-
-import de.mannheim.th.chess.ui.SpielFrame;
-import de.mannheim.th.chess.domain.Game;
-
-public abstract class BaseButtonViewListener {
-  protected SpielFrame sf;
-  protected Game game;
-
-  public BaseButtonViewListener(Game game, SpielFrame sf) {
-    this.sf = sf;
-    this.game = game;
-  }
-
-  /**
-   * Loads the gamestate and renders the board
-   */
-  protected void updateView() {
-    this.game.loadView();
-    this.sf.setDefaultButtons();
-    this.sf.applyBoardButtons();
-    this.sf.ladeBrett();
-  }
-}

src/main/java/de/mannheim/th/chess/controller/controlPanel/ButtonViewBackListener.java

@@ -1,24 +0,0 @@
-package de.mannheim.th.chess.controller.controlPanel;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import de.mannheim.th.chess.domain.Game;
-import de.mannheim.th.chess.ui.SpielFrame;
-
-public class ButtonViewBackListener extends BaseButtonViewListener implements ActionListener {
-
-  public ButtonViewBackListener(Game game, SpielFrame sf) {
-    super(game, sf);
-  }
-
-  @Override
-  public void actionPerformed(ActionEvent e) {
-    if (this.game.getViewPointer() > 0) {
-      this.game.setViewPointer(this.game.getViewPointer() - 1);
-      updateView();
-    }
-
-  }
-
-}

src/main/java/de/mannheim/th/chess/controller/controlPanel/ButtonViewFirstListener.java

@@ -1,21 +0,0 @@
-package de.mannheim.th.chess.controller.controlPanel;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import de.mannheim.th.chess.domain.Game;
-import de.mannheim.th.chess.ui.SpielFrame;
-
-public class ButtonViewFirstListener extends BaseButtonViewListener implements ActionListener {
-
-  public ButtonViewFirstListener(Game game, SpielFrame sf) {
-    super(game, sf);
-  }
-
-  @Override
-  public void actionPerformed(ActionEvent e) {
-    this.game.setViewPointer(0);
-    updateView();
-  }
-
-}

src/main/java/de/mannheim/th/chess/controller/controlPanel/ButtonViewForwardListener.java

@@ -1,24 +0,0 @@
-package de.mannheim.th.chess.controller.controlPanel;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import de.mannheim.th.chess.domain.Game;
-import de.mannheim.th.chess.ui.SpielFrame;
-
-public class ButtonViewForwardListener extends BaseButtonViewListener implements ActionListener {
-
-  public ButtonViewForwardListener(Game game, SpielFrame sf) {
-    super(game, sf);
-  }
-
-  @Override
-  public void actionPerformed(ActionEvent e) {
-    if (this.game.getMoveList().size() > this.game.getViewPointer()) {
-      this.game.setViewPointer(this.game.getViewPointer() + 1);
-      updateView();
-    }
-
-  }
-
-}

src/main/java/de/mannheim/th/chess/controller/controlPanel/ButtonViewLastListener.java

@@ -1,22 +0,0 @@
-
-package de.mannheim.th.chess.controller.controlPanel;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import de.mannheim.th.chess.domain.Game;
-import de.mannheim.th.chess.ui.SpielFrame;
-
-public class ButtonViewLastListener extends BaseButtonViewListener implements ActionListener {
-
-  public ButtonViewLastListener(Game game, SpielFrame sf) {
-    super(game, sf);
-  }
-
-  @Override
-  public void actionPerformed(ActionEvent e) {
-    this.game.setViewPointer(this.game.getMoveList().size());
-    updateView();
-  }
-
-}

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

@@ -1,6 +1,5 @@
 package de.mannheim.th.chess.domain;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -14,8 +13,10 @@ 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.ui.SpielFrame;
 import de.mannheim.th.chess.utl.Clock;
 
 /**
@@ -28,12 +29,11 @@ public class Game {
 
   private Board board;
   private Clock clock;
+  private SpielFrame sp;
+  private String modus;
   private boolean rotieren, zuruecknahme;
 
-  ArrayList<Piece> removedPieces;
-
   private MoveList movelist;
-  private int viewPointer;
 
   private MoveList savestate;
   private String startPosFen;
@@ -46,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;
 
@@ -67,7 +67,9 @@ public class Game {
     this.movelist = new MoveList();
 
     clock = new Clock(modus);
-    removedPieces = new ArrayList<>();
+
+    sp = new SpielFrame(this);
+
   }
 
   /**
@@ -79,13 +81,15 @@ public class Game {
     this.board = new Board();
 
     this.startPosFen = this.board.getFen();
+
     this.movelist = movelist;
 
     for (Move move : movelist) {
       this.board.doMove(move);
     }
 
-    this.clock = new Clock("blitz");
+    // this.clockPlayer1 = new Clock();
+    // this.clockPlayer2 = new Clock();
   }
 
   /**
@@ -99,6 +103,10 @@ public class Game {
 
     this.movelist = new MoveList();
     this.startPosFen = this.board.getFen();
+    // this.sp = new SpielFrame();
+
+    // this.clockPlayer1 = new Clock();
+    // this.clockPlayer2 = new Clock();
   }
 
   /**
@@ -107,14 +115,6 @@ 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();
@@ -129,11 +129,7 @@ public class Game {
 
   public void undo() {
     this.board.undoMove();
-    Move lastMove = this.movelist.removeLast();
+    this.movelist.removeLast();
-    Piece removedPiece = board.getPiece(lastMove.getTo());
-    if (removedPiece != Piece.NONE) {
-    	removedPieces.remove(removedPiece);
-    }
   }
 
   /**
@@ -142,8 +138,7 @@ public class Game {
   public void quicksave() {
     // TODO: save the current clocktime
     this.savestate = new MoveList(this.movelist);
-
+    logger.info("Quicksaved");
-    logger.info("Quicksaved...");
   }
 
   /**
@@ -163,81 +158,23 @@ public class Game {
         this.playMove(move);
       }
 
-      logger.info("Quickloaded...");
+      logger.info("Quickloaded");
     }
   }
 
   /**
    * Plays the move on the board and adds it to the movelist
    *
-   * @param origin     The square from which it moves from.
+   * @param origin     The square from wich 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();
   }
@@ -297,6 +234,45 @@ 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;
   }
@@ -326,6 +302,7 @@ public class Game {
   }
 
   public Board getBoard() {
+    // TODO Auto-generated method stub
     return this.board;
   }
 
@@ -334,24 +311,11 @@ public class Game {
     return board.getFen();
   }
 
+  // public Square getSelectedSquare() {
+  // return this.getSelectedSquare();
+  // }
+
   public String getUnicodeFromMove(Move move) {
     return board.getPiece(move.getTo()).getFanSymbol().toUpperCase();
   }
-
-  public void setViewPointer(int i) {
-    this.viewPointer = i;
-  }
-
-  public int getViewPointer() {
-    return this.viewPointer;
-  }
-  
-  public ArrayList<Piece> getRemovedPieces() {
-	  return removedPieces;
-  }
-
-  public boolean isRotieren() {
-    return rotieren;
-  }
-
 }

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

@@ -0,0 +1,8 @@
+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

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

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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,16 @@
+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,45 +4,41 @@ 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;
-  private Game game;
 
 	/**
 	 * Create the frame.
- * @throws IOException 
 	 */
 	public MainFrame() {
 
-
 		setBackground(Color.LIGHT_GRAY);
 		setResizable(true);
 		setAlwaysOnTop(true);
 		setTitle("Schach");
-    setDefaultCloseOperation(EXIT_ON_CLOSE);
+		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		setBounds(100, 100, 500, 500);
 
 		contentPane = new JPanel();
@@ -59,14 +55,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(CENTER_ALIGNMENT);
+		lblNewLabel.setAlignmentX(Component.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(CENTER_ALIGNMENT);
+		lblNewLabel_1.setAlignmentX(Component.CENTER_ALIGNMENT);
 		contentPane.add(lblNewLabel_1);
 
 		contentPane.add(Box.createVerticalStrut(75));
@@ -76,12 +72,14 @@ public class MainFrame extends JFrame {
 		btnNewButton.setBackground(Color.LIGHT_GRAY);
 		btnNewButton.setForeground(Color.BLACK);
 		btnNewButton.setFont(new Font("Tahoma", Font.BOLD, 16));
-    btnNewButton.setAlignmentX(CENTER_ALIGNMENT);
+		btnNewButton.setAlignmentX(Component.CENTER_ALIGNMENT);
 		btnNewButton.addActionListener(new ActionListener() {
 
 			@Override
 			public void actionPerformed(ActionEvent e) {
-        openSelectModeFrame();
+
+				ModeSelectionFrame ms = new ModeSelectionFrame();
+
 			}
 
 		});
@@ -89,22 +87,12 @@ 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);
-
-    contentPane.add(Box.createVerticalStrut(15));
-
 		JButton btnNewButton_2 = new JButton("App beenden");
 		
 		btnNewButton_2.setBackground(Color.LIGHT_GRAY);
 		btnNewButton_2.setForeground(Color.BLACK);
 		btnNewButton_2.setFont(new Font("Tahoma", Font.BOLD, 16));
-    btnNewButton_2.setAlignmentX(CENTER_ALIGNMENT);
+		btnNewButton_2.setAlignmentX(Component.CENTER_ALIGNMENT);
 		btnNewButton_2.addActionListener(new ActionListener() {
 
 			@Override
@@ -117,45 +105,4 @@ public class MainFrame extends JFrame {
 		contentPane.add(btnNewButton_2);
 		setVisible(true);
 	}
-
-  /**
-   * Starts the spielframe and game in playmode
- * @throws IOException 
-   */
-  public void startGame() {
-    if (this.game != null) {
-      //this.game.stopClock();
-      new SpielFrame(this.game);
-    }
-  }
-
-  /**
-   * Starts the spielframe and game in view mode
-   */
-  public void startView() {
-    if (this.game != null) {
-      this.game.stopClock();
-      SpielFrame sf = new SpielFrame(this.game);
-      sf.setMode(SpielFrame.BoardMode.finished);
-      sf.enableControlPanelButtons();
-    }
-  }
-
-  public void setGame(Game game) {
-    this.game = game;
-  }
-
-  /**
-   * opens the selectmodeframe
-   */
-  private void openSelectModeFrame() {
-    new ModeSelectionFrame(this);
-  }
-
-  /**
-   * Opens the pgnselectorframe
-   */
-  private void openPgnSelectFrame() {
-    new PGNLoaderFrame(this);
-  }
 }

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

@@ -3,29 +3,36 @@ 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) {
+    public ModeSelectionFrame() {
         // Frame-Eigenschaften
         setTitle("Modusauswahl");
         setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-    setBounds(100, 100, 600, 600);
+        setBounds(100, 100, 500, 500);
         setResizable(true);
         setAlwaysOnTop(true);
 
@@ -40,7 +47,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(CENTER_ALIGNMENT);
+        jl.setAlignmentX(Component.CENTER_ALIGNMENT);
         contentPane.add(jl);
         contentPane.add(Box.createVerticalStrut(15));
 
@@ -48,7 +55,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(CENTER_ALIGNMENT);
+        jcb1 .setAlignmentX(Component.CENTER_ALIGNMENT);
         contentPane.add(jcb1 );
         contentPane.add(Box.createVerticalStrut(15));
 
@@ -56,14 +63,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(CENTER_ALIGNMENT);
+        jl2 .setAlignmentX(Component.CENTER_ALIGNMENT);
         contentPane.add(jl2 );
 
         JCheckBox jb1  = new JCheckBox();
         jb1.setOpaque(false);
         jb1.setFocusPainted(false);
         jb1.setForeground(Color.BLACK);
-    jb1.setAlignmentX(CENTER_ALIGNMENT);
+        jb1 .setAlignmentX(Component.CENTER_ALIGNMENT);
         jb1 .setMaximumSize(new Dimension(30, 30));
         contentPane.add(jb1 );
         contentPane.add(Box.createVerticalStrut(15));
@@ -72,14 +79,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(CENTER_ALIGNMENT);
+        jl3.setAlignmentX(Component.CENTER_ALIGNMENT);
         contentPane.add(jl3);
 
         JCheckBox jb2 = new JCheckBox();
         jb2.setOpaque(false);
         jb2.setFocusPainted(false);
         jb2.setForeground(Color.BLACK);
-    jb2.setAlignmentX(CENTER_ALIGNMENT);
+        jb2.setAlignmentX(Component.CENTER_ALIGNMENT);
         jb2.setMaximumSize(new Dimension(30, 30));
         contentPane.add(jb2);
       
@@ -90,7 +97,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(CENTER_ALIGNMENT);
+		btnNewButton_1.setAlignmentX(Component.CENTER_ALIGNMENT);
 		btnNewButton_1.addActionListener(new ButtonFileLoaderListener(this));
 
 		contentPane.add(btnNewButton_1);
@@ -102,7 +109,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(CENTER_ALIGNMENT);
+        btnNewButton .setAlignmentX(Component.CENTER_ALIGNMENT);
         contentPane.add(btnNewButton );
 
         // Button-Listener
@@ -114,10 +121,8 @@ public class ModeSelectionFrame extends JFrame {
                 boolean zuruecknahme = jb2.isSelected();
 
                 Game game = new Game(modus, rotieren, zuruecknahme, fen);
-        mf.setGame(game);
-        mf.startGame();
                
-        // spiele.add(game);
+                spiele.add(game);
 
                 dispose();
             }

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

@@ -1,154 +0,0 @@
-package de.mannheim.th.chess.ui;
-
-import java.util.List;
-import java.io.File;
-
-import javax.swing.BoxLayout;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingWorker;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import com.github.bhlangonijr.chesslib.game.Game;
-import com.github.bhlangonijr.chesslib.pgn.PgnHolder;
-import com.github.bhlangonijr.chesslib.pgn.PgnLoadListener;
-
-public class PGNLoaderFrame extends JFrame {
-
-  private static final Logger logger = LogManager.getLogger(PGNLoaderFrame.class);
-
-  private PgnHolder pgn;
-  private File selectedFile;
-  private List<Game> games;
-  private DefaultListModel<String> gameListModel;
-  private JPanel contentPane;
-  private JList<String> gameList;
-  private JProgressBar progressBar;
-
-  /**
-   * Opens the PNGLoaderFrame
-   */
-  public PGNLoaderFrame(MainFrame mf) {
-
-    // ----- Style -----
-    setResizable(true);
-    setAlwaysOnTop(true);
-    setTitle("PGNLoader");
-    setBounds(100, 100, 500, 500);
-
-    // ----- contentPane -----
-    contentPane = new JPanel();
-    contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
-
-    setContentPane(contentPane);
-
-    // ----- FileSelector -----
-    JButton fileSelectButton = new JButton("Select File");
-    fileSelectButton.addActionListener(e -> {
-      JFileChooser fileChooser = new JFileChooser();
-      int returnValue = fileChooser.showOpenDialog(null);
-      if (returnValue == JFileChooser.APPROVE_OPTION) {
-        selectedFile = fileChooser.getSelectedFile();
-      }
-    });
-    contentPane.add(fileSelectButton);
-
-    // ----- LoadButton -----
-    JButton loadPgnButton = new JButton("Load file");
-    loadPgnButton.addActionListener(e -> loadFile());
-    contentPane.add(loadPgnButton);
-
-    // ----- SelectionList -----
-    gameListModel = new DefaultListModel<>();
-    gameList = new JList<>(gameListModel);
-    gameList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-    gameList.setVisibleRowCount(5);
-    JScrollPane scrollPane = new JScrollPane(gameList);
-    contentPane.add(scrollPane);
-
-    // ----- ProgressBar -----
-    progressBar = new JProgressBar(0, 100);
-    progressBar.setValue(0);
-    progressBar.setStringPainted(true);
-    contentPane.add(progressBar);
-
-    // ----- StartButton -----
-    JButton startGameButton = new JButton("Starte Spiel");
-    startGameButton.addActionListener(e -> {
-      int index = gameList.getSelectedIndex();
-      de.mannheim.th.chess.domain.Game game = new de.mannheim.th.chess.domain.Game(games.get(index).getHalfMoves());
-
-      mf.setGame(game);
-      mf.startView();
-    });
-    contentPane.add(startGameButton);
-
-    this.setVisible(true);
-
-  }
-
-  private void loadFile() {
-    if (this.selectedFile != null) {
-      pgn = new PgnHolder(this.selectedFile.getAbsolutePath());
-
-      LoadPGNWorker loadPGNWorker = new LoadPGNWorker();
-      loadPGNWorker.addPropertyChangeListener(e -> {
-        progressBar.setIndeterminate(true);
-      });
-
-      pgn.getListener().add(loadPGNWorker);
-      loadPGNWorker.execute();
-
-      gameList.revalidate();
-    }
-  }
-
-  private class LoadPGNWorker extends SwingWorker<Integer, Integer> implements PgnLoadListener {
-
-    @Override
-    protected Integer doInBackground() throws Exception {
-      try {
-        pgn.loadPgn();
-        games = pgn.getGames();
-        int totalGames = games.size();
-        for (int i = 0; i < totalGames; i++) {
-          publish(i);
-        }
-      } catch (Exception e) {
-        logger.info("Could not load pgn file!");
-      }
-      return pgn.getSize();
-    }
-
-    @Override
-    protected void process(List<Integer> chunks) {
-      for (Integer index : chunks) {
-        gameListModel.addElement("Game: " + index);
-        setProgress(Math.min(90, index * 100 / games.size()));
-      }
-    }
-
-    @Override
-    protected void done() {
-      setProgress(100);
-      progressBar.setValue(100);
-      progressBar.setIndeterminate(false);
-    }
-
-    @Override
-    public void notifyProgress(int games) {
-      setProgress(Math.min(90, games));
-      progressBar.setValue(Math.min(90, games));
-    }
-  }
-
-}

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

@@ -3,18 +3,24 @@ 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 gameHasFinished = false;
@@ -63,8 +69,7 @@ public class Clock extends Thread implements Runnable {
 		clock2.setAlignmentX(Component.CENTER_ALIGNMENT);
 //		player1Panel.add(clock1);
 //		player2Panel.add(clock2);
-    // JSplitPane split = new JSplitPane(JSplitPane.VERTICAL_SPLIT, player1Panel,
+//		JSplitPane split = new JSplitPane(JSplitPane.VERTICAL_SPLIT, player1Panel, player2Panel);
-    // player2Panel);
 //		split.setFont(new Font("Arial", Font.BOLD, 50));
 //		clockFrame.add(split);
 

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

@@ -0,0 +1,12 @@
+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

@@ -1,64 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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");
-		
-	}
-
-}