Menu
▾
▴
[Rails-commits] SF.net SVN: rails:[1515] trunk/18xx
|
From: <ev...@us...> - 2011-04-10 18:59:20
|
Revision: 1515
http://rails.svn.sourceforge.net/rails/?rev=1515&view=rev
Author: evos
Date: 2011-04-10 18:59:13 +0000 (Sun, 10 Apr 2011)
Log Message:
-----------
Code cleanups only
Modified Paths:
--------------
trunk/18xx/rails/algorithms/NetworkGraphBuilder.java
trunk/18xx/rails/algorithms/NetworkVertex.java
trunk/18xx/rails/algorithms/RevenueBonusTemplate.java
trunk/18xx/rails/algorithms/RevenueCalculatorMulti.java
trunk/18xx/rails/algorithms/RevenueTrainRun.java
trunk/18xx/rails/common/GuiHints.java
trunk/18xx/rails/game/MapManager.java
trunk/18xx/rails/game/StartRound_1830.java
trunk/18xx/rails/game/Tile.java
trunk/18xx/rails/game/action/SetDividend.java
trunk/18xx/rails/game/specific/_1825/ScoreTileOnlyOnceModifier.java
trunk/18xx/rails/game/specific/_1825/StockRound_1825.java
trunk/18xx/rails/game/specific/_1835/PrussianFormationRound.java
trunk/18xx/rails/game/specific/_1856/ShareSellingRound_1856.java
trunk/18xx/rails/game/specific/_18AL/NamedTrainRevenueModifier.java
trunk/18xx/rails/game/state/EnumState.java
trunk/18xx/rails/ui/swing/GameSetupWindow.java
trunk/18xx/rails/ui/swing/MessagePanel.java
trunk/18xx/rails/ui/swing/ORPanel.java
trunk/18xx/rails/ui/swing/UpgradesPanel.java
trunk/18xx/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java
trunk/18xx/rails/ui/swing/hexmap/GUIHex.java
trunk/18xx/rails/util/ConvertTilesXML.java
trunk/18xx/test/TestGameBuilder.java
trunk/18xx/tools/ConvertTilesXML.java
Modified: trunk/18xx/rails/algorithms/NetworkGraphBuilder.java
===================================================================
--- trunk/18xx/rails/algorithms/NetworkGraphBuilder.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/algorithms/NetworkGraphBuilder.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -5,7 +5,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -20,15 +19,12 @@
import org.jgrapht.Graph;
import org.jgrapht.Graphs;
import org.jgrapht.ext.JGraphModelAdapter;
-import org.jgrapht.graph.Multigraph;
import org.jgrapht.graph.SimpleGraph;
-import org.jgrapht.graph.Subgraph;
import com.jgraph.layout.JGraphFacade;
import com.jgraph.layout.JGraphLayout;
import com.jgraph.layout.organic.JGraphFastOrganicLayout;
-import rails.algorithms.NetworkEdge.MergeResult;
import rails.game.BaseToken;
import rails.game.City;
import rails.game.GameManagerI;
@@ -326,7 +322,6 @@
layout.run(facade);
facade.scale(new Rectangle(1600,1200));
- @SuppressWarnings("unchecked")
Map nested = facade.createNestedMap(true,true);
jgraph.getGraphLayoutCache().edit(nested);
Modified: trunk/18xx/rails/algorithms/NetworkVertex.java
===================================================================
--- trunk/18xx/rails/algorithms/NetworkVertex.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/algorithms/NetworkVertex.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -2,7 +2,6 @@
import java.awt.Rectangle;
import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
Modified: trunk/18xx/rails/algorithms/RevenueBonusTemplate.java
===================================================================
--- trunk/18xx/rails/algorithms/RevenueBonusTemplate.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/algorithms/RevenueBonusTemplate.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -13,7 +13,6 @@
import rails.game.PhaseManager;
import rails.game.TrainManager;
import rails.game.TrainTypeI;
-import rails.util.LocalText;
import rails.util.Tag;
/**
Modified: trunk/18xx/rails/algorithms/RevenueCalculatorMulti.java
===================================================================
--- trunk/18xx/rails/algorithms/RevenueCalculatorMulti.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/algorithms/RevenueCalculatorMulti.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -1,6 +1,5 @@
package rails.algorithms;
-import rails.algorithms.RevenueCalculator.Terminated;
final class RevenueCalculatorMulti extends RevenueCalculator {
Modified: trunk/18xx/rails/algorithms/RevenueTrainRun.java
===================================================================
--- trunk/18xx/rails/algorithms/RevenueTrainRun.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/algorithms/RevenueTrainRun.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -3,15 +3,12 @@
import java.awt.geom.GeneralPath;
import java.awt.geom.Point2D;
import java.util.ArrayList;
-import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.log4j.Logger;
-import org.jgrapht.GraphPath;
-import org.jgrapht.Graphs;
import rails.algorithms.NetworkVertex.StationType;
import rails.algorithms.NetworkVertex.VertexType;
Modified: trunk/18xx/rails/common/GuiHints.java
===================================================================
--- trunk/18xx/rails/common/GuiHints.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/common/GuiHints.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -4,7 +4,6 @@
import java.util.ArrayList;
import java.util.List;
-import rails.game.GameDef;
import rails.game.RoundI;
import rails.game.move.StateChange;
import rails.game.state.EnumState;
Modified: trunk/18xx/rails/game/MapManager.java
===================================================================
--- trunk/18xx/rails/game/MapManager.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/game/MapManager.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -115,7 +115,7 @@
public void finishConfiguration (GameManagerI gameManager) throws ConfigurationException {
MapHex hex;
- int i, j, k, dx, dy;
+ int i, j, k;
MapHex nb;
for (String hexName : mHexes.keySet()) {
Modified: trunk/18xx/rails/game/StartRound_1830.java
===================================================================
--- trunk/18xx/rails/game/StartRound_1830.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/game/StartRound_1830.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -360,6 +360,7 @@
}
} else if (auctionItem != null) {
+ // TODO Now dead code - should it be reactivated?
setNextBiddingPlayer(auctionItem);
} else {
setNextPlayer();
Modified: trunk/18xx/rails/game/Tile.java
===================================================================
--- trunk/18xx/rails/game/Tile.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/game/Tile.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -32,7 +32,6 @@
private final List<Upgrade> upgrades = new ArrayList<Upgrade>(); // Contains
// Upgrade instances
//private String upgradesString = "";
- @SuppressWarnings("unchecked")
private final List[] tracksPerSide = new ArrayList[6];
// N.B. Cannot parametrise collection array
private Map<Integer, List<Track>> tracksPerStation = null;
Modified: trunk/18xx/rails/game/action/SetDividend.java
===================================================================
--- trunk/18xx/rails/game/action/SetDividend.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/game/action/SetDividend.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -195,7 +195,6 @@
}
/** Deserialize */
- @SuppressWarnings("unchecked")
private void readObject(ObjectInputStream in) throws IOException,
ClassNotFoundException {
Modified: trunk/18xx/rails/game/specific/_1825/ScoreTileOnlyOnceModifier.java
===================================================================
--- trunk/18xx/rails/game/specific/_1825/ScoreTileOnlyOnceModifier.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/game/specific/_1825/ScoreTileOnlyOnceModifier.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -1,7 +1,6 @@
package rails.game.specific._1825;
import java.util.ArrayList;
-import java.util.Map;
import java.util.HashMap;
import java.util.List;
Modified: trunk/18xx/rails/game/specific/_1825/StockRound_1825.java
===================================================================
--- trunk/18xx/rails/game/specific/_1825/StockRound_1825.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/game/specific/_1825/StockRound_1825.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -87,8 +87,7 @@
String compName;
int price;
int number;
- int share, maxShareToSell;
- boolean dumpAllowed;
+ int maxShareToSell;
Portfolio playerPortfolio = currentPlayer.getPortfolio();
/*
@@ -100,7 +99,7 @@
// Check if shares of this company can be sold at all
if (!mayPlayerSellShareOfCompany(company)) continue;
- share = maxShareToSell = playerPortfolio.getShare(company);
+ maxShareToSell = playerPortfolio.getShare(company);
if (maxShareToSell == 0) continue;
/* May not sell more than the Pool can accept */
Modified: trunk/18xx/rails/game/specific/_1835/PrussianFormationRound.java
===================================================================
--- trunk/18xx/rails/game/specific/_1835/PrussianFormationRound.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/game/specific/_1835/PrussianFormationRound.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -279,6 +279,7 @@
break;
}
+ // This is now dead code, but won't be when some sensible validations exist
if (errMsg != null) {
DisplayBuffer.add(LocalText.getText("CannotMerge",
action.getFoldedCompanyNames(),
Modified: trunk/18xx/rails/game/specific/_1856/ShareSellingRound_1856.java
===================================================================
--- trunk/18xx/rails/game/specific/_1856/ShareSellingRound_1856.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/game/specific/_1856/ShareSellingRound_1856.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -1,9 +1,7 @@
package rails.game.specific._1856;
import rails.game.*;
-import rails.game.action.BuyCertificate;
import rails.game.state.IntegerState;
-import rails.util.LocalText;
/** Needed to copy behaviour on share selling from StockRound_1856. */
public class ShareSellingRound_1856 extends ShareSellingRound {
Modified: trunk/18xx/rails/game/specific/_18AL/NamedTrainRevenueModifier.java
===================================================================
--- trunk/18xx/rails/game/specific/_18AL/NamedTrainRevenueModifier.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/game/specific/_18AL/NamedTrainRevenueModifier.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -1,9 +1,7 @@
package rails.game.specific._18AL;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
-import java.util.Set;
import rails.algorithms.NetworkTrain;
import rails.algorithms.NetworkVertex;
Modified: trunk/18xx/rails/game/state/EnumState.java
===================================================================
--- trunk/18xx/rails/game/state/EnumState.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/game/state/EnumState.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -7,6 +7,7 @@
super (name, object);
}
+ @SuppressWarnings("unchecked")
public E value() {
return (E)object;
}
Modified: trunk/18xx/rails/ui/swing/GameSetupWindow.java
===================================================================
--- trunk/18xx/rails/ui/swing/GameSetupWindow.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/ui/swing/GameSetupWindow.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -4,7 +4,6 @@
import java.awt.*;
import java.awt.event.*;
import java.io.File;
-import java.io.IOException;
import java.util.*;
import java.util.List;
@@ -261,7 +260,6 @@
}
} else if (arg0.getSource().equals(recentButton)) {
File saveDirectory = new File(Config.get("save.directory"));
- if (saveDirectory == null) return;
recentFiles = new TreeSet<File>(new Comparator<File> (){
public int compare (File a, File b) {
Modified: trunk/18xx/rails/ui/swing/MessagePanel.java
===================================================================
--- trunk/18xx/rails/ui/swing/MessagePanel.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/ui/swing/MessagePanel.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -74,7 +74,7 @@
}
// display
String text = messageText.toString();
- int lines = text.split("<[Bb][Rr]>").length + 1;
+ //int lines = text.split("<[Bb][Rr]>").length + 1;
// setLines(lines);
message.setText("<html><center>" + text + "</center></html>");
Modified: trunk/18xx/rails/ui/swing/ORPanel.java
===================================================================
--- trunk/18xx/rails/ui/swing/ORPanel.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/ui/swing/ORPanel.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -10,7 +10,6 @@
import org.apache.log4j.Logger;
-import org.jgrapht.graph.Multigraph;
import org.jgrapht.graph.SimpleGraph;
import rails.algorithms.*;
Modified: trunk/18xx/rails/ui/swing/UpgradesPanel.java
===================================================================
--- trunk/18xx/rails/ui/swing/UpgradesPanel.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/ui/swing/UpgradesPanel.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -475,11 +475,6 @@
this.token = token;
}
- // NOTE: NOT USED
- TokenI getToken() {
- return token;
- }
-
}
/** JLabel extension to allow attaching the internal hex ID */
Modified: trunk/18xx/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java
===================================================================
--- trunk/18xx/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -1,6 +1,5 @@
package rails.ui.swing.gamespecific._1856;
-import javax.swing.JDialog;
import javax.swing.WindowConstants;
import rails.game.*;
Modified: trunk/18xx/rails/ui/swing/hexmap/GUIHex.java
===================================================================
--- trunk/18xx/rails/ui/swing/hexmap/GUIHex.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/ui/swing/hexmap/GUIHex.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -71,14 +71,6 @@
protected String toolTip = "";
- /**
- * Stores the neighbouring views. This parallels the neighors field in
- * MapHex, just on the view side.
- *
- * @todo check if we can avoid this
- */
- private GUIHex[] neighbors = new GUIHex[6];
-
// GUI variables
double[] xVertex = new double[6];
double[] yVertex = new double[6];
Modified: trunk/18xx/rails/util/ConvertTilesXML.java
===================================================================
--- trunk/18xx/rails/util/ConvertTilesXML.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/rails/util/ConvertTilesXML.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -349,11 +349,6 @@
outputJunction.setAttribute("slots", station[1]);
}
- // String[] p = (String[]) ((String[]) stationMap.get(type)).clone();
- if (station == null) {
- throw new ConfigurationException("Unknown junction type: " + type);
- }
-
// Junction revenue
Element revenue =
(Element) inputJunction.getElementsByTagName("revenue").item(0);
Modified: trunk/18xx/test/TestGameBuilder.java
===================================================================
--- trunk/18xx/test/TestGameBuilder.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/test/TestGameBuilder.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -1,7 +1,6 @@
package test;
import java.io.File;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Arrays;
Modified: trunk/18xx/tools/ConvertTilesXML.java
===================================================================
--- trunk/18xx/tools/ConvertTilesXML.java 2011-04-06 22:13:54 UTC (rev 1514)
+++ trunk/18xx/tools/ConvertTilesXML.java 2011-04-10 18:59:13 UTC (rev 1515)
@@ -330,11 +330,6 @@
outputJunction.setAttribute("slots", station[1]);
}
- // String[] p = (String[]) ((String[]) stationMap.get(type)).clone();
- if (station == null) {
- throw new ConfigurationException("Unknown junction type: " + type);
- }
-
// Junction revenue
Element revenue =
(Element) inputJunction.getElementsByTagName("revenue").item(0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
