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

Kommentare

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@467 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-06-18 17:41:43 +02:00
parent 297d5de03e
commit 6ffc2c38a2
3 changed files with 45 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/jrummikub/view/IStoneCollectionPanel.java
View file

@ -5,5 +5,10 @@ package jrummikub.view;
*/
public interface IStoneCollectionPanel extends IStonePanel {
/**
* Hide stone collection
*
* @param enable
*/
void setHidden(boolean enable);
}

14
src/jrummikub/view/IView.java
View file

@ -254,10 +254,24 @@ public interface IView {
WIN_PANEL
}
/**
* Is set if a player tried to lay out less than initial meld threshold
*
* @param points
* initial meld threshold
*/
void setInitialMeldError(int points);
/**
* Show stone collection
*
* @param enable
*/
void setStoneCollectionHidden(boolean enable);
/**
* Is set if the player tried to modify the table without laying out first
*/
void setInitialMeldFirstError();
}

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

@ -334,15 +334,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
choices);
}
initialMeldThresholdSpinner.setValue(gameSettings
.getInitialMeldThreshold());
stoneSetNumberSpinner.setValue(gameSettings.getStoneSetNumber());
highestValueSpinner.setValue(gameSettings.getHighestValue());
numberOfStonesDealtSpinner.setValue(gameSettings
.getNumberOfStonesDealt());
jokerNumberSpinner.setValue(gameSettings.getJokerNumber());
timeSpinner.setValue(gameSettings.getTotalTime());
noLimitsBox.setSelected(gameSettings.isNoLimits());
setInitialSettingsValue(gameSettings);
initialMeldThresholdLabel.setText(gameSettings
.getInitialMeldThreshold() + " Punkte");
@ -373,6 +365,18 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
playerSettingsViewport.revalidate();
}
private void setInitialSettingsValue(GameSettings gameSettings) {
initialMeldThresholdSpinner.setValue(gameSettings
.getInitialMeldThreshold());
stoneSetNumberSpinner.setValue(gameSettings.getStoneSetNumber());
highestValueSpinner.setValue(gameSettings.getHighestValue());
numberOfStonesDealtSpinner.setValue(gameSettings
.getNumberOfStonesDealt());
jokerNumberSpinner.setValue(gameSettings.getJokerNumber());
timeSpinner.setValue(gameSettings.getTotalTime());
noLimitsBox.setSelected(gameSettings.isNoLimits());
}
private void updatePlayerSettingsPanel(int i, PlayerSettings settings,
List<Type> choices) {
if (i < playerSettingsPanels.size()) {
@ -445,6 +449,18 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
variantLabel = new JLabel("Variante:");
makeVariantPanel();
row = makeAllOptionLabels(row);
GridBagConstraints c = new GridBagConstraints();
c.gridx = 1;
c.gridy = row;
c.fill = GridBagConstraints.BOTH;
c.weightx = 1;
c.weighty = 1;
optionsPanel.add(makeFiller(), c);
}
private int makeAllOptionLabels(int row) {
makeOptionLabel(row++, "Auslegeschranke:");
initialMeldThresholdLabel = new JLabel();
initialMeldThresholdSpinner = createOptionSpinner(1, 999, 1,
@ -481,14 +497,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
makeOptionLabel(row, "Steinfarben:");
createColorSelectionPanel();
colorLabelPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 0));
GridBagConstraints c = new GridBagConstraints();
c.gridx = 1;
c.gridy = row;
c.fill = GridBagConstraints.BOTH;
c.weightx = 1;
c.weighty = 1;
optionsPanel.add(makeFiller(), c);
return row;
}
private void removeOptionPanelComponentsAndLabels() {