archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

java6-compat: eliminate use of diamond operator (a J7-only feature)

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@576 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-02-24 14:01:36 +00:00
parent b1a1dea224
commit 7473c893bd
8 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/micropolisj/engine/CityEval.java
View file

@ -54,10 +54,10 @@ public class CityEval
public CityProblem [] problemOrder = new CityProblem[0];
/** Number of votes given for the various problems identified by problemOrder[]. */
public EnumMap<CityProblem,Integer> problemVotes = new EnumMap<>(CityProblem.class);
public EnumMap<CityProblem,Integer> problemVotes = new EnumMap<CityProblem,Integer>(CityProblem.class);
/** Score for various problems. */
public EnumMap<CityProblem,Integer> problemTable = new EnumMap<>(CityProblem.class);
public EnumMap<CityProblem,Integer> problemTable = new EnumMap<CityProblem,Integer>(CityProblem.class);
/**
* Perform an evaluation.
@ -166,7 +166,7 @@ public class CityEval
}
}
EnumMap<CityProblem,Integer> rv = new EnumMap<>(CityProblem.class);
EnumMap<CityProblem,Integer> rv = new EnumMap<CityProblem,Integer>(CityProblem.class);
for (int i = 0; i < pp.length; i++) {
rv.put(pp[i], votes[i]);
}

12
src/micropolisj/engine/Micropolis.java
View file

@ -190,7 +190,7 @@ public class Micropolis
public CityEval evaluation;
ArrayList<Sprite> sprites = new ArrayList<>();
ArrayList<Sprite> sprites = new ArrayList<Sprite>();
static final int VALVERATE = 2;
public static final int CENSUSRATE = 4;
@ -333,9 +333,9 @@ public class Micropolis
}
}
ArrayList<Listener> listeners = new ArrayList<>();
ArrayList<MapListener> mapListeners = new ArrayList<>();
ArrayList<EarthquakeListener> earthquakeListeners = new ArrayList<>();
ArrayList<Listener> listeners = new ArrayList<Listener>();
ArrayList<MapListener> mapListeners = new ArrayList<MapListener>();
ArrayList<EarthquakeListener> earthquakeListeners = new ArrayList<EarthquakeListener>();
public void addListener(Listener l)
{
@ -1729,7 +1729,7 @@ public class Micropolis
public int taxIncome;
public int operatingExpenses;
}
public ArrayList<FinancialHistory> financialHistory = new ArrayList<>();
public ArrayList<FinancialHistory> financialHistory = new ArrayList<FinancialHistory>();
void collectTax()
{
@ -2253,7 +2253,7 @@ public class Micropolis
*/
public boolean makeMeltdown()
{
ArrayList<CityLocation> candidates = new ArrayList<>();
ArrayList<CityLocation> candidates = new ArrayList<CityLocation>();
for (int y = 0; y < map.length; y++) {
for (int x = 0; x < map[y].length; x++) {
if ((map[y][x] & LOMASK) == NUCLEAR) {

2
src/micropolisj/engine/TrafficGen.java
View file

@ -22,7 +22,7 @@ class TrafficGen
Micropolis.ZoneType sourceZone;
int lastdir;
Stack<CityLocation> positions = new Stack<>();
Stack<CityLocation> positions = new Stack<CityLocation>();
static final int MAX_TRAFFIC_DISTANCE = 30;