Index: applications/editors/josm/plugins/smed/src/panels/PanelChr.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelChr.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelChr.java	(revision 30737)
@@ -36,5 +36,5 @@
 	public JToggleButton morseButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/MorseButton.png")));
 	public JToggleButton alternatingButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/AlternatingButton.png")));
-	private EnumMap<Chr, JToggleButton> buttons = new EnumMap<Chr, JToggleButton>(Chr.class);
+	private EnumMap<Chr, JToggleButton> buttons = new EnumMap<>(Chr.class);
 	private ActionListener alCharButton = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/smed/src/panels/PanelCol.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelCol.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelCol.java	(revision 30737)
@@ -34,5 +34,5 @@
 	public JRadioButton magentaButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/MagentaButton.png")));
 	public JRadioButton pinkButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PinkButton.png")));
-	public EnumMap<Col, JRadioButton> colours = new EnumMap<Col, JRadioButton>(Col.class);
+	public EnumMap<Col, JRadioButton> colours = new EnumMap<>(Col.class);
 	private ActionListener alColour = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -94,5 +94,5 @@
 	private JPanel stack;
 	private ButtonGroup stackColours = new ButtonGroup();
-	private ArrayList<JRadioButton> stackCol = new ArrayList<JRadioButton>();
+	private ArrayList<JRadioButton> stackCol = new ArrayList<>();
 	private int stackIdx = 0;
 	private ActionListener alStack = new ActionListener() {
Index: applications/editors/josm/plugins/smed/src/panels/PanelFog.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelFog.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelFog.java	(revision 30737)
@@ -24,5 +24,5 @@
 	public JRadioButton gongButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogGongButton.png")));
 	public JRadioButton explosButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FogExplosButton.png")));
-	private EnumMap<Fog, JRadioButton> fogs = new EnumMap<Fog, JRadioButton>(Fog.class);
+	private EnumMap<Fog, JRadioButton> fogs = new EnumMap<>(Fog.class);
 	private ActionListener alFog = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/smed/src/panels/PanelHaz.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelHaz.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelHaz.java	(revision 30737)
@@ -82,7 +82,7 @@
 	public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png")));
 	public JRadioButton towerButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TowerButton.png")));
-	public EnumMap<Shp, JRadioButton> shapes = new EnumMap<Shp, JRadioButton>(Shp.class);
-	public EnumMap<Shp, Obj> carObjects = new EnumMap<Shp, Obj>(Shp.class);
-	public EnumMap<Shp, Obj> isdObjects = new EnumMap<Shp, Obj>(Shp.class);
+	public EnumMap<Shp, JRadioButton> shapes = new EnumMap<>(Shp.class);
+	public EnumMap<Shp, Obj> carObjects = new EnumMap<>(Shp.class);
+	public EnumMap<Shp, Obj> isdObjects = new EnumMap<>(Shp.class);
 	private ActionListener alShape = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/smed/src/panels/PanelLights.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelLights.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelLights.java	(revision 30737)
@@ -19,5 +19,5 @@
 
 	public JComboBox<String> landCatBox;
-	public EnumMap<Cat, Integer> landCats = new EnumMap<Cat, Integer>(Cat.class);
+	public EnumMap<Cat, Integer> landCats = new EnumMap<>(Cat.class);
 	private ActionListener alLandCatBox = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -32,5 +32,5 @@
 	};
 	public JComboBox<String> trafficCatBox;
-	public EnumMap<Cat, Integer> trafficCats = new EnumMap<Cat, Integer>(Cat.class);
+	public EnumMap<Cat, Integer> trafficCats = new EnumMap<>(Cat.class);
 	private ActionListener alTrafficCatBox = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -45,5 +45,5 @@
 	};
 	public JComboBox<String> warningCatBox;
-	public EnumMap<Cat, Integer> warningCats = new EnumMap<Cat, Integer>(Cat.class);
+	public EnumMap<Cat, Integer> warningCats = new EnumMap<>(Cat.class);
 	private ActionListener alWarningCatBox = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -58,5 +58,5 @@
 	};
 	public JComboBox<String> platformCatBox;
