Update of /cvsroot/rails/18xx/rails/ui/swing
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24614/rails/ui/swing
Modified Files:
ORUIManager.java StartRoundWindow.java
Log Message:
Apply patches from Stefan Frey <ste...@we...> to implement 1889.
Index: StartRoundWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/StartRoundWindow.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** StartRoundWindow.java 31 Jan 2010 22:22:34 -0000 1.36
--- StartRoundWindow.java 3 Feb 2010 05:37:55 -0000 1.37
***************
*** 658,662 ****
if (item.getPrimary() instanceof PrivateCompany) {
PrivateCompany priv = (PrivateCompany) item.getPrimary();
! b.append ("<br>Revenue: ").append(Bank.format(priv.getRevenue()));
List<MapHex> blockedHexes = priv.getBlockedHexes();
if (blockedHexes == null) {
--- 658,662 ----
if (item.getPrimary() instanceof PrivateCompany) {
PrivateCompany priv = (PrivateCompany) item.getPrimary();
! b.append ("<br>Revenue: ").append(Bank.formatIntegerArray(priv.getRevenue()));
List<MapHex> blockedHexes = priv.getBlockedHexes();
if (blockedHexes == null) {
***************
*** 675,678 ****
--- 675,687 ----
}
}
+ // sfy 1889
+ List<String> preventClosingConditions = priv.getPreventClosingConditions();
+ if (!preventClosingConditions.isEmpty()) {
+ b.append("<br><b>Prevent closing conditions:</b>");
+ for (String condition : preventClosingConditions) {
+ b.append("<br>").append(condition);
+ }
+ }
+
}
if (item.getSecondary() != null) {
Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** ORUIManager.java 31 Jan 2010 22:22:34 -0000 1.48
--- ORUIManager.java 3 Feb 2010 05:37:55 -0000 1.49
***************
*** 529,533 ****
for (LayTile action : possibleActions.getType(LayTile.class)) {
if (action.getType() == LayTile.SPECIAL_PROPERTY
! && action.getSpecialProperty().getLocations().contains(mapHex)) {
// log.debug(hex.getName()+" is a special property target");
return true;
--- 529,536 ----
for (LayTile action : possibleActions.getType(LayTile.class)) {
if (action.getType() == LayTile.SPECIAL_PROPERTY
! && !action.getSpecialProperty().requiresConnection() // sfy 1889
! && action.getSpecialProperty().getLocations().contains(mapHex)
! )
! {
// log.debug(hex.getName()+" is a special property target");
return true;
|
