Add files via upload

.gitignore

@@ -0,0 +1,23 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*

Application.java

@@ -1,16 +1,22 @@
 import java.awt.EventQueue;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
-
 import java.awt.CardLayout;
+
 /**
- * Creates JFrame and adds the Game
+ * Creates JFrame and adds Menu & Game
+ * 
+ * @author Lucas
  */
 public class Application extends JFrame
 {
     JPanel cards;
     JPanel cardMenu;
     JPanel cardGame;
+
+    /**
+     * Creates the Menu and Game card and sets attributes
+     */
     public Application()
     {
         cardMenu = new Menu(this);
@@ -29,23 +35,14 @@ public Application()
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         setLocationRelativeTo(null);
     }
+
+    /**
+     * Changes the Menu card to the Game card
+     */
     public void changeCard() {
         CardLayout cl = (CardLayout)(cards.getLayout());
         cl.show(cards, "GAME");
         pack();
         setLocationRelativeTo(null);
     }
-    public static void main(String[] args)
-    {
-        EventQueue.invokeLater(new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                Application app = new Application();
-                app.setVisible(true);
-            }
-        }
-        );
-    }
 }

Automation.java

@@ -2,9 +2,14 @@
 import java.awt.event.*;
 import javax.swing.*;
 
+/**
+ * Automation is a support class to refresh the panel Game automatically
+ * 
+ * @author Lucas
+ */
 public class Automation extends JPanel implements ActionListener
 {
-    Game game;
+    private Game game;
     public Automation(Game game)
     {
         this.game = game;
@@ -13,6 +18,7 @@ public Automation(Game game)
 
     public void actionPerformed(ActionEvent e)
     {
-        game.gameloop(-1);
+        game.gamelogic();
+        game.redrawUI();
     }
 }

Card.java

@@ -7,25 +7,31 @@
 import javax.swing.JLabel;
 
 /**
- * Write a description of class Card here.
- *
- * @author Lucas & Filip
- * @version 18.09.
+ * Implements a playing card with suit and rank
+ * rank and suite are handled iternaly as integers
+ * 
+ * @author Lucas
  */
 public class Card 
 {
     private int suite; 
     private int rank;
     private ImageIcon icon;
-    private boolean flag_lower = false;
+    private boolean flagLower = false;
 
+    /**
+     * Sets suite, rank and icon
+     */
     public Card(int pSuite, int pRank)
     {
         suite = pSuite;
         rank = pRank;
         icon = new ImageIcon(new ImageIcon("src/resources/Playing_card_" + getSuite() + "_" + getRank() + ".png").getImage().getScaledInstance(120, 180, Image.SCALE_SMOOTH));
     }
 
+    /**
+     * Returns suite
+     */
     public String getSuite()
     {
         switch(suite) {
@@ -41,6 +47,9 @@ public String getSuite()
         return "";
     }
 
+    /**
+     * Returns rank
+     */
     public String getRank()
     {
         switch(rank) {
@@ -74,26 +83,35 @@ public String getRank()
         return "";
     }
 
+    /**
+     * Returns rank as integer
+     */
     public int getNumber()
     {
         if (rank > 10)
         {
             return 10;
         }
-        if (rank == 1 && !flag_lower)
+        if (rank == 1 && !flagLower)
         {
             return 11;
         }
         return rank;
     }
 
+    /**
+     * Returns icon
+     */
     public ImageIcon getIcon()
     {
         return icon;
     }
 
+    /**
+     * Sets Ace from 11 to 1
+     */
     public void setLower()
     {
-        flag_lower = true;
+        flagLower = true;
     }
 }

ClassDiagram.xml

@@ -0,0 +1 @@
+<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:60.0) Gecko/20100101 Firefox/60.0" version="9.1.8" editor="www.draw.io" type="github"><diagram id="3775ebc4-31d6-02d6-7405-95e2f1046fd9" name="Page-1">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</diagram></mxfile>

ClassDiagramNoGUI.xml

@@ -0,0 +1 @@
+<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:60.0) Gecko/20100101 Firefox/60.0" version="9.1.8" editor="www.draw.io" type="github"><diagram id="3775ebc4-31d6-02d6-7405-95e2f1046fd9" name="Page-1">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</diagram></mxfile>

Dealer.java

@@ -1,35 +1,38 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
- * Write a description of class Dealer here.
- *
- * @author (your name)
- * @version (a version number or a date)
+ * Dealer extends from Player and also creates the playing card deck
+ * 
+ * @author Lucas
  */
-public class Dealer
+public class Dealer extends Player
 {
-    private Card[] hand = new Card[10];
-    private int handCards = 0;
-
-    private boolean finished = false;
-    private boolean busted = false;
-
     private Card[] cards = new Card[208];
-    private int cardsNumber = 208;
+    private int cardsNumber;
 
+    /**
+     * Sets chips and bet to -1 because the dealer has endless chips and won´t place a bet
+     */
     public Dealer()
     {
+        super(null);
 
+        chips = -1;
+        bet = -1;
+        dealer = this;
     }
 
+    /**
+     * Dealer draws on 16 stands on all 17 
+     */
     public void turn()
     {
         int handValue = getHandValue();
 
         if (handValue < 17)
         {
             hit();
-            if (handValue < 17)
+            if (handValue > 17)
             {
                 stand();
             }
@@ -40,59 +43,48 @@ public void turn()
         }
     }
 
-    public void deal()
+    /**
+     * Dealer draws only one card
+     */
+    public int deal()
     {
         hit();
-        hit();
+        return 0;
     }
 
-    public void hit()
-    {
-        hand[handCards] = getCard();
-        handCards++;
-
-        if (getHandValue() > 21)
-        {
-            for (int i = 0; i < handCards; i++)
-            {
-                if (hand[i].getNumber() == 11)
-                {
-                    hand[i].setLower();
-                    if (getHandValue() < 21)
-                    {
-                        break;
-                    }
-                }
-            }
-        }
-        if (getHandValue() >= 21)
-        {
-            if (getHandValue() > 21)
-            {
-                busted = true;
-            }
-            stand();
-        }
-    }
-
-    public void stand()
+    /**
+     * Overwritten to set bet to -1, so the dealer doesn´t have to place a bet
+     */
+    @Override
+    public void flushHand()
     {
-        finished = true;
+        super.flushHand();
+        bet = -1;
     }
 
+    /**
+     * Returns a card from the stack
+     */
     public Card getCard()
     {
+        if (cardsNumber == 0)
+        {
+            createCards();
+        }
         cardsNumber--;
         return cards[cardsNumber];
     }
 
+    /**
+     * Creates 4 decks á 52 cards
+     */
     public void createCards()
     {
         // Blackjack is played with 4 Decks
         for (int i = 0; i < 4; i++) {
             // Create the 4 Suites
             for (int j = 0; j < 4; j++) {
-                // Create The 13 Ranks
+                // Create the 13 Ranks
                 for (int k = 0; k < 13; k++) {
                     cards[i*52 + j*13 + k*1] = new Card(j+1, k+1);
                 }
@@ -106,43 +98,7 @@ public void createCards()
             cards[i] = cards[rndm];
             cards[rndm] = tmp;
         }
-    }
-
-    public void flushHand()
-    {
-        hand = new Card[10];
-        handCards = 0;
-        finished = false;
-        busted = false;
-    }
-
-    public Card[] getHand()
-    {
-        return hand;
-    }
-
-    public int getHandValue()
-    {
-        int value = 0;
-        for (int i = 0; i < handCards; i++)
-        {
-            value += hand[i].getNumber();
-        }
-        return value;
-    }
-
-    public int getFirstCardValue()
-    {
-        return hand[0].getNumber();
-    }
-
-    public boolean getFinished()
-    {
-        return finished;
-    }
-
-    public boolean getBusted()
-    {
-        return busted;
+
+        cardsNumber = 208;
     }
 }