Re: [Rails-devel] delurking with a quick ReportWindow fix

[Erik V. <eri...@hc...>]

> The most recent information that I had is that "unified diff" 
> was still the preferred format for beginning contributions.  
> If that should be changed, just let me know.
> 
> I don't see how to save the contents of an Eclipse "source 
> compare" view in any meaningful way.  I must add that 
> whenever a non-coding task can be performed in Cygwin/Emacs 
> instead of Eclipse, I almost always do so. :-)

Eclipse can create unified diffs via (right-click)Team/Create Patch, see
example below.
The paths in this patch do have date/time, so that can't have been the
problem after all.
And this patch can be applied via Team/Apply Patch.

Perhaps it's more important that there is no "orig" in the paths; indeed I
also had to remove that stuff and make both paths equal to have Eclipse
accept the previous patches.

N.B. The below patch only removes some dead code. I have committed it.

Erik


### Eclipse Workspace Patch 1.0
#P Rails
Index: rails/game/GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.35
diff -u -r1.35 GameManager.java
--- rails/game/GameManager.java	26 Oct 2008 20:47:37 -0000	1.35
+++ rails/game/GameManager.java	22 Nov 2008 17:12:15 -0000
@@ -54,7 +54,6 @@
     protected int currentNumberOfOperatingRounds = 1;
     protected boolean skipFirstStockRound = false;
 
-    //protected boolean companiesCanBuyPrivates = false;
     protected boolean gameEndsWithBankruptcy = false;
     protected int gameEndsWhenBankHasLessOrEqual = 0;
     protected boolean gameEndsAfterSetOfORs = true;
@@ -542,8 +541,6 @@
         }
 
         // Note: round may have changed!
-        // log.debug("Calling setPossibleActions for round
-        // "+getCurrentRound().toString());
         possibleActions.clear();
         getCurrentRound().setPossibleActions();
 
@@ -612,8 +609,7 @@
     }
 
     public void finishShareSellingRound() {
-        // currentRound = interruptedRound;
-        setRound(interruptedRound);
+         setRound(interruptedRound);
         ((OperatingRound) getCurrentRound()).resumeTrainBuying();
     }
 
@@ -815,57 +811,14 @@
         }
     }
 
-    /*
-    public static void setCompaniesCanBuyPrivates() {
-        instance.companiesCanBuyPrivates = true;
-    }
-    */
-
     public String getHelp() {
         return getCurrentRound().getHelp();
     }
 
-    /*
-    public static void setHasAnyParPrice(boolean hasAnyParPrice) {
-        instance.hasAnyParPrice = hasAnyParPrice;
-    }
-    */
-
     public boolean canAnyCompanyHoldShares() {
         return canAnyCompanyHoldShares;
     }
 
-    /*
-    public static void setCanAnyCompanyHoldShares(
-            boolean canAnyCompanyHoldShares) {
-        instance.canAnyCompanyHoldShares = canAnyCompanyHoldShares;
-    }
-    */
-
-    /*
-    public static boolean canAnyCompBuyPrivates() {
-        return instance.canAnyCompBuyPrivates;
-    }
-    */
-
-    /*
-    public static void setCanAnyCompBuyPrivates(boolean
canAnyCompBuyPrivates) {
-        instance.canAnyCompanyBuyPrivates = canAnyCompBuyPrivates;
-    }
-    */
-
-    /*
-    public static boolean doBonusTokensExist() {
-        return instance.bonusTokensExist;
-    }
-    */
-
-    /*
-    public static void setBonusTokensExist(boolean bonusTokensExist) {
-        instance.bonusTokensExist = bonusTokensExist;
-    }
-    */
-    
     public String getClassName (Defs.ClassName key) {
         
         switch (key) {