[Rails-commits] 2 commits - build.xml rails/game

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

 build.xml                              |    2 +-
 rails/game/Game.java                   |    2 +-
 rails/game/GameManager.java            |    2 --
 rails/game/action/PossibleActions.java |    3 +--
 4 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit e161ea2c8e3da97064fc12a127ebaacf88fca30d
Author: Stefan Frey <ste...@we...>
Date:   Fri Nov 11 16:36:27 2011 +0100

    updated version number to rails 1.5.3 (this corresponds to release 1.5.3 in branch 1.5.x)

diff --git a/build.xml b/build.xml
index d346fc0..3900603 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
 	<property name="debuglevel" value="source,lines,vars"/>
 	<property name="target" value="1.5"/>
 	<property name="source" value="1.5"/>
-	<property name="version" value="1.5.2"/>
+	<property name="version" value="1.5.3"/>
 	<taskdef name="jarbundler" 
 		classpath="tools/lib/jarbundler-2.1.0.jar"
 		classname="net.sourceforge.jarbundler.JarBundler" />
diff --git a/rails/game/Game.java b/rails/game/Game.java
index d0a87dc..c9d1054 100644
--- a/rails/game/Game.java
+++ b/rails/game/Game.java
@@ -14,7 +14,7 @@ import rails.game.action.PossibleAction;
 import rails.util.GameFileIO;
 
 public class Game {
-    public static final String version = "1.5.2+";
+    public static final String version = "1.5.3+";
 
     /** The component Manager */
     protected GameManager gameManager;


commit 2fef5fe020452f1c1901f3ce1e1ee7ab1e49aa50
Author: Stefan Frey <ste...@we...>
Date:   Fri Nov 11 16:34:58 2011 +0100

    reverted commenting-out automated pass execution code (see commit 1893c3)

diff --git a/rails/game/GameManager.java b/rails/game/GameManager.java
index b7f9859..8507931 100644
--- a/rails/game/GameManager.java
+++ b/rails/game/GameManager.java
@@ -893,11 +893,9 @@ public class GameManager implements ConfigurableComponentI, GameManagerI {
         getCurrentRound().setPossibleActions();
 
         // only pass available => execute automatically
-        /*
         if (!isGameOver() && possibleActions.containsOnlyPass()) {
             result = process(possibleActions.getList().get(0));
         }
-         */
 
         // moveStack closing is done here to allow state changes to occur
         // when setting possible actions
diff --git a/rails/game/action/PossibleActions.java b/rails/game/action/PossibleActions.java
index 8eabf5d..42d5fbe 100644
--- a/rails/game/action/PossibleActions.java
+++ b/rails/game/action/PossibleActions.java
@@ -83,7 +83,6 @@ public class PossibleActions {
         return possibleActions.isEmpty();
     }
 
-    /* OBSOLETE
     public boolean containsOnlyPass() {
         if (possibleActions.size() != 1) return false;
         PossibleAction action = possibleActions.get(0);
@@ -92,7 +91,7 @@ public class PossibleActions {
         } else {
             return false;
         }
-    }*/
+    }
 
     /** Check if a given action exists in the current list of possible actions */
     public boolean validate(PossibleAction checkedAction) {