Menu
▾
▴
[Rails-commits] SF.net SVN: rails:[1455] trunk/18xx/rails/ui/swing
|
From: <ev...@us...> - 2010-10-28 18:57:49
|
Revision: 1455
http://rails.svn.sourceforge.net/rails/?rev=1455&view=rev
Author: evos
Date: 2010-10-28 18:57:43 +0000 (Thu, 28 Oct 2010)
Log Message:
-----------
Final fix of the map display problem when a game is started via RunGame with a saved file parameter.
Modified Paths:
--------------
trunk/18xx/rails/ui/swing/StartRoundWindow.java
trunk/18xx/rails/ui/swing/StatusWindow.java
trunk/18xx/rails/ui/swing/StockChart.java
trunk/18xx/rails/ui/swing/hexmap/GUIHex.java
trunk/18xx/rails/ui/swing/hexmap/HexMap.java
Modified: trunk/18xx/rails/ui/swing/StartRoundWindow.java
===================================================================
--- trunk/18xx/rails/ui/swing/StartRoundWindow.java 2010-10-27 21:54:11 UTC (rev 1454)
+++ trunk/18xx/rails/ui/swing/StartRoundWindow.java 2010-10-28 18:57:43 UTC (rev 1455)
@@ -158,7 +158,7 @@
gbc = new GridBagConstraints();
players = gameUIManager.getGameManager().getPlayers().toArray(new Player[0]);
- np = GameManager.getInstance().getNumberOfPlayers();
+ np = gameUIManager.getGameManager().getNumberOfPlayers();
packet = round.getStartPacket();
crossIndex = new int[packet.getNumberOfItems()];
@@ -185,8 +185,8 @@
requestFocus();
addKeyListener(this);
-
+
pack();
}
@@ -692,7 +692,7 @@
b.append("<br>").append(condition);
}
}
-
+
}
if (item.getSecondary() != null) {
b.append("<br><b>Also contains:</b><br>");
Modified: trunk/18xx/rails/ui/swing/StatusWindow.java
===================================================================
--- trunk/18xx/rails/ui/swing/StatusWindow.java 2010-10-27 21:54:11 UTC (rev 1454)
+++ trunk/18xx/rails/ui/swing/StatusWindow.java 2010-10-28 18:57:43 UTC (rev 1455)
@@ -3,12 +3,8 @@
import java.awt.BorderLayout;
import java.awt.Color;
-//import java.awt.GraphicsConfiguration;
-//import java.awt.Rectangle;
import java.awt.event.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
import javax.swing.*;
@@ -17,10 +13,8 @@
import rails.common.GuiDef;
import rails.game.*;
import rails.game.action.*;
-import rails.game.correct.*;
-import rails.ui.swing.elements.ActionButton;
-import rails.ui.swing.elements.ActionMenuItem;
-import rails.ui.swing.elements.ActionCheckBoxMenuItem;
+import rails.game.correct.CorrectionModeAction;
+import rails.ui.swing.elements.*;
import rails.util.Config;
import rails.util.LocalText;
@@ -93,7 +87,7 @@
Logger.getLogger(StatusWindow.class.getPackage().getName());
// GraphicsConfiguration graphicsConfiguration;
-
+
// public StatusWindow(GraphicsConfiguration gc) {
// super(gc);
// this.graphicsConfiguration = gc;
@@ -175,7 +169,7 @@
menuItem.setMnemonic(KeyEvent.VK_R);
menuItem.addActionListener(this);
optMenu.add(menuItem);
-
+
// new config menu only for non legacy configgfiles
if (!Config.isLegacyConfigFile()) {
menuItem = new JCheckBoxMenuItem(LocalText.getText("CONFIG"));
@@ -354,18 +348,18 @@
}
}
}
-
+
public void setCorrectionMenu() {
// Update the correction menu
correctionMenu.removeAll();
correctionMenu.setEnabled(false);
- // currently only shows CorrectionModeActions
+ // currently only shows CorrectionModeActions
List<CorrectionModeAction> corrections =
possibleActions.getType(CorrectionModeAction.class);
-
-
+
+
if (corrections != null && !corrections.isEmpty()) {
for (CorrectionModeAction a : corrections) {
ActionCheckBoxMenuItem item = new ActionCheckBoxMenuItem (
@@ -379,7 +373,7 @@
correctionMenu.setEnabled(true);
}
}
-
+
public boolean setupFor(RoundI round) {
currentRound = round;
@@ -397,14 +391,14 @@
// correction actions always possible
return gameStatus.initCashCorrectionActions();
-
+
}
public void updateStatus() {
- if (!(currentRound instanceof StockRound || currentRound instanceof EndOfGameRound))
+ if (!(currentRound instanceof StockRound || currentRound instanceof EndOfGameRound))
return;
-
+
// Moved here from StatusWindow_1856. It's getting generic...
if (possibleActions.contains(DiscardTrain.class)) {
immediateAction = possibleActions.getType(DiscardTrain.class).get(0);
@@ -537,7 +531,7 @@
}
if (currentRound instanceof EndOfGameRound) endOfGame();
-
+
pack();
toFront();
@@ -703,50 +697,50 @@
// setVisible(true);
// gameUIManager.reportWindow.setVisible(true);
// gameUIManager.stockChart.setVisible(true);
-
+
setTitle(LocalText.getText("EoGTitle"));
// Enable Passbutton
passButton.setEnabled(true);
passButton.setText(LocalText.getText("END_OF_GAME_CLOSE_ALL_WINDOWS"));
-
+
gameUIManager.orWindow.finish();
}
public Player getCurrentPlayer () {
return gameUIManager.getCurrentPlayer();
}
-
+
public void endOfGameReport() {
- GameManagerI gm = GameManager.getInstance();
-
- if (gm.getGameOverReportedUI())
+ GameManagerI gm = gameUIManager.getGameManager();
+
+ if (gm.getGameOverReportedUI())
return;
else
gm.setGameOverReportedUI(true);
-
+
JOptionPane.showMessageDialog(this,
LocalText.getText("EoGPressButton"),
LocalText.getText("EoGFinalRanking"),
JOptionPane.PLAIN_MESSAGE
);
-
+
// show game report line by line
- List<String> gameReport = GameManager.getInstance().getGameReport();
+ List<String> gameReport = gm.getGameReport();
Collections.reverse(gameReport);
-
+
StringBuilder report = new StringBuilder();
for (String s:gameReport) {
report.insert(0, s + "\n");
- JOptionPane.showMessageDialog(this,
+ JOptionPane.showMessageDialog(this,
report,
LocalText.getText("EoGFinalRanking"),
JOptionPane.PLAIN_MESSAGE
);
}
}
-
+
public void keyReleased(KeyEvent e) {}
public void keyPressed(KeyEvent e) {
Modified: trunk/18xx/rails/ui/swing/StockChart.java
===================================================================
--- trunk/18xx/rails/ui/swing/StockChart.java 2010-10-27 21:54:11 UTC (rev 1454)
+++ trunk/18xx/rails/ui/swing/StockChart.java 2010-10-28 18:57:43 UTC (rev 1455)
@@ -6,7 +6,6 @@
import javax.swing.*;
-import rails.game.GameManager;
import rails.game.StockSpaceI;
import rails.ui.swing.elements.GUIStockSpace;
@@ -108,7 +107,7 @@
public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_F1) {
- HelpWindow.displayHelp(GameManager.getInstance().getHelp());
+ HelpWindow.displayHelp(gameUIManager.getGameManager().getHelp());
e.consume();
}
}
Modified: trunk/18xx/rails/ui/swing/hexmap/GUIHex.java
===================================================================
--- trunk/18xx/rails/ui/swing/hexmap/GUIHex.java 2010-10-27 21:54:11 UTC (rev 1454)
+++ trunk/18xx/rails/ui/swing/hexmap/GUIHex.java 2010-10-28 18:57:43 UTC (rev 1455)
@@ -411,7 +411,9 @@
if (getHexModel().isBlockedForTileLays()) {
List<PrivateCompanyI> privates =
- GameManager.getInstance().getCompanyManager().getAllPrivateCompanies();
+ //GameManager.getInstance().getCompanyManager().getAllPrivateCompanies();
+ hexMap.getOrUIManager().getGameUIManager().getGameManager()
+ .getCompanyManager().getAllPrivateCompanies();
for (PrivateCompanyI p : privates) {
List<MapHex> blocked = p.getBlockedHexes();
if (blocked != null) {
Modified: trunk/18xx/rails/ui/swing/hexmap/HexMap.java
===================================================================
--- trunk/18xx/rails/ui/swing/hexmap/HexMap.java 2010-10-27 21:54:11 UTC (rev 1454)
+++ trunk/18xx/rails/ui/swing/hexmap/HexMap.java 2010-10-28 18:57:43 UTC (rev 1455)
@@ -540,7 +540,10 @@
return mapManager;
}
- public void mouseClicked(MouseEvent arg0) {
+ public ORUIManager getOrUIManager() {
+ return orUIManager;
+ }
+ public void mouseClicked(MouseEvent arg0) {
Point point = arg0.getPoint();
GUIHex clickedHex = getHexContainingPoint(point);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
