commit 6df4b8380cb1855f463bb691cea2e42c464f2097
parent d873e9760deb55d230880c806ea0196405160d44
Author: Michael Neuper <73108749+michaelneuper@users.noreply.github.com>
Date: Mon, 17 Oct 2022 15:09:12 +0200
add player values to GUI
Diffstat:
4 files changed, 75 insertions(+), 8 deletions(-)
diff --git a/src/controller/Controller.java b/src/controller/Controller.java
@@ -166,6 +166,9 @@ public class Controller {
return "Something went wrong";
}
+ /**
+ * Hits the player with a card
+ */
public void hitPlayer() {
player.hit(deck, discarded);
}
@@ -182,6 +185,14 @@ public class Controller {
/**
*
+ * @return the value of the player's hand
+ */
+ public String displayPlayerHandValue() {
+ return Integer.toString(player.getHand().calculateValue());
+ }
+
+ /**
+ *
* @return dealer hand
*/
public String displayDealerHand() {
@@ -191,11 +202,27 @@ public class Controller {
/**
*
+ * @return value of dealer's hand
+ */
+ public String displayDealerHandValue() {
+ return Integer.toString(dealer.getHand().calculateValue());
+ }
+
+ /**
+ *
* @return dealer's first card
*/
public String displayDealerFirstCard() {
System.out.println("Dealer's hand:\n");
return dealer.printFirstHand();
}
+
+ /**
+ *
+ * @return value of the first card
+ */
+ public String displayDealerFirstCardValue() {
+ return dealer.printFirstCardValue();
+ }
}
diff --git a/src/model/Dealer.java b/src/model/Dealer.java
@@ -17,4 +17,8 @@ public class Dealer extends Person {
public String printFirstHand() {
return "" + super.getHand().getCard(0);
}
+
+ public String printFirstCardValue() {
+ return "" + super.getHand().getCard(0).getValue();
+ }
}
diff --git a/src/view/GUI.form b/src/view/GUI.form
@@ -189,7 +189,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="530" y="290" width="400" height="150"/>
+ <AbsoluteConstraints x="530" y="300" width="400" height="150"/>
</Constraint>
</Constraints>
</Component>
@@ -202,7 +202,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="70" y="250" width="300" height="30"/>
+ <AbsoluteConstraints x="70" y="250" width="270" height="30"/>
</Constraint>
</Constraints>
</Component>
@@ -215,7 +215,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="540" y="250" width="240" height="30"/>
+ <AbsoluteConstraints x="490" y="250" width="210" height="30"/>
</Constraint>
</Constraints>
</Component>
@@ -232,5 +232,29 @@
</Constraint>
</Constraints>
</Component>
+ <Component class="javax.swing.JLabel" name="jLabelDealerHandValue">
+ <Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="36" style="1"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+ <AbsoluteConstraints x="360" y="247" width="80" height="40"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="jLabelPlayerHandValue">
+ <Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Dialog" size="36" style="1"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+ <AbsoluteConstraints x="720" y="250" width="60" height="40"/>
+ </Constraint>
+ </Constraints>
+ </Component>
</SubComponents>
</Form>
diff --git a/src/view/GUI.java b/src/view/GUI.java
@@ -41,6 +41,8 @@ public class GUI extends javax.swing.JFrame {
jLabelDealerHand = new javax.swing.JLabel();
jLabelPlayerHand = new javax.swing.JLabel();
jButtonExit = new javax.swing.JButton();
+ jLabelDealerHandValue = new javax.swing.JLabel();
+ jLabelPlayerHandValue = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
setTitle("librejack");
@@ -119,15 +121,15 @@ public class GUI extends javax.swing.JFrame {
getContentPane().add(jLabelDisplayDealerHand, new org.netbeans.lib.awtextra.AbsoluteConstraints(70, 290, 440, 160));
jLabelDisplayPlayerHand.setText(game.displayPlayerHand());
- getContentPane().add(jLabelDisplayPlayerHand, new org.netbeans.lib.awtextra.AbsoluteConstraints(530, 290, 400, 150));
+ getContentPane().add(jLabelDisplayPlayerHand, new org.netbeans.lib.awtextra.AbsoluteConstraints(530, 300, 400, 150));
jLabelDealerHand.setFont(new java.awt.Font("Dialog", 1, 36)); // NOI18N
jLabelDealerHand.setText("Dealer's Hand:");
- getContentPane().add(jLabelDealerHand, new org.netbeans.lib.awtextra.AbsoluteConstraints(70, 250, 300, 30));
+ getContentPane().add(jLabelDealerHand, new org.netbeans.lib.awtextra.AbsoluteConstraints(70, 250, 270, 30));
jLabelPlayerHand.setFont(new java.awt.Font("Dialog", 1, 36)); // NOI18N
jLabelPlayerHand.setText("Your Hand:");
- getContentPane().add(jLabelPlayerHand, new org.netbeans.lib.awtextra.AbsoluteConstraints(540, 250, 240, 30));
+ getContentPane().add(jLabelPlayerHand, new org.netbeans.lib.awtextra.AbsoluteConstraints(490, 250, 210, 30));
jButtonExit.setText("EXIT");
jButtonExit.addActionListener(new java.awt.event.ActionListener() {
@@ -137,6 +139,12 @@ public class GUI extends javax.swing.JFrame {
});
getContentPane().add(jButtonExit, new org.netbeans.lib.awtextra.AbsoluteConstraints(1132, 713, 120, 50));
+ jLabelDealerHandValue.setFont(new java.awt.Font("Dialog", 1, 36)); // NOI18N
+ getContentPane().add(jLabelDealerHandValue, new org.netbeans.lib.awtextra.AbsoluteConstraints(360, 247, 80, 40));
+
+ jLabelPlayerHandValue.setFont(new java.awt.Font("Dialog", 1, 36)); // NOI18N
+ getContentPane().add(jLabelPlayerHandValue, new org.netbeans.lib.awtextra.AbsoluteConstraints(720, 250, 60, 40));
+
pack();
}// </editor-fold>//GEN-END:initComponents
@@ -145,6 +153,7 @@ public class GUI extends javax.swing.JFrame {
jLabelBalance.setText(Double.toString(game.getBalance())); // update the balance
game.startRound();
jLabelDisplayDealerHand.setText(game.displayDealerFirstCard());
+ jLabelDealerHandValue.setText(game.displayDealerFirstCardValue());
printPlayerHand();
}//GEN-LAST:event_jButtonDealActionPerformed
@@ -180,7 +189,7 @@ public class GUI extends javax.swing.JFrame {
}//GEN-LAST:event_jButtonHitActionPerformed
private void jButtonExitActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonExitActionPerformed
-
+ // TODO: add exit operation
}//GEN-LAST:event_jButtonExitActionPerformed
/**
@@ -220,11 +229,12 @@ public class GUI extends javax.swing.JFrame {
public void printDealerHand() {
jLabelDisplayDealerHand.setText(game.displayDealerHand());
+ jLabelDealerHandValue.setText(game.displayDealerHandValue());
}
public void printPlayerHand() {
jLabelDisplayPlayerHand.setText(game.displayPlayerHand());
-
+ jLabelPlayerHandValue.setText(game.displayPlayerHandValue());
}
// Variables declaration - do not modify//GEN-BEGIN:variables
@@ -237,9 +247,11 @@ public class GUI extends javax.swing.JFrame {
private javax.swing.JLabel jLabelBalance;
private javax.swing.JLabel jLabelCurrentBet;
private javax.swing.JLabel jLabelDealerHand;
+ private javax.swing.JLabel jLabelDealerHandValue;
private javax.swing.JLabel jLabelDisplayDealerHand;
private javax.swing.JLabel jLabelDisplayPlayerHand;
private javax.swing.JLabel jLabelPlayerHand;
+ private javax.swing.JLabel jLabelPlayerHandValue;
private javax.swing.JLabel jLabelResult;
private javax.swing.JPanel jPanel3;
// End of variables declaration//GEN-END:variables
