Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java	(revision 30737)
@@ -76,5 +76,5 @@
     protected void realRun() throws SAXException, IOException,
     OsmTransferException {
-        jc.checkjunctions(new ArrayList<Channel>(subset), getProgressMonitor());
+        jc.checkjunctions(new ArrayList<>(subset), getProgressMonitor());
     }
 
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionSearchTask.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionSearchTask.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionSearchTask.java	(revision 30737)
@@ -64,5 +64,5 @@
     protected void realRun() throws SAXException, IOException,
     OsmTransferException {
-        jc.junctionSearch(new ArrayList<Channel>(subset), getProgressMonitor());
+        jc.junctionSearch(new ArrayList<>(subset), getProgressMonitor());
     }
 
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/PrepareJunctionCheckorSearch.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/PrepareJunctionCheckorSearch.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/PrepareJunctionCheckorSearch.java	(revision 30737)
@@ -23,5 +23,5 @@
         this.plugin = plugin;
         this.n = n;
-        this.subset = new HashSet<Channel>();
+        this.subset = new HashSet<>();
         this.produceRelation = producerelation;
     }
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/commandlineinterface/CLI.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/commandlineinterface/CLI.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/commandlineinterface/CLI.java	(revision 30737)
@@ -91,5 +91,5 @@
 
         JunctionChecker jc = new JunctionChecker(cdgb.getDigraph(), n);
