Changeset 18801 in josm for trunk/scripts/SyncEditorLayerIndex.java

Timestamp:

2023-08-09T15:30:01+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #22832: Code cleanup and some simplification, documentation fixes (patch by gaben)

There should not be any functional changes in this patch; it is intended to do
the following:

• Simplify and cleanup code (example: Arrays.asList(item) -> Collections.singletonList(item))
• Fix typos in documentation (which also corrects the documentation to match what actually happens, in some cases)

File:

• trunk/scripts/SyncEditorLayerIndex.java (modified) (3 diffs)

trunk/scripts/SyncEditorLayerIndex.java

@@ -70 +70 @@
  * Compare and analyse the differences of the editor layer index and the JOSM imagery list.
  * The goal is to keep both lists in sync.
- *
- * The editor layer index project (https://github.com/osmlab/editor-layer-index)
- * provides also a version in the JOSM format, but the GEOJSON is the original source
- * format, so we read that.
- *
- * How to run:
- * -----------
- *
- * Main JOSM binary needs to be in classpath, e.g.
- *
- * $ java -cp ../dist/josm-custom.jar SyncEditorLayerIndex
- *
- * Add option "-h" to show the available command line flags.
+ * <p>
+ * The <a href="https://github.com/osmlab/editor-layer-index">editor layer index</a> project
+ * provides also a version in the JOSM format, but the GEOJSON is the original source format, so we read that.
+ * <p>
+ * For running, the main JOSM binary needs to be in classpath, e.g.
+ * <p>
+ * {@code $ java -cp ../dist/josm-custom.jar SyncEditorLayerIndex}
+ * <p>
+ * Add option {@code -h} to show the available command line flags.
  */
 @SuppressWarnings("unchecked")
@@ -294 +290 @@
     void myprintln(String s) {
         String color;
+        final String escaped = s.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
         if ((color = isSkipString(s)) != null) {
             skip.remove(s);
             if (optionXhtmlBody || optionXhtml) {
                 s = "<pre style=\"margin:3px;color:"+color+"\">"
-                        + s.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;")+"</pre>";
+                        + escaped +"</pre>";
             }
             if (!optionNoSkip) {
@@ -310 +307 @@
                                 (s.startsWith("!") ? "orange" :
                                     (s.startsWith("~") ? "red" : "brown"))));
-            s = "<pre style=\"margin:3px;color:"+color+"\">"+s.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;")+"</pre>";
+            s = "<pre style=\"margin:3px;color:"+color+"\">"+ escaped +"</pre>";
         }
         if ((s.startsWith("+ ") || s.startsWith("+++ ELI") || s.startsWith("#")) && optionNoEli) {