Changeset 31460 in osm for applications/editors/josm/plugins/mapillary/src/org

Timestamp:

2015-08-06T16:55:15+02:00 (10 years ago)

Author:

nokutu

Message:

Created several new tests and improved comments.

Location:

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

Files:

• MapillaryAbstractImage.java (modified) (2 diffs)
• MapillaryData.java (modified) (5 diffs)
• MapillaryLayer.java (modified) (1 diff)
• MapillarySequence.java (modified) (1 diff)
• actions/WalkThread.java (modified) (2 diffs)
• downloads/MapillaryDownloader.java (modified) (2 diffs)
• gui/MapillaryExportDialog.java (modified) (1 diff)
• gui/MapillaryImageDisplay.java (modified) (1 diff)
• mode/JoinMode.java (modified) (1 diff)
• mode/SelectMode.java (modified) (1 diff)

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

@@ -21 +21 @@
 
   /**
-   * Lock that locks next() and previous() methods. Used when downloading images
-   * to prevent concurrency problems.
+   * Lock that locks {@link MapillaryAbstractImage#next()} and
+   * {@link MapillaryAbstractImage#previous()} methods. Used when downloading
+   * images to prevent concurrency problems.
    */
   public static Lock LOCK = new ReentrantLock();
@@ -213 +214 @@
    * Returns the date the picture was taken in the given format.
    *
-   * @param format Format of the date. See {@link SimpleDateFormat}.
+   * @param format
+   *          Format of the date. See {@link SimpleDateFormat}.
    * @return A String containing the date the picture was taken using the given
    *         format.

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

@@ -117 +117 @@
    * @return The image under the mouse cursor.
    */
-  public MapillaryAbstractImage getHighlighted() {
+  public MapillaryAbstractImage getHighlightedImage() {
     return this.highlightedImage;
   }
@@ -239 +239 @@
   public void selectPrevious(boolean moveToPicture) {
     if (getSelectedImage() == null)
-      return;
+      throw new IllegalStateException();
     if (getSelectedImage().getSequence() == null)
       throw new IllegalStateException();
@@ -277 +277 @@
     this.multiSelectedImages.clear();
     this.multiSelectedImages.add(image);
-    if (image != null) {
+    if (image != null && Main.main != null) {
       if (image instanceof MapillaryImage) {
         MapillaryImage mapillaryImage = (MapillaryImage) image;
@@ -284 +284 @@
           CacheUtils.downloadPicture((MapillaryImage) mapillaryImage.next());
           if (mapillaryImage.next().next() != null)
-            CacheUtils
-                .downloadPicture((MapillaryImage) mapillaryImage.next().next());
+            CacheUtils.downloadPicture((MapillaryImage) mapillaryImage.next()
+                .next());
         }
         if (mapillaryImage.previous() != null) {
-          CacheUtils.downloadPicture((MapillaryImage) mapillaryImage.previous());
+          CacheUtils
+              .downloadPicture((MapillaryImage) mapillaryImage.previous());
           if (mapillaryImage.previous().previous() != null)
-            CacheUtils.downloadPicture((MapillaryImage) mapillaryImage.previous()
-                .previous());
+            CacheUtils.downloadPicture((MapillaryImage) mapillaryImage
+                .previous().previous());
         }
       }
     }
-    if (zoom)
+    if (zoom && Main.main != null)
       Main.map.mapView.zoomTo(getSelectedImage().getLatLon());
     if (Main.main != null)
@@ -325 +326 @@
         this.setSelectedImage(image);
     }
-    Main.map.mapView.repaint();
+    if (Main.main != null)
+      Main.map.mapView.repaint();
   }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java ¶

@@ -415 +415 @@
     g.drawImage(op.filter(bi, null), p.x - (width / 2), p.y - (height / 2),
         Main.map.mapView);
-    if (this.data.getHighlighted() == image) {
+    if (this.data.getHighlightedImage() == image) {
       drawPointHighlight(g, p, 16);
     }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillarySequence.java ¶

@@ -139 +139 @@
     return this.images.get(i - 1);
   }
-
-  /**
-   * Returns the difference of index between two {@link MapillaryAbstractImage}
-   * objects belonging to the same {@link MapillarySequence}.
-   *
-   * @param image1
-   *          The first image.
-   * @param image2
-   *          The second image.
-   * @return The distance between two {@link MapillaryAbstractImage} objects
-   *         belonging to the same {@link MapillarySequence}.
-   */
-  public int getDistance(MapillaryAbstractImage image1,
-      MapillaryAbstractImage image2) {
-    if (!this.images.contains(image1) || !this.images.contains(image2))
-      throw new IllegalArgumentException();
-    return Math.abs(this.images.indexOf(image1) - this.images.indexOf(image2));
-  }
 }

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

@@ -22 +22 @@
  */
 public class WalkThread extends Thread implements MapillaryDataListener {
-  private int interval;
-  private MapillaryData data;
-  private Lock lock = new ReentrantLock();
+  private final int interval;
+  private final MapillaryData data;
+  private final Lock lock;
   private boolean end = false;
   private final boolean waitForFullQuality;
@@ -53 +53 @@
     this.data = MapillaryLayer.getInstance().getData();
     this.data.addListener(this);
+    this.lock = new ReentrantLock();
   }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryDownloader.java ¶

