Changeset 35942 in osm for applications/editors/josm/plugins/CommandLine/src/org

Timestamp:

2022-03-22T22:32:08+01:00 (3 years ago)

Author:

taylor.smock

Message:

fix #16641: Listener CommandLine.LengthAction was not registered before or already removed

This was caused by the exitMode() being called on mode change AND on drawing
finish.

This patch also improves user feedback when a command errors out. For example,
when python isn't installed.

Location:

applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline

Files:

• CommandLine.java (modified) (4 diffs)
• LengthAction.java (modified) (1 diff)

applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/CommandLine.java

@@ -21 +21 @@
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -47 +46 @@
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
@@ -52 +52 @@
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
 import org.openstreetmap.josm.io.GpxWriter;
@@ -497 +498 @@
             tp.process = builder.start();
         } catch (final IOException e) {
+            final String errorText;
             synchronized (debugstr) {
-                Logging.error(
-                        tr("Error executing the script:") + ' ' +
-                        debugstr.toString() + e.getMessage() + '\n' + Arrays.toString(e.getStackTrace()));
-            }
+                errorText = tr("Error executing the script:") + ' ' + debugstr + e.getMessage();
+            }
+            Logging.error(errorText);
+            Logging.error(e);
+            GuiHelper.runInEDT(() ->
+                new Notification(errorText).setIcon(JOptionPane.ERROR_MESSAGE).setDuration(Notification.TIME_LONG).show()
+            );
+            setMode(Mode.IDLE);
             return;
         }

applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/LengthAction.java

@@ -152 +152 @@
         drawStartPos = null;
         drawing = false;
-        exitMode();
+        // exitMode is called when we change to a different action. Do not call it here.
     }