-	public EnumMap<Cat, Integer> platformCats = new EnumMap<Cat, Integer>(Cat.class);
+	public EnumMap<Cat, Integer> platformCats = new EnumMap<>(Cat.class);
 	private ActionListener alPlatformCatBox = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -71,5 +71,5 @@
 	};
 	public JComboBox<String> pilotCatBox;
-	public EnumMap<Cat, Integer> pilotCats = new EnumMap<Cat, Integer>(Cat.class);
+	public EnumMap<Cat, Integer> pilotCats = new EnumMap<>(Cat.class);
 	private ActionListener alPilotCatBox = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -84,5 +84,5 @@
 	};
 	public JComboBox<String> rescueCatBox;
-	public EnumMap<Cat, Integer> rescueCats = new EnumMap<Cat, Integer>(Cat.class);
+	public EnumMap<Cat, Integer> rescueCats = new EnumMap<>(Cat.class);
 	private ActionListener alRescueCatBox = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -97,5 +97,5 @@
 	};
 	public JComboBox<String> radioCatBox;
-	public EnumMap<Cat, Integer> radioCats = new EnumMap<Cat, Integer>(Cat.class);
+	public EnumMap<Cat, Integer> radioCats = new EnumMap<>(Cat.class);
 	private ActionListener alRadioCatBox = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -110,5 +110,5 @@
 	};
 	public JComboBox<String> radarCatBox;
-	public EnumMap<Cat, Integer> radarCats = new EnumMap<Cat, Integer>(Cat.class);
+	public EnumMap<Cat, Integer> radarCats = new EnumMap<>(Cat.class);
 	private ActionListener alRadarCatBox = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -124,5 +124,5 @@
 	public JLabel functionLabel;
 	public JComboBox<String> functionBox;
-	public EnumMap<Fnc, Integer> functions = new EnumMap<Fnc, Integer>(Fnc.class);
+	public EnumMap<Fnc, Integer> functions = new EnumMap<>(Fnc.class);
 	private ActionListener alfunctionBox = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -151,5 +151,5 @@
 	public JRadioButton radioButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RadioStationButton.png")));
 	public JRadioButton radarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RadarStationButton.png")));
-	public EnumMap<Obj, JRadioButton> objects = new EnumMap<Obj, JRadioButton>(Obj.class);
+	public EnumMap<Obj, JRadioButton> objects = new EnumMap<>(Obj.class);
 	private ActionListener alObj = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/smed/src/panels/PanelLit.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelLit.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelLit.java	(revision 30737)
@@ -40,5 +40,5 @@
 	public JLabel visibilityLabel;
 	public JComboBox<String> visibilityBox;
-	public EnumMap<Vis, Integer> visibilities = new EnumMap<Vis, Integer>(Vis.class);
+	public EnumMap<Vis, Integer> visibilities = new EnumMap<>(Vis.class);
 	private ActionListener alVisibility = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -80,5 +80,5 @@
 	public JLabel categoryLabel;
 	public JComboBox<String> categoryBox;
-	public EnumMap<Lit, Integer> categories = new EnumMap<Lit, Integer>(Lit.class);
+	public EnumMap<Lit, Integer> categories = new EnumMap<>(Lit.class);
 	private ActionListener alCategory = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -116,5 +116,5 @@
 	public JLabel exhibitionLabel;
 	public JComboBox<String> exhibitionBox;
-	public EnumMap<Exh, Integer> exhibitions = new EnumMap<Exh, Integer>(Exh.class);
+	public EnumMap<Exh, Integer> exhibitions = new EnumMap<>(Exh.class);
 	private ActionListener alExhibition = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/smed/src/panels/PanelMore.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelMore.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelMore.java	(revision 30737)
@@ -45,5 +45,5 @@
 	public JLabel statusLabel;
 	public JComboBox<String> statusBox;
