Changeset 36362 in osm for applications/editors/josm/plugins/utilsplugin2/src/org

Timestamp:

2025-01-02T14:16:53+01:00 (12 months ago)

Author:

stoecker

Message:

see #23688, patch for local URL calling

Location:

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2

Files:

• customurl/OpenPageAction.java (modified) (2 diffs)
• customurl/UtilsPluginPreferences.java (modified) (1 diff)
• latlon/LatLonDialog.java (modified) (1 diff)
• search/ConnectedMatch.java (modified) (1 diff)
• search/InsideMatch.java (modified) (1 diff)
• search/IntersectingMatch.java (modified) (1 diff)
• search/RangeMatch.java (modified) (1 diff)
• selection/NodeWayUtils.java (modified) (1 diff)
• selection/SelectHighwayAction.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/OpenPageAction.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.Collection;
 import java.util.regex.Matcher;
@@ -98 +101 @@
             addr = addr.replace(keys[j], vals[j]);
         }
+
+        // Opened on the local system instead of the browser: local:http://127.0.0.1:<port>/script
+        Pattern pat_direct = Pattern.compile("local:(http.*)$");
+        Matcher m_direct = pat_direct.matcher(addr);
+
         try {
+            if (m_direct.find()) {
+                addr = m_direct.group(1);   // replace addr so possible error uses it
+                Logging.info("Opening on the local system: " + addr);
+                URL url = new URL(addr);
+                HttpURLConnection urlConn = (HttpURLConnection) url.openConnection();
+                urlConn.setRequestMethod("GET");
+                if (urlConn.getResponseCode() != HttpURLConnection.HTTP_OK) {
+                    throw new IOException(". GET response:" + urlConn.getResponseCode());
+                }
+
             // See #12836 - do not load invalid history
-            if (!addr.endsWith("/0/history")) {
+            } else if (!addr.endsWith("/0/history")) {
                 OpenBrowser.displayUrl(addr);
             }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/UtilsPluginPreferences.java

@@ -137 +137 @@
 
     private List<String> readItemsFromTable() {
-        TableModel model = (table.getModel());
+        TableModel model = table.getModel();
         String v;
         ArrayList<String> lst = new ArrayList<>();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonDialog.java

@@ -347 +347 @@
             } else if (m.group(7) != null) {
                 sb.append("x");     // cardinal direction
-                String c = m.group(7).toUpperCase();
+                String c = m.group(7).toUpperCase(Locale.ROOT);
                 if ("N".equals(c) || "S".equals(c) || "E".equals(c) || "W".equals(c)) {
                     list.add(c);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ConnectedMatch.java

@@ -80 +80 @@
         if (this == obj)
             return true;
-        if (!super.equals(obj) || getClass() != obj.getClass())
+        if (!super.equals(obj) || !(obj instanceof ConnectedMatch))
             return false;
         ConnectedMatch other = (ConnectedMatch) obj;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/InsideMatch.java

@@ -62 +62 @@
         if (this == obj)
             return true;
-        if (!super.equals(obj) || getClass() != obj.getClass())
+        if (!super.equals(obj) || !(obj instanceof InsideMatch))
             return false;
         InsideMatch other = (InsideMatch) obj;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/IntersectingMatch.java

@@ -70 +70 @@
         if (this == obj)
             return true;
-        if (!super.equals(obj) || getClass() != obj.getClass())
+        if (!super.equals(obj) || !(obj instanceof IntersectingMatch))
             return false;
         IntersectingMatch other = (IntersectingMatch) obj;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/RangeMatch.java

@@ -53 +53 @@
         if (this == obj)
             return true;
-        if (obj == null || getClass() != obj.getClass())
+        if (!(obj instanceof RangeMatch))
             return false;
         RangeMatch other = (RangeMatch) obj;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java

@@ -433 +433 @@
 
     /**
+     * Get Count of Ray intersections
      * @param point - point to start an OX-parallel  ray
      * @param polygonPoints - poits forming bundary, use null to split unconnected segmants

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java

@@ -194 +194 @@
         public List<Way> getPath(Way to) {
             if (to == null)
-                return Collections.singletonList(tree.get(0));
+                return Collections.unmodifiableList(Collections.singletonList(tree.get(0)));
             int pos = tree.indexOf(to);
             if (pos < 0)