Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.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/MultiFetchServerObjectReader.java (modified) (5 diffs)

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

@@ -75 +75 @@
      */
     public MultiFetchServerObjectReader() {
-        nodes = new LinkedHashSet<Long>();
-        ways = new LinkedHashSet<Long>();
-        relations = new LinkedHashSet<Long>();
+        nodes = new LinkedHashSet<>();
+        ways = new LinkedHashSet<>();
+        relations = new LinkedHashSet<>();
         this.outputDataSet = new DataSet();
-        this.missingPrimitives = new LinkedHashSet<PrimitiveId>();
+        this.missingPrimitives = new LinkedHashSet<>();
     }
 
@@ -238 +238 @@
      */
     protected Set<Long> extractIdPackage(Set<Long> ids) {
-        HashSet<Long> pkg = new HashSet<Long>();
+        HashSet<Long> pkg = new HashSet<>();
         if (ids.isEmpty())
             return pkg;
@@ -333 +333 @@
         progressMonitor.setTicks(0);
         // The complete set containg all primitives to fetch
-        Set<Long> toFetch = new HashSet<Long>(ids);
+        Set<Long> toFetch = new HashSet<>(ids);
         // Build a list of fetchers that will  download smaller sets containing only MAX_IDS_PER_REQUEST (200) primitives each.
         // we will run up to MAX_DOWNLOAD_THREADS concurrent fetchers.
@@ -339 +339 @@
         threadsNumber = Math.min(Math.max(threadsNumber, 1), OsmApi.MAX_DOWNLOAD_THREADS);
         Executor exec = Executors.newFixedThreadPool(threadsNumber);
-        CompletionService<FetchResult> ecs = new ExecutorCompletionService<FetchResult>(exec);
-        List<Future<FetchResult>> jobs = new ArrayList<Future<FetchResult>>();
+        CompletionService<FetchResult> ecs = new ExecutorCompletionService<>(exec);
+        List<Future<FetchResult>> jobs = new ArrayList<>();
         while (!toFetch.isEmpty()) {
             jobs.add(ecs.submit(new Fetcher(type, extractIdPackage(toFetch), progressMonitor)));
@@ -388 +388 @@
         progressMonitor.beginTask(trn("Downloading {0} object from ''{1}''", "Downloading {0} objects from ''{1}''", n, n, OsmApi.getOsmApi().getBaseUrl()));
         try {
-            missingPrimitives = new HashSet<PrimitiveId>();
+            missingPrimitives = new HashSet<>();
             if (isCanceled()) return null;
             fetchPrimitives(ways,OsmPrimitiveType.WAY, progressMonitor);