Changeset 32652 in osm for applications/editors/josm/plugins/mapillary/test

Timestamp:

2016-07-14T15:18:07+02:00 (9 years ago)

Author:

floscher

Message:

Rename download modes

The labels facing the user (combobox in the settings) are now internationalized, the preference setting is not.
This change is backwards-compatible, because on each start of JOSM the plugin converts the old names of the download modes with the corresponding new one. This feature will sooner or later be removed again, but as long as every user starts JOSM at least once until then, the setting won't be affected by this change.

In some places the old names are still mentioned (e.g. comments and names of variables or methods), but the relevant occurences are now updated.

File:

• applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSettingTest.java (modified) (3 diffs)

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSettingTest.java

@@ -7 +7 @@
 import java.awt.GraphicsEnvironment;
 import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
 
 import javax.swing.JButton;
@@ -20 +18 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.plugins.mapillary.AbstractTest;
+import org.openstreetmap.josm.plugins.mapillary.io.download.MapillaryDownloader.DOWNLOAD_MODE;
 import org.openstreetmap.josm.tools.I18n;
 
@@ -118 +117 @@
       ((JComboBox<String>) getPrivateField(settings, "downloadModeComboBox")).setSelectedIndex(i);
       settings.ok();
-      assertEquals(Main.pref.get("mapillary.download-mode"),
-          ((JComboBox<String>) getPrivateField(settings, "downloadModeComboBox")).getSelectedItem());
+      assertEquals(
+        Main.pref.get("mapillary.download-mode"),
+        DOWNLOAD_MODE.fromLabel(
+          ((JComboBox<String>) getPrivateField(settings, "downloadModeComboBox")).getSelectedItem().toString()
+        ).getPrefId()
+      );
     }
   }