-	public EnumMap<Sts, Integer> statuses = new EnumMap<Sts, Integer>(Sts.class);
+	public EnumMap<Sts, Integer> statuses = new EnumMap<>(Sts.class);
 	private ActionListener alStatus = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -57,5 +57,5 @@
 	public JLabel constrLabel;
 	public JComboBox<String> constrBox;
-	public EnumMap<Cns, Integer> constructions = new EnumMap<Cns, Integer>(Cns.class);
+	public EnumMap<Cns, Integer> constructions = new EnumMap<>(Cns.class);
 	private ActionListener alConstr = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -69,5 +69,5 @@
 	public JLabel conLabel;
 	public JComboBox<String> conBox;
-	public EnumMap<Con, Integer> conspicuities = new EnumMap<Con, Integer>(Con.class);
+	public EnumMap<Con, Integer> conspicuities = new EnumMap<>(Con.class);
 	private ActionListener alCon = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -81,5 +81,5 @@
 	public JLabel reflLabel;
 	public JComboBox<String> reflBox;
-	public EnumMap<Con, Integer> reflectivities = new EnumMap<Con, Integer>(Con.class);
+	public EnumMap<Con, Integer> reflectivities = new EnumMap<>(Con.class);
 	private ActionListener alRefl = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/smed/src/panels/PanelPat.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelPat.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelPat.java	(revision 30737)
@@ -25,5 +25,5 @@
 	public JRadioButton squareButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SquaredButton.png")));
 	public JRadioButton borderButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BorderButton.png")));
-	public EnumMap<Pat, JRadioButton> patterns = new EnumMap<Pat, JRadioButton>(Pat.class);
+	public EnumMap<Pat, JRadioButton> patterns = new EnumMap<>(Pat.class);
 	private ActionListener alPat = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/smed/src/panels/PanelPort.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelPort.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelPort.java	(revision 30737)
@@ -24,6 +24,6 @@
 	public JRadioButton perchButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PerchPButton.png")));
 	public JRadioButton stakeButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/StakeButton.png")));
-	public EnumMap<Shp, JRadioButton> shapes = new EnumMap<Shp, JRadioButton>(Shp.class);
-	public EnumMap<Shp, Obj> objects = new EnumMap<Shp, Obj>(Shp.class);
+	public EnumMap<Shp, JRadioButton> shapes = new EnumMap<>(Shp.class);
+	public EnumMap<Shp, Obj> objects = new EnumMap<>(Shp.class);
 	public ActionListener alShape = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/smed/src/panels/PanelRadar.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelRadar.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelRadar.java	(revision 30737)
@@ -29,5 +29,5 @@
 	};
 	private JComboBox<String> radioCatBox;
-	private EnumMap<Cat, Integer> radioCats = new EnumMap<Cat, Integer>(Cat.class);
+	private EnumMap<Cat, Integer> radioCats = new EnumMap<>(Cat.class);
 	private ActionListener alRadioCatBox = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -46,5 +46,5 @@
 	public JRadioButton raconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RaconButton.png")));
 	public JRadioButton leadingButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LeadingRaconButton.png")));
-	private EnumMap<Rtb, JRadioButton> rads = new EnumMap<Rtb, JRadioButton>(Rtb.class);
+	private EnumMap<Rtb, JRadioButton> rads = new EnumMap<>(Rtb.class);
 	private ActionListener alRad = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/smed/src/panels/PanelSaw.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelSaw.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelSaw.java	(revision 30737)
@@ -20,6 +20,6 @@
 	public JRadioButton floatButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/FloatButton.png")));
 	public JRadioButton beaconButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BeaconButton.png")));
-	public EnumMap<Shp, JRadioButton> shapes = new EnumMap<Shp, JRadioButton>(Shp.class);
-	public EnumMap<Shp, Obj> objects = new EnumMap<Shp, Obj>(Shp.class);
+	public EnumMap<Shp, JRadioButton> shapes = new EnumMap<>(Shp.class);
+	public EnumMap<Shp, Obj> objects = new EnumMap<>(Shp.class);
 	public ActionListener alShape = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/smed/src/panels/PanelSectors.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelSectors.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelSectors.java	(revision 30737)
