Can now alter card style and background colour

git-svn-id: http://chris.smith.name/svn/japoker/trunk@4 b8598caf-53df-4c1b-98b8-507a84a220

nbproject/private/private.properties

@@ -1,4 +1,4 @@
 javac.debug=true
 javadoc.preview=true
-jaxws.endorsed.dir=/usr/local/netbeans-6.0/java1/modules/ext/jaxws21/api
-user.properties.file=/home/chris/.netbeans/6.0/build.properties
+jaxws.endorsed.dir=/usr/local/netbeans-6.1/java2/modules/ext/jaxws21/api
+user.properties.file=/home/chris/.netbeans/6.1/build.properties

src/com/md87/cardgame/config/AppearancePanel.java

@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) Chris 'MD87' Smith, 2007-2008. All rights reserved.
+ *
+ * This code may not be redistributed without prior permission from the
+ * aforementioned copyright holder(s).
+ */
+
+package com.md87.cardgame.config;
+
+import com.md87.cardgame.config.cards.*;
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+import javax.swing.BorderFactory;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ *
+ * @author Chris
+ */
+public class AppearancePanel extends JPanel implements ActionListener, ChangeListener {
+
+    private static final long serialVersionUID = 1;
+    
+    private final PreviewPanel preview = new PreviewPanel();
+    
+    private final JComboBox frontCombo = new JComboBox();
+    private final JComboBox backCombo = new JComboBox();
+    
+    private final JSpinner redSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 255, 1));
+    private final JSpinner greenSpinner = new JSpinner(new SpinnerNumberModel(100, 0, 255, 1));
+    private final JSpinner blueSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 255, 1));
+
+    public AppearancePanel() {
+        setLayout(new MigLayout("fill"));
+        
+        frontCombo.addItem(new ClassicFront1());
+        frontCombo.addItem(new ClassicFront2());
+        frontCombo.addItem(new OcaWhiteFront());
+        
+        backCombo.addItem(new ClassicBack1());
+        backCombo.addItem(new ClassicBack2());
+        backCombo.addItem(new OcaBlueHatchBack());
+        backCombo.addItem(new OcaRedHatchBack());
+        backCombo.addItem(new OcaBlueCardsBack());
+        backCombo.addItem(new OcaRedCardsBack());
+        backCombo.addItem(new OcaBlueSuits1Back());
+        backCombo.addItem(new OcaBlueSuits2Back());
+        backCombo.addItem(new OcaRedSuits1Back());
+        backCombo.addItem(new OcaRedSuits2Back());
+        
+        frontCombo.addActionListener(this);
+        backCombo.addActionListener(this);
+        
+        redSpinner.addChangeListener(this);
+        greenSpinner.addChangeListener(this);
+        blueSpinner.addChangeListener(this);
+        
+        final JPanel optionsPanel = new JPanel();
+        final JPanel previewPanel = new JPanel();        
+        final JPanel colourPanel = new JPanel();
+        
+        optionsPanel.setBorder(BorderFactory.createTitledBorder("Card style"));
+        optionsPanel.setLayout(new MigLayout("fillx"));
+        optionsPanel.add(new JLabel("Front:"));
+        optionsPanel.add(frontCombo, "growx");
+        optionsPanel.add(new JLabel("Back:"));
+        optionsPanel.add(backCombo, "growx");
+        
+        colourPanel.setBorder(BorderFactory.createTitledBorder("Background colour"));
+        colourPanel.setLayout(new MigLayout("fillx"));
+        colourPanel.add(new JLabel("Red:"));
+        colourPanel.add(redSpinner, "growx");
+        colourPanel.add(new JLabel("Green:"));
+        colourPanel.add(greenSpinner, "growx");
+        colourPanel.add(new JLabel("Blue:"));
+        colourPanel.add(blueSpinner, "growx");
+        
+        previewPanel.setBorder(BorderFactory.createTitledBorder("Preview"));
+        previewPanel.setLayout(new MigLayout());
+        previewPanel.add(preview, "grow, push");
+        
+        add(optionsPanel, "growx, wrap");
+        add(colourPanel, "growx, wrap");
+        add(previewPanel, "growx, growy");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        preview.repaint();
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void stateChanged(final ChangeEvent e) {
+        preview.repaint();
+    }
+    
+    public String getBackName() {
+        return ((CardStyle) backCombo.getSelectedItem()).getFolderName();
+    }
+    
+    public String getFrontName() {
+        return ((CardStyle) frontCombo.getSelectedItem()).getFolderName();
+    }
+    
+    public Color getColour() {
+        return new Color((Integer) redSpinner.getValue(),
+                (Integer) greenSpinner.getValue(), (Integer) blueSpinner.getValue());
+    }
+
+    private class PreviewPanel extends JPanel {
+
+        public PreviewPanel() {
+            super(new MigLayout("fill"));
+        }
+
+        @Override
+        public void paint(final Graphics g) {
+            g.setColor(AppearancePanel.this.getColour());
+            g.fillRect(0, 0, getWidth(), getHeight());
+            
+            final String backFile = "/com/md87/cardgame/res/backs/"
+                    + ((CardStyle) backCombo.getSelectedItem()).getFolderName() + ".png";
+            final String frontFile1 = "/com/md87/cardgame/res/fronts/"
+                    + ((CardStyle) frontCombo.getSelectedItem()).getFolderName() + "/sace.png";
+            final String frontFile2 = "/com/md87/cardgame/res/fronts/"
+                    + ((CardStyle) frontCombo.getSelectedItem()).getFolderName() + "/hdeuce.png";
+            final String frontFile3 = "/com/md87/cardgame/res/fronts/"
+                    + ((CardStyle) frontCombo.getSelectedItem()).getFolderName() + "/djack.png";
+
+            try {
+                final BufferedImage front1 = ImageIO.read(getClass().getResource(frontFile1));
+                final BufferedImage front2 = ImageIO.read(getClass().getResource(frontFile2));
+                final BufferedImage front3 = ImageIO.read(getClass().getResource(frontFile3));
+                final BufferedImage back1 = ImageIO.read(getClass().getResource(backFile));
+                final int width = front1.getWidth();
+                final int height = front1.getHeight();
+                
+                final int offsetX = (getWidth() - width * 4 - 30) / 2;
+                final int offsetY = (getHeight() - height) / 2;
+
+                ((Graphics2D) g).drawImage(front1, offsetX, offsetY, offsetX + width, 
+                        offsetY + height, 0, 0, width, height, this);
+                ((Graphics2D) g).drawImage(front2, offsetX + width + 10, offsetY, 
+                        offsetX + 2 * width + 10, offsetY + height, 0, 0, width, height, this);
+                ((Graphics2D) g).drawImage(front3, offsetX + 2 * (width + 10), offsetY, 
+                        offsetX + 3 * width + 20, offsetY + height, 0, 0, width, height, this);
+                ((Graphics2D) g).drawImage(back1, offsetX + 3 * (width + 10), offsetY, 
+                        offsetX + 4 * width + 30, offsetY + height, 0, 0, back1.getWidth(),
+                        back1.getHeight(), this);
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+
+        }
+        
+    }
+
+}

src/com/md87/cardgame/config/ConfigScreen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Chris 'MD87' Smith, 2007. All rights reserved.
+ * Copyright (c) Chris 'MD87' Smith, 2007-2008. All rights reserved.
  *
  * This code may not be redistributed without prior permission from the
  * aforementioned copyright holder(s).
@@ -39,6 +39,7 @@ public class ConfigScreen extends JDialog {
     private final PlayerPanel playerPanel = new PlayerPanel();
     private final GamePanel gamePanel = new GamePanel(this);
     private final BettingPanel bettingPanel = new BettingPanel();
+    private final AppearancePanel stylePanel = new AppearancePanel();
     private final JPanel savePanel = new JPanel();
     
     private GameInfo game;
@@ -50,12 +51,14 @@ public class ConfigScreen extends JDialog {
         Image playerIcon = null;
         Image moneyIcon = null;
         Image saveIcon = null;
+        Image styleIcon = null;
         
         try {
-            gameIcon = ImageIO.read(getClass().getResource("/com/md87/cardgame/res/icon.png"));
-            playerIcon = ImageIO.read(getClass().getResource("/com/md87/cardgame/res/user.png"));
-            moneyIcon = ImageIO.read(getClass().getResource("/com/md87/cardgame/res/money.png"));
-            saveIcon = ImageIO.read(getClass().getResource("/com/md87/cardgame/res/save.png"));
+            gameIcon = ImageIO.read(getClass().getResource("/com/md87/cardgame/res/icons/icon.png"));
+            playerIcon = ImageIO.read(getClass().getResource("/com/md87/cardgame/res/icons/user.png"));
+            moneyIcon = ImageIO.read(getClass().getResource("/com/md87/cardgame/res/icons/money.png"));
+            saveIcon = ImageIO.read(getClass().getResource("/com/md87/cardgame/res/icons/save.png"));
+            styleIcon = ImageIO.read(getClass().getResource("/com/md87/cardgame/res/icons/style.png"));
         } catch (IOException ex) {
             System.err.println("Unable to load icons");
         }   
@@ -64,11 +67,12 @@ public class ConfigScreen extends JDialog {
         
         setTitle("JaPoker: Game configuration");
         
-        tabbedPane.addTab("Game type", new ImageIcon(gameIcon), gamePanel);
+        tabbedPane.addTab("Game", new ImageIcon(gameIcon), gamePanel);
         tabbedPane.addTab("Players", new ImageIcon(playerIcon), playerPanel);
         tabbedPane.addTab("Betting", new ImageIcon(moneyIcon), bettingPanel);
+        tabbedPane.addTab("Appearance", new ImageIcon(styleIcon), stylePanel);
         tabbedPane.addTab("Save/Load", new ImageIcon(saveIcon), savePanel);
-        
+        tabbedPane.setEnabledAt(4, false);
         tabbedPane.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
         
         setLayout(new BorderLayout());
@@ -89,7 +93,7 @@ public class ConfigScreen extends JDialog {
         
         startButton.addActionListener(new ActionListener() {
             @Override
-            public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(final ActionEvent e) {
                 startGame();
             }
         });
@@ -115,7 +119,9 @@ public class ConfigScreen extends JDialog {
         final Game myGame = game.getGame(playerPanel.getNumPlayers(), 
                 bettingPanel.getBigBlind(), bettingPanel.getAnte(), 
                 bettingPanel.getRaises());
-        final GameWindow window = new GameWindow(myGame);
+        final GameWindow window = new GameWindow(myGame,
+                stylePanel.getFrontName(), stylePanel.getBackName(),
+                stylePanel.getColour());
         
         for (Player player : playerPanel.getPlayers(myGame, window)) {
             myGame.addPlayer(player);

src/com/md87/cardgame/config/PlayerPanel.java

@@ -66,7 +66,7 @@ public class PlayerPanel extends JPanel {
             sp.setPreferredSize(new Dimension(100, 20));
             
             final JComboBox co = new JComboBox(ControllerInfo.getControllers());
-            co.setPreferredSize(new Dimension(160, 20));
+            co.setPreferredSize(new Dimension(200, 20));
             
             if (i > 0) {
                 co.setSelectedIndex(3);

src/com/md87/cardgame/config/cards/CardStyle.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) Chris 'MD87' Smith, 2007-2008. All rights reserved.
+ *
+ * This code may not be redistributed without prior permission from the
+ * aforementioned copyright holder(s).
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public interface CardStyle {
+
+    /** {@inheritDoc} */
+    @Override
+    String toString();
+    
+    /**
+     * Retrieves the folder name for the card front.
+     * 
+     * @return The card front's folder name
+     */
+    String getFolderName();
+    
+}

src/com/md87/cardgame/config/cards/ClassicBack1.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public class ClassicBack1 implements CardStyle {
+
+    @Override
+    public String toString() {
+        return "Classic blue";
+    }
+
+    public String getFolderName() {
+        return "classic1";
+    }
+
+}

src/com/md87/cardgame/config/cards/ClassicBack2.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public class ClassicBack2 implements CardStyle {
+
+    @Override
+    public String toString() {
+        return "Classic red";
+    }
+
+    public String getFolderName() {
+        return "classic2";
+    }
+
+}

src/com/md87/cardgame/config/cards/ClassicFront1.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public class ClassicFront1 implements CardStyle {
+
+    @Override
+    public String toString() {
+        return "Classic small";
+    }
+
+    public String getFolderName() {
+        return "classic";
+    }
+
+}

src/com/md87/cardgame/config/cards/ClassicFront2.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public class ClassicFront2 implements CardStyle {
+
+    @Override
+    public String toString() {
+        return "Classic large";
+    }
+
+    public String getFolderName() {
+        return "classic2";
+    }
+
+}

src/com/md87/cardgame/config/cards/OcaBlueCardsBack.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public class OcaBlueCardsBack implements CardStyle {
+
+    @Override
+    public String toString() {
+        return "OpenClipart blue cards";
+    }
+
+    public String getFolderName() {
+        return "ocabluecards";
+    }
+
+}

src/com/md87/cardgame/config/cards/OcaBlueHatchBack.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public class OcaBlueHatchBack implements CardStyle {
+
+    @Override
+    public String toString() {
+        return "OpenClipart blue hatch";
+    }
+
+    public String getFolderName() {
+        return "ocabluehatch";
+    }
+
+}

src/com/md87/cardgame/config/cards/OcaBlueSuits1Back.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public class OcaBlueSuits1Back implements CardStyle {
+
+    @Override
+    public String toString() {
+        return "OpenClipart blue suits 1";
+    }
+
+    public String getFolderName() {
+        return "ocabluesuits1";
+    }
+
+}

src/com/md87/cardgame/config/cards/OcaBlueSuits2Back.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public class OcaBlueSuits2Back implements CardStyle {
+
+    @Override
+    public String toString() {
+        return "OpenClipart blue suits 2";
+    }
+
+    public String getFolderName() {
+        return "ocabluesuits2";
+    }
+
+}

src/com/md87/cardgame/config/cards/OcaRedCardsBack.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public class OcaRedCardsBack implements CardStyle {
+
+    @Override
+    public String toString() {
+        return "OpenClipart red cards";
+    }
+
+    public String getFolderName() {
+        return "ocaredcards";
+    }
+
+}

src/com/md87/cardgame/config/cards/OcaRedHatchBack.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public class OcaRedHatchBack implements CardStyle {
+
+    @Override
+    public String toString() {
+        return "OpenClipart red hatch";
+    }
+
+    public String getFolderName() {
+        return "ocaredhatch";
+    }
+
+}

src/com/md87/cardgame/config/cards/OcaRedSuits1Back.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public class OcaRedSuits1Back implements CardStyle {
+
+    @Override
+    public String toString() {
+        return "OpenClipart red suits 1";
+    }
+
+    public String getFolderName() {
+        return "ocaredsuits1";
+    }
+
+}

src/com/md87/cardgame/config/cards/OcaRedSuits2Back.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public class OcaRedSuits2Back implements CardStyle {
+
+    @Override
+    public String toString() {
+        return "OpenClipart red suits 2";
+    }
+
+    public String getFolderName() {
+        return "ocaredsuits2";
+    }
+
+}

src/com/md87/cardgame/config/cards/OcaWhiteFront.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.cardgame.config.cards;
+
+/**
+ *
+ * @author chris
+ */
+public class OcaWhiteFront implements CardStyle {
+
+    @Override
+    public String toString() {
+        return "OpenClipart White";
+    }
+
+    public String getFolderName() {
+        return "ocawhite";
+    }
+
+}

src/com/md87/cardgame/controllers/RandomPlayer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Chris 'MD87' Smith, 2007. All rights reserved.
+ * Copyright (c) Chris 'MD87' Smith, 2007-2008. All rights reserved.
  *
  * This code may not be redistributed without prior permission from the
  * aforementioned copyright holder(s).
@@ -15,15 +15,21 @@ import com.md87.cardgame.interfaces.Game;
 import com.md87.cardgame.interfaces.PlayerController;
 
 /**
- *
+ * A computer-controlled player that choses what to do randomly.
+ * 
  * @author Chris
  */
 public class RandomPlayer implements PlayerController {
     
+    /** The player that we're controlling. */
     protected Player player;
+    
+    /** The game that we're playing. */
     protected Game game;
 
-    public CallRaiseFold doCallRaiseFold(int callAmount, boolean canRaise) {
+    /** {@inheritDoc} */
+    @Override
+    public CallRaiseFold doCallRaiseFold(final int callAmount, final boolean canRaise) {
         if (Math.random() < 0.3) {
             if (player.getCash() - callAmount < game.getBigBlind() || !canRaise) {
                 return CallRaiseFold.FOLD;
@@ -35,6 +41,8 @@ public class RandomPlayer implements PlayerController {
         }
     }
 
+    /** {@inheritDoc} */
+    @Override
     public OpenCheck doOpenCheck() {
         if (Math.random() < 0.5 || player.getCash() < game.getBigBlind()) {
             return OpenCheck.CHECK;
@@ -43,28 +51,38 @@ public class RandomPlayer implements PlayerController {
         }
     }
 
+    /** {@inheritDoc} */
+    @Override
     public boolean shouldShowCards() {
         return false;
     }
 
-    public void setPlayer(Player player) {
+    /** {@inheritDoc} */
+    @Override
+    public void setPlayer(final Player player) {
         this.player = player;
     }
     
-    public void setGame(Game game) {
+    /** {@inheritDoc} */
+    @Override
+    public void setGame(final Game game) {
         this.game = game;
     }
 
-    public int getRaise(int minimum) {
+    /** {@inheritDoc} */
+    @Override    
+    public int getRaise(final int minimum) {
         return minimum;
     }
     
     /** {@inheritDoc} */
+    @Override
     public boolean isLocalHuman() {
         return false;
     }
 
     /** {@inheritDoc} */
+    @Override
     public Deck discardCards(final int minimum, final int maximum) {
         return new Deck(player.getCards().subList(0, minimum));
     }

src/com/md87/cardgame/interfaces/PlayerController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Chris 'MD87' Smith, 2007. All rights reserved.
+ * Copyright (c) Chris 'MD87' Smith, 2007-2008. All rights reserved.
  *
  * This code may not be redistributed without prior permission from the
  * aforementioned copyright holder(s).