Changeset 18801 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2023-08-09T15:30:01+02:00 (21 months 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)

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• ChangesetQuery.java (modified) (2 diffs)
• DefaultProxySelector.java (modified) (1 diff)
• DiffResultProcessor.java (modified) (1 diff)
• IGpxReader.java (modified) (1 diff)
• OsmApi.java (modified) (2 diffs)
• OsmReader.java (modified) (1 diff)
• imagery/WMSImagery.java (modified) (1 diff)
• remotecontrol/handler/RequestHandler.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java

@@ -265 +265 @@
      * <code>d</code> d is a date relative to the current time zone.
      *
-     * @param d the date . Must not be null.
+     * @param d the date. Must not be null.
      * @return the restricted changeset query
      * @throws IllegalArgumentException if d is null
@@ -570 +570 @@
          * see <a href="http://wiki.openstreetmap.org/wiki/API_v0.6#Query:_GET_.2Fapi.2F0.6.2Fchangesets">OSM API</a>.
          *
-         * Example for an query string:<br>
+         * Example for a query string:<br>
          * <pre>
          *    uid=1234&amp;open=true

trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java

@@ -60 +60 @@
      * is defined <strong>at startup</strong>. It has no effect if the property is set
      * later by the application.
-     *
-     * We therefore read the property at class loading time and remember it's value.
+     * <p>
+     * We therefore read the property at class loading time and remember its value.
      */
     private static boolean jvmWillUseSystemProxies;

trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java

@@ -105 +105 @@
     /**
      * Postprocesses the diff result read and parsed from the server.
-     *
+     * <p>
      * Uploaded objects are assigned their new id (if they got assigned a new
      * id by the server), their new version (if the version was incremented),

trunk/src/org/openstreetmap/josm/io/IGpxReader.java

@@ -33 +33 @@
 
     /**
-     * Returns the number of coordinates that have been successfuly read.
-     * @return the number of coordinates that have been successfuly read
+     * Returns the number of coordinates that have been successfully read.
+     * @return the number of coordinates that have been successfully read
      * @since 18179
      */

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -809 +809 @@
                     errorHeader = response.getHeaderField("Error");
                     Logging.error("Error header: " + errorHeader);
-                } else if (retCode != HttpURLConnection.HTTP_OK && responseBody.length() > 0) {
+                } else if (retCode != HttpURLConnection.HTTP_OK && !responseBody.isEmpty()) {
                     Logging.error("Error body: " + responseBody);
                 }
@@ -815 +815 @@
 
                 errorHeader = errorHeader == null ? null : errorHeader.trim();
-                String errorBody = responseBody.length() == 0 ? null : responseBody.trim();
+                String errorBody = responseBody.isEmpty() ? null : responseBody.trim();
                 switch(retCode) {
                 case HttpURLConnection.HTTP_OK:

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -487 +487 @@
 
     /**
-     * Exception thrown after user cancelation.
+     * Exception thrown after user cancellation.
      */
     private static final class OsmParsingCanceledException extends XmlStreamParsingException implements ImportCancelException {

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -509 +509 @@
                         }
                         // TODO should we handle also POST?
-                        if ("GET".equalsIgnoreCase(mode) && getMapUrl != null && !"".equals(getMapUrl)) {
+                        if ("GET".equalsIgnoreCase(mode) && getMapUrl != null && !getMapUrl.isEmpty()) {
                             try {
                                 String query = new URL(getMapUrl).getQuery();

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

@@ -160 +160 @@
 
     /**
-     * Returns usage examples for the given command. To be overriden only my handlers that define several commands.
+     * Returns usage examples for the given command. To be overridden only my handlers that define several commands.
      * @param cmd The command asked
      * @return Usage examples for the given command
@@ -203 +203 @@
         if (GLOBAL_CONFIRMATION.get()) {
             // Ensure dialog box does not exceed main window size
-            Integer maxWidth = (int) Math.max(200, MainApplication.getMainFrame().getWidth()*0.6);
+            int maxWidth = (int) Math.max(200, MainApplication.getMainFrame().getWidth() * 0.6);
             String message = "<html><div>" + getPermissionMessage() +
                     "<br/>" + tr("Do you want to allow this?") + "</div></html>";
@@ -357 +357 @@
         DownloadParams result = new DownloadParams();
         if (args != null) {
-            result = result
-                .withNewLayer(isLoadInNewLayer())
-                .withLayerName(args.get("layer_name"))
-                .withLocked(get("layer_locked"))
-                .withDownloadPolicy(get("download_policy", DownloadPolicy::of, () -> DownloadPolicy.NORMAL))
-                .withUploadPolicy(get("upload_policy", UploadPolicy::of, () -> UploadPolicy.NORMAL));
+            result.withNewLayer(isLoadInNewLayer())
+                    .withLayerName(args.get("layer_name"))
+                    .withLocked(get("layer_locked"))
+                    .withDownloadPolicy(get("download_policy", DownloadPolicy::of, () -> DownloadPolicy.NORMAL))
+                    .withUploadPolicy(get("upload_policy", UploadPolicy::of, () -> UploadPolicy.NORMAL));
         }
         return result;
@@ -498 +497 @@
 
     /**
-     * Handler that takes an URL as parameter.
+     * Handler that takes a URL as a parameter.
      */
     public abstract static class RawURLParseRequestHandler extends RequestHandler {