@@ -37,9 +37,9 @@
 	};
 	public JComboBox<ImageIcon> colourBox;
-	public EnumMap<Col, ImageIcon> colours = new EnumMap<Col, ImageIcon>(Col.class);
+	public EnumMap<Col, ImageIcon> colours = new EnumMap<>(Col.class);
 	public JComboBox<String> visibilityBox;
-	public EnumMap<Vis, String> visibilities = new EnumMap<Vis, String>(Vis.class);
+	public EnumMap<Vis, String> visibilities = new EnumMap<>(Vis.class);
 	public JComboBox<String> exhibitionBox;
-	public EnumMap<Exh, String> exhibitions = new EnumMap<Exh, String>(Exh.class);
+	public EnumMap<Exh, String> exhibitions = new EnumMap<>(Exh.class);
 
 	public PanelSectors(SmedAction dia) {
Index: applications/editors/josm/plugins/smed/src/panels/PanelSpec.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelSpec.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelSpec.java	(revision 30737)
@@ -18,5 +18,5 @@
 	public JLabel categoryLabel;
 	public JComboBox<String> categoryBox;
-	public EnumMap<Cat, Integer> categories = new EnumMap<Cat, Integer>(Cat.class);
+	public EnumMap<Cat, Integer> categories = new EnumMap<>(Cat.class);
 	private ActionListener alCategoryBox = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -29,5 +29,5 @@
 	};
 	public JComboBox<String> mooringBox;
-	public EnumMap<Cat, Integer> moorings = new EnumMap<Cat, Integer>(Cat.class);
+	public EnumMap<Cat, Integer> moorings = new EnumMap<>(Cat.class);
 	private ActionListener alMooringBox = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -62,6 +62,6 @@
 	public JRadioButton stakeButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/StakeButton.png")));
 	public JRadioButton cairnButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CairnButton.png")));
-	public EnumMap<Shp, JRadioButton> shapes = new EnumMap<Shp, JRadioButton>(Shp.class);
-	public EnumMap<Shp, Obj> objects = new EnumMap<Shp, Obj>(Shp.class);
+	public EnumMap<Shp, JRadioButton> shapes = new EnumMap<>(Shp.class);
+	public EnumMap<Shp, Obj> objects = new EnumMap<>(Shp.class);
 	public ActionListener alShape = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/smed/src/panels/PanelStbd.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelStbd.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelStbd.java	(revision 30737)
@@ -24,6 +24,6 @@
 	public JRadioButton perchButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PerchSButton.png")));
 	public JRadioButton stakeButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/StakeButton.png")));
-	public EnumMap<Shp, JRadioButton> shapes = new EnumMap<Shp, JRadioButton>(Shp.class);
-	public EnumMap<Shp, Obj> objects = new EnumMap<Shp, Obj>(Shp.class);
+	public EnumMap<Shp, JRadioButton> shapes = new EnumMap<>(Shp.class);
+	public EnumMap<Shp, Obj> objects = new EnumMap<>(Shp.class);
 	public ActionListener alShape = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/smed/src/panels/PanelTop.java
===================================================================
--- applications/editors/josm/plugins/smed/src/panels/PanelTop.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/panels/PanelTop.java	(revision 30737)
@@ -32,5 +32,5 @@
 	public JRadioButton squareDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/SquareDayButton.png")));
 	public JRadioButton circleDayButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/CircleDayButton.png")));
-	private EnumMap<Top, JRadioButton> tops = new EnumMap<Top, JRadioButton>(Top.class);
+	private EnumMap<Top, JRadioButton> tops = new EnumMap<>(Top.class);
 	private ActionListener alTop = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/smed/src/seamarks/SeaMark.java
