Changeset 13793 in josm

Timestamp:

2018-05-20T21:19:27+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16288 - replace similar i18n strings (script update for plugins)

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (4 diffs)
• scripts/I18nSimilarStrings.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -4126 +4126 @@
             <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
             <text key="ele" text="Elevation" />
-            <text key="description" text="Closer Description" />
+            <text key="description" text="Closer description" />
             <space />
             <reference ref="link_contact_address_payment" />
@@ -4440 +4440 @@
             <combo key="map_type" text="Detail Grade" values="topo,street,scheme,toposcope" />
             <combo key="map_size" text="Shown Area" values="site,city,region" />
-            <text key="description" text="Closer Description" />
+            <text key="description" text="Closer description" />
             <optional text="Routes shown for:">
                 <check key="hiking" text="Hiking" />
@@ -4464 +4464 @@
             <text key="name" text="Name" />
             <combo key="board_type" text="Board Content" values="notice,history,nature,wildlife,plants,geology" />
-            <text key="description" text="Closer Description" />
+            <text key="description" text="Closer description" />
         </item> <!-- Information Board -->
         <item name="Guidepost" icon="presets/misc/information/guidepost.svg" type="node" preset_name_label="true">
@@ -4542 +4542 @@
             <key key="tourism" value="information" />
             <text key="name" text="Name" />
-            <text key="description" text="Closer Description" />
+            <text key="description" text="Closer description" />
         </item> <!-- Other Information Point -->
     </group> <!-- Tourism -->

trunk/scripts/I18nSimilarStrings.java

@@ -3 +3 @@
 import java.util.List;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
 import org.openstreetmap.josm.data.validation.tests.SimilarNamedWays;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MainApplicationTest;
+import org.openstreetmap.josm.plugins.PluginHandlerTestIT;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.I18n;
 
@@ -19 +27 @@
     public static void main(String[] args) {
         I18n.init();
+        Main.determinePlatformHook();
+        Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
+        Preferences pref = new Preferences();
+        Config.setPreferencesInstance(pref);
+        pref.init(false);
+        MainApplication.undoRedo = new UndoRedoHandler();
+        MainApplicationTest.initContentPane();
+        MainApplicationTest.initToolbar();
+        MainApplicationTest.initMainMenu();
+        PluginHandlerTestIT.loadAllPlugins();
         List<String> strings = new ArrayList<>();
         strings.addAll(I18n.getSingularTranslations().keySet());
         strings.addAll(I18n.getPluralTranslations().keySet());
-        System.out.println("Loaded " + strings.size() + " core strings");
+        System.out.println("Loaded " + strings.size() + " strings");
         strings.removeIf(s -> s.length() <= 5);
-        System.out.println("Kept " + strings.size() + " core strings longer than 5 characters");
+        System.out.println("Kept " + strings.size() + " strings longer than 5 characters");
         Collections.sort(strings);
         for (int i = 0; i < strings.size(); i++) {

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java

@@ -50 +50 @@
     @Test
     public void testValidityOfAvailablePlugins() {
+        loadAllPlugins();
+
+        Map<String, Throwable> loadingExceptions = PluginHandler.pluginLoadingExceptions.entrySet().stream()
+                .collect(Collectors.toMap(e -> e.getKey(), e -> ExceptionUtils.getRootCause(e.getValue())));
+
+        // Add/remove layers twice to test basic plugin good behaviour
+        Map<String, Throwable> layerExceptions = new HashMap<>();
+        List<PluginInformation> loadedPlugins = PluginHandler.getPlugins();
+        for (int i = 0; i < 2; i++) {
+            OsmDataLayer layer = new OsmDataLayer(new DataSet(), "Layer "+i, null);
+            testPlugin(MainApplication.getLayerManager()::addLayer, layer, layerExceptions, loadedPlugins);
+            testPlugin(MainApplication.getLayerManager()::removeLayer, layer, layerExceptions, loadedPlugins);
+        }
+        for (int i = 0; i < 2; i++) {
+            GpxLayer layer = new GpxLayer(new GpxData());
+            testPlugin(MainApplication.getLayerManager()::addLayer, layer, layerExceptions, loadedPlugins);
+            testPlugin(MainApplication.getLayerManager()::removeLayer, layer, layerExceptions, loadedPlugins);
+        }
+
+        MapUtils.debugPrint(System.out, null, loadingExceptions);
+        MapUtils.debugPrint(System.out, null, layerExceptions);
+        String msg = Arrays.toString(loadingExceptions.entrySet().toArray()) + '\n' +
+                     Arrays.toString(layerExceptions.entrySet().toArray());
+        assertTrue(msg, loadingExceptions.isEmpty() && layerExceptions.isEmpty());
+    }
+
+    /**
+     * Downloads and loads all JOSM plugins.
+     */
+    public static void loadAllPlugins() {
         // Download complete list of plugins
         ReadRemotePluginInformationTask pluginInfoDownloadTask = new ReadRemotePluginInformationTask(
@@ -81 +111 @@
         // Load late plugins
         PluginHandler.loadLatePlugins(null, plugins, null);
-
-        Map<String, Throwable> loadingExceptions = PluginHandler.pluginLoadingExceptions.entrySet().stream()
-                .collect(Collectors.toMap(e -> e.getKey(), e -> ExceptionUtils.getRootCause(e.getValue())));
-
-        // Add/remove layers twice to test basic plugin good behaviour
-        Map<String, Throwable> layerExceptions = new HashMap<>();
-        List<PluginInformation> loadedPlugins = PluginHandler.getPlugins();
-        for (int i = 0; i < 2; i++) {
-            OsmDataLayer layer = new OsmDataLayer(new DataSet(), "Layer "+i, null);
-            testPlugin(MainApplication.getLayerManager()::addLayer, layer, layerExceptions, loadedPlugins);
-            testPlugin(MainApplication.getLayerManager()::removeLayer, layer, layerExceptions, loadedPlugins);
-        }
-        for (int i = 0; i < 2; i++) {
-            GpxLayer layer = new GpxLayer(new GpxData());
-            testPlugin(MainApplication.getLayerManager()::addLayer, layer, layerExceptions, loadedPlugins);
-            testPlugin(MainApplication.getLayerManager()::removeLayer, layer, layerExceptions, loadedPlugins);
-        }
-
-        MapUtils.debugPrint(System.out, null, loadingExceptions);
-        MapUtils.debugPrint(System.out, null, layerExceptions);
-        String msg = Arrays.toString(loadingExceptions.entrySet().toArray()) + '\n' +
-                     Arrays.toString(layerExceptions.entrySet().toArray());
-        assertTrue(msg, loadingExceptions.isEmpty() && layerExceptions.isEmpty());
     }