rails-commits

[Stefan F. <ste...@us...>]

Update of /cvsroot/rails/18xx/rails/ui/swing
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7598/rails/ui/swing

Modified Files:
	ORUIManager.java 
Log Message:
Fixed bug that stations with token of company were still highlighted

Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** ORUIManager.java	24 Jun 2010 21:48:08 -0000	1.80
--- ORUIManager.java	24 Jun 2010 22:34:07 -0000	1.81
***************
*** 272,280 ****
                  if (mapHexes) {
                      // generate network graph to indicate the token lays
!                     hexUpgrades = NetworkGraphBuilder.getStationHexes(getCompanyGraph(), orComp);
!                     for (LayToken layToken:allowedTokenLays) {
!                         if (layToken.getLocations() != null)
!                             hexUpgrades.addAll(layToken.getLocations());
!                     }
                      for (MapHex hex:hexUpgrades) {
                          GUIHex guiHex = map.getHexByName(hex.getName());
--- 272,276 ----
                  if (mapHexes) {
                      // generate network graph to indicate the token lays
!                     hexUpgrades.addAll(NetworkGraphBuilder.getTokenableStationHexes(getCompanyGraph(), orComp));
                      for (MapHex hex:hexUpgrades) {
                          GUIHex guiHex = map.getHexByName(hex.getName());