Merge maintenance branch into the master branch

src/main/java/net/sf/rails/algorithms/NetworkVertex.java

@@ -135,6 +135,10 @@ public boolean isMajor(){
     public boolean isMinor(){
         return (stationType != null && stationType == StationType.MINOR);
     }
+
+    public boolean isMine( ) {
+        return (stationType != null && stationType == StationType.COALMINE);
+    }
 
     public boolean isMine( ) {
         return (stationType != null && stationType == StationType.COALMINE);

src/main/java/net/sf/rails/game/OperatingRound.java

@@ -294,6 +294,12 @@ public boolean process(PossibleAction action) {
                 && ((UseSpecialProperty) selectedAction).getSpecialProperty() instanceof SpecialRight) {
 
             result = buyRight((UseSpecialProperty) selectedAction);
+
+        } else if (selectedAction instanceof UseSpecialProperty 
+                && ((UseSpecialProperty) selectedAction).getSpecialProperty() instanceof ExchangeForShare) {
+
+            useSpecialProperty((UseSpecialProperty)selectedAction);
+
 
         } else if (selectedAction instanceof UseSpecialProperty
                 && ((UseSpecialProperty) selectedAction).getSpecialProperty() instanceof ExchangeForShare) {
@@ -332,6 +338,82 @@ public boolean process(PossibleAction action) {
 
         return result;
     }
+
+    public boolean useSpecialProperty(UseSpecialProperty action) {
+
+        SpecialProperty sp = action.getSpecialProperty();
+
+        if (sp instanceof ExchangeForShare) {
+
+            return executeExchangeForShare(action, (ExchangeForShare) sp);
+
+        } else {
+            return false;
+        }
+    }
+
+    public boolean executeExchangeForShare (UseSpecialProperty action, ExchangeForShare sp) {
+
+        PublicCompany publicCompany =
+            companyManager.getPublicCompany(sp.getPublicCompanyName());
+        PrivateCompany privateCompany = (PrivateCompany)sp.getOriginalCompany();
+        Owner owner= privateCompany.getOwner();
+        Player player = null;
+        String errMsg = null;
+        boolean ipoHasShare = ipo.getShare(publicCompany) >= sp.getShare();
+        boolean poolHasShare = pool.getShare(publicCompany) >= sp.getShare();
+
+        while (true) {
+
+            /* Check if the private is owned by a player */
+            if (!(owner instanceof Player)) {
+                errMsg =
+                    LocalText.getText("PrivateIsNotOwnedByAPlayer",
+                            privateCompany.getId());
+                break;
+            }
+
+            player = (Player) owner;
+
+            /* Check if a share is available */
+            if (!ipoHasShare && !poolHasShare) {
+                errMsg =
+                    LocalText.getText("NoSharesAvailable",
+                            publicCompany.getId());
+                break;
+            }
+
+            break;
+        }
+        if (errMsg != null) {
+            DisplayBuffer.add(this, LocalText.getText(
+                    "CannotSwapPrivateForCertificate",
+                    player.getId(),
+                    privateCompany.getId(),
+                    sp.getShare(),
+                    publicCompany.getId(),
+                    errMsg ));
+            return false;
+        }
+
+
+
+        Certificate cert =
+            ipoHasShare ? ipo.findCertificate(publicCompany,
+                    false) : pool.findCertificate(publicCompany,
+                            false);
+            cert.moveTo(player);
+            ReportBuffer.add(this, LocalText.getText("SwapsPrivateForCertificate",
+                    player.getId(),
+                    privateCompany.getId(),
+                    sp.getShare(),
+                    publicCompany.getId()));
+            sp.setExercised();
+            privateCompany.setClosed();
+
+            return true;
+    }
+
 
     public boolean useSpecialProperty(UseSpecialProperty action) {
 
@@ -2533,7 +2615,7 @@ public void payout(int amount) {
                     recipient.getId(), partText, shares,
                     operatingCompany.value().getShareUnit()));
         }
-
+        
         // Move the token
         operatingCompany.value().payout(amount);
 

src/main/java/net/sf/rails/game/financial/NationalFormationRound.java

@@ -37,7 +37,6 @@ public class NationalFormationRound extends StockRound {
 
     public NationalFormationRound(GameManager parent, String id) {
         super(parent, id);
-        // TODO Auto-generated constructor stub
     }
 
 
@@ -488,7 +487,7 @@ protected void finishRound() {
 
     @Override
     public String toString() {
-        return "1837 KuKFormationRound";
+        return "1837 NationalFormationRound";
     }
 
 }

src/main/java/net/sf/rails/game/financial/PlayerShareUtils.java

@@ -93,11 +93,11 @@ private static SortedSet<Integer> presidentSellMultiple(PublicCompany company, P
         int potentialShareNumber = potential.getPortfolioModel().getShare(company);
         int shareNumberDumpDifference = presidentShareNumber - potentialShareNumber;
         boolean presidentShareOnly = false;
-        
+
         if (presidentCert.getShare() == presidentShareNumber)  { // Only President Share to be sold...
             presidentShareOnly = true;
         }
-        
+
         // ... if this is less than what the pool allows => goes back to non-president selling
         int poolAllows = poolAllowsShareNumbers(company);
         if ((shareNumberDumpDifference <= poolAllows) && (!presidentShareOnly)) {

src/main/java/net/sf/rails/game/financial/StockRound.java

@@ -552,6 +552,7 @@ public void setSellableShares() {
                     continue;
                 }
 
+                //For a president certificate only the number is 2.. but it may also be 2 if the player has more than just the president certificate..
                 for (int i = 1; i <= number; i++) {
                     if (checkIfSplitSaleOfPresidentAllowed()) {
                         // check if selling would dump the company

src/main/java/net/sf/rails/game/model/CertificatesModel.java

@@ -99,7 +99,7 @@ ImmutableMultimap<String, PublicCertificate> getCertificatesByType(PublicCompany
     SortedMultiset<Integer> getCertificateTypeCounts(PublicCompany company) {
         ImmutableSortedMultiset.Builder<Integer> certCount = ImmutableSortedMultiset.naturalOrder();
         for (PublicCertificate cert : getCertificates(company)) {
-            if (!cert.isPresidentShare()) {
+            if (!cert.isPresidentShare()) { 
                 certCount.add(cert.getShares());
             }
         }

src/main/java/net/sf/rails/game/specific/_1835/StockRound_1835.java

@@ -124,7 +124,7 @@ protected int getBuyPrice (BuyCertificate action, StockSpace currentSpace) {
     }
 
     // The sell-in-same-turn-at-decreasing-price option does not apply here
-    
+
     // change: check exactly how it differs here
     // requires: do a parameterization
     @Override
@@ -246,11 +246,11 @@ public boolean done(NullAction action, String playerName,
 
   /*  (non-Javadoc)
      * @see net.sf.rails.game.StockRound#mayPlayerSellShareOfCompany(net.sf.rails.game.PublicCompany)
-    */ 
+    */
     @Override
     public boolean mayPlayerSellShareOfCompany(PublicCompany company) {
-        if (!super.mayPlayerSellShareOfCompany(company) ) 
-            { 
+        if (!super.mayPlayerSellShareOfCompany(company) )
+            {
             return false;
             }
         else {
@@ -259,13 +259,13 @@ public boolean mayPlayerSellShareOfCompany(PublicCompany company) {
            * But if he has sold a share in this round he is allowed to sell dump the presidency...
            *
            * */
-            if (company.getPresident() == currentPlayer) { 
+            if (company.getPresident() == currentPlayer) {
                 if (PlayerShareUtils.poolAllowsShareNumbers(company) >1) return true;
                 }
         }
         return true;
     }
-    
+
     @Override
     protected boolean checkIfSplitSaleOfPresidentAllowed() {
         // in 1835 its not allowed to Split the President Certificate on sale
@@ -278,5 +278,5 @@ protected void setPriority(String string) {
 			super.setPriority(string);
 		}
 	}
-     
+
 }

src/main/java/net/sf/rails/game/specific/_1837/GameManager_1837.java

@@ -8,17 +8,19 @@
 
 import net.sf.rails.common.GuiDef;
 import net.sf.rails.game.GameManager;
+import net.sf.rails.game.NationalFormationRound;
+import net.sf.rails.game.OperatingRound;
 import net.sf.rails.game.Phase;
 import net.sf.rails.game.Player;
 import net.sf.rails.game.RailsRoot;
 import net.sf.rails.game.Round;
 import net.sf.rails.game.StartPacket;
 import net.sf.rails.game.StartRound;
-import net.sf.rails.game.OperatingRound;
-import net.sf.rails.game.financial.NationalFormationRound;
+import net.sf.rails.game.specific._1837.OperatingRound_1837;
+import net.sf.rails.game.specific._18EU.FinalMinorExchangeRound;
+import net.sf.rails.game.state.BooleanState;
 import net.sf.rails.game.state.GenericState;
 import net.sf.rails.game.state.IntegerState;
-import net.sf.rails.game.state.BooleanState;
 
 
 

src/main/java/net/sf/rails/game/specific/_1837/OperatingRound_1837.java

@@ -12,6 +12,7 @@
 import org.slf4j.LoggerFactory;
 
 import net.sf.rails.common.DisplayBuffer;
+import net.sf.rails.common.GameOption;
 import net.sf.rails.common.LocalText;
 import net.sf.rails.common.ReportBuffer;
 import net.sf.rails.game.GameDef;
@@ -27,6 +28,7 @@
 import net.sf.rails.game.financial.NationalFormationRound;
 import net.sf.rails.game.special.ExchangeForShare;
 import net.sf.rails.game.special.SpecialProperty;
+import net.sf.rails.game.specific._18EU.GameManager_18EU;
 import net.sf.rails.game.state.BooleanState;
 import net.sf.rails.game.state.Currency;
 import net.sf.rails.game.state.MoneyOwner;

src/main/java/net/sf/rails/game/specific/_1837/PublicCompany_1837.java

@@ -14,7 +14,7 @@
 import net.sf.rails.game.state.Owner;
 
 public class PublicCompany_1837 extends PublicCompany {
-   
+
     public PublicCompany_1837(RailsItem parent, String id) {
         super(parent, id);
     }
@@ -68,6 +68,6 @@ public boolean isSoldOut() {
     /**
      * @param coalMineTreasuryBonus the coalMineTreasuryBonus to set
      */
-    
-    
+
+
 }

src/main/java/net/sf/rails/game/specific/_1837/StartRound_1837_2ndEd.java

@@ -333,4 +333,9 @@ private void setNextSelectingPlayer() {
         playerManager.setCurrentToNextPlayerAfter(selectingPlayer.value());
     }
 
+    @Override
+    public String getHelp() {
+        return "1837 Start Round help text";
+    }
+
 }

src/main/java/net/sf/rails/ui/swing/GameStatus.java

@@ -564,7 +564,6 @@ protected void initFields() {
                     wideGapPosition, true);
         }
 
-
         addField(new Caption(LocalText.getText("WORTH")), 0,
                 playerWorthYOffset, 1, 1, 0, true);
         for (int i = 0; i < np; i++) {

src/main/java/net/sf/rails/ui/swing/GameUIManager.java

@@ -568,7 +568,6 @@ public void updateUI() {
             log.debug("Correction overrides active window: status window active");
         }
 
-
         // Active window settings are handled last.
         // Side effects: the active window is made visible and put on top.
         if (uiHints.getActivePanel() == GuiDef.Panel.START_ROUND) {

src/main/java/net/sf/rails/ui/swing/gamespecific/_1837/ORUIManager_1837.java

@@ -9,6 +9,7 @@
 import net.sf.rails.sound.SoundManager;
 import net.sf.rails.ui.swing.ORPanel;
 import net.sf.rails.ui.swing.ORUIManager;
+import net.sf.rails.ui.swing.ORWindow;
 import net.sf.rails.ui.swing.gamespecific._1880.StartRoundWindow_1880;
 import rails.game.action.SetDividend;