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

Timestamp:

2015-07-31T18:23:44+02:00 (10 years ago)

Author:

nokutu

Message:

Fixed problem with ImageProvider and tests

Location:

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

Files:

• MapillaryPlugin.java (modified) (4 diffs)
• actions/MapillaryDownloadAction.java (modified) (2 diffs)
• actions/MapillaryDownloadViewAction.java (modified) (2 diffs)
• actions/MapillaryExportAction.java (modified) (2 diffs)
• actions/MapillaryImportAction.java (modified) (2 diffs)
• actions/MapillaryImportIntoSequenceAction.java (modified) (2 diffs)
• actions/MapillaryJoinAction.java (modified) (2 diffs)
• actions/MapillaryWalkAction.java (modified) (2 diffs)
• actions/MapillaryZoomAction.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.mapillary;
 
-import java.io.File;
 import java.io.IOException;
 
@@ -32 +31 @@
 public class MapillaryPlugin extends Plugin {
 
-  /** Plugin's directory */
-  public static String directory;
   /** OS route separator */
   public static final String SEPARATOR = System.getProperty("file.separator");
@@ -88 +85 @@
     super(info);
 
-
-    directory = new File("").getAbsolutePath() + SEPARATOR;
-    ICON24 = new ImageProvider(directory + "images" + SEPARATOR + "icon24.png").get();
-    ICON16 = new ImageProvider(directory + "images" + SEPARATOR + "icon16.png").get();
-    MAP_ICON = new ImageProvider(directory + "images" + SEPARATOR + "mapicon.png").get();
-    MAP_ICON_SELECTED = new ImageProvider(directory
-        + "images" + SEPARATOR + "mapiconselected.png").get();
-    MAP_ICON_IMPORTED = new ImageProvider(directory
-        + "images/mapiconimported.png").get();
-    MAP_SIGN = new ImageProvider(directory + "images" + SEPARATOR + "sign.png").get();
+    ICON24 = new ImageProvider("icon24.png").get();
+    ICON16 = new ImageProvider("icon16.png").get();
+    MAP_ICON = new ImageProvider("mapicon.png").get();
+    MAP_ICON_SELECTED = new ImageProvider("mapiconselected.png").get();
+    MAP_ICON_IMPORTED = new ImageProvider("mapiconimported.png").get();
+    MAP_SIGN = new ImageProvider("sign.png").get();
 
     downloadAction = new MapillaryDownloadAction();
@@ -184 +177 @@
     return new MapillaryPreferenceSetting();
   }
+
+  /**
+   * Returns a ImageProvider for the given string or null if in headless mode.
+   *
+   * @param s
+   * @return A ImageProvider object for the given string or null if in headless mode.
+   */
+  public static ImageProvider getProvider(String s) {
+    if (Main.map == null)
+      return null;
+    else
+      return new ImageProvider(s);
+  }
 }

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

@@ -13 +13 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -31 +30 @@
    */
   public MapillaryDownloadAction() {
-    super(tr("Mapillary"), new ImageProvider(MapillaryPlugin.directory
-        + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"),
+    super(tr("Mapillary"), MapillaryPlugin.getProvider("icon24.png"),
         tr("Create Mapillary layer"), Shortcut.registerShortcut("Mapillary",
             tr("Start Mapillary layer"), KeyEvent.VK_COMMA, Shortcut.SHIFT),

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

@@ -7 +7 @@
 
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin;
 import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryDownloader;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -27 +26 @@
   public MapillaryDownloadViewAction() {
     super(tr("Download Mapillary images in current view"), new ImageProvider(
-        MapillaryPlugin.directory + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"), tr("Download Mapillary images in current view"),
+        "icon24.png"), tr("Download Mapillary images in current view"),
         Shortcut.registerShortcut("Mapillary area",
             tr("Download Mapillary images in current view"),

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

@@ -24 +24 @@
 import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryExportManager;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryExportDialog;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -43 +42 @@
    */
   public MapillaryExportAction() {
-    super(tr("Export pictures"), new ImageProvider(MapillaryPlugin.directory
-        + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"),
+    super(tr("Export pictures"), MapillaryPlugin.getProvider("icon24.png"),
         tr("Export pictures"), Shortcut.registerShortcut("Export Mapillary",
             tr("Export Mapillary pictures"), KeyEvent.CHAR_UNDEFINED,

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

@@ -26 +26 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -50 +49 @@
    */
   public MapillaryImportAction() {
-    super(tr("Import pictures"), new ImageProvider(MapillaryPlugin.directory
-        + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"),
+    super(tr("Import pictures"), MapillaryPlugin.getProvider("icon24.png"),
         tr("Import local pictures"), Shortcut.registerShortcut(
             "Import Mapillary", tr("Import pictures into Mapillary layer"),

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

@@ -30 +30 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin;
 import org.openstreetmap.josm.plugins.mapillary.MapillarySequence;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -51 +50 @@
    */
   public MapillaryImportIntoSequenceAction() {
-    super(tr("Import pictures into sequence"), new ImageProvider(
-        MapillaryPlugin.directory
-            + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"),
+    super(tr("Import pictures into sequence"), MapillaryPlugin.getProvider("icon24.png"),
         tr("Import local pictures"), Shortcut.registerShortcut(
             "Import Mapillary Sequence",

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

@@ -11 +11 @@
 import org.openstreetmap.josm.plugins.mapillary.mode.JoinMode;
 import org.openstreetmap.josm.plugins.mapillary.mode.SelectMode;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -28 +27 @@
    */
   public MapillaryJoinAction() {
-    super(tr("Join mode"), new ImageProvider(MapillaryPlugin.directory
-        + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"),
+    super(tr("Join mode"), MapillaryPlugin.getProvider("icon24.png"),
         tr("Join/unjoin pictures"), Shortcut.registerShortcut("Mapillary join",
             tr("Join Mapillary pictures"), KeyEvent.CHAR_UNDEFINED,

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

@@ -18 +18 @@
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryMainDialog;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryWalkDialog;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -39 +38 @@
    */
   public MapillaryWalkAction() {
-    super(tr("Walk mode"), new ImageProvider(MapillaryPlugin.directory
-        + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"), tr("Walk mode"),
+    super(tr("Walk mode"), MapillaryPlugin.getProvider("icon24.png"), tr("Walk mode"),
         Shortcut.registerShortcut("Mapillary walk", tr("Start walk mode"),
             KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false, "mapillaryWalk",

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

@@ -12 +12 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryDataListener;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -30 +29 @@
    */
   public MapillaryZoomAction() {
-    super(tr("Zoom to selected image"), new ImageProvider(
-        MapillaryPlugin.directory
-            + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"),
+    super(tr("Zoom to selected image"), MapillaryPlugin.getProvider("icon24.png"),
         tr("Zoom to selected image"), Shortcut.registerShortcut(
             "Zoom Mapillary",