commit 6774c1e1cf80073380356c684533c951a7967799
parent f74340a3b387515103ab445c4ea891800bc05c15
Author: Michael Neuper <73108749+michaelneuper@users.noreply.github.com>
Date: Mon, 10 Oct 2022 18:42:55 +0200
update GUI.java
Diffstat:
| M | src/view/GUI.form | | | 78 | +++++++++++++++++++++++++++++++++++++++++++++++++----------------------------- |
| M | src/view/GUI.java | | | 62 | +++++++++++++++++++++++++++++++++++++++++++++----------------- |
2 files changed, 94 insertions(+), 46 deletions(-)
diff --git a/src/view/GUI.form b/src/view/GUI.form
@@ -49,7 +49,7 @@
<Component class="javax.swing.JLabel" name="jLabelBalance">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection code=""Balance: "" type="code"/>
+ <Connection code=""Balance: " + game.getBalance()" type="code"/>
</Property>
</Properties>
<Constraints>
@@ -58,63 +58,83 @@
</Constraint>
</Constraints>
</Component>
- <Container class="javax.swing.JScrollPane" name="jScrollPane1">
- <AuxValues>
- <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
- </AuxValues>
+ <Component class="javax.swing.JButton" name="jButtonDouble">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="DOUBLE DOWN"/>
+ </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="40" y="640" width="230" height="90"/>
+ <AbsoluteConstraints x="1010" y="500" width="190" height="110"/>
</Constraint>
</Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
- <SubComponents>
- <Component class="javax.swing.JTextArea" name="jTextAreaBetAmount">
- <Properties>
- <Property name="columns" type="int" value="20"/>
- <Property name="rows" type="int" value="5"/>
- </Properties>
- </Component>
- </SubComponents>
- </Container>
- <Component class="javax.swing.JLabel" name="jLabelEnterBet">
+ </Component>
+ <Component class="javax.swing.JButton" name="jButtonStand">
<Properties>
- <Property name="text" type="java.lang.String" value="Place a bet"/>
+ <Property name="text" type="java.lang.String" value="STAND"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="40" y="610" width="230" height="30"/>
+ <AbsoluteConstraints x="1010" y="340" width="190" height="110"/>
</Constraint>
</Constraints>
</Component>
- <Component class="javax.swing.JButton" name="jButtonDouble">
+ <Component class="javax.swing.JButton" name="jButtonHit">
<Properties>
- <Property name="text" type="java.lang.String" value="DOUBLE"/>
+ <Property name="text" type="java.lang.String" value="HIT"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="1010" y="500" width="190" height="110"/>
+ <AbsoluteConstraints x="1010" y="180" width="190" height="110"/>
</Constraint>
</Constraints>
</Component>
- <Component class="javax.swing.JButton" name="jButtonStand">
+ <Component class="javax.swing.JButton" name="jButtonDeal">
<Properties>
- <Property name="text" type="java.lang.String" value="STAND"/>
+ <Property name="text" type="java.lang.String" value="DEAL"/>
</Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButtonDealActionPerformed"/>
+ </Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="1010" y="340" width="190" height="110"/>
+ <AbsoluteConstraints x="440" y="620" width="460" height="120"/>
</Constraint>
</Constraints>
</Component>
- <Component class="javax.swing.JButton" name="jButtonHit">
+ <Component class="javax.swing.JButton" name="jButtonBetAmount">
<Properties>
- <Property name="text" type="java.lang.String" value="HIT"/>
+ <Property name="text" type="java.lang.String" value="Change bet amount"/>
</Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButtonBetAmountActionPerformed"/>
+ </Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="1010" y="180" width="190" height="110"/>
+ <AbsoluteConstraints x="50" y="610" width="220" height="60"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="jLabel1">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection code=""Current bet: " + game.getBet()" type="code"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+ <AbsoluteConstraints x="60" y="680" width="200" height="50"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="jLabelResult">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection code="game." type="code"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+ <AbsoluteConstraints x="400" y="40" width="460" height="120"/>
</Constraint>
</Constraints>
</Component>
diff --git a/src/view/GUI.java b/src/view/GUI.java
@@ -16,11 +16,16 @@
*/
package view;
+import controller.Controller;
+import javax.swing.JOptionPane;
+
/**
*
* @author Michael
*/
public class GUI extends javax.swing.JFrame {
+
+ Controller game = new Controller();
/**
* Creates new form GUI
@@ -40,12 +45,13 @@ public class GUI extends javax.swing.JFrame {
jPanel3 = new javax.swing.JPanel();
jLabelBalance = new javax.swing.JLabel();
- jScrollPane1 = new javax.swing.JScrollPane();
- jTextAreaBetAmount = new javax.swing.JTextArea();
- jLabelEnterBet = new javax.swing.JLabel();
jButtonDouble = new javax.swing.JButton();
jButtonStand = new javax.swing.JButton();
jButtonHit = new javax.swing.JButton();
+ jButtonDeal = new javax.swing.JButton();
+ jButtonBetAmount = new javax.swing.JButton();
+ jLabel1 = new javax.swing.JLabel();
+ jLabelResult = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
setTitle("librejack");
@@ -64,19 +70,10 @@ public class GUI extends javax.swing.JFrame {
getContentPane().add(jPanel3, new org.netbeans.lib.awtextra.AbsoluteConstraints(710, 110, -1, -1));
- jLabelBalance.setText("Balance: ");
+ jLabelBalance.setText("Balance: " + game.getBalance());
getContentPane().add(jLabelBalance, new org.netbeans.lib.awtextra.AbsoluteConstraints(40, 40, 220, 90));
- jTextAreaBetAmount.setColumns(20);
- jTextAreaBetAmount.setRows(5);
- jScrollPane1.setViewportView(jTextAreaBetAmount);
-
- getContentPane().add(jScrollPane1, new org.netbeans.lib.awtextra.AbsoluteConstraints(40, 640, 230, 90));
-
- jLabelEnterBet.setText("Place a bet");
- getContentPane().add(jLabelEnterBet, new org.netbeans.lib.awtextra.AbsoluteConstraints(40, 610, 230, 30));
-
- jButtonDouble.setText("DOUBLE");
+ jButtonDouble.setText("DOUBLE DOWN");
getContentPane().add(jButtonDouble, new org.netbeans.lib.awtextra.AbsoluteConstraints(1010, 500, 190, 110));
jButtonStand.setText("STAND");
@@ -85,9 +82,39 @@ public class GUI extends javax.swing.JFrame {
jButtonHit.setText("HIT");
getContentPane().add(jButtonHit, new org.netbeans.lib.awtextra.AbsoluteConstraints(1010, 180, 190, 110));
+ jButtonDeal.setText("DEAL");
+ jButtonDeal.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ jButtonDealActionPerformed(evt);
+ }
+ });
+ getContentPane().add(jButtonDeal, new org.netbeans.lib.awtextra.AbsoluteConstraints(440, 620, 460, 120));
+
+ jButtonBetAmount.setText("Change bet amount");
+ jButtonBetAmount.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ jButtonBetAmountActionPerformed(evt);
+ }
+ });
+ getContentPane().add(jButtonBetAmount, new org.netbeans.lib.awtextra.AbsoluteConstraints(50, 610, 220, 60));
+
+ jLabel1.setText("Current bet: " + game.getBet());
+ getContentPane().add(jLabel1, new org.netbeans.lib.awtextra.AbsoluteConstraints(60, 680, 200, 50));
+
+ jLabelResult.setText(game.);
+ getContentPane().add(jLabelResult, new org.netbeans.lib.awtextra.AbsoluteConstraints(400, 40, 460, 120));
+
pack();
}// </editor-fold>//GEN-END:initComponents
+ private void jButtonDealActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonDealActionPerformed
+ game.startRound();
+ }//GEN-LAST:event_jButtonDealActionPerformed
+
+ private void jButtonBetAmountActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonBetAmountActionPerformed
+ game.setBet(Double.parseDouble(JOptionPane.showInputDialog("Enter the bet amount")));
+ }//GEN-LAST:event_jButtonBetAmountActionPerformed
+
/**
* @param args the command line arguments
*/
@@ -124,13 +151,14 @@ public class GUI extends javax.swing.JFrame {
}
// Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JButton jButtonBetAmount;
+ private javax.swing.JButton jButtonDeal;
private javax.swing.JButton jButtonDouble;
private javax.swing.JButton jButtonHit;
private javax.swing.JButton jButtonStand;
+ private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabelBalance;
- private javax.swing.JLabel jLabelEnterBet;
+ private javax.swing.JLabel jLabelResult;
private javax.swing.JPanel jPanel3;
- private javax.swing.JScrollPane jScrollPane1;
- private javax.swing.JTextArea jTextAreaBetAmount;
// End of variables declaration//GEN-END:variables
}
