From 0f8f165f377d6ef5a7bd6c94c20299a4de6ffc93 Mon Sep 17 00:00:00 2001
From: Jiri Vlasak <jiri.hubacek@gmail.com>
Date: Thu, 21 Sep 2023 08:31:27 +0200
Subject: [PATCH 2/2] Closing note comment based on the OSM instance URL
---
src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
index 8282a6444a..5d0a5c59b6 100644
|
a
|
b
|
public class NotesDialog extends ToggleDialog implements LayerChangeListener, No
|
| 430 | 430 | if (note != null) { |
| 431 | 431 | Boolean isDefaultOsmInstance = Config.getUrls().getDefaultOsmApiUrl().equals(OsmApi.getOsmApi().getServerUrl()); |
| 432 | 432 | String noteUrlShort = "osm.org/note/" + note.getId(); |
| 433 | | String noteUrlLong = "openstreetmap.org/note/" + note.getId(); |
| | 433 | String hostUrl = OsmApi.getOsmApi().getHost().substring(4); // substring removes "api." |
| | 434 | String noteUrlLong = hostUrl + "/note/" + note.getId(); |
| 434 | 435 | for (Changeset cs: ChangesetCache.getInstance().getChangesets()) { |
| 435 | 436 | if (isDefaultOsmInstance && (cs.getComment().indexOf(noteUrlShort) > -1 || cs.getComment().indexOf(noteUrlLong) > -1)) { |
| 436 | | changesetUrl = "https://www.osm.org/changeset/" + cs.getId(); |
| | 437 | changesetUrl = "https://" + hostUrl + "/changeset/" + cs.getId(); |
| 437 | 438 | } |
| 438 | 439 | } |
| 439 | 440 | } |
