Update of /cvsroot/rails/18xx/rails/ui/swing
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7856/rails/ui/swing
Modified Files:
ORUIManager.java UpgradesPanel.java GameUIManager.java
Log Message:
1835 Prussian start & side effects
Index: UpgradesPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/UpgradesPanel.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** UpgradesPanel.java 31 Jan 2010 22:22:34 -0000 1.23
--- UpgradesPanel.java 28 Feb 2010 21:38:04 -0000 1.24
***************
*** 120,124 ****
description = text = comp.getName();
if (action.getSpecialProperty() != null) {
! description += " (" + action.getSpecialProperty().getCompany().getName()+")";
}
} else if (action instanceof LayBonusToken) {
--- 120,124 ----
description = text = comp.getName();
if (action.getSpecialProperty() != null) {
! description += " (" + action.getSpecialProperty().getOriginalCompany().getName()+")";
}
} else if (action instanceof LayBonusToken) {
Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** ORUIManager.java 24 Feb 2010 21:09:33 -0000 1.58
--- ORUIManager.java 28 Feb 2010 21:38:04 -0000 1.59
***************
*** 851,855 ****
if (bTrain.hasSpecialProperty()) {
String priv =
! (bTrain.getSpecialProperty()).getCompany().getName();
b.append(" ").append(LocalText.getText("USING_SP", priv));
usingPrivates += ", " + priv;
--- 851,855 ----
if (bTrain.hasSpecialProperty()) {
String priv =
! (bTrain.getSpecialProperty()).getOriginalCompany().getName();
b.append(" ").append(LocalText.getText("USING_SP", priv));
usingPrivates += ", " + priv;
Index: GameUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** GameUIManager.java 31 Jan 2010 22:22:34 -0000 1.39
--- GameUIManager.java 28 Feb 2010 21:38:04 -0000 1.40
***************
*** 499,504 ****
if (!ready) {
!
! if (currentDialog instanceof RadioButtonDialog
&& currentDialogAction instanceof StartCompany) {
--- 499,506 ----
if (!ready) {
!
! if (checkGameSpecificDialogAction()) {
! ;
! } else if (currentDialog instanceof RadioButtonDialog
&& currentDialogAction instanceof StartCompany) {
***************
*** 570,573 ****
--- 572,580 ----
}
+ /** Stub, can be overridden by subclasses */
+ protected boolean checkGameSpecificDialogAction() {
+ return false;
+ }
+
public JDialog getCurrentDialog() {
return currentDialog;
|