===================================================================
--- applications/editors/josm/plugins/smed/src/seamarks/SeaMark.java	(revision 30532)
+++ applications/editors/josm/plugins/smed/src/seamarks/SeaMark.java	(revision 30737)
@@ -30,5 +30,5 @@
 	}
 
-	public static final EnumMap<Reg, String> RegSTR = new EnumMap<Reg, String>(Reg.class);
+	public static final EnumMap<Reg, String> RegSTR = new EnumMap<>(Reg.class);
 	static {
 		RegSTR.put(Reg.A, "iala-a");
@@ -69,5 +69,5 @@
 	}
 
-	public static final EnumMap<Obj, String> ObjSTR = new EnumMap<Obj, String>(Obj.class);
+	public static final EnumMap<Obj, String> ObjSTR = new EnumMap<>(Obj.class);
 	static {
 		ObjSTR.put(Obj.BCNCAR, "beacon_cardinal");
@@ -130,5 +130,5 @@
 	}
 
-	public static final EnumMap<Obj, Ent> EntMAP = new EnumMap<Obj, Ent>(Obj.class);
+	public static final EnumMap<Obj, Ent> EntMAP = new EnumMap<>(Obj.class);
 	static {
 		EntMAP.put(Obj.BCNCAR, Ent.BEACON);
@@ -170,5 +170,5 @@
 	}
 
-	public static final EnumMap<Obj, Grp> GrpMAP = new EnumMap<Obj, Grp>(Obj.class);
+	public static final EnumMap<Obj, Grp> GrpMAP = new EnumMap<>(Obj.class);
 	static {
 		GrpMAP.put(Obj.UNKOBJ, Grp.NUL);
@@ -229,5 +229,5 @@
 	}
 		 
-	public static final EnumMap<Cat, String> CatSTR = new EnumMap<Cat, String>(Cat.class);
+	public static final EnumMap<Cat, String> CatSTR = new EnumMap<>(Cat.class);
 	static {
 		CatSTR.put(Cat.LAM_PORT, "port");
@@ -435,5 +435,5 @@
 	}
 
-	public static final EnumMap<Shp, String> ShpSTR = new EnumMap<Shp, String>(Shp.class);
+	public static final EnumMap<Shp, String> ShpSTR = new EnumMap<>(Shp.class);
 	static {
 		ShpSTR.put(Shp.PILLAR, "pillar");
@@ -469,5 +469,5 @@
 	}
 
-	public static final EnumMap<Col, Color> ColMAP = new EnumMap<Col, Color>(Col.class);
+	public static final EnumMap<Col, Color> ColMAP = new EnumMap<>(Col.class);
 	static {
 		ColMAP.put(Col.UNKCOL, new Color(0xc0c0c0));
@@ -487,5 +487,5 @@
 	}
 
-	public static final EnumMap<Col, String> ColSTR = new EnumMap<Col, String>(Col.class);
+	public static final EnumMap<Col, String> ColSTR = new EnumMap<>(Col.class);
 	static {
 		ColSTR.put(Col.WHITE, "white");
@@ -539,5 +539,5 @@
 	}
 
-	private ArrayList<Col> bodyColour = new ArrayList<Col>();
+	private ArrayList<Col> bodyColour = new ArrayList<>();
 
 	public Col getObjColour(int i) {
@@ -577,5 +577,5 @@
 	}
 
-	private ArrayList<Col> topmarkColour = new ArrayList<Col>();
+	private ArrayList<Col> topmarkColour = new ArrayList<>();
 
 	public Col getTopColour(int i) {
@@ -619,5 +619,5 @@
 	}
 
-	public static final Map<EnumSet<Chr>, String> ChrMAP = new HashMap<EnumSet<Chr>, String>();
+	public static final Map<EnumSet<Chr>, String> ChrMAP = new HashMap<>();
 	static {
 		ChrMAP.put(EnumSet.of(Chr.FIXED), "F");
@@ -654,5 +654,5 @@
 	}
 