-        ArrayList<Channel> subset = new ArrayList<Channel>();
+        ArrayList<Channel> subset = new ArrayList<>();
 
         Channel seed = new Channel();
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/DiGraphSealer.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/DiGraphSealer.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/DiGraphSealer.java	(revision 30737)
@@ -34,6 +34,6 @@
      */
     public void sealingGraph() {
-        Vector<Integer> outgoingChannelIDs = new Vector<Integer>();
-        Vector<Integer> incomingChannelIDs = new Vector<Integer>();
+        Vector<Integer> outgoingChannelIDs = new Vector<>();
+        Vector<Integer> incomingChannelIDs = new Vector<>();
 
         for (int i = 0; i < digraph.numberOfChannels(); i++) {
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/StrongConnectednessCalculator.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/StrongConnectednessCalculator.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/connectedness/StrongConnectednessCalculator.java	(revision 30737)
@@ -8,9 +8,9 @@
 
     private int index = 0;
-    private final ArrayList<Channel> stack = new ArrayList<Channel>();
-    private final ArrayList<ArrayList<Channel>> SCC = new ArrayList<ArrayList<Channel>>();
+    private final ArrayList<Channel> stack = new ArrayList<>();
+    private final ArrayList<ArrayList<Channel>> SCC = new ArrayList<>();
     private final int numberOfNodes;
     private int calculatedNodes = 0;
-    private ArrayList<Channel> nsccchannels = new ArrayList<Channel>();
+    private ArrayList<Channel> nsccchannels = new ArrayList<>();
     private final ChannelDiGraph digraph;
     int biggestPart = 0;
@@ -57,5 +57,5 @@
      **/
     private void saveNotSCCChannel() {
-        nsccchannels = new ArrayList<Channel>();
+        nsccchannels = new ArrayList<>();
         for (int i = 0; i < SCC.size(); i++) {
             if (i != biggestPart) {
@@ -124,5 +124,5 @@
         if (v.getLowlink() == v.getIndex()) {
             Channel n;
-            ArrayList<Channel> component = new ArrayList<Channel>();
+            ArrayList<Channel> component = new ArrayList<>();
             do {
                 n = stack.remove(0);
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/TurnRestrictionChecker.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/TurnRestrictionChecker.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/converting/TurnRestrictionChecker.java	(revision 30737)
@@ -18,5 +18,5 @@
 public class TurnRestrictionChecker {
 
-    private final ArrayList<OSMRelation> turnrestrictionsrelations = new ArrayList<OSMRelation>();
+    private final ArrayList<OSMRelation> turnrestrictionsrelations = new ArrayList<>();
     private final ChannelDiGraph channelDigraph;
     private int relationpointer;
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/BasicChannel.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/BasicChannel.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/BasicChannel.java	(revision 30737)
@@ -11,10 +11,10 @@
     private OSMNode toNode;
     private OSMNode fromNode;
-    private ArrayList<LeadsTo> leadsTo = new ArrayList<LeadsTo>();
-    private final ArrayList<OSMWay> ways = new ArrayList<OSMWay>();
+    private ArrayList<LeadsTo> leadsTo = new ArrayList<>();
+    private final ArrayList<OSMWay> ways = new ArrayList<>();
     private int newid;
     //gibt es nur, wenn ein Channelobjekt aus einer Nichteinbahnstraße erzeugt wurde (backchannelID ist dann die ID des anderen Channels)
     private int backChannelID = -100;
-    private final ArrayList<Channel> predChannels = new ArrayList<Channel>();
+    private final ArrayList<Channel> predChannels = new ArrayList<>();
 
     //werden für den Tarjan-Algorithmus gebraucht
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/Channel.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/Channel.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/Channel.java	(revision 30737)
@@ -17,5 +17,5 @@
     private boolean subgraph;
     private int visited = BacktrackingColors.WHITE;
-    private final ArrayList<Channel> reachableNodes = new ArrayList<Channel>();
+    private final ArrayList<Channel> reachableNodes = new ArrayList<>();
     private int ennr;
     private boolean isStrongConnected = true;
@@ -23,5 +23,5 @@
     private boolean isPartOfJunction = false; //wird für den eigenen Layer benötigt, um Teile einer Kreuzung farbig repräsentieren zu können
     
-    private final HashMap<Channel , ArrayList<Channel>> paths2 = new HashMap<Channel , ArrayList<Channel>>();
+    private final HashMap<Channel , ArrayList<Channel>> paths2 = new HashMap<>();
 
 
@@ -197,5 +197,5 @@
      */
     public ArrayList<ArrayList<Channel>> getPaths() {
-        ArrayList<ArrayList<Channel>> t = new ArrayList<ArrayList<Channel>>();
+        ArrayList<ArrayList<Channel>> t = new ArrayList<>();
         t.addAll(paths2.values());
         return t;
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/ChannelDiGraph.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/ChannelDiGraph.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/ChannelDiGraph.java	(revision 30737)
@@ -11,8 +11,8 @@
 public class ChannelDiGraph extends Graph {
 
-    private ArrayList<Channel> channels = new ArrayList<Channel>();
-    private final ArrayList<LeadsTo> leadsTos = new ArrayList<LeadsTo>();
-    private final HashSet<Channel> selectedChannels = new HashSet<Channel>();
-    private HashSet<Channel> junctioncandidate = new HashSet<Channel>();
+    private ArrayList<Channel> channels = new ArrayList<>();
+    private final ArrayList<LeadsTo> leadsTos = new ArrayList<>();
+    private final HashSet<Channel> selectedChannels = new HashSet<>();
+    private HashSet<Channel> junctioncandidate = new HashSet<>();
 
     public void setChannels(ArrayList<Channel> channels) {
@@ -100,5 +100,5 @@
      */
     public OSMNode[] getAllOSMNodes() {
-        HashMap<Long, OSMNode> nodes = new HashMap<Long, OSMNode>();
+        HashMap<Long, OSMNode> nodes = new HashMap<>();
         for (int i = 0; i < channels.size(); i++) {
             if (!nodes.containsKey(channels.get(i).getFromNode().getId())) {
@@ -185,5 +185,5 @@
      */
     public ArrayList<Channel> getChannelsTouchingOSMNodes (ArrayList<OSMNode> nodes) {
-        ArrayList<Channel> touchingChannel = new ArrayList<Channel>();
+        ArrayList<Channel> touchingChannel = new ArrayList<>();
         for (int i = 0; i < nodes.size(); i++) {
             for (int j = 0; j < channels.size(); j++) {
@@ -204,5 +204,5 @@
 
     public ArrayList<Channel> getChannelsTouchingOSMNode(long id) {
-        ArrayList<Channel> returnchannels = new ArrayList<Channel>();
+        ArrayList<Channel> returnchannels = new ArrayList<>();
         for (int i = 0; i < channels.size(); i++) {
             if (channels.get(i).getFromNode().getId() == id) {
@@ -223,5 +223,5 @@
      */
     public ArrayList<Channel> getChannelsBetween(int idfrom, int idto) {
-        ArrayList<Channel> channelsresult = new ArrayList<Channel>();
+        ArrayList<Channel> channelsresult = new ArrayList<>();
         for (int i = 0; i < channels.size(); i++) {
             if (channels.get(i).getFromNode().getId() == idfrom) {
@@ -240,5 +240,5 @@
 
     public ArrayList<Channel> getChannelswithWayID(int id) {
-        ArrayList<Channel> channelsresult = new ArrayList<Channel>();
+        ArrayList<Channel> channelsresult = new ArrayList<>();
         for (int i = 0; i < channels.size(); i++) {
             if (channels.get(i).getWay().getId() == id) {
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMEntity.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMEntity.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMEntity.java	(revision 30737)
@@ -38,5 +38,5 @@
      * @uml.property  name="hashmap"
      */
-    private HashMap<String, String> hashmap = new HashMap<String, String>();
+    private HashMap<String, String> hashmap = new HashMap<>();
     /**
      * @uml.property  name="version"
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMGraph.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMGraph.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMGraph.java	(revision 30737)
@@ -16,7 +16,7 @@
 public class OSMGraph extends Graph{
 
-    private final HashMap<Long, OSMWay> ways = new HashMap<Long, OSMWay>();
-    private HashMap<Long, OSMRelation> relations = new HashMap<Long, OSMRelation>();
-    private final HashMap<Long, OSMNode> nodes = new HashMap<Long, OSMNode>();
+    private final HashMap<Long, OSMWay> ways = new HashMap<>();
+    private HashMap<Long, OSMRelation> relations = new HashMap<>();
+    private final HashMap<Long, OSMNode> nodes = new HashMap<>();
 
     public void addNode(OSMNode node) {
@@ -86,5 +86,5 @@
     public ArrayList<Long> getIDsfromWay(int id) {
         OSMWay w = ways.get(id);
-        ArrayList<Long> ids  = new ArrayList<Long>();
+        ArrayList<Long> ids  = new ArrayList<>();
         ids.add(w.getToNode().getId());
         ids.add(w.getFromNode().getId());
@@ -97,5 +97,5 @@
         OSMnode.setLatitude(node.getBBox().getTopLeft().lat());
         OSMnode.setLongitude(node.getBBox().getTopLeft().lon());
-        OSMnode.setHashmap(new HashMap<String, String>(node.getKeys()));
+        OSMnode.setHashmap(new HashMap<>(node.getKeys()));
         nodes.put(OSMnode.getId(), OSMnode);
     }
@@ -108,5 +108,5 @@
             osmway.addNode(getNode(it.next().getId()));
         }
-        osmway.setHashmap(new HashMap<String, String>(way.getKeys()));
+        osmway.setHashmap(new HashMap<>(way.getKeys()));
         ways.put(osmway.getId(), osmway);
     }
@@ -115,5 +115,5 @@
         OSMRelation osmrelation = new OSMRelation();
         osmrelation.setId(relation.getId());
-        osmrelation.setHashmap(new HashMap<String, String>(relation.getKeys()));
+        osmrelation.setHashmap(new HashMap<>(relation.getKeys()));
         RelationMember rmember;
         for (int i = 0; i < relation.getMembers().size(); i++) {
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMNode.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMNode.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMNode.java	(revision 30737)
@@ -11,7 +11,7 @@
     private double latitude;
     private double longitude;
-    private ArrayList<Channel> outgoingChannels = new ArrayList<Channel>();
-    private ArrayList<OSMNode> succNodeList = new ArrayList<OSMNode>();
-    private ArrayList<OSMNode> predNodeList = new ArrayList<OSMNode>();
+    private ArrayList<Channel> outgoingChannels = new ArrayList<>();
+    private ArrayList<OSMNode> succNodeList = new ArrayList<>();
+    private ArrayList<OSMNode> predNodeList = new ArrayList<>();
     
     public void addOutgoingChannel(Channel channel) {
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMRelation.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMRelation.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMRelation.java	(revision 30737)
@@ -9,5 +9,5 @@
 public class OSMRelation extends OSMEntity {
 
-    private ArrayList<Member> members = new ArrayList<Member>();
+    private ArrayList<Member> members = new ArrayList<>();
 
     public void setMembers(ArrayList<Member> members) {
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMWay.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMWay.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMWay.java	(revision 30737)
@@ -8,5 +8,5 @@
 public class OSMWay extends OSMEntity {
 
-    private Vector<OSMNode> nodes = new Vector<OSMNode>();
+    private Vector<OSMNode> nodes = new Vector<>();
 
     public OSMNode[] getNodes() {
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/filter/Filter.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/filter/Filter.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/filter/Filter.java	(revision 30737)
@@ -9,5 +9,5 @@
 public class Filter {
     
-    private HashSet<String> tagValues = new HashSet<String>();
+    private HashSet<String> tagValues = new HashSet<>();
     private String keyValue;
     
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java	(revision 30737)
@@ -28,12 +28,12 @@
     private final ArrayList<Channel> OrEx;
     private final int n;
-    private final List<List<Object>> L = new ArrayList<List<Object>>(); //The list of columns to be sorted
+    private final List<List<Object>> L = new ArrayList<>(); //The list of columns to be sorted
     private long EEovern = 0;
-    private final HashSet<Channel> subgraph = new HashSet<Channel>();//The candidate subgraph to be tested
+    private final HashSet<Channel> subgraph = new HashSet<>();//The candidate subgraph to be tested
     private ProgressMonitor pm;
     private final boolean pmenabled;
-    private final ArrayList<HashSet<Channel>> junctions = new ArrayList<HashSet<Channel>>();
+    private final ArrayList<HashSet<Channel>> junctions = new ArrayList<>();
     private final boolean searchFirstJunction;
-    private final ArrayList<Channel> subJunction = new ArrayList<Channel>();
+    private final ArrayList<Channel> subJunction = new ArrayList<>();
     private final JPrepare jprepare;
     private boolean Check = false;
@@ -92,5 +92,5 @@
             do {
                 int missing = 0;
-                C = new ArrayList<Object>(3);
+                C = new ArrayList<>(3);
                 v = new int[n][2];
                 C.add(i);//the first position of column variable C is the column index
@@ -133,5 +133,5 @@
         Iterator<List<Object>> l = L.listIterator();
         List<Object> C;
-        ArrayList<int[]> CandidateK = new ArrayList<int[]>(n*n); //saves the candidate K_{n-1} in entry-exit pairs
+        ArrayList<int[]> CandidateK = new ArrayList<>(n*n); //saves the candidate K_{n-1} in entry-exit pairs
         long lindex= 0;
         int h = 0;
@@ -229,5 +229,5 @@
             }
         }
-        jprepare.jPrepare(new ArrayList<Channel>(subgraph));
+        jprepare.jPrepare(new ArrayList<>(subgraph));
         JCheck jCheck = new JCheck();
         Check = jCheck.jCheck(jprepare.getEntries(), jprepare.getExits(), n);
@@ -253,5 +253,5 @@
                 }
                 if (isin == false) {
-                    junctions.add(new HashSet<Channel>(subgraph));
+                    junctions.add(new HashSet<>(subgraph));
                     //log.info("Kreuzungskandidat der Liste zugefügt" + junctions.size());
                 }
@@ -267,5 +267,5 @@
      */
     public ArrayList<Channel> getSubJunctionCandidate(){
-        return new ArrayList<Channel>(subgraph);
+        return new ArrayList<>(subgraph);
     }
 
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JPrepare.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JPrepare.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JPrepare.java	(revision 30737)
@@ -17,6 +17,6 @@
 
     public JPrepare(ChannelDiGraph digraph) {
-        entries = new ArrayList<Channel>();
-        exits = new ArrayList<Channel>();
+        entries = new ArrayList<>();
+        exits = new ArrayList<>();
         this.digraph = digraph;
     }
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JunctionChecker.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JunctionChecker.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JunctionChecker.java	(revision 30737)
@@ -33,5 +33,5 @@
     private JMinimality m;
     // Variable wird beim KreuzungsSuchen benutzt, sonst ist sie leer!
-    private ArrayList<HashSet<Channel>> junctions = new ArrayList<HashSet<Channel>>();
+    private ArrayList<HashSet<Channel>> junctions = new ArrayList<>();
     //dient zur Zeitmessung
     private long startIterate = 0;
@@ -44,5 +44,5 @@
         this.n = n;
         this.jCheck = new JCheck();
-        this.subjunction = new ArrayList<Channel>();
+        this.subjunction = new ArrayList<>();
         smallerJunction = false;
     }
@@ -138,5 +138,5 @@
 
     private void collectECandidates(ArrayList<Channel> subgraph) {
-        E = new ArrayList<Channel>();
+        E = new ArrayList<>();
         for (int i = 0; i < subgraph.size(); i++) {
             if ((subgraph.get(i).getIndegree() + subgraph.get(i).getOutdegree() >= 3)
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/TRDFS.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/TRDFS.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/TRDFS.java	(revision 30737)
@@ -26,5 +26,5 @@
         this.vertices = adnodes;
         this.digraph = digraph;
-        this.cycleEdges = new ArrayList<LeadsTo>();
+        this.cycleEdges = new ArrayList<>();
     }
 
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/ColorSchemeXMLReader.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/ColorSchemeXMLReader.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/ColorSchemeXMLReader.java	(revision 30737)
@@ -31,5 +31,5 @@
     @Override
     public void parseXML() {
-        colorScheme = new HashMap<String, Color>();
+        colorScheme = new HashMap<>();
         String tempValue;
         //String tempKeyValue ="";
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/OSMXMLReader.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/OSMXMLReader.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/OSMXMLReader.java	(revision 30737)
@@ -82,5 +82,5 @@
         OSMWay way = new OSMWay();
         OSMRelation relation = new OSMRelation();
-        HashMap<String, String> hashmap = new HashMap<String, String>();
+        HashMap<String, String> hashmap = new HashMap<>();
         try {
             while (parser.hasNext()) {
@@ -92,5 +92,5 @@
                     if (xmlelement.equals("node")) {
                         node = new OSMNode();
-                        hashmap = new HashMap<String, String>();
+                        hashmap = new HashMap<>();
                         readAttributes(node);
                         node.setLatitude(Double.parseDouble(parser
@@ -102,5 +102,5 @@
                     if (xmlelement.equals("way")) {
                         way = new OSMWay();
-                        hashmap = new HashMap<String, String>();
+                        hashmap = new HashMap<>();
                         readAttributes(way);
                     }
@@ -108,5 +108,5 @@
                     if (xmlelement.equals("relation")) {
                         relation = new OSMRelation();
-                        hashmap = new HashMap<String, String>();
+                        hashmap = new HashMap<>();
                         readAttributes(relation);
                     }
@@ -139,5 +139,5 @@
                     if (xmlelement.equals("relation")) {
                         relation = new OSMRelation();
-                        hashmap = new HashMap<String, String>();
+                        hashmap = new HashMap<>();
                         readAttributes(relation);
                     }
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/XMLFilterReader.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/XMLFilterReader.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/reader/XMLFilterReader.java	(revision 30737)
@@ -16,5 +16,5 @@
     public XMLFilterReader(String filename) {
         super(filename);
-        filters = new Vector<Filter>();
+        filters = new Vector<>();
     }
 
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/util/RelationProducer.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/util/RelationProducer.java	(revision 30725)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/util/RelationProducer.java	(revision 30737)
@@ -24,5 +24,5 @@
     public RelationProducer(JunctionCheckerPlugin plugin) {
         this.plugin = plugin;
-        storedRelations = new HashSet<HashSet<Channel>>();
+        storedRelations = new HashSet<>();
     }
 
@@ -31,5 +31,5 @@
             return;
         }
-        LinkedList<OsmPrimitive> ways = new LinkedList<OsmPrimitive>();
+        LinkedList<OsmPrimitive> ways = new LinkedList<>();
         Iterator<Channel> cit = subset.iterator();
         while (cit.hasNext()) {