Update of /cvsroot/rails/18xx/rails/ui/swing
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7661/rails/ui/swing
Modified Files:
ORPanel.java
Log Message:
Some minor refactoring
Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** ORPanel.java 20 May 2010 23:13:21 -0000 1.65
--- ORPanel.java 22 May 2010 18:42:26 -0000 1.66
***************
*** 591,599 ****
MapManager mapManager = gm.getMapManager();
- NetworkGraphBuilder nwGraph = new NetworkGraphBuilder();
- nwGraph.generateGraph(mapManager.getHexesAsList());
- SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = nwGraph.getMapGraph();
-
if (companyName.equals("All")) {
NetworkGraphBuilder.visualize(mapGraph, "Map Network");
mapGraph = NetworkGraphBuilder.optimizeGraph(mapGraph);
--- 591,599 ----
MapManager mapManager = gm.getMapManager();
if (companyName.equals("All")) {
+ NetworkGraphBuilder nwGraph = new NetworkGraphBuilder();
+ nwGraph.generateGraph(mapManager.getHexesAsList());
+ SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = nwGraph.getMapGraph();
+
NetworkGraphBuilder.visualize(mapGraph, "Map Network");
mapGraph = NetworkGraphBuilder.optimizeGraph(mapGraph);
***************
*** 606,611 ****
RevenueAdapter ra = null;
while (anotherTrain) {
! ra = new RevenueAdapter(gm, nwGraph, company, gm.getCurrentPhase());
! ra.populateFromRails();
for (String addTrain:addTrainList) {
ra.addTrainByString(addTrain);
--- 606,610 ----
RevenueAdapter ra = null;
while (anotherTrain) {
! ra = RevenueAdapter.createRevenueAdapter(gm, company, gm.getCurrentPhase());
for (String addTrain:addTrainList) {
ra.addTrainByString(addTrain);
***************
*** 785,799 ****
private RevenueAdapter initRevenueCalculation(PublicCompanyI company){
-
GameManagerI gm = orUIManager.getGameUIManager().getGameManager();
! MapManager mapManager = gm.getMapManager();
!
! NetworkGraphBuilder nwGraph = new NetworkGraphBuilder();
! nwGraph.generateGraph(mapManager.getHexesAsList());
! RevenueAdapter ra = new RevenueAdapter(gm, nwGraph, company, gm.getCurrentPhase());
! ra.populateFromRails();
ra.initRevenueCalculator();
ra.addRevenueListener(this);
-
return ra;
}
--- 784,791 ----
private RevenueAdapter initRevenueCalculation(PublicCompanyI company){
GameManagerI gm = orUIManager.getGameUIManager().getGameManager();
! RevenueAdapter ra = RevenueAdapter.createRevenueAdapter(gm, company, gm.getCurrentPhase());
ra.initRevenueCalculator();
ra.addRevenueListener(this);
return ra;
}
|
