Menu
▾
▴
[Rails-commits] Branch 'rails2.0' - 4 commits - rails/algorithms rails/common rails/game rails/ui rails/util tools/ListAndFixSavedFiles.java
|
From: Stefan F. <ste...@us...> - 2012-01-28 11:18:22
|
rails/algorithms/RevenueManager.java | 10
rails/common/DisplayBuffer.java | 1
rails/common/GuiHints.java | 8
rails/common/parser/ComponentManager.java | 6
rails/common/parser/GameFileParser.java | 7
rails/game/Bank.java | 10
rails/game/Company.java | 2
rails/game/CompanyManager.java | 2
rails/game/Game.java | 4
rails/game/GameManager.java | 32 +-
rails/game/MapHex.java | 10
rails/game/MapManager.java | 4
rails/game/OperatingRound.java | 32 ++
rails/game/PhaseManager.java | 6
rails/game/Player.java | 18 -
rails/game/PlayerManager.java | 4
rails/game/PrivateCompany.java | 4
rails/game/PublicCompany.java | 97 +++----
rails/game/Round.java | 18 -
rails/game/ShareSellingRound.java | 2
rails/game/StartItem.java | 22 -
rails/game/StartRound.java | 19 -
rails/game/StartRoundI.java | 8
rails/game/StartRound_1835.java | 4
rails/game/StockMarket.java | 6
rails/game/StockRound.java | 12
rails/game/StockSpace.java | 11
rails/game/Stop.java | 4
rails/game/Tile.java | 8
rails/game/TileI.java | 3
rails/game/TileManager.java | 2
rails/game/Train.java | 4
rails/game/TrainCertificateType.java | 10
rails/game/TrainManager.java | 4
rails/game/TreasuryShareRound.java | 4
rails/game/action/BuyTrain.java | 8
rails/game/correct/CashCorrectionAction.java | 1
rails/game/correct/CashCorrectionManager.java | 12
rails/game/correct/CorrectionManager.java | 6
rails/game/model/AbstractModel.java | 52 ----
rails/game/model/AbstractOwnable.java | 15 -
rails/game/model/BaseTokensModel.java | 66 ++++-
rails/game/model/BonusModel.java | 38 ++-
rails/game/model/CalculatedMoneyModel.java | 49 +++
rails/game/model/CashModel.java | 63 +++--
rails/game/model/CertificateCountModel.java | 46 +++
rails/game/model/CertificatesModel.java | 52 +++-
rails/game/model/DirectCashOwner.java | 20 +
rails/game/model/DirectOwner.java | 4
rails/game/model/Model.java | 46 +++
rails/game/model/MoneyModel.java | 53 +++-
rails/game/model/Observer.java | 14 -
rails/game/model/Owner.java | 1
rails/game/model/OwnerState.java | 16 -
rails/game/model/Portfolio.java | 50 ++--
rails/game/model/PortfolioCashOwner.java | 13 -
rails/game/model/PortfolioOwner.java | 14 -
rails/game/model/PresidentModel.java | 58 ++++
rails/game/model/PriceModel.java | 43 ++-
rails/game/model/PrivatesModel.java | 4
rails/game/model/SingleOwner.java | 18 +
rails/game/model/StorageModel.java | 55 +++-
rails/game/model/TrainsModel.java | 14 -
rails/game/round/RoundContext.java | 3
rails/game/special/SellBonusToken.java | 4
rails/game/special/SpecialProperty.java | 6
rails/game/special/SpecialRight.java | 1
rails/game/special/SpecialTrainBuy.java | 1
rails/game/specific/_1825/DoubleHeadingModifier.java | 1
rails/game/specific/_1825/PublicCompany_1825.java | 3
rails/game/specific/_1835/GameManager_1835.java | 4
rails/game/specific/_1835/OperatingRound_1835.java | 21 +
rails/game/specific/_1851/BirminghamTileModifier.java | 1
rails/game/specific/_1856/CGRFormationRound.java | 4
rails/game/specific/_1856/GameManager_1856.java | 4
rails/game/specific/_1856/OperatingRound_1856.java | 2
rails/game/specific/_1856/PublicCompany_1856.java | 4
rails/game/specific/_1856/PublicCompany_CGR.java | 16 -
rails/game/specific/_1856/ShareSellingRound_1856.java | 4
rails/game/specific/_1856/StockRound_1856.java | 4
rails/game/specific/_1880/PublicCompany_1880.java | 4
rails/game/specific/_1880/StartRound_1880.java | 14 -
rails/game/specific/_1880/StockRound_1880.java | 8
rails/game/specific/_1889/OperatingRound_1889.java | 4
rails/game/specific/_18AL/NameableTrain.java | 2
rails/game/specific/_18EU/GameManager_18EU.java | 15 -
rails/game/specific/_18EU/OperatingRound_18EU.java | 2
rails/game/specific/_18EU/StartRound_18EU.java | 8
rails/game/specific/_18EU/StockRound_18EU.java | 7
rails/game/specific/_18TN/OperatingRound_18TN.java | 2
rails/game/specific/_18TN/PublicCompany_18TN.java | 6
rails/game/state/AbstractContext.java | 65 -----
rails/game/state/AbstractItem.java | 68 -----
rails/game/state/AbstractState.java | 122 ---------
rails/game/state/ArrayListMultimapState.java | 29 +-
rails/game/state/ArrayListState.java | 42 ++-
rails/game/state/BooleanState.java | 41 ++-
rails/game/state/ChangeSet.java | 3
rails/game/state/Context.java | 113 ++++++++-
rails/game/state/Formatter.java | 2
rails/game/state/GameContext.java | 55 ----
rails/game/state/GameItem.java | 130 ++++------
rails/game/state/GenericState.java | 39 ++-
rails/game/state/HashMapState.java | 56 +++-
rails/game/state/HashMultimapState.java | 30 +-
rails/game/state/HashSetChange.java | 2
rails/game/state/HashSetState.java | 43 ++-
rails/game/state/IntegerState.java | 46 +++
rails/game/state/Item.java | 2
rails/game/state/MultimapChange.java | 2
rails/game/state/MultimapState.java | 15 -
rails/game/state/Observable.java | 69 ++++-
rails/game/state/Observer.java | 18 +
rails/game/state/State.java | 76 +++++-
rails/game/state/StateManager.java | 221 ++++++++----------
rails/game/state/StringState.java | 39 ++-
rails/game/state/Triggerable.java | 7
rails/ui/swing/GridPanel.java | 76 +++---
rails/ui/swing/ORUIManager.java | 6
rails/ui/swing/RemainingTilesWindow.java | 2
rails/ui/swing/elements/Caption.java | 1
rails/ui/swing/elements/Field.java | 88 +++----
rails/ui/swing/elements/GUIStockSpace.java | 31 +-
rails/ui/swing/elements/ViewObject.java | 13 -
rails/ui/swing/hexmap/GUIHex.java | 48 +++
rails/ui/swing/hexmap/GUITile.java | 2
rails/ui/swing/hexmap/HexMap.java | 38 ++-
rails/ui/swing/hexmap/HexMapImage.java | 13 -
rails/util/GameFileIO.java | 1
rails/util/Util.java | 2
tools/ListAndFixSavedFiles.java | 33 ++
131 files changed, 1783 insertions(+), 1290 deletions(-)
New commits:
commit 8e75b2c1ad5f74332133ca95cc8922e00b571119
Author: Stefan Frey <ste...@we...>
Date: Mon Jan 23 15:34:24 2012 +0100
changed creation of states to factory method create() only
diff --git a/rails/algorithms/RevenueManager.java b/rails/algorithms/RevenueManager.java
index 7a2aa1f..06c506f 100644
--- a/rails/algorithms/RevenueManager.java
+++ b/rails/algorithms/RevenueManager.java
@@ -41,9 +41,9 @@ public final class RevenueManager extends GameItem implements ConfigurableCompon
private RevenueDynamicModifier activeCalculator;
public RevenueManager() {
- graphModifiers = new ArrayListState<NetworkGraphModifier>(this, "NetworkGraphModifiers");
- staticModifiers = new ArrayListState<RevenueStaticModifier>(this, "RevenueStaticModifiers");
- dynamicModifiers = new ArrayListState<RevenueDynamicModifier>(this, "RevenueDynamicModifiers");
+ graphModifiers = ArrayListState.create(this, "NetworkGraphModifiers");
+ staticModifiers = ArrayListState.create(this, "RevenueStaticModifiers");
+ dynamicModifiers = ArrayListState.create(this, "RevenueDynamicModifiers");
configurableModifiers = new HashSet<ConfigurableComponentI>();
activeStaticModifiers = new ArrayList<RevenueStaticModifier>();
diff --git a/rails/common/DisplayBuffer.java b/rails/common/DisplayBuffer.java
index 68ad46f..114d886 100644
--- a/rails/common/DisplayBuffer.java
+++ b/rails/common/DisplayBuffer.java
@@ -7,7 +7,6 @@ import java.util.List;
import org.apache.log4j.Logger;
import rails.game.GameManager;
-import rails.game.GameManager;
import rails.util.Util;
/**
diff --git a/rails/common/GuiHints.java b/rails/common/GuiHints.java
index ddef0db..64d8dde 100644
--- a/rails/common/GuiHints.java
+++ b/rails/common/GuiHints.java
@@ -35,7 +35,7 @@ public class GuiHints extends GameItem implements Serializable{
public void setCurrentRoundType(Class<? extends RoundI> currentRoundType) {
if (this.currentRoundType == null) {
- this.currentRoundType = new GenericState<Class<? extends RoundI>>
+ this.currentRoundType = GenericState.<Class<? extends RoundI>>create
(this, "CurrentRoundType", currentRoundType);
} else {
this.currentRoundType.set(currentRoundType);
@@ -67,7 +67,7 @@ public class GuiHints extends GameItem implements Serializable{
public void setActivePanel(GuiDef.Panel activePanel) {
if (this.activePanel == null) {
- this.activePanel = new GenericState<GuiDef.Panel>(this, "ActivePanel", activePanel);
+ this.activePanel = GenericState.create(this, "ActivePanel", activePanel);
} else {
this.activePanel.set(activePanel);
}
diff --git a/rails/common/parser/GameFileParser.java b/rails/common/parser/GameFileParser.java
index f0baa49..d6eb4ec 100644
--- a/rails/common/parser/GameFileParser.java
+++ b/rails/common/parser/GameFileParser.java
@@ -2,9 +2,6 @@ package rails.common.parser;
import java.util.Map;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
import rails.algorithms.RevenueManager;
import rails.common.DisplayBuffer;
import rails.common.LocalText;
diff --git a/rails/game/Bank.java b/rails/game/Bank.java
index e386b29..07addf3 100644
--- a/rails/game/Bank.java
+++ b/rails/game/Bank.java
@@ -43,7 +43,7 @@ public class Bank extends GameItem implements CashOwner, ConfigurableComponentI
private static Bank instance = null;
/** Is the bank broken (remains true once set) */
- private BooleanState broken = new BooleanState(this, "Bank.broken", false);
+ private BooleanState broken = BooleanState.create(this, "Bank.broken", false);
/**
* The money format template. '@' is replaced by the numeric amount, the
@@ -58,7 +58,7 @@ public class Bank extends GameItem implements CashOwner, ConfigurableComponentI
instance = this;
- money = new CashModel(this);
+ money = CashModel.create(this);
// Create the IPO and the Bank Pool.
ipo = new Portfolio(ipo, IPO_NAME);
pool = new Portfolio(pool, POOL_NAME);
@@ -103,7 +103,7 @@ public class Bank extends GameItem implements CashOwner, ConfigurableComponentI
public void finishConfiguration (GameManager gameManager) {
ReportBuffer.add(LocalText.getText("BankSizeIs",
- format(money.getText())));
+ format(money.value())));
// Add privates
List<PrivateCompany> privates =
@@ -141,7 +141,7 @@ public class Bank extends GameItem implements CashOwner, ConfigurableComponentI
* @return Bank's current cash level
*/
public int getCashValue() {
- return money.getText();
+ return money.value();
}
/**
@@ -155,7 +155,7 @@ public class Bank extends GameItem implements CashOwner, ConfigurableComponentI
* Check if the bank has broken. In some games <0 could apply, so this
* will become configurable.
*/
- if (money.getText() <= 0 && !broken.booleanValue()) {
+ if (money.value() <= 0 && !broken.booleanValue()) {
broken.set(true);
money.setText(LocalText.getText("BROKEN"));
GameManager.getInstance().registerBrokenBank();
@@ -188,7 +188,7 @@ public class Bank extends GameItem implements CashOwner, ConfigurableComponentI
}
public String getFormattedCash() {
- return money.getData();
+ return money.getText();
}
public static String format(int amount) {
@@ -210,7 +210,7 @@ public class Bank extends GameItem implements CashOwner, ConfigurableComponentI
// end sfy 1889
public int getCash() {
- return money.getText();
+ return money.value();
}
public CashModel getCashModel() {
diff --git a/rails/game/Company.java b/rails/game/Company.java
index 6483953..bb8cb00 100644
--- a/rails/game/Company.java
+++ b/rails/game/Company.java
@@ -69,7 +69,7 @@ Cloneable, Comparable<Company> {
public void init(String name, CompanyTypeI type) {
this.name = name;
this.type = type;
- closedObject = new BooleanState(this, name + "_Closed", false);
+ closedObject = BooleanState.create(this, name + "_Closed", false);
}
/** Only to be called from subclasses */
diff --git a/rails/game/CompanyManager.java b/rails/game/CompanyManager.java
index 184d130..25f946a 100644
--- a/rails/game/CompanyManager.java
+++ b/rails/game/CompanyManager.java
@@ -1 +1 @@
-package rails.game;
import java.util.*;
import org.apache.log4j.Logger;
import rails.common.LocalText;
import rails.common.parser.ConfigurableComponentI;
import rails.common.parser.ConfigurationException;
import rails.common.parser.Tag;
import rails.game.state.GameItem;
import rails.game.state.Context;
public class CompanyManager extends GameItem implements CompanyManagerI, ConfigurableComponentI {
/** A List with all private companies */
private List<PrivateCompany> lPrivateCompanies =
new ArrayList<PrivateCompany>();
/** A List with all public companies */
private List<PublicCompany> lPublicCompanies =
new ArrayList<PublicCompany>();
/** A map with all private companies by name */
private Map<String, PrivateCompany> mPrivateCompanies =
new HashMap<String, PrivateCompany>();
/** A map with all public (i.e. non-private) companies by name */
private Map<String, PublicCompany> mPublicCompanies =
new HashMap<String, PublicCompany>();
/** A map of all type names to maps of companies of that type by name */
// TODO Redundant, current usage can be replaced.
private Map<String, Map<String, Company>> mCompaniesByTypeAndName =
new HashMap<String, Map<String, Company>>();
/** A list of all company types */
private List<CompanyTypeI> lCompanyTypes = new ArrayList<CompanyTypeI>();
/** A list of all start packets (usually one) */
private List<StartPacket> startPackets = new ArrayList<StartPacket>();
/** A map of all start packets, keyed by name. Default name is "Initial" */
private Map<String, StartPacket> startPacketMap
= new HashMap<String, StartPacket>();
/** A map to enable translating aliases to names */
protected Map<String, String> aliases = null;
private int numberOfPublicCompanies = 0;
protected static Logger log =
Logger.getLogger(CompanyManager.class.getPackage().getName());
protected GameManager gameManager;
/*
* NOTES: 1. |
