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

Change sort events to 'Sort by runs' and 'Sort by groups'

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@82 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-05-03 17:40:08 +02:00
parent 6161c4b1d4
commit 2eaf873ec6
3 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/jrummikub/JRummikub.java
View file

@ -38,16 +38,16 @@ public class JRummikub {
view.getTablePanel().setTopPlayerName("Player 3"); view.getTablePanel().setTopPlayerName("Player 3");
view.getTablePanel().setRightPlayerName("Player 4"); view.getTablePanel().setRightPlayerName("Player 4");
view.getPlayerPanel().getSortByNumberEvent().add(new IListener() { view.getPlayerPanel().getSortByGroupsEvent().add(new IListener() {
@Override @Override
public void handle() { public void handle() {
System.out.println("'Sort by number' fired"); System.out.println("'Sort by groups' fired");
} }
}); });
view.getPlayerPanel().getSortByColorEvent().add(new IListener() { view.getPlayerPanel().getSortByRunsEvent().add(new IListener() {
@Override @Override
public void handle() { public void handle() {
System.out.println("'Sort by color' fired"); System.out.println("'Sort by runs' fired");
} }
}); });
view.getPlayerPanel().getEndTurnEvent().add(new IListener() { view.getPlayerPanel().getEndTurnEvent().add(new IListener() {

12
src/jrummikub/view/IPlayerPanel.java
View file

@ -28,20 +28,20 @@ public interface IPlayerPanel {
public void setTimeLeft(int time); public void setTimeLeft(int time);
/** /**
* The sort by number event is emitted when the player wants to sort his * The sort by groups event is emitted when the player wants to sort his
* stones by number * stones by groups
* *
* @return the event * @return the event
*/ */
public IEvent getSortByNumberEvent(); public IEvent getSortByGroupsEvent();
/** /**
* The sort by number event is emitted when the player wants to sort his * The sort by runs event is emitted when the player wants to sort his stones
* stones by number * by runs
* *
* @return the event * @return the event
*/ */
public IEvent getSortByColorEvent(); public IEvent getSortByRunsEvent();
/** /**
* The end turn event is emitted when the player wants to end his turn * The end turn event is emitted when the player wants to end his turn

50
src/jrummikub/view/impl/PlayerPanel.java
View file

@ -36,13 +36,13 @@ class PlayerPanel extends JPanel implements IPlayerPanel {
private JPanel leftPanel, rightPanel; private JPanel leftPanel, rightPanel;
private JLabel currentPlayerNameLabel; private JLabel currentPlayerNameLabel;
private JButton sortByNumberButton; private JButton sortByGroupsButton;
private JButton sortByColorButton; private JButton sortByRunsButton;
private JProgressBar timeBar; private JProgressBar timeBar;
private JButton endTurnButton; private JButton endTurnButton;
private Event sortByNumberEvent = new Event(); private Event sortByGroupsEvent = new Event();
private Event sortByColorEvent = new Event(); private Event sortByRunsEvent = new Event();
private Event endTurnEvent = new Event(); private Event endTurnEvent = new Event();
@Override @Override
@ -63,13 +63,13 @@ class PlayerPanel extends JPanel implements IPlayerPanel {
} }
@Override @Override
public IEvent getSortByNumberEvent() { public IEvent getSortByGroupsEvent() {
return sortByNumberEvent; return sortByGroupsEvent;
} }
@Override @Override
public IEvent getSortByColorEvent() { public IEvent getSortByRunsEvent() {
return sortByColorEvent; return sortByRunsEvent;
} }
@Override @Override
@ -90,27 +90,27 @@ class PlayerPanel extends JPanel implements IPlayerPanel {
currentPlayerNameLabel.setVerticalTextPosition(JLabel.CENTER); currentPlayerNameLabel.setVerticalTextPosition(JLabel.CENTER);
leftPanel.add(currentPlayerNameLabel); leftPanel.add(currentPlayerNameLabel);
sortByNumberButton = new JButton("<html><center>Sort by number"); sortByGroupsButton = new JButton("<html><center>Nach Gruppen sortieren");
sortByNumberButton.setFont(sortByNumberButton.getFont().deriveFont(0)); sortByGroupsButton.setFont(sortByGroupsButton.getFont().deriveFont(0));
sortByNumberButton.setMargin(new Insets(0, 0, 0, 0)); sortByGroupsButton.setMargin(new Insets(0, 0, 0, 0));
sortByNumberButton.addActionListener(new ActionListener() { sortByGroupsButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent arg0) { public void actionPerformed(ActionEvent arg0) {
sortByNumberEvent.emit(); sortByGroupsEvent.emit();
} }
}); });
leftPanel.add(sortByNumberButton); leftPanel.add(sortByGroupsButton);
sortByColorButton = new JButton("<html><center>Sort by color"); sortByRunsButton = new JButton("<html><center>Nach Reihen sortieren");
sortByColorButton.setFont(sortByColorButton.getFont().deriveFont(0)); sortByRunsButton.setFont(sortByRunsButton.getFont().deriveFont(0));
sortByNumberButton.setMargin(new Insets(0, 0, 0, 0)); sortByRunsButton.setMargin(new Insets(0, 0, 0, 0));
sortByColorButton.addActionListener(new ActionListener() { sortByRunsButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent arg0) { public void actionPerformed(ActionEvent arg0) {
sortByColorEvent.emit(); sortByRunsEvent.emit();
} }
}); });
leftPanel.add(sortByColorButton); leftPanel.add(sortByRunsButton);
leftPanel.addComponentListener(new LeftPanelResizeListener()); leftPanel.addComponentListener(new LeftPanelResizeListener());
} }
@ -125,7 +125,7 @@ class PlayerPanel extends JPanel implements IPlayerPanel {
timeBar.setStringPainted(true); timeBar.setStringPainted(true);
rightPanel.add(timeBar); rightPanel.add(timeBar);
endTurnButton = new JButton("End turn"); endTurnButton = new JButton("Zug beenden");
endTurnButton.setFont(endTurnButton.getFont().deriveFont(0)); endTurnButton.setFont(endTurnButton.getFont().deriveFont(0));
endTurnButton.setMargin(new Insets(0, 0, 0, 0)); endTurnButton.setMargin(new Insets(0, 0, 0, 0));
endTurnButton.addActionListener(new ActionListener() { endTurnButton.addActionListener(new ActionListener() {
@ -202,14 +202,14 @@ class PlayerPanel extends JPanel implements IPlayerPanel {
fontSize = MAX_BUTTON_FONT_SIZE; fontSize = MAX_BUTTON_FONT_SIZE;
currentPlayerNameLabel.setBounds(x, y, width, firstLineHeight); currentPlayerNameLabel.setBounds(x, y, width, firstLineHeight);
sortByNumberButton.setBounds(x, y + firstLineHeight sortByGroupsButton.setBounds(x, y + firstLineHeight
+ SIDE_PANEL_SEPARATOR, buttonWidth, buttonHeight); + SIDE_PANEL_SEPARATOR, buttonWidth, buttonHeight);
sortByColorButton.setBounds(x + buttonWidth + SIDE_PANEL_SEPARATOR, y sortByRunsButton.setBounds(x + buttonWidth + SIDE_PANEL_SEPARATOR, y
+ firstLineHeight + SIDE_PANEL_SEPARATOR, buttonWidth, buttonHeight); + firstLineHeight + SIDE_PANEL_SEPARATOR, buttonWidth, buttonHeight);
sortByNumberButton.setFont(sortByNumberButton.getFont().deriveFont( sortByGroupsButton.setFont(sortByGroupsButton.getFont().deriveFont(
fontSize)); fontSize));
sortByColorButton.setFont(sortByColorButton.getFont() sortByRunsButton.setFont(sortByRunsButton.getFont()
.deriveFont(fontSize)); .deriveFont(fontSize));
} }
} }