Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/io/GpxReader.java

Timestamp:

2014-04-26T17:39:23+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

File:

• trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -67 +67 @@
         private Extensions currentExtensions;
         private Stack<State> states;
-        private final Stack<String> elements = new Stack<String>();
+        private final Stack<String> elements = new Stack<>();
 
         private StringBuffer accumulator = new StringBuffer();
@@ -75 +75 @@
         @Override public void startDocument() {
             accumulator = new StringBuffer();
-            states = new Stack<State>();
+            states = new Stack<>();
             data = new GpxData();
         }
@@ -123 +123 @@
                     states.push(currentState);
                     currentState = State.trk;
-                    currentTrack = new ArrayList<Collection<WayPoint>>();
-                    currentTrackAttr = new HashMap<String, Object>();
+                    currentTrack = new ArrayList<>();
+                    currentTrackAttr = new HashMap<>();
                 } else if (localName.equals("extensions")) {
                     states.push(currentState);
@@ -164 +164 @@
                     states.push(currentState);
                     currentState = State.trkseg;
-                    currentTrackSeg = new ArrayList<WayPoint>();
+                    currentTrackSeg = new ArrayList<>();
                 } else if (localName.equals("link")) {
                     states.push(currentState);
@@ -415 +415 @@
 
         public void tryToFinish() throws SAXException {
-            List<String> remainingElements = new ArrayList<String>(elements);
+            List<String> remainingElements = new ArrayList<>(elements);
             for (int i=remainingElements.size() - 1; i >= 0; i--) {
                 endElement(null, remainingElements.get(i), remainingElements.get(i));