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

4
src/micropolisj/gui/GraphsPane.java
View file

@ -42,7 +42,7 @@ public class GraphsPane extends JPanel
CRIME,
POLLUTION;
}
EnumMap<GraphData,JToggleButton> dataBtns = new EnumMap<>(GraphData.class);
EnumMap<GraphData,JToggleButton> dataBtns = new EnumMap<GraphData,JToggleButton>(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<GraphData, Path2D.Double> paths = new HashMap<>();
final HashMap<GraphData, Path2D.Double> paths = new HashMap<GraphData,Path2D.Double>();
for (GraphData gd : GraphData.values())
{
if (dataBtns.get(gd).isSelected()) {

2
src/micropolisj/gui/MainWindow.java
View file

@ -44,7 +44,7 @@ public class MainWindow extends JFrame
JLabel currentToolLbl;
JLabel currentToolCostLbl;
Map<MicropolisTool,JToggleButton> toolBtns;
EnumMap<MapState,JMenuItem> mapStateMenuItems = new EnumMap<>(MapState.class);
EnumMap<MapState,JMenuItem> mapStateMenuItems = new EnumMap<MapState,JMenuItem>(MapState.class);
MicropolisTool currentTool;
File currentFile;
boolean doSounds = true;

4
src/micropolisj/gui/MicropolisDrawingArea.java
View file

@ -25,7 +25,7 @@ public class MicropolisDrawingArea extends JComponent
{
Micropolis m;
boolean blinkUnpoweredZones = true;
HashSet<Point> unpoweredZones = new HashSet<>();
HashSet<Point> unpoweredZones = new HashSet<Point>();
boolean blink;
Timer blinkTimer;
ToolPreview toolPreview;
@ -107,7 +107,7 @@ public class MicropolisDrawingArea extends JComponent
spriteImages = new EnumMap<SpriteKind, Map<Integer,Image> >(SpriteKind.class);
for (SpriteKind kind : SpriteKind.values())
{
HashMap<Integer,Image> imgs = new HashMap<>();
HashMap<Integer,Image> imgs = new HashMap<Integer,Image>();
for (int i = 0; i < kind.numFrames; i++) {
Image img = loadSpriteImage(kind, i);
if (img != null) {

2
src/micropolisj/gui/OverlayMapView.java
View file

@ -23,7 +23,7 @@ public class OverlayMapView extends JComponent
implements Scrollable, MapListener
{
Micropolis engine;
ArrayList<ConnectedView> views = new ArrayList<>();
ArrayList<ConnectedView> views = new ArrayList<ConnectedView>();
MapState mapState = MapState.ALL;
public OverlayMapView(Micropolis _engine)