Cleaned up player panel code
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@279 72836036-5685-4462-b002-a69064685172
This commit is contained in:
parent
d69fdbacb9
commit
3fb3b387c8
1 changed files with 22 additions and 42 deletions
|
@ -113,27 +113,19 @@ class PlayerPanel extends JPanel implements IPlayerPanel {
|
||||||
currentPlayerNameLabel.setVerticalTextPosition(JLabel.CENTER);
|
currentPlayerNameLabel.setVerticalTextPosition(JLabel.CENTER);
|
||||||
leftPanel.add(currentPlayerNameLabel);
|
leftPanel.add(currentPlayerNameLabel);
|
||||||
|
|
||||||
sortByGroupsButton = new JButton("<html><center>Nach Sammlungen sortieren");
|
sortByGroupsButton = createButton(leftPanel, "<html><center>Nach Sammlungen sortieren", new ActionListener() {
|
||||||
sortByGroupsButton.setFont(sortByGroupsButton.getFont().deriveFont(0));
|
|
||||||
sortByGroupsButton.setMargin(new Insets(0, 0, 0, 0));
|
|
||||||
sortByGroupsButton.addActionListener(new ActionListener() {
|
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent arg0) {
|
public void actionPerformed(ActionEvent arg0) {
|
||||||
sortByGroupsEvent.emit();
|
sortByGroupsEvent.emit();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
leftPanel.add(sortByGroupsButton);
|
|
||||||
|
|
||||||
sortByRunsButton = new JButton("<html><center>Nach Reihen sortieren");
|
sortByRunsButton = createButton(leftPanel, "<html><center>Nach Reihen sortieren", new ActionListener() {
|
||||||
sortByRunsButton.setFont(sortByRunsButton.getFont().deriveFont(0));
|
|
||||||
sortByRunsButton.setMargin(new Insets(0, 0, 0, 0));
|
|
||||||
sortByRunsButton.addActionListener(new ActionListener() {
|
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent arg0) {
|
public void actionPerformed(ActionEvent arg0) {
|
||||||
sortByRunsEvent.emit();
|
sortByRunsEvent.emit();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
leftPanel.add(sortByRunsButton);
|
|
||||||
|
|
||||||
leftPanel.addComponentListener(new LeftPanelResizeListener());
|
leftPanel.addComponentListener(new LeftPanelResizeListener());
|
||||||
}
|
}
|
||||||
|
@ -144,69 +136,57 @@ class PlayerPanel extends JPanel implements IPlayerPanel {
|
||||||
rightPanel.setBorder(new EmptyBorder(SIDE_PANEL_INSET, SIDE_PANEL_INSET,
|
rightPanel.setBorder(new EmptyBorder(SIDE_PANEL_INSET, SIDE_PANEL_INSET,
|
||||||
SIDE_PANEL_INSET, SIDE_PANEL_INSET));
|
SIDE_PANEL_INSET, SIDE_PANEL_INSET));
|
||||||
|
|
||||||
handRowUpButton = new JButton("<html><center>\u25B2");
|
handRowUpButton = createButton(rightPanel, "<html><center>\u25B2", new ActionListener() {
|
||||||
handRowUpButton.setMargin(new Insets(0, 0, 0, 0));
|
|
||||||
handRowUpButton.addActionListener(new ActionListener() {
|
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
hand.rowUp();
|
hand.rowUp();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
rightPanel.add(handRowUpButton);
|
|
||||||
|
|
||||||
handRowDownButton = new JButton("<html><center>\u25BC");
|
handRowDownButton = createButton(rightPanel, "<html><center>\u25BC", new ActionListener() {
|
||||||
handRowDownButton.setMargin(new Insets(0, 0, 0, 0));
|
|
||||||
handRowDownButton.addActionListener(new ActionListener() {
|
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
hand.rowDown();
|
hand.rowDown();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
rightPanel.add(handRowDownButton);
|
|
||||||
|
|
||||||
timeBar = new JProgressBar(0, 60);
|
timeBar = new JProgressBar(0, 60);
|
||||||
timeBar.setStringPainted(true);
|
timeBar.setStringPainted(true);
|
||||||
rightPanel.add(timeBar);
|
rightPanel.add(timeBar);
|
||||||
|
|
||||||
endTurnButton = new JButton("---");
|
endTurnButton = createButton(rightPanel, "---", new ActionListener() {
|
||||||
endTurnButton.setFont(endTurnButton.getFont().deriveFont(0));
|
|
||||||
endTurnButton.setMargin(new Insets(0, 0, 0, 0));
|
|
||||||
endTurnButton.addActionListener(new ActionListener() {
|
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
endTurnEvent.emit();
|
endTurnEvent.emit();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
rightPanel.add(endTurnButton);
|
keepStonesButton = createButton(rightPanel, "<html><center>Steine<br>behalten", new ActionListener() {
|
||||||
|
|
||||||
keepStonesButton = new JButton("<html><center>Steine<br>behalten");
|
|
||||||
keepStonesButton.setFont(keepStonesButton.getFont().deriveFont(0));
|
|
||||||
keepStonesButton.setMargin(new Insets(0, 0, 0, 0));
|
|
||||||
keepStonesButton.addActionListener(new ActionListener() {
|
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
endTurnEvent.emit();
|
endTurnEvent.emit();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
rightPanel.add(keepStonesButton);
|
redealButton = createButton(rightPanel, "<html><center>Neu<br>geben", new ActionListener() {
|
||||||
|
|
||||||
redealButton= new JButton("<html><center>Neu<br>geben");
|
|
||||||
redealButton.setFont(redealButton.getFont().deriveFont(0));
|
|
||||||
redealButton.setMargin(new Insets(0, 0, 0, 0));
|
|
||||||
redealButton.addActionListener(new ActionListener() {
|
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
redealEvent.emit();
|
redealEvent.emit();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
rightPanel.add(redealButton);
|
|
||||||
|
|
||||||
rightPanel.addComponentListener(new RightPanelResizeListener());
|
rightPanel.addComponentListener(new RightPanelResizeListener());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private JButton createButton(JPanel panel, String caption, ActionListener listener) {
|
||||||
|
JButton button = new JButton(caption);
|
||||||
|
button.setFont(button.getFont().deriveFont(0));
|
||||||
|
button.setMargin(new Insets(0, 0, 0, 0));
|
||||||
|
button.addActionListener(listener);
|
||||||
|
panel.add(button);
|
||||||
|
return button;
|
||||||
|
}
|
||||||
|
|
||||||
private void rescale() {
|
private void rescale() {
|
||||||
Insets insets = getInsets();
|
Insets insets = getInsets();
|
||||||
int x = insets.left, y = insets.top, width = getWidth() - insets.left
|
int x = insets.left, y = insets.top, width = getWidth() - insets.left
|
||||||
|
|
Reference in a new issue