-	public static final EnumMap<Vis, String> VisSTR = new EnumMap<Vis, String>(Vis.class);
+	public static final EnumMap<Vis, String> VisSTR = new EnumMap<>(Vis.class);
 	static {
 		VisSTR.put(Vis.HIGH, "high");
@@ -670,5 +670,5 @@
 	}
 
-	public static final EnumMap<Lit, String> LitSTR = new EnumMap<Lit, String>(Lit.class);
+	public static final EnumMap<Lit, String> LitSTR = new EnumMap<>(Lit.class);
 	static {
 		LitSTR.put(Lit.VERT, "vertical");
@@ -696,5 +696,5 @@
 	}
 
-	public static final EnumMap<Exh, String> ExhSTR = new EnumMap<Exh, String>(Exh.class);
+	public static final EnumMap<Exh, String> ExhSTR = new EnumMap<>(Exh.class);
 	static {
 		ExhSTR.put(Exh.H24, "24h");
@@ -713,5 +713,5 @@
 			"", "", "", Vis.UNKVIS, Exh.UNKEXH, "", "", Col.UNKCOL };
 
-	private ArrayList<Object[]> sectors = new ArrayList<Object[]>();
+	private ArrayList<Object[]> sectors = new ArrayList<>();
 
 	public int getSectorCount() {
@@ -801,5 +801,5 @@
 	}
 
-	public static final EnumMap<Pat, String> PatSTR = new EnumMap<Pat, String>(Pat.class);
+	public static final EnumMap<Pat, String> PatSTR = new EnumMap<>(Pat.class);
 	static {
 		PatSTR.put(Pat.HSTRP, "horizontal");
@@ -850,5 +850,5 @@
 	}
 
-	public static final EnumMap<Top, String> TopSTR = new EnumMap<Top, String>(Top.class);
+	public static final EnumMap<Top, String> TopSTR = new EnumMap<>(Top.class);
 	static {
 		TopSTR.put(Top.CYL, "cylinder");
@@ -895,5 +895,5 @@
 	}
 
-	public static final EnumMap<Rtb, String> RtbSTR = new EnumMap<Rtb, String>(Rtb.class);
+	public static final EnumMap<Rtb, String> RtbSTR = new EnumMap<>(Rtb.class);
 	static {
 		RtbSTR.put(Rtb.RACON, "racon");
@@ -991,5 +991,5 @@
 	}
 
-	public static final EnumMap<Fog, String> FogSTR = new EnumMap<Fog, String>(Fog.class);
+	public static final EnumMap<Fog, String> FogSTR = new EnumMap<>(Fog.class);
 	static {
 		FogSTR.put(Fog.FOGSIG, "yes");
@@ -1068,5 +1068,5 @@
 	}
 
-	public static final EnumMap<Sts, String> StsSTR = new EnumMap<Sts, String>(Sts.class);
+	public static final EnumMap<Sts, String> StsSTR = new EnumMap<>(Sts.class);
 	static {
 		StsSTR.put(Sts.PERM, "permanent");
@@ -1104,5 +1104,5 @@
 	}
 
-	public static final EnumMap<Cns, String> CnsSTR = new EnumMap<Cns, String>(Cns.class);
+	public static final EnumMap<Cns, String> CnsSTR = new EnumMap<>(Cns.class);
 	static {
 		CnsSTR.put(Cns.BRICK, "masonry");
@@ -1131,5 +1131,5 @@
 	}
 
-	public static final EnumMap<Con, String> ConSTR = new EnumMap<Con, String>(Con.class);
+	public static final EnumMap<Con, String> ConSTR = new EnumMap<>(Con.class);
 	static {
 		ConSTR.put(Con.CONSP, "conspicuous");
@@ -1164,5 +1164,5 @@
 	}
 
-	public static final EnumMap<Fnc, String> FncSTR = new EnumMap<Fnc, String>(Fnc.class);
+	public static final EnumMap<Fnc, String> FncSTR = new EnumMap<>(Fnc.class);
 	static {
 		FncSTR.put(Fnc.UNKFNC, "");