Changeset 36352 in osm for applications/editors/josm/plugins/opendata

Timestamp:

2024-10-31T14:18:10+01:00 (2 months ago)

Author:

taylor.smock

Message:

Fix #23991: Incorrect ProgressMonitor text for loading GeoPackage

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeotoolsConverter.java (modified) (5 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeotoolsConverter.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.plugins.opendata.core.io.geographic.GeographicReader.wgs84;
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -43 +44 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.plugins.opendata.core.io.geographic.geopackage.GeoPackageReader;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.UserCancelException;
@@ -77 +79 @@
         String[] typeNames = dataStore.getTypeNames();
         if (progressMonitor != null) {
-            progressMonitor.beginTask(tr("Loading shapefile ({0} layers)", typeNames.length), typeNames.length);
+            progressMonitor.beginTask(tr(getLayerMessage(this.reader.getClass()), typeNames.length), typeNames.length);
         }
         try {
@@ -114 +116 @@
             throws FactoryException, GeoMathTransformException, TransformException, GeoCrsException {
         if (progressMonitor != null) {
-            progressMonitor.beginTask(tr("Loading shapefile ({0} features)", collection.size()), collection.size());
+            progressMonitor.beginTask(tr(getFeatureMessage(this.reader.getClass()), collection.size()), collection.size());
         }
 
@@ -151 +153 @@
             }
         }
+    }
+
+    /**
+     * Get the message for loading layers
+     * @param clazz The class to use to figure out which message to show
+     * @return The message to show the user
+     */
+    private static String getLayerMessage(Class<? extends GeographicReader> clazz) {
+        if (GeoPackageReader.class.equals(clazz)) {
+            return marktr("Loading GeoPackage ({0} layers)");
+        } else if (GmlReader.class.equals(clazz)) {
+            return marktr("Loading GML ({0} layers)");
+        }
+        return marktr("Loading shapefile ({0} layers)");
+    }
+
+    /**
+     * Get the message for loading features
+     * @param clazz The class to use to figure out which message to show
+     * @return The message to show the user
+     */
+    private static String getFeatureMessage(Class<? extends GeographicReader> clazz) {
+        if (GeoPackageReader.class.equals(clazz)) {
+            return marktr("Loading GeoPackage ({0} features)");
+        } else if (GmlReader.class.equals(clazz)) {
+            return marktr("Loading GML ({0} features)");
+        }
+        return marktr("Loading shapefile ({0} features)");
     }