From: Stefan F. <ste...@us...> - 2010-05-24 07:49:34
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10363/rails/ui/swing Modified Files: ORUIManager.java ORPanel.java Log Message: Activated 1851 Birmingam modifier and several minor beauty changes Index: ORUIManager.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** ORUIManager.java 15 May 2010 16:36:09 -0000 1.74 --- ORUIManager.java 24 May 2010 07:49:26 -0000 1.75 *************** *** 125,131 **** private SimpleGraph<NetworkVertex, NetworkEdge> getCompanyGraph(){ ! MapManager mapManager = gameUIManager.getGameManager().getMapManager(); ! NetworkGraphBuilder nwGraph = new NetworkGraphBuilder(); ! nwGraph.generateGraph(mapManager.getHexesAsList()); SimpleGraph<NetworkVertex, NetworkEdge> graph = nwGraph.getRailRoadGraph(orComp, true); --- 125,129 ---- private SimpleGraph<NetworkVertex, NetworkEdge> getCompanyGraph(){ ! NetworkGraphBuilder nwGraph = NetworkGraphBuilder.createMapGraph(gameUIManager.getGameManager()); SimpleGraph<NetworkVertex, NetworkEdge> graph = nwGraph.getRailRoadGraph(orComp, true); Index: ORPanel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** ORPanel.java 22 May 2010 18:42:26 -0000 1.66 --- ORPanel.java 24 May 2010 07:49:26 -0000 1.67 *************** *** 592,597 **** if (companyName.equals("All")) { ! NetworkGraphBuilder nwGraph = new NetworkGraphBuilder(); ! nwGraph.generateGraph(mapManager.getHexesAsList()); SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = nwGraph.getMapGraph(); --- 592,596 ---- if (companyName.equals("All")) { ! NetworkGraphBuilder nwGraph = NetworkGraphBuilder.createMapGraph(gm); SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = nwGraph.getMapGraph(); |