testklasse

# Conflicts:
#	src/Tetris/Stein.java

.idea/Tetris.iml

@@ -7,14 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/Datenbank/sqlite-jdbc-3.36.0.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" exported="" name="sqlite-jdbc-3.36.0.3" level="project" />
   </component>
 </module>

.idea/aws.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="accountSettings">
+    <option name="activeRegion" value="us-east-1" />
+    <option name="recentlyUsedRegions">
+      <list>
+        <option value="us-east-1" />
+      </list>
+    </option>
+  </component>
+</project>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

.idea/libraries/sqlite_jdbc_3_36_0_3.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="sqlite-jdbc-3.36.0.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/sqlite-jdbc-3.36.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/runConfigurations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

src/Tetris/Board.java

@@ -1,7 +1,6 @@
 package Tetris;
 
-import java.awt.Color;
-import java.awt.Graphics;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -11,153 +10,172 @@ import javax.swing.JPanel;
 import javax.swing.Timer;
 
 //Ewen Kerbs,Zhe Wang-Holkenbrink
-public class Board extends JPanel implements KeyListener
-{
-  private  static int FPS =60;
-  private  static int delay =FPS/1000;
+public class Board extends JPanel implements KeyListener {
+    private static int FPS = 60;
+    private static int delay = FPS / 1000;
 
-  public static final int BOARD_WIDTH=11;
-  public static final int BOARD_HEIGHT=20;
-  public static final int BLOCK_SIZE=30;
+    //Spielfeld Breite und Länge
+    public static final int BOARD_WIDTH = 11;
+    public static final int BOARD_HEIGHT = 20;
+    public static final int BLOCK_SIZE = 30;
 
-  private Timer loop;
-  private Color[][] board = new Color[BOARD_HEIGHT][BOARD_WIDTH];
-  private Stein [] steine=new Stein[7];
-  private Stein currenStein;
-  private Random ran;
+    private Timer loop;
+    private Color[][] board = new Color[BOARD_HEIGHT][BOARD_WIDTH];
+    private Stein[] steine = new Stein[7];
+    private Stein currenStein;
+    private Random ran;
+    private boolean gameOver = false;
 
-private Color[] colors ={Color.decode("#ff00bf"),Color.decode("#0000ff"),Color.decode("#00ff80"),Color.decode("#ff8000"),Color.decode("#ffb3b3"),
-        Color.decode("#8000ff"),Color.decode("#ff0040"),};
+    // Steinfarben
+    private Color[] colors = {Color.decode("#ff00bf"), Color.decode("#0000ff"), Color.decode("#00ff80"), Color.decode("#ff8000"), Color.decode("#ffb3b3"),
+            Color.decode("#8000ff"), Color.decode("#ff0040"),};
 
 
+    // Steinform
+    public Board() {
+        ran = new Random();
+        steine[0] = new Stein(new int[][]{
+                {1, 1, 1},
+                {0, 1, 0},
 
-  public Board() {
-    ran = new Random();
-    steine[0]= new Stein(new int[][]{
-            {1,1,1},
-            {0,1,0}
+        }, this, colors[0]);
+        steine[1] = new Stein(new int[][]{
+                {1, 1},
+                {1, 1}
 
-    }, this,colors[0]);
-    steine[1]= new Stein(new int[][]{
-            {1,1},
-            {1,1}
+        }, this, colors[1]);
+        steine[2] = new Stein(new int[][]{
+                {1, 1, 1},
+                {1, 0, 0}
+        }, this, colors[2]);
+        steine[3] = new Stein(new int[][]{
+                {1, 1, 1},
+                {0, 0, 1}
+        }, this, colors[3]);
+        steine[4] = new Stein(new int[][]{
+                {0, 1, 1},
+                {1, 1, 0}
+        }, this, colors[4]);
+        steine[5] = new Stein(new int[][]{
+                {1, 1, 0},
+                {0, 1, 1}
+        }, this, colors[5]);
+        steine[6] = new Stein(new int[][]{
+                {1, 1, 1, 1}
+        }, this, colors[6]);
 
-    }, this,colors[1]);
-    steine[2]= new Stein(new int[][]{
-            {1,1,1},
-            {1,0,0}
-    }, this,colors[2]);
-    steine[3]= new Stein(new int[][]{
-            {1,1,1},
-            {0,0,1}
-    }, this,colors[3]);
-    steine[4]= new Stein(new int[][]{
-            {0,1,1},
-            {1,1,0}
-    }, this,colors[4]);
-    steine[5]= new Stein(new int[][]{
-            {1,1,0},
-            {0,1,1}
-    }, this,colors[5]);
-    steine[6]= new Stein(new int[][]{
-            {1,1,1,1}
-    }, this,colors[6]);
+        currenStein = steine[0];
 
-    currenStein= steine[0];
+        loop = new Timer(delay, new ActionListener() {
+            int n = 0;
 
-    loop = new Timer(delay, new ActionListener() {
-      int n = 0;
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                update();
+                repaint();
+                //System.out.println(n++);
+            }
+        });
+        loop.start();
+    }
 
-      @Override
-      public void actionPerformed(ActionEvent e) {
-        update();
-
-        repaint();
-        //System.out.println(n++);
-      }
-    });
-    loop.start();
-  }
-
-  private void update(){
-    currenStein.update();
-  }
-
-
-  public void setCurrenStein() {
-    currenStein = steine[ran.nextInt(steine.length)];
-    currenStein.reset();
-  }
-
-  public Stein getCurrenStein() {
-    return currenStein;
-  }
-
-  public Color[][] getBoard(){
-    return board;
-  }
-
-  @Override
-  protected void paintComponent(Graphics g) {
-    super.paintComponent(g);
-    g.fillRect(0, 0, getWidth(), getHeight());
-    g.setColor(Color.lightGray);
-
-    currenStein.render(g);
-
-    for(int row=0;row< board.length;row++){
-      for(int col = 0;col< board[row].length;col++){
-        if(board[row][col] !=null){
-          g.setColor(board[row][col]);
-          //
-          g.fillRect(col*BLOCK_SIZE,row*BLOCK_SIZE,BLOCK_SIZE,BLOCK_SIZE);
+    private void update() {
+        if (spielbeenden()) {
+            loop.stop();
+            return;
         }
-      }
+        currenStein.update();
     }
 
-    //shape mit 2-Forschleife
-
-
-    for (int row = 0; row < BOARD_HEIGHT+1; row++) {
-      g.drawLine(0, BLOCK_SIZE * row, BLOCK_SIZE * BOARD_WIDTH, BLOCK_SIZE * row);
-    }
-    for (int col = 0; col < BOARD_WIDTH+1; col++) {
-      g.drawLine(col * BLOCK_SIZE, 0, col * BLOCK_SIZE, BLOCK_SIZE * BOARD_HEIGHT);
+    private boolean spielbeenden() {
+        if (!gameOver) {
+            for (int i = 0; i < currenStein.getCoords().length; i++) {
+                for (int j = 0; j < currenStein.getCoords()[0].length; j++) {
+                    if (currenStein.getCoords()[i][j] != 0) {
+                        if (board[currenStein.getY() + i][currenStein.getX() + j] != null) {
+                            gameOver = true;
+                        }
+                    }
+                }
+            }
+        }
+        return false;
     }
 
-  }
 
-  @Override
-  public void keyTyped(KeyEvent e) {
-//    switch(e.getKeyChar()) {
-//      case KeyEvent.VK_SPACE:
-//        currenStein.speedup();
-//        break;
-//      case KeyEvent.VK_A:
-//        currenStein.moveLeft();
-//        break;
-//      case KeyEvent.VK_D:
-//        currenStein.moveRight();
-//        break;
-//    }
-  }
-
-  @Override
-  public void keyPressed(KeyEvent e) {
-    if(e.getKeyChar() == KeyEvent.VK_SPACE){
-      currenStein.speedup();
-    }else if(e.getKeyChar() == KeyEvent.VK_ENTER){
-      currenStein.moveRight();
-    }
-    else if(e.getKeyChar() == KeyEvent.VK_ESCAPE){
-      currenStein.moveLeft();
-      }
+    public void setCurrenStein() {
+        currenStein = steine[ran.nextInt(steine.length)];
+        currenStein.reset();
     }
 
-  @Override
-  public void keyReleased(KeyEvent e) {
-    if(e.getKeyChar() == KeyEvent.VK_SPACE){
-      currenStein.speedDown();
+    public Stein getCurrenStein() {
+        return currenStein;
+    }
+
+    public Color[][] getBoard() {
+        return board;
+    }
+
+    @Override
+    protected void paintComponent(Graphics g) {
+        super.paintComponent(g);
+        g.fillRect(0, 0, getWidth(), getHeight());
+        g.setColor(Color.lightGray);
+
+        currenStein.render(g);
+
+        for (int row = 0; row < board.length; row++) {
+            for (int col = 0; col < board[row].length; col++) {
+                if (board[row][col] != null) {
+                    g.setColor(board[row][col]);
+                    //
+                    g.fillRect(col * BLOCK_SIZE, row * BLOCK_SIZE, BLOCK_SIZE, BLOCK_SIZE);
+                }
+            }
+        }
+
+        //linien mit 2-Forschleife
+
+
+        for (int row = 0; row < BOARD_HEIGHT + 1; row++) {
+            g.drawLine(0, BLOCK_SIZE * row, BLOCK_SIZE * BOARD_WIDTH, BLOCK_SIZE * row);
+        }
+        for (int col = 0; col < BOARD_WIDTH + 1; col++) {
+            g.drawLine(col * BLOCK_SIZE, 0, col * BLOCK_SIZE, BLOCK_SIZE * BOARD_HEIGHT);}
+        if (gameOver) {
+            String gameOverString = "GAME OVER";
+            g.setColor(Color.GREEN);
+            g.setFont(new Font("SANS_SERIF", Font.BOLD, 30));
+            g.drawString(gameOverString, 50, GameGui.height / 2);
+        }
+    }
+
+
+    @Override
+    public void keyTyped(KeyEvent e) {
+
+    }
+
+    //Tastatur eingabe zur steinbewegung
+    //wang/kerbs
+    @Override
+    public void keyPressed(KeyEvent e) {
+        if (e.getKeyCode() == KeyEvent.VK_SPACE) {
+            currenStein.speedup();
+        } else if (e.getKeyCode() == KeyEvent.VK_D) {
+            currenStein.moveRight();
+        } else if (e.getKeyCode() == KeyEvent.VK_A) {
+            currenStein.moveLeft();
+        } else if (e.getKeyCode() == KeyEvent.VK_W) {
+            currenStein.steinRotiert();
+        }
+
+    }
+
+    @Override
+    public void keyReleased(KeyEvent e) {
+        if (e.getKeyCode() == KeyEvent.VK_SPACE) {
+            currenStein.speedDown();
+        }
     }
-  }
 }

src/Tetris/Game.java

@@ -1,102 +1,42 @@
 package Tetris;
 
-import java.sql.*;
 import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.List;
 
 public class Game {
-
     public static void main(String[] args) {
-        Connection connection = null;
-        try
-        {
-            connection = DriverManager.getConnection("jdbc:sqlite:userhighscore.db");
-            Statement statement = connection.createStatement();
-            statement.setQueryTimeout(30);
 
-            Menue menue = new Menue();
-            menue.getButton().addActionListener(new java.awt.event.ActionListener() {
-                @Override
-                public void actionPerformed(java.awt.event.ActionEvent evt) {
-                    String name = JOptionPane.showInputDialog(menue.getParent(),
-                            "What is your name?", null);
-                    if(name == null){
-                        name = "anon";
-                    }
-                    menue.getParent().setVisible(false);
-                    new GameGui(name);
-                }
-            });
-            String playername = menue.getName();
-            ResultSet resultSet = statement.executeQuery("select * from userscore where name = "+ playername);
-            if(!resultSet.next())
-            {
-                // Playername gibt es noch nicht in der Datenbank also anlegen.
-                // Es fehlt noch der score.
-                statement.executeUpdate("insert into userscore values(1," + playername + ", 123)");
+        // Datenbankverbindung herstellen
+        PlayerDBController playerDBController = PlayerDBController.getInstance();
+        playerDBController.initDBConnection();
+        List<Player> playerListe = playerDBController.holeSpielerDaten();
+        JFrame tetrisMenueJframe = new TetrisMenue("Tetris");
+        tetrisMenueJframe.setVisible(true);
+        TetrisMenue tetrisMenue = (TetrisMenue) tetrisMenueJframe;
+        tetrisMenue.getSpielStartenButton().addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                String spielerName = tetrisMenue.getSpielerNameTextField().getText();
+                new GameGui(spielerName);
+                PlayerDBController.getInstance().speichereSpieler(new Player(spielerName,0));
+                tetrisMenueJframe.setVisible(false);
             }
-        }
-        catch(SQLException e)
-        {
-            // if the error message is "out of memory",
-            // it probably means no database file is found
-            System.err.println(e.getMessage());
-        }
-        finally
-        {
-            try
-            {
-                if(connection != null)
-                    connection.close();
-            }
-            catch(SQLException e)
-            {
-                // connection close failed.
-                System.err.println(e.getMessage());
-            }
-        }
+        });
+//        Menue menue = new Menue();
+//        final Player[] aktuellerSpieler = new Player[1];
+//        menue.getButton().addActionListener(new java.awt.event.ActionListener() {
+//            @Override
+//            public void actionPerformed(java.awt.event.ActionEvent evt) {
+//                aktuellerSpieler[0] = new Player(menue.getTextField().getText(), 0);
+//                menue.getParent().setVisible(false);
+//                //new GameGui(name);
+//                playerDBController.speichereSpieler(aktuellerSpieler[0]);
+//            }
+//        });
+
+        //String playername = menue.getName();
+        //new GameGui(playername);
     }
-
-    private static void CreateSqlLiteDatabaseConnection(){
-//        try
-//        {
-//            Connection connection = null;
-//            // create a database connection
-//             connection = DriverManager.getConnection("jdbc:sqlite:userhighscore.db");
-//            Statement statement = connection.createStatement();
-//            statement.setQueryTimeout(30);  // set timeout to 30 sec.
-
-//            statement.executeUpdate("drop table if exists userscore");
-//            statement.executeUpdate("create table userscore (id integer, name string, score integer)");
-//            statement.executeUpdate("insert into userscore values(1, 'leo', 123)");
-//            statement.executeUpdate("insert into userscore values(2, 'yui', 456)");
-//            ResultSet rs = statement.executeQuery("select * from userscore");
-//            while(rs.next())
-//            {
-//                // read the result set
-//
-//                System.out.println("name = " + rs.getString("name"));
-//                System.out.println("score = " + rs.getInt("score"));
-//                System.out.println("id = " + rs.getInt("id"));
-//            }
-//        }
-//        catch(SQLException e)
-//        {
-//            // if the error message is "out of memory",
-//            // it probably means no database file is found
-//            System.err.println(e.getMessage());
-//        }
-//        finally
-//        {
-//            try
-//            {
-//                if(connection != null)
-//                    connection.close();
-//            }
-//            catch(SQLException e)
-//            {
-//                // connection close failed.
-//                System.err.println(e.getMessage());
-//            }
-//        }
-    }
-}
+}

src/Tetris/GameGui.java

@@ -1,6 +1,7 @@
 package Tetris;
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.ActionListener;
 
 public class GameGui {
     public static final int width= 550, height =650;
@@ -14,18 +15,19 @@ public class GameGui {
         panel.setBorder(BorderFactory.createMatteBorder(500, 10, 10, 50,Color.black));
 
         //Button
-        //JButton button1 = new JButton("Start");
-        //button1.setPreferredSize( new Dimension(150,50));
-        JButton buttonPause = new JButton("Pause");
-        buttonPause.setPreferredSize( new Dimension(100,30));
-        JButton buttonScore = new JButton("Score");
-        buttonScore.setPreferredSize( new Dimension(100,30));
+        JButton buttonStop = new JButton("Pause");
+        buttonStop.setPreferredSize( new Dimension(100,30));
+        JButton buttonVerlassen = new JButton("verlassen");
+        buttonVerlassen.setPreferredSize( new Dimension(100,30));
+
+
 
         //Button untereinander
         panel.setLayout(new GridLayout(0,1));
         panel.setBackground(Color.YELLOW);
-        panel.add(buttonPause);
-        panel.add(buttonScore);
+        panel.add(buttonStop);
+        panel.add(buttonVerlassen);
+
 
         frame.add(panel,BorderLayout.EAST);
         frame.setSize(width,height);
@@ -36,6 +38,15 @@ public class GameGui {
         frame.addKeyListener(board);
         frame.add(board,BorderLayout.CENTER);
         frame.requestFocusInWindow();
+
+        // Wenn man Button "Verlassen" drückt,schlißt das Spielfenster.
+        ActionListener al = ev -> {if(ev.getSource() == buttonVerlassen)
+        {
+            System.exit(0);
+        }
+        };
+
+        buttonVerlassen.addActionListener(al);
     }
 
 }

src/Tetris/Player.java

@@ -0,0 +1,36 @@
+package Tetris;
+
+public class Player implements Comparable<Player> {
+    private String name;
+    private int score;
+
+    public Player(String name, int score) {
+        this.name = name;
+        this.score = score;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getScore() {
+        return score;
+    }
+
+    public void setScore(int score) {
+        this.score = score;
+    }
+
+    @Override
+    public int compareTo(Player andere) {
+        return andere.score-score;
+    }
+    @Override
+    public String toString(){
+        return name +": "+ score;
+    }
+}

src/Tetris/PlayerDBController.java

@@ -0,0 +1,171 @@
+package Tetris;
+
+
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+// Beispiel aus https://javabeginners.de/Datenbanken/SQLite-Datenbank.php , sieh unten
+class PlayerDBController {
+
+        private static final PlayerDBController dbcontroller = new PlayerDBController();
+        private static Connection connection;
+        private static final String DB_PATH = "userhighscore.db";
+
+        static {
+            try {
+                Class.forName("org.sqlite.JDBC");
+            } catch (ClassNotFoundException e) {
+                System.err.println("Fehler beim Laden des JDBC-Treibers");
+                e.printStackTrace();
+            }
+        }
+
+        private PlayerDBController(){
+        }
+
+        public static PlayerDBController getInstance(){
+            return dbcontroller;
+        }
+
+        //Datenbankverbindung herstellen
+
+        public void initDBConnection() {
+            try {
+                if (connection != null)
+                    return;
+                System.out.println("Creating Connection to Database...");
+                connection = DriverManager.getConnection("jdbc:sqlite:" + DB_PATH);
+                if (!connection.isClosed())
+                    System.out.println("...Connection established");
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+
+            Runtime.getRuntime().addShutdownHook(new Thread() {
+                public void run() {
+                    try {
+                        if (!connection.isClosed() && connection != null) {
+                            connection.close();
+                            if (connection.isClosed())
+                                System.out.println("Connection to Database closed");
+                        }
+                    } catch (SQLException e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        }
+
+        // Es wird eingegebenen Spielername,Score mit 0 in der Datenbank mit insert gespeichert.
+        public void speichereSpieler(Player player) {
+            try {
+                Statement statement = connection.createStatement();
+                statement.setQueryTimeout(30);
+                // Spielername gibt es noch garnicht
+                ResultSet resultSet = statement.executeQuery("select * from userscore where name='"+player.getName()+"'");
+                if(!resultSet.next()){
+                    statement.executeUpdate("insert into userscore values('"+player.getName()+"',"+player.getScore()+")");
+                }
+                else{
+                    // Spielername gibt es schon, update player.score wenn größer als score im Datenbank.
+                    String query = "UPDATE userscore SET score='"+ player.getScore() +"' WHERE name='"+player.getName()+"'";
+                    statement.executeUpdate(query);
+                }
+            } catch (SQLException e) {
+                System.err.println("Couldn't handle DB-Query");
+                e.printStackTrace();
+            }
+
+        }
+
+        // SpielerDaten aus Datenbank holen, dann in einer Arraylist speicher und zurückgeben.
+    public List<Player> holeSpielerDaten() {
+        List<Player> playerList = new ArrayList<Player>();
+        try {
+            Statement statement = connection.createStatement();
+            statement.setQueryTimeout(30);
+//          statement.executeUpdate("create table userscore (name string, score integer)");
+//          statement.executeUpdate("insert into userscore values('leo', 123)");
+//          statement.executeUpdate("insert into userscore values('yui', 456)");
+            System.out.println("vorRS");
+
+            ResultSet resultSet = statement.executeQuery("SELECT * FROM userscore;");
+            System.out.println("nachRS");
+            while(resultSet.next())
+            {
+                playerList.add(new Player(resultSet.getString("name"), resultSet.getInt("score")));
+
+                // Playername gibt es noch nicht in der Datenbank also anlegen.
+                // Es fehlt noch der score.
+                //statement.executeUpdate("insert into userscore values(1," + playername + ", 123)");
+            }
+            resultSet.close();
+
+        } catch (SQLException e) {
+            System.err.println("Couldn't handle DB-Query");
+            e.printStackTrace();
+        }
+        return playerList;
+
+    }
+
+        private void handleDB() {
+            try {
+                Statement stmt = connection.createStatement();
+                stmt.executeUpdate("DROP TABLE IF EXISTS books;");
+                stmt.executeUpdate("CREATE TABLE books (author, title, publication, pages, price);");
+                stmt.execute("INSERT INTO books (author, title, publication, pages, price) VALUES ('Paulchen Paule', 'Paul der Penner', '2001-05-06', '1234', '5.67')");
+
+                PreparedStatement ps = connection
+                        .prepareStatement("INSERT INTO books VALUES (?, ?, ?, ?, ?);");
+
+                ps.setString(1, "Willi Winzig");
+                ps.setString(2, "Willi's Wille");
+                ps.setDate(3, Date.valueOf("2011-05-16"));
+                ps.setInt(4, 432);
+                ps.setDouble(5, 32.95);
+                ps.addBatch();
+
+                ps.setString(1, "Anton Antonius");
+                ps.setString(2, "Anton's Alarm");
+                ps.setDate(3, Date.valueOf("2009-10-01"));
+                ps.setInt(4, 123);
+                ps.setDouble(5, 98.76);
+                ps.addBatch();
+
+                connection.setAutoCommit(false);
+                ps.executeBatch();
+                connection.setAutoCommit(true);
+
+                ResultSet rs = stmt.executeQuery("SELECT * FROM books;");
+                while (rs.next()) {
+                    System.out.println("Autor = " + rs.getString("author"));
+                    System.out.println("Titel = " + rs.getString("title"));
+                    System.out.println("Erscheinungsdatum = "
+                            + rs.getDate("publication"));
+                    System.out.println("Seiten = " + rs.getInt("pages"));
+                    System.out.println("Preis = " + rs.getDouble("price"));
+                }
+                rs.close();
+                connection.close();
+            } catch (SQLException e) {
+                System.err.println("Couldn't handle DB-Query");
+                e.printStackTrace();
+            }
+        }
+
+//        public static void main(String[] args) {
+//            PlayerDBController dbc = PlayerDBController.getInstance();
+//            dbc.initDBConnection();
+//            dbc.handleDB();
+//        }
+    }
+

src/Tetris/Stein.java

@@ -1,16 +1,23 @@
 package Tetris;
 
 import java.awt.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.Scanner;
 
 public class Stein {
-    private int x = 4, y = 0;
+
+
+    //SteineTyp Block;
+   private int x = 4, y = 0;
     private int normal = 850;
     private int fast = 50;
-    private int rotation;
+   // private int rotation;
     private long beginTime;
     private int delayTime = normal;
     private int deltax = 0;
     private boolean collision = false;
+   // private int size;
 
     public static final int BOARD_WIDTH = 11;
     public static final int BOARD_HEIGHT = 20;
@@ -20,20 +27,12 @@ public class Stein {
     private Board board;
     private Color color;
 
-    public Stein(int[][] coords, Board board, Color color) {
+    public Stein(int[][] coords,Board board,Color color) {
         this.coords = coords;
         this.board = board;
         this.color = color;
     }
 
-    public void rotate()
-    {
-        rotation++;
-        if(rotation==4)
-        {
-            rotation=0;
-        }
-    }
 
     public void setX(int x) {
         this.x = x;
@@ -47,7 +46,6 @@ public class Stein {
         this.x = 2;
         this.y = 0;
         collision = false;
-
     }
 
     //Kollisons abfrage
@@ -60,6 +58,7 @@ public class Stein {
                     }
                 }
             }
+            linieLöschen();
             board.setCurrenStein();
             return;
         }
@@ -82,7 +81,7 @@ public class Stein {
         }
 
         deltax = 0;
-
+// stapeln
         if (System.currentTimeMillis() - beginTime > delayTime) {
             if (!(y + 1+coords.length > BOARD_HEIGHT)) {
                 for (int row = 0; row < coords.length; row++) {
@@ -95,18 +94,35 @@ public class Stein {
                     }
                 }
             }
-            if (!collision) {
+                if (!collision) {
                 y++;
+                }
+            }
+            else {
+                collision = true;
             }
-
-        } else {
-            collision = true;
-        }
 
         beginTime = System.currentTimeMillis();
     }
 
 }
+
+public void linieLöschen(){
+        int bollomLine = board.getBoard().length - 1;
+        for(int topLine =  board.getBoard().length - 1; topLine > 0; topLine--){
+             int anZahl = 0;
+             for(int col = 0; col < board.getBoard()[0].length; col++){
+                 if(board.getBoard()[topLine][col] != null) {
+                     anZahl++;
+                 }
+                 board.getBoard()[bollomLine][col] = board.getBoard()[topLine][col];
+             }
+             if(anZahl < board.getBoard()[0].length){
+                 bollomLine--;
+             }
+        }
+}
+
 public void render(Graphics g){
     for(int row=0;row< coords.length;row++){
         for(int col = 0;col< coords[0].length;col++){
@@ -118,8 +134,64 @@ public void render(Graphics g){
         }
     }
 }
+/*Kerbs Ewen
+Hier wird der stein rotiert dazu wurden die hilfs methoden : datenarrayflippen, steineflippen implementiert
+diese helfen das komplexe steinrotiert verständlich zu machen.
+Beim datenarrayflippen wird einmal das neue array ausgerechnet wie es auszusehen hat.
+Da aber die bei dieser formatierung das array falsch herum aufgebaut wird benötigt man die hilfsmethode steineflippen
+Diese dreht dreht das array um sodas der stein richtig gezeigt werden kann
 
-public void speedup(){
+* */
+public void steinRotiert()
+{
+    int[][] rotierterstein = null;
+    rotierterstein = datenarrayflippen(coords);
+    rotierterstein = steineflippen(rotierterstein);
+    //grenzen ueberprufeung damit wird gewährleistet das der stein nicht aus dem array/koordiantensystem/spielbrett raus geht
+    if ((x + rotierterstein[0].length > 10) || (y + rotierterstein.length > 20)) {
+        return;
+    }
+    //ueberpruefung ob bereits ein stein im weg ist sollte dies sein kann der stein sich nicht drehen
+    for (int i = 0; i < rotierterstein.length; i++) {
+        for (int j = 0; j < rotierterstein[i].length; j++) {
+            if(rotierterstein[i][j] !=0)
+            {
+                if (board.getBoard()[y+i][x+j] !=null)
+                {
+                    return;
+                }
+            }
+        }
+
+    }
+    coords = rotierterstein;
+}
+
+    private int[][] datenarrayflippen(int[][] altesArray)
+    {
+        int[][] updatedArray = new int[altesArray[0].length][altesArray.length];
+        for (int i = 0; i < altesArray.length; i++) {
+            for (int j = 0; j < altesArray[0].length; j++) {
+                updatedArray[j][i] = altesArray[i][j];
+            }
+        }
+        return updatedArray;
+    }
+
+    private int[][] steineflippen(int[][] rotierenedesArray)
+    {
+        int mittelpunkt = rotierenedesArray.length / 2;
+        for (int i = 0; i < mittelpunkt; i++) {
+            int[] rotiertesArray = rotierenedesArray[i];
+            rotierenedesArray[i] = rotierenedesArray[rotierenedesArray.length - i - 1];
+            rotierenedesArray[rotierenedesArray.length - i - 1] = rotiertesArray;
+        }
+        return rotierenedesArray;
+    }
+
+
+
+    public void speedup(){
     delayTime=fast;
 }
 public void speedDown(){
@@ -131,4 +203,14 @@ public void moveRight(){
     public void moveLeft(){
         deltax = -1;
     }
+    public int[][] getCoords() {
+        return coords;
+    }
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
 }

src/Tetris/SteineTyp.java

@@ -1,11 +0,0 @@
-package Tetris;
-
-import java.util.concurrent.ThreadLocalRandom;
-
-public enum SteineTyp {
-    I,O,T,L,J,Z,S;
-    public static SteineTyp randomSteine()
-    {
-        return values()[ThreadLocalRandom.current().nextInt(0,values().length)];
-    }
-}

src/Tetris/Test.java

@@ -0,0 +1,8 @@
+package Tetris;
+
+public class Test {
+  //test klasse falls probleme mit der datenbank vorhanden sind
+  public static void main(String[] args) {
+      GameGui test = new GameGui("test");
+  }
+}

src/Tetris/TetrisMenue.form

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Tetris.TetrisMenue">
+  <grid id="27dc6" binding="tetrisMenuePanel" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="20" left="20" bottom="40" right="40"/>
+    <constraints>
+      <xy x="20" y="20" width="576" height="536"/>
+    </constraints>
+    <properties>
+      <foreground color="-1"/>
+    </properties>
+    <border type="none"/>
+    <children>
+      <component id="dca30" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="10" fill="0" indent="0" use-parent-layout="false">
+            <preferred-size width="30" height="30"/>
+          </grid>
+        </constraints>
+        <properties>
+          <horizontalAlignment value="0"/>
+          <text value="Highscores:"/>
+          <verticalAlignment value="3"/>
+          <verticalTextPosition value="3"/>
+        </properties>
+      </component>
+      <scrollpane id="b4fda">
+        <constraints>
+          <grid row="1" column="2" row-span="2" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <preferred-size width="256" height="287"/>
+          </grid>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="c58cf" class="javax.swing.JList" binding="list1" custom-create="true" default-binding="true">
+            <constraints/>
+            <properties/>
+          </component>
+        </children>
+      </scrollpane>
+      <component id="96af" class="javax.swing.JTextField" binding="spielerNameTextField">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="0" indent="0" use-parent-layout="false">
+            <preferred-size width="200" height="30"/>
+          </grid>
+        </constraints>
+        <properties>
+          <horizontalAlignment value="2"/>
+          <text value=""/>
+        </properties>
+      </component>
+      <component id="84141" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false">
+            <preferred-size width="30" height="20"/>
+          </grid>
+        </constraints>
+        <properties>
+          <text value="Spielername:"/>
+          <verticalAlignment value="0"/>
+          <verticalTextPosition value="0"/>
+        </properties>
+      </component>
+      <component id="84295" class="javax.swing.JButton" binding="spielStartenButton" default-binding="true">
+        <constraints>
+          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false">
+            <preferred-size width="80" height="30"/>
+          </grid>
+        </constraints>
+        <properties>
+          <text value="Spiel starten"/>
+        </properties>
+      </component>
+      <component id="3d5e3" class="javax.swing.JLabel" binding="tetrisBildLabel" custom-create="true">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <horizontalAlignment value="2"/>
+          <text value=""/>
+        </properties>
+      </component>
+    </children>
+  </grid>
+</form>

src/Tetris/TetrisMenue.java

@@ -0,0 +1,58 @@
+package Tetris;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class TetrisMenue extends JFrame {
+    private JTextField spielerNameTextField;
+    private JButton spielStartenButton;
+    private JPanel tetrisMenuePanel;
+    private JLabel tetrisBildLabel;
+    private JList list1;
+
+    public TetrisMenue(String title)  {
+        super(title);
+
+
+
+        this.setPreferredSize(new Dimension(640,480));
+        this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        this.setContentPane(tetrisMenuePanel);
+        this.pack();
+
+
+    }
+
+    private void createUIComponents() {
+        // Bild zu JPanel hinzufügen (https://stackoverflow.com/questions/299495/how-to-add-an-image-to-a-jpanel)
+        try{
+            BufferedImage myPicture = ImageIO.read(new File("tetris.png"));
+            tetrisBildLabel  = new JLabel(new ImageIcon(myPicture.getScaledInstance(300,125,Image.SCALE_SMOOTH)));
+            //add(tetrisBildLabel);
+        }
+        catch (IOException exception)
+        {
+            System.out.println("Fehler bei laden vom Tetris Bild: " + exception.getMessage());
+        }
+        java.util.List<Player> playerList = PlayerDBController.getInstance().holeSpielerDaten();
+        Player[] players = playerList.toArray(new Player[0]);
+        Arrays.sort(players);
+        list1 = new JList(players);
+    }
+
+    public JButton getSpielStartenButton() {
+        return spielStartenButton;
+    }
+
+    public JTextField getSpielerNameTextField() {
+        return spielerNameTextField;
+    }
+}