diff --git a/build.xml b/build.xml
index 06ed8d5..2b99474 100644
--- a/build.xml
+++ b/build.xml
@@ -44,7 +44,7 @@
classpathref="build-classpath"
includeantruntime="false"
debug="true" debuglevel="lines,vars,source"
- source="1.7" target="1.7"
+ source="1.6" target="1.6"
>
diff --git a/src/micropolisj/engine/CityEval.java b/src/micropolisj/engine/CityEval.java
index b22fc6f..fb6a4c7 100644
--- a/src/micropolisj/engine/CityEval.java
+++ b/src/micropolisj/engine/CityEval.java
@@ -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 problemVotes = new EnumMap<>(CityProblem.class);
+ public EnumMap problemVotes = new EnumMap(CityProblem.class);
/** Score for various problems. */
- public EnumMap problemTable = new EnumMap<>(CityProblem.class);
+ public EnumMap problemTable = new EnumMap(CityProblem.class);
/**
* Perform an evaluation.
@@ -166,7 +166,7 @@ public class CityEval
}
}
- EnumMap rv = new EnumMap<>(CityProblem.class);
+ EnumMap rv = new EnumMap(CityProblem.class);
for (int i = 0; i < pp.length; i++) {
rv.put(pp[i], votes[i]);
}
diff --git a/src/micropolisj/engine/Micropolis.java b/src/micropolisj/engine/Micropolis.java
index 8140a81..2feecaa 100644
--- a/src/micropolisj/engine/Micropolis.java
+++ b/src/micropolisj/engine/Micropolis.java
@@ -190,7 +190,7 @@ public class Micropolis
public CityEval evaluation;
- ArrayList sprites = new ArrayList<>();
+ ArrayList sprites = new ArrayList();
static final int VALVERATE = 2;
public static final int CENSUSRATE = 4;
@@ -333,9 +333,9 @@ public class Micropolis
}
}
- ArrayList listeners = new ArrayList<>();
- ArrayList mapListeners = new ArrayList<>();
- ArrayList earthquakeListeners = new ArrayList<>();
+ ArrayList listeners = new ArrayList();
+ ArrayList mapListeners = new ArrayList();
+ ArrayList earthquakeListeners = new ArrayList();
public void addListener(Listener l)
{
@@ -1729,7 +1729,7 @@ public class Micropolis
public int taxIncome;
public int operatingExpenses;
}
- public ArrayList financialHistory = new ArrayList<>();
+ public ArrayList financialHistory = new ArrayList();
void collectTax()
{
@@ -2253,7 +2253,7 @@ public class Micropolis
*/
public boolean makeMeltdown()
{
- ArrayList candidates = new ArrayList<>();
+ ArrayList candidates = new ArrayList();
for (int y = 0; y < map.length; y++) {
for (int x = 0; x < map[y].length; x++) {
if ((map[y][x] & LOMASK) == NUCLEAR) {
diff --git a/src/micropolisj/engine/TrafficGen.java b/src/micropolisj/engine/TrafficGen.java
index d82b890..4f35536 100644
--- a/src/micropolisj/engine/TrafficGen.java
+++ b/src/micropolisj/engine/TrafficGen.java
@@ -22,7 +22,7 @@ class TrafficGen
Micropolis.ZoneType sourceZone;
int lastdir;
- Stack positions = new Stack<>();
+ Stack positions = new Stack();
static final int MAX_TRAFFIC_DISTANCE = 30;
diff --git a/src/micropolisj/gui/GraphsPane.java b/src/micropolisj/gui/GraphsPane.java
index 8e371ca..13d7822 100644
--- a/src/micropolisj/gui/GraphsPane.java
+++ b/src/micropolisj/gui/GraphsPane.java
@@ -42,7 +42,7 @@ public class GraphsPane extends JPanel
CRIME,
POLLUTION;
}
- EnumMap dataBtns = new EnumMap<>(GraphData.class);
+ EnumMap dataBtns = new EnumMap(GraphData.class);
static ResourceBundle strings = MainWindow.strings;
static final int LEFT_MARGIN = 4;
@@ -264,7 +264,7 @@ public class GraphsPane extends JPanel
}
int H = isOneTwenty ? 239 : 119;
- final HashMap paths = new HashMap<>();
+ final HashMap paths = new HashMap();
for (GraphData gd : GraphData.values())
{
if (dataBtns.get(gd).isSelected()) {
diff --git a/src/micropolisj/gui/MainWindow.java b/src/micropolisj/gui/MainWindow.java
index 93ba7b2..ab59a31 100644
--- a/src/micropolisj/gui/MainWindow.java
+++ b/src/micropolisj/gui/MainWindow.java
@@ -44,7 +44,7 @@ public class MainWindow extends JFrame
JLabel currentToolLbl;
JLabel currentToolCostLbl;
Map toolBtns;
- EnumMap mapStateMenuItems = new EnumMap<>(MapState.class);
+ EnumMap mapStateMenuItems = new EnumMap(MapState.class);
MicropolisTool currentTool;
File currentFile;
boolean doSounds = true;
diff --git a/src/micropolisj/gui/MicropolisDrawingArea.java b/src/micropolisj/gui/MicropolisDrawingArea.java
index 476d97c..9bb5695 100644
--- a/src/micropolisj/gui/MicropolisDrawingArea.java
+++ b/src/micropolisj/gui/MicropolisDrawingArea.java
@@ -25,7 +25,7 @@ public class MicropolisDrawingArea extends JComponent
{
Micropolis m;
boolean blinkUnpoweredZones = true;
- HashSet unpoweredZones = new HashSet<>();
+ HashSet unpoweredZones = new HashSet();
boolean blink;
Timer blinkTimer;
ToolPreview toolPreview;
@@ -107,7 +107,7 @@ public class MicropolisDrawingArea extends JComponent
spriteImages = new EnumMap >(SpriteKind.class);
for (SpriteKind kind : SpriteKind.values())
{
- HashMap imgs = new HashMap<>();
+ HashMap imgs = new HashMap();
for (int i = 0; i < kind.numFrames; i++) {
Image img = loadSpriteImage(kind, i);
if (img != null) {
diff --git a/src/micropolisj/gui/OverlayMapView.java b/src/micropolisj/gui/OverlayMapView.java
index 461ccb6..813e555 100644
--- a/src/micropolisj/gui/OverlayMapView.java
+++ b/src/micropolisj/gui/OverlayMapView.java
@@ -23,7 +23,7 @@ public class OverlayMapView extends JComponent
implements Scrollable, MapListener
{
Micropolis engine;
- ArrayList views = new ArrayList<>();
+ ArrayList views = new ArrayList();
MapState mapState = MapState.ALL;
public OverlayMapView(Micropolis _engine)