@@ -45 +45 @@
   public final static String CLIENT_ID = "T1Fzd20xZjdtR0s1VDk5OFNIOXpYdzoxNDYyOGRkYzUyYTFiMzgz";
   /** Executor that will run the petitions. */
-  private static ThreadPoolExecutor EXECUTOR = new ThreadPoolExecutor(3, 5,
-      100, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(50));
+  private static ThreadPoolExecutor EXECUTOR;
 
   /**
@@ -63 +62 @@
     queryStringParts.put("max_lat", maxLatLon.lat());
     queryStringParts.put("max_lon", maxLatLon.lon());
+    EXECUTOR = new ThreadPoolExecutor(3, 5, 100, TimeUnit.SECONDS,
+        new ArrayBlockingQueue<Runnable>(50));
     run(new MapillarySquareDownloadManagerThread(queryStringParts));
   }

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

@@ -33 +33 @@
   protected JOptionPane optionPane;
   /** Button to export all downloaded images. */
-  public JRadioButton all;
+  public final JRadioButton all;
   /**
    * Button to export all images in the sequence of the selected MapillaryImage.
    */
-  public JRadioButton sequence;
+  public final JRadioButton sequence;
   /**
    * Button to export all images belonging to the selected
    * {@link MapillaryImage} objects.
    */
-  public JRadioButton selected;
+  public final JRadioButton selected;
   /** Button to rewrite all imported images. */
-  public JRadioButton rewrite;
+  public final JRadioButton rewrite;
   /** Group of button containing all the options. */
-  public ButtonGroup group;
-  private JButton choose;
-  private JLabel path;
+  public final ButtonGroup group;
+  private final JButton choose;
+  private final JLabel path;
   /** File chooser. */
   public JFileChooser chooser;
   protected String exportDirectory;
-  private JButton ok;
+  private final JButton ok;
 
   /**

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

@@ -57 +57 @@
   private Rectangle selectedRect = null;
 
+  /** HyperlinkLabel shown in the bottom right corner. */
   protected HyperlinkLabel hyperlink;
 

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

@@ -37 +37 @@
   @Override
   public void mousePressed(MouseEvent e) {
-    if (this.data.getHighlighted() == null)
+    if (this.data.getHighlightedImage() == null)
       return;
     if (this.lastClick == null
-        && this.data.getHighlighted() instanceof MapillaryImportedImage) {
-      this.lastClick = (MapillaryImportedImage) this.data.getHighlighted();
+        && this.data.getHighlightedImage() instanceof MapillaryImportedImage) {
+      this.lastClick = (MapillaryImportedImage) this.data.getHighlightedImage();
     } else if (this.lastClick != null
-        && this.data.getHighlighted() instanceof MapillaryImportedImage) {
-      if (((this.data.getHighlighted().previous() == null && this.lastClick.next() == null) || (this.data
-          .getHighlighted().next() == null && this.lastClick.previous() == null))
-          && (this.data.getHighlighted().getSequence() != this.lastClick.getSequence() || this.lastClick
+        && this.data.getHighlightedImage() instanceof MapillaryImportedImage) {
+      if (((this.data.getHighlightedImage().previous() == null && this.lastClick.next() == null) || (this.data
+          .getHighlightedImage().next() == null && this.lastClick.previous() == null))
+          && (this.data.getHighlightedImage().getSequence() != this.lastClick.getSequence() || this.lastClick
               .getSequence() == null)) {
-        join(this.lastClick, (MapillaryImportedImage) this.data.getHighlighted());
-      } else if (this.lastClick.next() == this.data.getHighlighted()
-          || this.lastClick.previous() == this.data.getHighlighted())
-        unjoin(this.lastClick, (MapillaryImportedImage) this.data.getHighlighted());
+        join(this.lastClick, (MapillaryImportedImage) this.data.getHighlightedImage());
+      } else if (this.lastClick.next() == this.data.getHighlightedImage()
+          || this.lastClick.previous() == this.data.getHighlightedImage())
+        unjoin(this.lastClick, (MapillaryImportedImage) this.data.getHighlightedImage());
       this.lastClick = null;
     }

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

@@ -182 +182 @@
     }
 
-    if (this.data.getHighlighted() != closestTemp && closestTemp != null) {
+    if (this.data.getHighlightedImage() != closestTemp && closestTemp != null) {
       this.data.setHighlightedImage(closestTemp);
       MapillaryMainDialog.getInstance().setImage(closestTemp);
       MapillaryMainDialog.getInstance().updateImage(false);
-    } else if (this.data.getHighlighted() != closestTemp && closestTemp == null) {
+    } else if (this.data.getHighlightedImage() != closestTemp && closestTemp == null) {
       this.data.setHighlightedImage(null);
       MapillaryMainDialog.getInstance().setImage(this.data.getSelectedImage());