Index: applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java
===================================================================
--- applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java	(revision 30532)
+++ applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java	(revision 30737)
@@ -146,6 +146,6 @@
      */
     public static Command connect(Way newWay, LatLon pos, ServerParam param, boolean ctrl, boolean alt) {
-        LinkedList<Command> cmds = new LinkedList<Command>();
-        LinkedList<Command> cmds2 = new LinkedList<Command>();
+        LinkedList<Command> cmds = new LinkedList<>();
+        LinkedList<Command> cmds2 = new LinkedList<>();
         
         s_oParam = param;
@@ -214,6 +214,6 @@
      */
     public static List<Command> connectTo() {
-        Map<Way, Way> modifiedWays = new HashMap<Way, Way>();
-        LinkedList<Command> cmds = new LinkedList<Command>();
+        Map<Way, Way> modifiedWays = new HashMap<>();
+        LinkedList<Command> cmds = new LinkedList<>();
         Way way = new Way(s_oWay);
         for (int i = 0; i < way.getNodesCount() - 1; i++) {
@@ -271,5 +271,5 @@
      */
     private static List<Command> mergeNodes(Node n1, Node n2){
-        List<Command> cmds = new LinkedList<Command>();
+        List<Command> cmds = new LinkedList<>();
         cmds.add(new MoveCommand(n2,
                  (n1.getEastNorth().getX() - n2.getEastNorth().getX())/2,
Index: applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TagValues.java
===================================================================
--- applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TagValues.java	(revision 30532)
+++ applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TagValues.java	(revision 30737)
@@ -53,5 +53,5 @@
         
     	// get values
-        List<String> tagValues = new ArrayList<String>();
+        List<String> tagValues = new ArrayList<>();
         List<AutoCompletionListItem> values = Main.main.getCurrentDataSet().getAutoCompletionManager().getValues(m_strTag);
         for ( AutoCompletionListItem i : values ) {
@@ -65,5 +65,5 @@
     	} else {
     		String[] prefered = m_strPreferredValues.split(";");
-    		tagValues = new ArrayList<String>();
+    		tagValues = new ArrayList<>();
     		
     		for (String str: prefered) {
Index: applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java
===================================================================
--- applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java	(revision 30532)
+++ applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java	(revision 30737)
@@ -83,5 +83,5 @@
         
     	Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
-    	List<Command> commands = new ArrayList<Command>();
+    	List<Command> commands = new ArrayList<>();
     	
     	if ( checkActiveServerParam() == false ) return;
@@ -281,5 +281,5 @@
     
     private void traceSync(LatLon pos, ProgressMonitor progressMonitor) {
-        Collection<Command> commands = new LinkedList<Command>();
+        Collection<Command> commands = new LinkedList<>();
         
         progressMonitor.beginTask(null, 3);
@@ -305,5 +305,5 @@
 	            coordList = oTraceSimple.m_listLatLon;
         	} catch (Exception e) {
-            	coordList = new ArrayList<LatLon>();
+            	coordList = new ArrayList<>();
             }
            
Index: applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerDebug.java
===================================================================
--- applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerDebug.java	(revision 30532)
+++ applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerDebug.java	(revision 30737)
@@ -66,8 +66,8 @@
         	Collection<? extends OsmPrimitive> cpx = null;
         	
-        	List<OsmPrimitive> lp1 = new LinkedList<OsmPrimitive>();
-        	List<OsmPrimitive> lp2 = new LinkedList<OsmPrimitive>();
-        	List<OsmPrimitive> lp3 = new LinkedList<OsmPrimitive>();
-        	List<OsmPrimitive> lp = new LinkedList<OsmPrimitive>();
+        	List<OsmPrimitive> lp1 = new LinkedList<>();
+        	List<OsmPrimitive> lp2 = new LinkedList<>();
+        	List<OsmPrimitive> lp3 = new LinkedList<>();
+        	List<OsmPrimitive> lp = new LinkedList<>();
         	
         	cp1 = lp1;
Index: applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamList.java
===================================================================
--- applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamList.java	(revision 30532)
+++ applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamList.java	(revision 30737)
@@ -29,5 +29,5 @@
 
 public class ServerParamList {
-    ArrayList<ServerParam> m_listServerParam = new ArrayList<ServerParam>();
+    ArrayList<ServerParam> m_listServerParam = new ArrayList<>();
     ServerParam m_oActivParam = null;
     String m_strFilename;
@@ -107,5 +107,5 @@
     
     public List<ServerParam> getEnableParamList() {
-    	List<ServerParam> listParam = new ArrayList<ServerParam>();
+    	List<ServerParam> listParam = new ArrayList<>();
     	for ( ServerParam param: m_listServerParam) {
         	if (param.isEnabled()) {
Index: applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetTrace.java
===================================================================
--- applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetTrace.java	(revision 30532)
+++ applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetTrace.java	(revision 30737)
@@ -28,5 +28,5 @@
 	private LatLon m_oLatLon;
 	private ServerParam m_oServerParam;
-    public ArrayList<LatLon> m_listLatLon = new ArrayList<LatLon>();
+    public ArrayList<LatLon> m_listLatLon = new ArrayList<>();
     
     /**
@@ -71,5 +71,5 @@
             strResponse = strResponse.substring(1, strResponse.length()-1);
             
-            ArrayList<LatLon> nodelist = new ArrayList<LatLon>();
+            ArrayList<LatLon> nodelist = new ArrayList<>();
             
             String[] astrPoints = strResponse.split("\\)\\(");
@@ -82,5 +82,5 @@
             m_listLatLon = nodelist;
         } catch (Exception e) {
-        	m_listLatLon = new ArrayList<LatLon>();
+        	m_listLatLon = new ArrayList<>();
         }
     }