Changeset 14930 in josm for trunk/src/org

Timestamp:

2019-03-25T10:38:08+01:00 (6 years ago)

Author:

GerdP

Message:

see #17514: Allow to paste full changeset URL where changeset id is expected

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/ChangesetIdTextField.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/ChangesetIdTextField.java

@@ -62 +62 @@
         public void validate() {
             if (!isValid()) {
-                feedbackInvalid(tr("The current value is not a valid changeset ID. Please enter an integer value > 0"));
+                feedbackInvalid(tr("The current value is not a valid changeset ID. Please enter an integer value > 0 or a changeset URL."));
             } else {
-                feedbackValid(tr("Please enter an integer value > 0"));
+                feedbackValid(tr("Please enter an integer value > 0 or a changeset URL."));
             }
         }
@@ -75 +75 @@
             String value = getComponent().getText();
             if (value != null && !value.trim().isEmpty()) {
+                value = value.trim();
                 id = 0;
                 try {
-                    int changesetId = Integer.parseInt(value.trim());
+                    if (value.matches("http.*/changeset/[0-9]+")) {
+                        // full URL given, extract id
+                        value = value.substring(value.lastIndexOf('/') + 1);
+                    }
+
+                    int changesetId = Integer.parseInt(value);
                     if (changesetId > 0) {
                         id = changesetId;