[Rails-commits] SF.net SVN: rails:[1462] trunk/18xx/rails/game

[<ev...@us...>]

Revision: 1462
          http://rails.svn.sourceforge.net/rails/?rev=1462&view=rev
Author:   evos
Date:     2010-12-18 21:42:03 +0000 (Sat, 18 Dec 2010)

Log Message:
-----------
Fixed bug in ArrayListState / AddToList that caused CGR always to operate last in its formation OR.

Modified Paths:
--------------
    trunk/18xx/rails/game/OperatingRound.java
    trunk/18xx/rails/game/move/AddToList.java
    trunk/18xx/rails/game/specific/_1856/OperatingRound_1856.java
    trunk/18xx/rails/game/state/ArrayListState.java

Modified: trunk/18xx/rails/game/OperatingRound.java
===================================================================
--- trunk/18xx/rails/game/OperatingRound.java	2010-12-18 21:40:56 UTC (rev 1461)
+++ trunk/18xx/rails/game/OperatingRound.java	2010-12-18 21:42:03 UTC (rev 1462)
@@ -2282,7 +2282,8 @@
     }
 
     public int getOperatingCompanyIndex() {
-        return operatingCompanies.indexOf(getOperatingCompany());
+        int index = operatingCompanies.indexOf(getOperatingCompany());
+        return index;
     }
 
     /**

Modified: trunk/18xx/rails/game/move/AddToList.java
===================================================================
--- trunk/18xx/rails/game/move/AddToList.java	2010-12-18 21:40:56 UTC (rev 1461)
+++ trunk/18xx/rails/game/move/AddToList.java	2010-12-18 21:42:03 UTC (rev 1462)
@@ -19,7 +19,7 @@
     protected String listName;
     protected Integer index; // if supplied insert at index position
 
-    public AddToList(List<E> list, E object, String listName, 
+    public AddToList(List<E> list, E object, String listName,
             ModelObject modelToUpdate) {
         this.object = object;
         this.list = list;
@@ -29,15 +29,25 @@
 
         MoveSet.add(this);
     }
-    
+
     public AddToList(List<E> list, E object, String listName) {
-        this (list, object, listName, null);
+        this.object = object;
+        this.list = list;
+        this.listName = listName;
+        this.index = null;
+
+        MoveSet.add(this);
     }
-    
-    public void atIndex(int index) {
+
+    public AddToList(List<E> list, E object, int index, String listName) {
+        this.object = object;
+        this.list = list;
+        this.listName = listName;
         this.index = index;
-    }
 
+        MoveSet.add(this);
+   }
+
     @Override
     public boolean execute() {
         if (index == null) {
@@ -58,7 +68,7 @@
 
     @Override
     public String toString() {
-        if (index == null) 
+        if (index == null)
             return "AddToList " + listName + ": " + object.toString();
         else
             return "AddToList " + listName + ": " + object.toString() + " at index " + index;

Modified: trunk/18xx/rails/game/specific/_1856/OperatingRound_1856.java
===================================================================
--- trunk/18xx/rails/game/specific/_1856/OperatingRound_1856.java	2010-12-18 21:40:56 UTC (rev 1461)
+++ trunk/18xx/rails/game/specific/_1856/OperatingRound_1856.java	2010-12-18 21:42:03 UTC (rev 1462)
@@ -1,6 +1,7 @@
 package rails.game.specific._1856;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import rails.common.GuiDef;
 import rails.game.*;
@@ -9,7 +10,6 @@
 import rails.game.special.SellBonusToken;
 import rails.game.special.SpecialPropertyI;
 import rails.game.state.BooleanState;
-import rails.game.state.IntegerState;
 import rails.util.LocalText;
 
 public class OperatingRound_1856 extends OperatingRound {

Modified: trunk/18xx/rails/game/state/ArrayListState.java
===================================================================
--- trunk/18xx/rails/game/state/ArrayListState.java	2010-12-18 21:40:56 UTC (rev 1461)
+++ trunk/18xx/rails/game/state/ArrayListState.java	2010-12-18 21:42:03 UTC (rev 1462)
@@ -43,7 +43,7 @@
     }
 
     public void add(int index, E element) {
-        new AddToList<E>(list, element, listName).atIndex(index);
+        new AddToList<E>(list, element, index, listName);
     }
 
     public boolean remove(E element) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.