neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

joker count can now be zero

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@495 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Bennet Gerlach 2011-06-19 22:38:08 +02:00
parent 2c3f5b53e1
commit 890051a3e9
1 changed files with 33 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/jrummikub/view/impl/SettingsPanel.java
View file

@ -320,8 +320,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
@Override @Override
public void setGameSettings(GameSettings gameSettings) { public void setGameSettings(GameSettings gameSettings) {
while (playerSettingsPanels.size() > gameSettings.getPlayerList() while (playerSettingsPanels.size() > gameSettings.getPlayerList().size()) {
.size()) {
removePlayerSettingsPanel(); removePlayerSettingsPanel();
} }
@ -330,22 +329,19 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
if (i < playerTypeChoices.size()) { if (i < playerTypeChoices.size()) {
choices = playerTypeChoices.get(i); choices = playerTypeChoices.get(i);
} }
updatePlayerSettingsPanel(i, gameSettings.getPlayerList().get(i), updatePlayerSettingsPanel(i, gameSettings.getPlayerList().get(i), choices);
choices);
} }
setInitialSettingsValue(gameSettings); setInitialSettingsValue(gameSettings);
initialMeldThresholdLabel.setText(gameSettings initialMeldThresholdLabel.setText(gameSettings.getInitialMeldThreshold()
.getInitialMeldThreshold() + " Punkte"); + " Punkte");
stoneSetNumberLabel.setText(Integer.toString(gameSettings stoneSetNumberLabel.setText(Integer.toString(gameSettings
.getStoneSetNumber())); .getStoneSetNumber()));
highestValueLabel.setText(Integer.toString(gameSettings highestValueLabel.setText(Integer.toString(gameSettings.getHighestValue()));
.getHighestValue()));
numberOfStonesDealtLabel.setText(Integer.toString(gameSettings numberOfStonesDealtLabel.setText(Integer.toString(gameSettings
.getNumberOfStonesDealt())); .getNumberOfStonesDealt()));
jokerNumberLabel jokerNumberLabel.setText(Integer.toString(gameSettings.getJokerNumber()));
.setText(Integer.toString(gameSettings.getJokerNumber()));
timeLabel.setText(gameSettings.getTotalTime() + " Sekunden"); timeLabel.setText(gameSettings.getTotalTime() + " Sekunden");
noLimitsLabel.setText(gameSettings.isNoLimits() ? "An" : "Aus"); noLimitsLabel.setText(gameSettings.isNoLimits() ? "An" : "Aus");
@ -366,12 +362,11 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
} }
private void setInitialSettingsValue(GameSettings gameSettings) { private void setInitialSettingsValue(GameSettings gameSettings) {
initialMeldThresholdSpinner.setValue(gameSettings initialMeldThresholdSpinner
.getInitialMeldThreshold()); .setValue(gameSettings.getInitialMeldThreshold());
stoneSetNumberSpinner.setValue(gameSettings.getStoneSetNumber()); stoneSetNumberSpinner.setValue(gameSettings.getStoneSetNumber());
highestValueSpinner.setValue(gameSettings.getHighestValue()); highestValueSpinner.setValue(gameSettings.getHighestValue());
numberOfStonesDealtSpinner.setValue(gameSettings numberOfStonesDealtSpinner.setValue(gameSettings.getNumberOfStonesDealt());
.getNumberOfStonesDealt());
jokerNumberSpinner.setValue(gameSettings.getJokerNumber()); jokerNumberSpinner.setValue(gameSettings.getJokerNumber());
timeSpinner.setValue(gameSettings.getTotalTime()); timeSpinner.setValue(gameSettings.getTotalTime());
noLimitsBox.setSelected(gameSettings.isNoLimits()); noLimitsBox.setSelected(gameSettings.isNoLimits());
@ -389,8 +384,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
private void addPlayerSettingsPanel(int i, PlayerSettings settings, private void addPlayerSettingsPanel(int i, PlayerSettings settings,
List<Type> choices) { List<Type> choices) {
PlayerSettingsPanel panel = new PlayerSettingsPanel(i, settings, PlayerSettingsPanel panel = new PlayerSettingsPanel(i, settings, choices,
choices, settingsMode != SettingsMode.NETWORK_OFFER settingsMode != SettingsMode.NETWORK_OFFER
&& settingsMode != SettingsMode.NETWORK_JOIN); && settingsMode != SettingsMode.NETWORK_JOIN);
playerSettingsPanels.add(panel); playerSettingsPanels.add(panel);
playerSettingsViewport.add(panel, playerSettingsViewport.add(panel,
@ -400,8 +395,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
} }
private void removePlayerSettingsPanel() { private void removePlayerSettingsPanel() {
PlayerSettingsPanel p = playerSettingsPanels PlayerSettingsPanel p = playerSettingsPanels.remove(playerSettingsPanels
.remove(playerSettingsPanels.size() - 1); .size() - 1);
playerSettingsViewport.remove(p); playerSettingsViewport.remove(p);
} }
@ -423,8 +418,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
playerSettingsViewport.add(addPlayerPanel); playerSettingsViewport.add(addPlayerPanel);
addPlayerButton = new JButton("+"); addPlayerButton = new JButton("+");
addPlayerButton addPlayerButton.setFont(addPlayerButton.getFont().deriveFont(Font.BOLD));
.setFont(addPlayerButton.getFont().deriveFont(Font.BOLD));
addPlayerButton.addActionListener(new ActionListener() { addPlayerButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@ -473,8 +467,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
makeOptionLabel(row++, "H\u00f6chster Steinwert:"); makeOptionLabel(row++, "H\u00f6chster Steinwert:");
highestValueLabel = new JLabel(); highestValueLabel = new JLabel();
highestValueSpinner = createOptionSpinner(3, 99, 1, highestValueSpinner = createOptionSpinner(3, 99, 1, changeHighestValueEvent);
changeHighestValueEvent);
makeOptionLabel(row++, "Anzahl Startsteine:"); makeOptionLabel(row++, "Anzahl Startsteine:");
numberOfStonesDealtLabel = new JLabel(); numberOfStonesDealtLabel = new JLabel();
@ -483,8 +476,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
makeOptionLabel(row++, "Jokeranzahl:"); makeOptionLabel(row++, "Jokeranzahl:");
jokerNumberLabel = new JLabel(); jokerNumberLabel = new JLabel();
jokerNumberSpinner = createOptionSpinner(1, 999, 1, jokerNumberSpinner = createOptionSpinner(0, 999, 1, changeJokerNumberEvent);
changeJokerNumberEvent);
makeOptionLabel(row++, "Zeit f\u00fcr Spielzug:"); makeOptionLabel(row++, "Zeit f\u00fcr Spielzug:");
timeLabel = new JLabel(); timeLabel = new JLabel();
@ -637,8 +629,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
final Event1<Integer> targetEvent) { final Event1<Integer> targetEvent) {
final JSpinner spinner = new JSpinner(); final JSpinner spinner = new JSpinner();
spinner.setModel(new SpinnerNumberModel(min, min, max, step)); spinner.setModel(new SpinnerNumberModel(min, min, max, step));
spinner.setPreferredSize(new Dimension(60, spinner
spinner.getMinimumSize().height)); .setPreferredSize(new Dimension(60, spinner.getMinimumSize().height));
spinner.addChangeListener(new ChangeListener() { spinner.addChangeListener(new ChangeListener() {
@Override @Override
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {
@ -699,8 +691,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
addDefaultButtons(); addDefaultButtons();
setBorder(new CompoundBorder(new LineBorder(Color.BLACK), setBorder(new CompoundBorder(new LineBorder(Color.BLACK), new EmptyBorder(
new EmptyBorder(10, 10, 10, 10))); 10, 10, 10, 10)));
} }
void resetTabbedPane() { void resetTabbedPane() {
@ -828,8 +820,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
private JLabel typeLabel; private JLabel typeLabel;
public void setSettings(PlayerSettings settings) { public void setSettings(PlayerSettings settings) {
if (nameField != null if (nameField != null && !nameField.getText().equals(settings.getName())) {
&& !nameField.getText().equals(settings.getName())) {
nameField.setText(settings.getName()); nameField.setText(settings.getName());
} }
if (nameLabel != null) { if (nameLabel != null) {
@ -846,8 +837,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
if (typeLabel != null) { if (typeLabel != null) {
typeLabel.setText(getTypeLabel(settings.getType())); typeLabel.setText(getTypeLabel(settings.getType()));
} }
colorButton.setIcon(ImageUtil.createColorIcon(settings.getColor(), colorButton
16, 2)); .setIcon(ImageUtil.createColorIcon(settings.getColor(), 16, 2));
colorChangable = !((settingsMode == SettingsMode.NETWORK_JOIN | settingsMode == SettingsMode.NETWORK_OFFER) & settings colorChangable = !((settingsMode == SettingsMode.NETWORK_JOIN | settingsMode == SettingsMode.NETWORK_OFFER) & settings
.getType() != Type.HUMAN); .getType() != Type.HUMAN);
@ -941,8 +932,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
c.gridy = 0; c.gridy = 0;
add(colorButton, c); add(colorButton, c);
nameField.getDocument().addDocumentListener( nameField.getDocument().addDocumentListener(new NameChangeListener());
new NameChangeListener());
c2.gridy = 0; c2.gridy = 0;
c2.weightx = 1; c2.weightx = 1;
c2.fill = GridBagConstraints.HORIZONTAL; c2.fill = GridBagConstraints.HORIZONTAL;
@ -957,8 +947,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
}); });
playerType.setPreferredSize(new Dimension(120, playerType playerType.setPreferredSize(new Dimension(120, playerType
.getPreferredSize().height)); .getPreferredSize().height));
playerType.setMinimumSize(new Dimension(120, playerType playerType.setMinimumSize(new Dimension(120,
.getMinimumSize().height)); playerType.getMinimumSize().height));
add(playerType, c); add(playerType, c);
removeButton = new JButton("\u00d7"); removeButton = new JButton("\u00d7");
@ -1001,8 +991,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
typeLabel.setBorder(new EmptyBorder(3, 7, 3, 7)); typeLabel.setBorder(new EmptyBorder(3, 7, 3, 7));
typeLabel.setPreferredSize(new Dimension(120, typeLabel typeLabel.setPreferredSize(new Dimension(120, typeLabel
.getPreferredSize().height)); .getPreferredSize().height));
typeLabel.setMinimumSize(new Dimension(120, typeLabel typeLabel.setMinimumSize(new Dimension(120,
.getMinimumSize().height)); typeLabel.getMinimumSize().height));
add(typeLabel, c); add(typeLabel, c);
} }
@ -1010,9 +1000,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
Dimension preferredSize = super.getPreferredSize(); Dimension preferredSize = super.getPreferredSize();
for (Component component : this.getComponents()) { for (Component component : this.getComponents()) {
preferredSize.setSize( preferredSize
preferredSize.width, .setSize(preferredSize.width, Math.max(preferredSize.height,
Math.max(preferredSize.height,
component.getPreferredSize().height)); component.getPreferredSize().height));
} }
return preferredSize; return preferredSize;
@ -1022,9 +1011,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
public Dimension getMaximumSize() { public Dimension getMaximumSize() {
Dimension preferredSize = super.getPreferredSize(); Dimension preferredSize = super.getPreferredSize();
for (Component component : this.getComponents()) { for (Component component : this.getComponents()) {
preferredSize.setSize( preferredSize
Integer.MAX_VALUE, .setSize(Integer.MAX_VALUE, Math.max(preferredSize.height,
Math.max(preferredSize.height,
component.getPreferredSize().height)); component.getPreferredSize().height));
} }
return preferredSize; return preferredSize;
@ -1058,8 +1046,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
add(new ColorButton(c, menu)); add(new ColorButton(c, menu));
} else { } else {
add(new JLabel(ImageUtil.createColorIcon( add(new JLabel(ImageUtil.createColorIcon(
UIManager.getColor("PopupMenu.background"), 16, UIManager.getColor("PopupMenu.background"), 16, 0)));
0)));
} }
} }