Changeset 31833 in osm for applications/editors/josm/plugins/mapillary/src

Timestamp:

2015-12-15T21:47:02+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Fix tests in MapillaryURLTest that were failing in Java 7 due to different ordering of HashMaps

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary

Files:

• MapillaryData.java (modified) (1 diff)
• gui/FinishedUploadDialog.java (modified) (1 diff)
• gui/MapillaryMainDialog.java (modified) (2 diffs)
• gui/MapillaryPreferenceSetting.java (modified) (2 diffs)
• io/download/MapillaryDownloader.java (modified) (5 diffs)
• oauth/OAuthPortListener.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java

@@ -31 +31 @@
   private final CopyOnWriteArrayList<MapillaryDataListener> listeners = new CopyOnWriteArrayList<>();
   /** The bounds of the areas for which the pictures have been downloaded. */
-  public CopyOnWriteArrayList<Bounds> bounds;
+  public List<Bounds> bounds;
 
   /**

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/FinishedUploadDialog.java

@@ -8 +8 @@
 import java.awt.event.ActionListener;
 import java.io.IOException;
-import java.net.URL;
 
 import javax.swing.BoxLayout;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.mapillary.gui;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.marktr;
 
 import java.awt.BorderLayout;
@@ -15 +15 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.util.Arrays;
 import java.util.List;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java

@@ -3 +3 @@
 
 import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.io.IOException;
-import java.net.URL;
 
 import javax.swing.AbstractAction;
@@ -92 +92 @@
     onLogout();
     panel.add(loginPanel, GBC.eol());
-    panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
+    panel.add(Box.createVerticalGlue(), GBC.eol().fill(GridBagConstraints.BOTH));
 
     gui.getDisplayPreference().addSubTab(this, "Mapillary", new JScrollPane(panel));

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryDownloader.java

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -39 +38 @@
 
   /** Executor that will run the petitions. */
-  private static ThreadPoolExecutor EXECUTOR = new ThreadPoolExecutor(3, 5,
-      100, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(100));;
+  private static ThreadPoolExecutor executor = new ThreadPoolExecutor(3, 5, 100, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(100));
 
   /**
@@ -52 +50 @@
    */
   public static void getImages(LatLon minLatLon, LatLon maxLatLon) {
-    if (maxLatLon == null || maxLatLon == null) {
+    if (minLatLon == null || maxLatLon == null) {
       throw new IllegalArgumentException();
     }
@@ -90 +88 @@
   private static void run(Thread t) {
     threads.add(t);
-    EXECUTOR.execute(t);
+    executor.execute(t);
   }
 
@@ -214 +212 @@
     }
     threads.clear();
-    EXECUTOR.shutdownNow();
+    executor.shutdownNow();
     try {
-      EXECUTOR.awaitTermination(30, TimeUnit.SECONDS);
+      executor.awaitTermination(30, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
       Main.error(e);
     }
-    EXECUTOR = new ThreadPoolExecutor(3, 5, 100, TimeUnit.SECONDS,
+    executor = new ThreadPoolExecutor(3, 5, 100, TimeUnit.SECONDS,
         new ArrayBlockingQueue<Runnable>(100));
   }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListener.java

@@ -37 +37 @@
   @Override
   public void run() {
-    try {
-      ServerSocket serverSocket = new ServerSocket(PORT);
-      Socket clientSocket = serverSocket.accept();
-      PrintWriter out = new PrintWriter(new OutputStreamWriter(
-          clientSocket.getOutputStream(), "UTF-8"), true);
-      Scanner in = new Scanner(new InputStreamReader(
-          clientSocket.getInputStream(), "UTF-8"));
+    try (
+        ServerSocket serverSocket = new ServerSocket(PORT);
+        Socket clientSocket = serverSocket.accept();
+        PrintWriter out = new PrintWriter(new OutputStreamWriter(clientSocket.getOutputStream(), "UTF-8"), true);
+        Scanner in = new Scanner(new InputStreamReader(clientSocket.getInputStream(), "UTF-8"));
+    ) {
       String s;
       String accessToken = null;