Changeset 17555 in josm

Timestamp:

2021-03-07T15:34:28+01:00 (3 years ago)

Author:

Don-vip

Message:

fix #20571 - strip leading/trailing whitespace from roles entered in relation editor

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions

Files:

• CancelAction.java (modified) (2 diffs)
• OKAction.java (modified) (2 diffs)
• SetRoleAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java

@@ -16 +16 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -50 +51 @@
             if (ret == 0) { //Yes, save the changes
                 //copied from OKAction.run()
-                Config.getPref().put("relation.editor.generic.lastrole", tfRole.getText());
+                Config.getPref().put("relation.editor.generic.lastrole", Utils.strip(tfRole.getText()));
                 if (!applyChanges())
                     return;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/OKAction.java

@@ -8 +8 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -29 +30 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Config.getPref().put("relation.editor.generic.lastrole", tfRole.getText());
+        Config.getPref().put("relation.editor.generic.lastrole", Utils.strip(tfRole.getText()));
         editorAccess.getMemberTable().stopHighlighting();
         if (!applyChanges())

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -83 +84 @@
             return;
         }
-        editorAccess.getMemberTableModel().updateRole(editorAccess.getMemberTable().getSelectedRows(), tfRole.getText());
+        editorAccess.getMemberTableModel().updateRole(editorAccess.getMemberTable().getSelectedRows(), Utils.strip(tfRole.getText()));
     }