Menu
▾
▴
rails-commits
|
From: Stefan F. <ste...@us...> - 2011-10-14 04:57:13
|
rails/algorithms/NetworkCompanyGraph.java | 14
rails/algorithms/NetworkGraphBuilder.java | 20
rails/algorithms/NetworkIterator.java | 4
rails/algorithms/NetworkTrain.java | 10
rails/algorithms/NetworkVertex.java | 8
rails/algorithms/RevenueAdapter.java | 34
rails/algorithms/RevenueBonus.java | 28
rails/algorithms/RevenueBonusTemplate.java | 10
rails/algorithms/RevenueManager.java | 4
rails/common/DisplayBuffer.java | 6
rails/common/parser/ConfigurableComponentI.java | 4
rails/game/Bank.java | 63 -
rails/game/BaseToken.java | 17
rails/game/Bonus.java | 12
rails/game/BonusToken.java | 15
rails/game/CashHolder.java | 26
rails/game/Certificate.java | 7
rails/game/Company.java | 51
rails/game/CompanyI.java | 115 --
rails/game/CompanyManager.java | 2
rails/game/CompanyManagerI.java | 13
rails/game/CompanyType.java | 17
rails/game/CompanyTypeI.java | 5
rails/game/EndOfGameRound.java | 2
rails/game/Game.java | 5
rails/game/GameManager.java | 218 ++--
rails/game/GameManagerI.java | 252 ----
rails/game/MapHex.java | 159 +--
rails/game/MapManager.java | 5
rails/game/OperatingRound.java | 271 ++---
rails/game/Phase.java | 19
rails/game/PhaseI.java | 45
rails/game/PhaseManager.java | 22
rails/game/Player.java | 65 -
rails/game/PlayerManager.java | 14
rails/game/Portfolio.java | 734 --------------
rails/game/PrivateCompany.java | 94 -
rails/game/PrivateCompanyI.java | 71 -
rails/game/PublicCertificate.java | 39
rails/game/PublicCertificateI.java | 87 -
rails/game/PublicCompany.java | 197 ++-
rails/game/PublicCompanyI.java | 358 ------
rails/game/ReportBuffer.java | 12
rails/game/Round.java | 96 -
rails/game/ShareSellingRound.java | 49
rails/game/StartItem.java | 38
rails/game/StartPacket.java | 4
rails/game/StartRound.java | 10
rails/game/StartRound_1830.java | 4
rails/game/StartRound_1835.java | 2
rails/game/StockMarket.java | 32
rails/game/StockMarketI.java | 18
rails/game/StockRound.java | 163 +--
rails/game/StockSpace.java | 31
rails/game/StockSpaceI.java | 16
rails/game/Stop.java | 66 -
rails/game/SwitchableUIRound.java | 2
rails/game/Tile.java | 10
rails/game/TileI.java | 4
rails/game/TileManager.java | 2
rails/game/Token.java | 52
rails/game/TokenHolder.java | 51
rails/game/TokenI.java | 26
rails/game/Train.java | 49
rails/game/TrainCertificateType.java | 8
rails/game/TrainI.java | 80 -
rails/game/TrainManager.java | 5
rails/game/TrainType.java | 4
rails/game/TreasuryShareRound.java | 50
rails/game/action/BuyBonusToken.java | 22
rails/game/action/BuyCertificate.java | 13
rails/game/action/BuyPrivate.java | 8
rails/game/action/BuyStartItem.java | 4
rails/game/action/BuyTrain.java | 33
rails/game/action/DiscardTrain.java | 18
rails/game/action/LayBonusToken.java | 2
rails/game/action/MergeCompanies.java | 28
rails/game/action/PossibleAction.java | 4
rails/game/action/PossibleORAction.java | 6
rails/game/action/ReachDestinations.java | 22
rails/game/action/RepayLoans.java | 8
rails/game/action/SellShares.java | 4
rails/game/action/StartCompany.java | 8
rails/game/action/TakeLoans.java | 8
rails/game/correct/CashCorrectionAction.java | 10
rails/game/correct/CashCorrectionManager.java | 19
rails/game/correct/ClosePrivate.java | 6
rails/game/correct/MapCorrectionManager.java | 2
rails/game/model/AbstractModel.java | 40
rails/game/model/AbstractOwnable.java | 27
rails/game/model/BaseTokensModel.java | 10
rails/game/model/BonusModel.java | 2
rails/game/model/CalculatedMoneyModel.java | 11
rails/game/model/CashModel.java | 22
rails/game/model/CashOwner.java | 11
rails/game/model/CertificateCountModel.java | 14
rails/game/model/CertificatesModel.java | 98 +
rails/game/model/DirectCashOwner.java | 15
rails/game/model/DirectOwner.java | 45
rails/game/model/Holder.java | 37
rails/game/model/HolderModel.java | 70 +
rails/game/model/Model.java | 9
rails/game/model/MoneyModel.java | 5
rails/game/model/Observer.java | 14
rails/game/model/Ownable.java | 19
rails/game/model/Owner.java | 29
rails/game/model/OwnerState.java | 16
rails/game/model/Owners.java | 75 +
rails/game/model/Portfolio.java | 630 ++++++++++++
rails/game/model/PortfolioCashOwner.java | 21
rails/game/model/PortfolioOwner.java | 35
rails/game/model/PresidentModel.java | 13
rails/game/model/PriceModel.java | 11
rails/game/model/PrivatesModel.java | 9
rails/game/model/SingleOwner.java | 55 +
rails/game/model/TrainsModel.java | 45
rails/game/model/View.java | 12
rails/game/special/LocatedBonus.java | 2
rails/game/special/SellBonusToken.java | 17
rails/game/special/SpecialProperty.java | 38
rails/game/special/SpecialPropertyI.java | 17
rails/game/special/SpecialRight.java | 2
rails/game/special/SpecialTileLay.java | 2
rails/game/special/SpecialTokenLay.java | 10
rails/game/specific/_1825/OperatingRound_1825.java | 14
rails/game/specific/_1825/PublicCompany_1825.java | 4
rails/game/specific/_1825/StartRound_1825.java | 2
rails/game/specific/_1825/StockRound_1825.java | 15
rails/game/specific/_1835/FoldIntoPrussian.java | 22
rails/game/specific/_1835/GameManager_1835.java | 4
rails/game/specific/_1835/OperatingRound_1835.java | 32
rails/game/specific/_1835/PrussianFormationRound.java | 77 -
rails/game/specific/_1835/StockRound_1835.java | 26
rails/game/specific/_1851/BirminghamTileModifier.java | 4
rails/game/specific/_1851/StartRound_1851.java | 2
rails/game/specific/_1856/CGRFormationRound.java | 92 -
rails/game/specific/_1856/OperatingRound_1856.java | 49
rails/game/specific/_1856/PublicCompany_1856.java | 4
rails/game/specific/_1856/PublicCompany_CGR.java | 20
rails/game/specific/_1856/ShareSellingRound_1856.java | 4
rails/game/specific/_1856/StockRound_1856.java | 27
rails/game/specific/_1880/OperatingRound_1880.java | 4
rails/game/specific/_1880/StartRound_1880.java | 4
rails/game/specific/_1880/StockRound_1880.java | 6
rails/game/specific/_1889/OperatingRound_1889.java | 6
rails/game/specific/_18AL/AssignNamedTrains.java | 30
rails/game/specific/_18AL/NameTrains.java | 8
rails/game/specific/_18AL/NameableTrain.java | 10
rails/game/specific/_18AL/NamedTrainRevenueModifier.java | 8
rails/game/specific/_18AL/NamedTrainToken.java | 2
rails/game/specific/_18AL/OperatingRound_18AL.java | 10
rails/game/specific/_18EU/FinalMinorExchangeRound.java | 16
rails/game/specific/_18EU/GameManager_18EU.java | 14
rails/game/specific/_18EU/OffBoardRevenueModifier.java | 4
rails/game/specific/_18EU/OperatingRound_18EU.java | 43
rails/game/specific/_18EU/StartCompany_18EU.java | 18
rails/game/specific/_18EU/StartRound_18EU.java | 4
rails/game/specific/_18EU/StockRound_18EU.java | 141 +-
rails/game/specific/_18GA/OperatingRound_18GA.java | 11
rails/game/specific/_18Kaas/RuhrRevenueModifier.java | 4
rails/game/specific/_18TN/OperatingRound_18TN.java | 14
rails/game/specific/_18TN/PublicCompany_18TN.java | 4
rails/game/state/AbstractItem.java | 10
rails/game/state/AbstractState.java | 73 -
rails/game/state/ArrayListMultimapState.java | 12
rails/game/state/ArrayListState.java | 8
rails/game/state/ChangeSet.java | 8
rails/game/state/ChangeStack.java | 9
rails/game/state/DoubleMapChange.java | 59 -
rails/game/state/Formatter.java | 7
rails/game/state/GenericState.java | 6
rails/game/state/GenericStateChange.java | 35
rails/game/state/HashMultimapState.java | 43
rails/game/state/Holder.java | 16
rails/game/state/MoveUtils.java | 50
rails/game/state/Moveable.java | 9
rails/game/state/Notifiable.java | 5
rails/game/state/Observable.java | 20
rails/game/state/PriceMove.java | 3
rails/game/state/PriceTokenMove.java | 7
rails/game/state/State.java | 5
rails/game/state/StateChange.java | 35
rails/game/state/StateManager.java | 93 +
rails/game/state/TileMove.java | 4
rails/ui/swing/GameSetupWindow.java | 2
rails/ui/swing/GameStatus.java | 25
rails/ui/swing/GameUIManager.java | 16
rails/ui/swing/GridPanel.java | 13
rails/ui/swing/ORPanel.java | 28
rails/ui/swing/ORUIManager.java | 41
rails/ui/swing/ReportWindow.java | 4
rails/ui/swing/StatusWindow.java | 2
rails/ui/swing/TokenIcon.java | 6
rails/ui/swing/UpgradesPanel.java | 42
rails/ui/swing/elements/Field.java | 26
rails/ui/swing/elements/GUIStockSpace.java | 17
rails/ui/swing/elements/ViewObject.java | 7
rails/ui/swing/gamespecific/_1835/GameUIManager_1835.java | 4
rails/ui/swing/gamespecific/_1835/StatusWindow_1835.java | 6
rails/ui/swing/gamespecific/_18AL/NameTrainsDialog.java | 2
rails/ui/swing/gamespecific/_18EU/GameStatus_18EU.java | 10
rails/ui/swing/gamespecific/_18EU/GameUIManager_18EU.java | 10
rails/ui/swing/gamespecific/_18EU/StatusWindow_18EU.java | 10
rails/ui/swing/hexmap/GUIHex.java | 43
rails/ui/swing/hexmap/HexMap.java | 4
rails/util/GameFileIO.java | 4
rails/util/RunGame.java | 4
rails/util/SequenceUtil.java | 18
rails/util/Util.java | 31
test/GameTestServlet.java | 30
test/StockMarketTestServlet.java | 8
test/StockTest.java | 12
212 files changed, 3361 insertions(+), 4079 deletions(-)
New commits:
commit a37c54431b540d1b0b169a9cb774c1051fa84c85
Author: Stefan Frey <ste...@we...>
Date: Sat Oct 1 07:51:20 2011 +0200
First checkin to Rails 2.0 without compile errors.
Further redesigning of basic Rails concepts.
Mainly effected are Portfolio and Holding of other objects
by defining owner and ownable interfaces
and derived abstract classes.
Removed many of the superflous postfix I-interfaces (e.g. GameManagerI etc.).
diff --git a/rails/algorithms/NetworkCompanyGraph.java b/rails/algorithms/NetworkCompanyGraph.java
index bd93113..00469dd 100644
--- a/rails/algorithms/NetworkCompanyGraph.java
+++ b/rails/algorithms/NetworkCompanyGraph.java
@@ -16,8 +16,8 @@ import org.jgrapht.graph.SimpleGraph;
import org.jgrapht.graph.Subgraph;
import rails.algorithms.RevenueAdapter.EdgeTravel;
-import rails.game.PublicCompanyI;
-import rails.game.TokenI;
+import rails.game.PublicCompany;
+import rails.game.Token;
/**
* This class stores and creates the various graphs
@@ -29,7 +29,7 @@ public class NetworkCompanyGraph {
Logger.getLogger(NetworkCompanyGraph.class.getPackage().getName());
private final NetworkGraphBuilder graphBuilder;
- private final PublicCompanyI company;
+ private final PublicCompany company;
private SimpleGraph<NetworkVertex, NetworkEdge> routeGraph;
private SimpleGraph<NetworkVertex, NetworkEdge> revenueGraph;
@@ -40,7 +40,7 @@ public class NetworkCompanyGraph {
private Collection<NetworkVertex> protectedVertices;
- private NetworkCompanyGraph(NetworkGraphBuilder graphBuilder, PublicCompanyI company) {
+ private NetworkCompanyGraph(NetworkGraphBuilder graphBuilder, PublicCompany company) {
this.graphBuilder = graphBuilder;
this.company = company;
this.routeGraph = null;
@@ -48,7 +48,7 @@ public class NetworkCompanyGraph {
this.phase2Graph = null;
}
- public static NetworkCompanyGraph create(NetworkGraphBuilder graphBuilder, PublicCompanyI company) {
+ public static NetworkCompanyGraph create(NetworkGraphBuilder graphBuilder, PublicCompany company) {
return new NetworkCompanyGraph(graphBuilder, company);
}
@@ -112,9 +112,9 @@ public class NetworkCompanyGraph {
return graph;
}
- public List<NetworkVertex> getCompanyBaseTokenVertexes(PublicCompanyI company) {
+ public List<NetworkVertex> getCompanyBaseTokenVertexes(PublicCompany company) {
List<NetworkVertex> vertexes = new ArrayList<NetworkVertex>();
- for (TokenI token:company.getTokens()){
+ for (Token token:company.getTokens()){
NetworkVertex vertex = graphBuilder.getVertex(token);
if (vertex == null) continue;
vertexes.add(vertex);
diff --git a/rails/algorithms/NetworkGraphBuilder.java b/rails/algorithms/NetworkGraphBuilder.java
index 4246dc6..2dd1f0e 100644
--- a/rails/algorithms/NetworkGraphBuilder.java
+++ b/rails/algorithms/NetworkGraphBuilder.java
@@ -27,15 +27,15 @@ import com.jgraph.layout.organic.JGraphFastOrganicLayout;
import rails.game.BaseToken;
import rails.game.Stop;
-import rails.game.GameManagerI;
+import rails.game.GameManager;
import rails.game.MapHex;
import rails.game.MapManager;
-import rails.game.PublicCompanyI;
+import rails.game.PublicCompany;
import rails.game.Station;
import rails.game.TileI;
-import rails.game.TokenHolder;
-import rails.game.TokenI;
+import rails.game.Token;
import rails.game.Track;
+import rails.game.model.Owner;
public final class NetworkGraphBuilder implements Iterable<NetworkVertex> {
@@ -53,7 +53,7 @@ public final class NetworkGraphBuilder implements Iterable<NetworkVertex> {
mapVertexes = new HashMap<String, NetworkVertex> ();
}
- public static NetworkGraphBuilder create(GameManagerI gameManager) {
+ public static NetworkGraphBuilder create(GameManager gameManager) {
NetworkGraphBuilder graphBuilder = new NetworkGraphBuilder();
graphBuilder.generateGraph(gameManager.getMapManager(), gameManager.getRevenueManager());
return graphBuilder;
@@ -175,11 +175,11 @@ public final class NetworkGraphBuilder implements Iterable<NetworkVertex> {
return mapVertexes.get(identVertex);
}
- public NetworkVertex getVertex(TokenI token) {
+ public NetworkVertex getVertex(Token token) {
if (!(token instanceof BaseToken)) return null;
- TokenHolder holder = token.getHolder();
- if (!(holder instanceof Stop)) return null;
- Stop city = (Stop)holder;
+ Owner owner = token.getOwner();
+ if (!(owner instanceof Stop)) return null;
+ Stop city = (Stop)owner;
MapHex hex = city.getHolder();
Station station = city.getRelatedStation();
return getVertex(hex, station);
@@ -212,7 +212,7 @@ public final class NetworkGraphBuilder implements Iterable<NetworkVertex> {
}
public static List<MapHex> getTokenableStationHexes(Graph<NetworkVertex, NetworkEdge> graph,
- PublicCompanyI company){
+ PublicCompany company){
List<MapHex> hexes = new ArrayList<MapHex>();
for(NetworkVertex vertex:graph.vertexSet()) {
Stop city = vertex.getCity();
diff --git a/rails/algorithms/NetworkIterator.java b/rails/algorithms/NetworkIterator.java
index f4029e8..9f9026a 100644
--- a/rails/algorithms/NetworkIterator.java
+++ b/rails/algorithms/NetworkIterator.java
@@ -10,7 +10,7 @@ import org.apache.log4j.Logger;
import org.jgrapht.*;
import org.jgrapht.traverse.*;
-import rails.game.PublicCompanyI;
+import rails.game.PublicCompany;
public class NetworkIterator extends
AbstractGraphIterator<NetworkVertex, NetworkEdge> {
@@ -48,7 +48,7 @@ public class NetworkIterator extends
* Returns NetworkIterator for specific company
*/
public NetworkIterator(Graph<NetworkVertex, NetworkEdge> graph, NetworkVertex startVertex,
- PublicCompanyI company) {
+ PublicCompany company) {
super();
if (graph == null)
diff --git a/rails/algorithms/NetworkTrain.java b/rails/algorithms/NetworkTrain.java
index 7536686..9b2a9cf 100644
--- a/rails/algorithms/NetworkTrain.java
+++ b/rails/algorithms/NetworkTrain.java
@@ -3,7 +3,7 @@ package rails.algorithms;
import org.apache.log4j.Logger;
-import rails.game.TrainI;
+import rails.game.Train;
import rails.game.TrainType;
public final class NetworkTrain implements Comparable<NetworkTrain>{
@@ -18,11 +18,11 @@ public final class NetworkTrain implements Comparable<NetworkTrain>{
private final int multiplyMinors;
private final boolean isHTrain;
private String trainName;
- private final TrainI railsTrain;
+ private final Train railsTrain;
private NetworkTrain(int majors, int minors, boolean ignoreMinors,
- int multiplyMajors, int multiplyMinors, boolean isHTrain, String trainName, TrainI train) {
+ int multiplyMajors, int multiplyMinors, boolean isHTrain, String trainName, Train train) {
this.majors = majors;
this.minors = minors;
this.ignoreMinors = ignoreMinors;
@@ -34,7 +34,7 @@ public final class NetworkTrain implements Comparable<NetworkTrain>{
log.info("Created NetworkTrain " + this.toString() + " / " + this.attributes());
}
- static NetworkTrain createFromRailsTrain(TrainI railsTrain){
+ static NetworkTrain createFromRailsTrain(Train railsTrain){
int majors = railsTrain.getMajorStops();
int minors = railsTrain.getMinorStops();
if (railsTrain.getTownCountIndicator() == 0) {
@@ -139,7 +139,7 @@ public final class NetworkTrain implements Comparable<NetworkTrain>{
return trainName;
}
- public TrainI getRailsTrain() {
+ public Train getRailsTrain() {
return railsTrain;
}
diff --git a/rails/algorithms/NetworkVertex.java b/rails/algorithms/NetworkVertex.java
index de85f2c..cfbe510 100644
--- a/rails/algorithms/NetworkVertex.java
+++ b/rails/algorithms/NetworkVertex.java
@@ -77,7 +77,7 @@ public final class NetworkVertex implements Comparable<NetworkVertex> {
}
/** constructor for public company hq */
- public NetworkVertex(PublicCompanyI company) {
+ public NetworkVertex(PublicCompany company) {
this(VertexType.HQ, "HQ");
}
@@ -219,7 +219,7 @@ public final class NetworkVertex implements Comparable<NetworkVertex> {
* Initialize for rails vertexes
* @return true = can stay inside the network, false = has to be removed
*/
- public boolean initRailsVertex(PublicCompanyI company) {
+ public boolean initRailsVertex(PublicCompany company) {
// side vertices use the defaults, virtuals cannot use this function
if (virtual || type == VertexType.SIDE) return true;
@@ -264,7 +264,7 @@ public final class NetworkVertex implements Comparable<NetworkVertex> {
}
- public void setRailsVertexValue(PhaseI phase) {
+ public void setRailsVertexValue(Phase phase) {
// side vertices and virtuals cannot use this function
if (virtual || type == VertexType.SIDE) return;
@@ -310,7 +310,7 @@ public final class NetworkVertex implements Comparable<NetworkVertex> {
* @param phase the current phase (with regard to values)
*/
public static void initAllRailsVertices(Graph<NetworkVertex, NetworkEdge> graph,
- PublicCompanyI company, PhaseI phase) {
+ PublicCompany company, Phase phase) {
// store vertices for removal
List<NetworkVertex> verticesToRemove = new ArrayList<NetworkVertex>();
diff --git a/rails/algorithms/RevenueAdapter.java b/rails/algorithms/RevenueAdapter.java
index 9df031a..931b668 100644
--- a/rails/algorithms/RevenueAdapter.java
+++ b/rails/algorithms/RevenueAdapter.java
@@ -18,11 +18,11 @@ import org.jgrapht.Graphs;
import org.jgrapht.graph.SimpleGraph;
import rails.common.LocalText;
-import rails.game.GameManagerI;
+import rails.game.GameManager;
import rails.game.MapHex;
-import rails.game.PhaseI;
-import rails.game.PublicCompanyI;
-import rails.game.TrainI;
+import rails.game.Phase;
+import rails.game.PublicCompany;
+import rails.game.Train;
import rails.game.TrainType;
import rails.ui.swing.hexmap.HexMap;
@@ -59,12 +59,12 @@ public final class RevenueAdapter implements Runnable {
}
// basic links, to be defined at creation
- private final GameManagerI gameManager;
+ private final GameManager gameManager;
private final RevenueManager revenueManager;
private final NetworkGraphBuilder graphBuilder;
private final NetworkCompanyGraph companyGraph;
- private final PublicCompanyI company;
- private final PhaseI phase;
+ private final PublicCompany company;
+ private final Phase phase;
// basic components, defined empty at creation
private SimpleGraph<NetworkVertex, NetworkEdge> graph;
@@ -88,8 +88,8 @@ public final class RevenueAdapter implements Runnable {
// revenue listener to communicate results
private RevenueListener revenueListener;
- public RevenueAdapter(GameManagerI gameManager, NetworkGraphBuilder graphBuilder, NetworkCompanyGraph companyGraph,
- PublicCompanyI company, PhaseI phase){
+ public RevenueAdapter(GameManager gameManager, NetworkGraphBuilder graphBuilder, NetworkCompanyGraph companyGraph,
+ PublicCompany company, Phase phase){
this.gameManager = gameManager;
this.revenueManager = gameManager.getRevenueManager();
this.graphBuilder = graphBuilder;
@@ -106,7 +106,7 @@ public final class RevenueAdapter implements Runnable {
this.protectedVertices = new HashSet<NetworkVertex>();
}
- public static RevenueAdapter createRevenueAdapter(GameManagerI gm, PublicCompanyI company, PhaseI phase) {
+ public static RevenueAdapter createRevenueAdapter(GameManager gm, PublicCompany company, Phase phase) {
NetworkGraphBuilder nwGraph = NetworkGraphBuilder.create(gm);
NetworkCompanyGraph companyGraph = NetworkCompanyGraph.create(nwGraph, company);
RevenueAdapter ra = new RevenueAdapter(gm, nwGraph, companyGraph, company, phase);
@@ -115,11 +115,11 @@ public final class RevenueAdapter implements Runnable {
}
- public PublicCompanyI getCompany() {
+ public PublicCompany getCompany() {
return company;
}
- public PhaseI getPhase() {
+ public Phase getPhase() {
return phase;
}
@@ -161,7 +161,7 @@ public final class RevenueAdapter implements Runnable {
return trains;
}
- public boolean addTrain(TrainI railsTrain){
+ public boolean addTrain(Train railsTrain){
NetworkTrain train = NetworkTrain.createFromRailsTrain(railsTrain);
if (train == null) {
return false;
@@ -183,7 +183,7 @@ public final class RevenueAdapter implements Runnable {
TrainType trainType = gameManager.getTrainManager().getTypeByName(trainString.trim());
if (trainType != null) { // string defines available trainType
log.info("RA: found trainType" + trainType);
- TrainI railsTrain = gameManager.getTrainManager().cloneTrain(trainType.getCertificateType());
+ Train railsTrain = gameManager.getTrainManager().cloneTrain(trainType.getCertificateType());
return addTrain(railsTrain);
} else { // otherwise interpret the train
NetworkTrain train = NetworkTrain.createFromString(trainString);
@@ -229,7 +229,7 @@ public final class RevenueAdapter implements Runnable {
// define Trains
company.getPortfolio().getTrainList();
- for (TrainI train:company.getPortfolio().getTrainList()) {
+ for (Train train:company.getPortfolio().getTrainList()) {
addTrain(train);
}
@@ -529,7 +529,7 @@ public final class RevenueAdapter implements Runnable {
rc.setDynamicModifiers(hasDynamicModifiers);
}
- public int getVertexValue(NetworkVertex vertex, NetworkTrain train, PhaseI phase) {
+ public int getVertexValue(NetworkVertex vertex, NetworkTrain train, Phase phase) {
// base value
int value = vertex.getValueByTrain(train);
@@ -544,7 +544,7 @@ public final class RevenueAdapter implements Runnable {
return value;
}
- public String getVertexValueAsString(NetworkVertex vertex, NetworkTrain train, PhaseI phase) {
+ public String getVertexValueAsString(NetworkVertex vertex, NetworkTrain train, Phase phase) {
StringBuffer s = new StringBuffer();
// base value
diff --git a/rails/algorithms/RevenueBonus.java b/rails/algorithms/RevenueBonus.java
index 710128c..162f022 100644
--- a/rails/algorithms/RevenueBonus.java
+++ b/rails/algorithms/RevenueBonus.java
@@ -8,8 +8,8 @@ import java.util.Map;
import org.apache.log4j.Logger;
-import rails.game.PhaseI;
-import rails.game.TrainI;
+import rails.game.Phase;
+import rails.game.Train;
import rails.game.TrainType;
public final class RevenueBonus {
@@ -26,8 +26,8 @@ public final class RevenueBonus {
// internal attributes
private List<NetworkVertex> vertices;
private List<TrainType> trainTypes;
- private List<TrainI> trains;
- private List<PhaseI> phases;
+ private List<Train> trains;
+ private List<Phase> phases;
public RevenueBonus(int value, String name) {
this.value = value;
@@ -35,8 +35,8 @@ public final class RevenueBonus {
vertices = new ArrayList<NetworkVertex>();
trainTypes = new ArrayList<TrainType>();
- trains = new ArrayList<TrainI>();
- phases = new ArrayList<PhaseI>();
+ trains = new ArrayList<Train>();
+ phases = new ArrayList<Phase>(...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X