Menu
▾
▴
[Colossus-checkins] SF.net SVN: colossus: [3269] branches/cleka_acquire_etc/Colossus/core/src/ main/java/net/sf/colossus/client
|
From: <dra...@us...> - 2008-04-11 22:25:55
|
Revision: 3269
http://colossus.svn.sourceforge.net/colossus/?rev=3269&view=rev
Author: dranathi
Date: 2008-04-11 15:25:52 -0700 (Fri, 11 Apr 2008)
Log Message:
-----------
Updates to Layout.
Modified Paths:
--------------
branches/cleka_acquire_etc/Colossus/core/src/main/java/net/sf/colossus/client/BattleAftermathDialog.java
branches/cleka_acquire_etc/Colossus/core/src/main/java/net/sf/colossus/client/DialogTestMain.java
Modified: branches/cleka_acquire_etc/Colossus/core/src/main/java/net/sf/colossus/client/BattleAftermathDialog.java
===================================================================
--- branches/cleka_acquire_etc/Colossus/core/src/main/java/net/sf/colossus/client/BattleAftermathDialog.java 2008-04-11 15:56:39 UTC (rev 3268)
+++ branches/cleka_acquire_etc/Colossus/core/src/main/java/net/sf/colossus/client/BattleAftermathDialog.java 2008-04-11 22:25:52 UTC (rev 3269)
@@ -21,9 +21,11 @@
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
import javax.swing.JButton;
+import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
+import javax.swing.border.TitledBorder;
import net.sf.colossus.game.Creature;
import net.sf.colossus.game.Legion;
@@ -52,7 +54,7 @@
private static final Chit CRITTERSLOT = new Chit(CREATURE_SIZE,
"QuestionMarkMask", false, true, false);
- private final JPanel gridPane; // Content Panel
+ private final JPanel contentsPane; // Content Panel
private final JPanel buttonPane; // Action Buttons
private final JLabel statusLabel;
@@ -91,8 +93,9 @@
this.legion = legion;
slots = 7 - legion.getHeight();
getContentPane().setLayout(new BorderLayout());
- gridPane = new JPanel(new GridLayout(0, 2));
- getContentPane().add(gridPane, BorderLayout.CENTER);
+ contentsPane = new JPanel();
+ contentsPane.setLayout(new BoxLayout(contentsPane, BoxLayout.Y_AXIS));
+ getContentPane().add(contentsPane, BorderLayout.CENTER);
useSaveWindow(client.getOptions(), "BattleAftermath", null);
addMouseListener(this);
@@ -132,7 +135,6 @@
chit.addMouseListener(this);
legionPane.add(chit);
}
- gridPane.add(legionPane);
// Panel for creatures being added.
newLegionPane = new JPanel();
newLegionPane.setBorder(BorderFactory
@@ -142,7 +144,7 @@
Chit chit = new Chit(CRITTERSLOT);
newLegionPane.add(chit);
}
- gridPane.add(newLegionPane);
+ contentsPane.add(gridPane(legionPane, newLegionPane));
// Current Acquirable is next
// Selected Acquirable on the right.
@@ -154,6 +156,8 @@
.createTitledBorder("Acquirables"));
newAcquirablePane.setBorder(BorderFactory
.createTitledBorder("Acquisitions"));
+ newAcquirablePane.setLayout(new BoxLayout(newAcquirablePane,
+ BoxLayout.Y_AXIS));
if (legion.getAcquirableDecisions() != null)
{
for (Legion.AcquirableDecision decision : legion
@@ -162,6 +166,9 @@
JPanel acquireAtPanel = new JPanel();
acquireAtPanel.setBorder(BorderFactory
.createTitledBorder(decision.getPoints() + ""));
+ JPanel acquireSelectPanel = new JPanel();
+ acquireSelectPanel.setBorder(BorderFactory
+ .createTitledBorder(decision.getPoints() + ""));
for (String creature : decision.getNames())
{
ChitData cd = new ChitData(variant
@@ -169,21 +176,17 @@
addedChits.add(cd);
Chit chit = cd.chit;
chit.addMouseListener(this);
+ cd.legionChit.addMouseListener(this);
+ cd.selectedChit.addMouseListener(this);
acquireAtPanel.add(chit);
}
acquirablePane.add(acquireAtPanel);
- }
- // add 1 acquirable slot per decision up to slots available.
- int cntDecisions = (legion.getAcquirableDecisionsCount() > slots) ? slots
- : legion.getAcquirableDecisionsCount();
- for (int i = 0; i < cntDecisions; i++)
- {
Chit chit = new Chit(CRITTERSLOT);
- newAcquirablePane.add(chit);
+ acquireSelectPanel.add(chit);
+ newAcquirablePane.add(acquireSelectPanel);
}
}
- gridPane.add(acquirablePane);
- gridPane.add(newAcquirablePane);
+ contentsPane.add(gridPane(acquirablePane, newAcquirablePane));
// If Attacker, Add Summonable Panels.
if (client.isMyTurn() && legion.getSummonableDecisionsCount() > 0)
@@ -200,6 +203,8 @@
for (SummonableDecision decision : legion.getSummonableDecisions())
{
JPanel pane = new JPanel();
+ pane.setBorder(BorderFactory.createTitledBorder(decision
+ .getDonor().getMarkerId()));
for (String creature : decision.getNames())
{
ChitData cd = new ChitData(variant
@@ -207,6 +212,8 @@
addedChits.add(cd);
Chit chit = cd.chit;
chit.addMouseListener(this);
+ cd.legionChit.addMouseListener(this);
+ cd.selectedChit.addMouseListener(this);
pane.add(chit);
}
// add 1 summonable slot per decision up to slots available.
@@ -218,8 +225,7 @@
}
summonablePane.add(pane);
}
- gridPane.add(summonablePane);
- gridPane.add(newSummonablePane);
+ contentsPane.add(gridPane(summonablePane, newSummonablePane));
}
recruitPane = new JPanel();
@@ -241,6 +247,8 @@
addedChits.add(cd);
Chit chit = cd.chit;
chit.addMouseListener(this);
+ cd.legionChit.addMouseListener(this);
+ cd.selectedChit.addMouseListener(this);
pane.add(chit);
if (client.isMyTurn()) // Attacker cannot recruit till phase.
{
@@ -264,10 +272,17 @@
{
newRecruitPane.add(new JLabel("Wait for Recruit Phase"));
}
- gridPane.add(recruitPane);
- gridPane.add(newRecruitPane);
+ contentsPane.add(gridPane(recruitPane, newRecruitPane));
}
+ private JPanel gridPane(JPanel left, JPanel right)
+ {
+ JPanel pane = new JPanel(new GridLayout(0, 2));
+ pane.add(left);
+ pane.add(right);
+ return pane;
+ }
+
public void actionPerformed(ActionEvent e)
{
if (e.getActionCommand().equals("Reset"))
@@ -293,7 +308,7 @@
}
}
}
- repaint();
+ ((JComponent)e.getSource()).getRootPane().revalidate();
}
else if (e.getActionCommand().equals("Done"))
{
@@ -326,7 +341,7 @@
}
Chit chit = (Chit)source;
- Container container = chit.getParent();
+ JPanel container = (JPanel)chit.getParent();
ChitData cd = findChitData(chit);
if (cd == null)
{
@@ -357,7 +372,24 @@
Container container2 = container.getParent();
if (container2.equals(acquirablePane))
{
- newAcquirablePane.add(cd.selectedChit);
+ JPanel selectedPane = null;
+ for (Component comp : newAcquirablePane.getComponents())
+ {
+ String points = ((TitledBorder)container.getBorder())
+ .getTitle();
+ if (comp instanceof JPanel)
+ {
+ JPanel pane = (JPanel)comp;
+ if (points.equals(((TitledBorder)pane.getBorder())
+ .getTitle()))
+ {
+ selectedPane = pane;
+ }
+
+ }
+ }
+ assert selectedPane != null;
+ selectedPane.add(cd.selectedChit);
}
else if (container2.equals(summonablePane))
{
Modified: branches/cleka_acquire_etc/Colossus/core/src/main/java/net/sf/colossus/client/DialogTestMain.java
===================================================================
--- branches/cleka_acquire_etc/Colossus/core/src/main/java/net/sf/colossus/client/DialogTestMain.java 2008-04-11 15:56:39 UTC (rev 3268)
+++ branches/cleka_acquire_etc/Colossus/core/src/main/java/net/sf/colossus/client/DialogTestMain.java 2008-04-11 22:25:52 UTC (rev 3269)
@@ -51,8 +51,9 @@
client.updatePlayerInfo(infoStrings);
// System.out.println(client.toString());
- LegionClientSide legion = new LegionClientSide(player, "Bk01", client,
- hex);
+ String id = "BK01";
+ LegionClientSide legion = new LegionClientSide(player, id, client, hex);
+ legion.setMarker(new Marker(3 * Scale.get(), id, client));
List<String> list = new ArrayList<String>();
list.add("Ogre");
list.add("Ogre");
@@ -66,8 +67,10 @@
legion.addCreature("Centaur");
legion.addCreature("Centaur");
- LegionClientSide donor1 = new LegionClientSide(player, "Bk02", client,
+ String id2 = "BK02";
+ LegionClientSide donor1 = new LegionClientSide(player, id2, client,
hex2);
+ donor1.setMarker(new Marker(3 * Scale.get(), id2, client));
client.didSplit(hex2, legion, donor1, list1.size(), list1, 3);
donor1.addCreature("Angel");
@@ -80,8 +83,10 @@
legion.addCreature("Gargoyle");
legion.addCreature("Gargoyle");
- LegionClientSide donor2 = new LegionClientSide(player, "Bk03", client,
+ String id3 = "BK03";
+ LegionClientSide donor2 = new LegionClientSide(player, id3, client,
hex3);
+ donor2.setMarker(new Marker(3 * Scale.get(), id3, client));
client.didSplit(hex3, legion, donor2, list2.size(), list2, 4);
donor2.addCreature("Archangel");
@@ -112,15 +117,20 @@
recruits.add("Ranger");
legion.addReinforceDecision(recruits);
- // I'm the attacker
- // client.setupTurnState(client.getOwningPlayer(), 1);
- // i'm the defender
- client.setupTurnState(player2, 1);
+ boolean isAttacker = true;
+ if (isAttacker)
+ {
+ client.setupTurnState(client.getOwningPlayer(), 1);
+ }
+ else
+ {
+ client.setupTurnState(player2, 1);
+ }
+
boolean clemensDialog = false;
if (clemensDialog)
{
- boolean isAttacker = false;
boolean mayStillSR = true;
new AfterEngagementDialog(mainFrame, legion, isAttacker,
mayStillSR);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|