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

Timestamp:

2016-01-02T14:22:20+01:00 (9 years ago)

Author:

donvip

Message:

[josm_mapillary] fix warnings

Location:

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

Files:

• MapillaryAbstractImage.java (modified) (1 diff)
• MapillaryData.java (modified) (1 diff)
• actions/MapillaryExportAction.java (modified) (1 diff)
• actions/MapillaryImportAction.java (modified) (1 diff)
• actions/MapillaryImportIntoSequenceAction.java (modified) (2 diffs)
• gui/MapillaryFilterChooseSigns.java (modified) (1 diff)
• gui/MapillaryMainDialog.java (modified) (1 diff)
• history/commands/CommandDelete.java (modified) (1 diff)
• history/commands/CommandImport.java (modified) (1 diff)
• history/commands/CommandJoin.java (modified) (1 diff)
• history/commands/CommandMove.java (modified) (1 diff)
• history/commands/CommandTurn.java (modified) (1 diff)
• history/commands/CommandUnjoin.java (modified) (2 diffs)
• history/commands/MapillaryCommand.java (modified) (1 diff)
• history/commands/MapillaryExecutableCommand.java (modified) (1 diff)
• io/download/MapillaryDownloader.java (modified) (1 diff)
• io/download/MapillarySequenceDownloadThread.java (modified) (2 diffs)
• mode/SelectMode.java (modified) (2 diffs)
• oauth/UploadUtils.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Locale;
 
 import org.openstreetmap.josm.Main;

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

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.mapillary;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.CopyOnWriteArrayList;
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java

@@ -10 +10 @@
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListSet;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.beans.beancontext.BeanContextChildComponentProxy;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListSet;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java

@@ -8 +8 @@
 import java.io.File;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 import java.util.concurrent.ConcurrentSkipListSet;
 
@@ -97 +100 @@
       }
       joinImages();
-      MapillaryRecord.getInstance().addCommand(new CommandImport(new ConcurrentSkipListSet(images)));
+      MapillaryRecord.getInstance().addCommand(new CommandImport(new ConcurrentSkipListSet<>(images)));
     }
     MapillaryUtils.showAllPictures();

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

@@ -66 +66 @@
   }
 
-  private void addCheckBoxWithLabel(final JPanel parentPanel, final JCheckBox checkBox,
+  private static void addCheckBoxWithLabel(final JPanel parentPanel, final JCheckBox checkBox,
       final boolean isSelected, final String iconPath,  final String labelText) {
     final JPanel checkBoxPanel = new JPanel();

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

@@ -39 +39 @@
 import org.openstreetmap.josm.plugins.mapillary.actions.WalkListener;
 import org.openstreetmap.josm.plugins.mapillary.actions.WalkThread;
-import org.openstreetmap.josm.plugins.mapillary.cache.CacheUtils;
 import org.openstreetmap.josm.plugins.mapillary.cache.MapillaryCache;
 import org.openstreetmap.josm.tools.ImageProvider;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandDelete.java

@@ -5 +5 @@
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandImport.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.util.List;
 import java.util.Set;
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandJoin.java

@@ -31 +31 @@
    */
   public CommandJoin(List<MapillaryAbstractImage> images) {
-    super(new ConcurrentSkipListSet(images));
+    super(new ConcurrentSkipListSet<>(images));
     a = images.get(0);
     b = images.get(1);

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandMove.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.util.List;
 import java.util.Set;
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandTurn.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.util.List;
 import java.util.Set;
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandUnjoin.java

@@ -5 +5 @@
 
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListSet;
 
@@ -32 +31 @@
    */
   public CommandUnjoin(List<MapillaryAbstractImage> images) {
-    super(new ConcurrentSkipListSet(images));
+    super(new ConcurrentSkipListSet<>(images));
     a = images.get(0);
     b = images.get(1);

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/MapillaryCommand.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.mapillary.history.commands;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListSet;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/MapillaryExecutableCommand.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.mapillary.history.commands;
 
-import java.util.List;
 import java.util.Set;
 

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

@@ -29 +29 @@
 
   /** Possible download modes. */
-  public enum MODES {Automatic, Semiautomatic, Manual};
+  public enum MODES {Automatic, Semiautomatic, Manual}
 
   /** All the Threads that have been run. Used to interrupt them properly. */

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

@@ -114 +114 @@
         }
 
-        MapillaryLayer.getInstance().getData().add(new ConcurrentSkipListSet(finalImages), false);
+        MapillaryLayer.getInstance().getData().add(new ConcurrentSkipListSet<MapillaryAbstractImage>(finalImages), false);
       }
     } catch (IOException e) {
@@ -122 +122 @@
   }
 
-  private boolean isInside(MapillaryAbstractImage image) {
+  private static boolean isInside(MapillaryAbstractImage image) {
     for (Bounds b : MapillaryLayer.getInstance().getData().bounds) {
       if (b.contains(image.getLatLon())) {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java

@@ -8 +8 @@
 import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
-import java.util.ArrayList;
 import java.util.concurrent.ConcurrentSkipListSet;
 
@@ -86 +85 @@
                 .indexOf(this.lastClicked);
         if (i < j)
-          this.data.addMultiSelectedImage(new ConcurrentSkipListSet(this.closest.getSequence()
+          this.data.addMultiSelectedImage(new ConcurrentSkipListSet<>(this.closest.getSequence()
                   .getImages().subList(i, j + 1)));
         else
-          this.data.addMultiSelectedImage(new ConcurrentSkipListSet(this.closest.getSequence()
+          this.data.addMultiSelectedImage(new ConcurrentSkipListSet<>(this.closest.getSequence()
                   .getImages().subList(j, i + 1)));
       }

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

@@ -9 +9 @@
 import java.io.OutputStream;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Set;
 import java.util.UUID;
@@ -180 +179 @@
     exifDirectory.removeField(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL);
     exifDirectory.add(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL,
-            ((MapillaryImportedImage) image).getDate("yyyy/MM/dd HH:mm:ss"));
+            image.getDate("yyyy/MM/dd HH:mm:ss"));
 
     // Removes the ImageDescription tag, that causes problems in the upload.
@@ -275 +274 @@
    */
   public static void uploadSequence(MapillarySequence sequence, boolean delete) {
-    Main.worker.submit(new SequenceUploadThread(new ConcurrentSkipListSet(sequence.getImages()), delete));
+    Main.worker.submit(new SequenceUploadThread(new ConcurrentSkipListSet<>(sequence.getImages()), delete));
   }
 }