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

Timestamp:

2020-11-23T16:28:11+01:00 (3 years ago)

Author:

Don-vip

Message:

see #20129 - Fix typos and misspellings in the code (patch by gaben)

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• ChangesetQuery.java (modified) (2 diffs)
• ImportCancelException.java (modified) (1 diff)
• MessageNotifier.java (modified) (1 diff)
• MultiFetchServerObjectReader.java (modified) (1 diff)
• NoteWriter.java (modified) (1 diff)
• OsmApi.java (modified) (1 diff)
• OsmWriter.java (modified) (1 diff)
• OverpassDownloadReader.java (modified) (6 diffs)
• audio/AudioPlayer.java (modified) (2 diffs)
• audio/JavaSoundPlayer.java (modified) (1 diff)
• auth/CredentialsAgentResponse.java (modified) (1 diff)

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

@@ -236 +236 @@
      *
      * @param min the min lat/lon coordinates of the bounding box. Must not be null.
-     * @param max the max lat/lon coordiantes of the bounding box. Must not be null.
+     * @param max the max lat/lon coordinates of the bounding box. Must not be null.
      *
      * @return the restricted changeset query
@@ -278 +278 @@
     /**
      * Restricts the result to changesets which have been closed after <code>closedAfter</code> and which
-     * habe been created before <code>createdBefore</code>. Both dates are expressed relative to the current
+     * have been created before <code>createdBefore</code>. Both dates are expressed relative to the current
      * time zone.
      *

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

@@ -3 +3 @@
 
 /**
- * All exceptions resulting from a user cancelation during any import should implement this interface.
+ * All exceptions resulting from a user cancellation during any import should implement this interface.
  * @since 6621
  */

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

@@ -90 +90 @@
                 }
             } catch (OsmApiException e) {
-                // We want to explicitely display message to user in some cases like when he has been blocked (#17722)
+                // We want to explicitly display message to user in some cases like when he has been blocked (#17722)
                 ExceptionDialogUtil.explainOsmTransferException(e);
             } catch (OsmTransferException e) {

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

@@ -409 +409 @@
 
     /**
-     * Workaround for difference in Oerpass API.
+     * Workaround for difference in Overpass API.
      * As of now (version 7.55) Overpass api doesn't return invisible objects.
      * Check if we have objects which do not appear in the dataset and fetch them from OSM instead.

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

@@ -51 +51 @@
             out.print("  <note ");
             out.print("id=\"" + note.getId() + "\" ");
-            out.print("lat=\"" + LatLon.cDdHighPecisionFormatter.format(ll.lat()) + "\" ");
-            out.print("lon=\"" + LatLon.cDdHighPecisionFormatter.format(ll.lon()) + "\" ");
+            out.print("lat=\"" + LatLon.cDdHighPrecisionFormatter.format(ll.lat()) + "\" ");
+            out.print("lon=\"" + LatLon.cDdHighPrecisionFormatter.format(ll.lon()) + "\" ");
             out.print("created_at=\"" + DateUtils.fromDate(note.getCreatedAt()) + "\" ");
             if (note.getClosedAt() != null) {

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

@@ -72 +72 @@
 
     /**
-     * Defines whether all OSM API requests should be signed with an OAuth token (user-based bandwith limit instead of IP-based one)
+     * Defines whether all OSM API requests should be signed with an OAuth token (user-based bandwidth limit instead of IP-based one)
      */
     public static final BooleanProperty USE_OAUTH_FOR_ALL_REQUESTS = new BooleanProperty("oauth.use-for-all-requests", true);

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

@@ -239 +239 @@
     void writeLatLon(LatLon ll) {
         if (ll != null) {
-            out.print(" lat='"+LatLon.cDdHighPecisionFormatter.format(ll.lat())+
-                     "' lon='"+LatLon.cDdHighPecisionFormatter.format(ll.lon())+'\'');
+            out.print(" lat='"+LatLon.cDdHighPrecisionFormatter.format(ll.lat())+
+                     "' lon='"+LatLon.cDdHighPrecisionFormatter.format(ll.lon())+'\'');
         }
     }

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

@@ -94 +94 @@
      * @since 11916
      */
-    public enum OverpassOutpoutFormat {
+    public enum OverpassOutputFormat {
         /** Default output format: plain OSM XML */
         OSM_XML("xml"),
@@ -110 +110 @@
         private final String directive;
 
-        OverpassOutpoutFormat(String directive) {
+        OverpassOutputFormat(String directive) {
             this.directive = directive;
         }
@@ -123 +123 @@
 
         /**
-         * Returns the {@code OverpassOutpoutFormat} matching the given directive.
+         * Returns the {@code OverpassOutputFormat} matching the given directive.
          * @param directive directive used in {@code [out:<directive>]} statement
-         * @return {@code OverpassOutpoutFormat} matching the given directive
+         * @return {@code OverpassOutputFormat} matching the given directive
          * @throws IllegalArgumentException in case of invalid directive
          */
-        static OverpassOutpoutFormat from(String directive) {
-            for (OverpassOutpoutFormat oof : values()) {
+        static OverpassOutputFormat from(String directive) {
+            for (OverpassOutputFormat oof : values()) {
                 if (oof.directive.equals(directive)) {
                     return oof;
@@ -140 +140 @@
     static final Pattern OUTPUT_FORMAT_STATEMENT = Pattern.compile(".*\\[out:([a-z]{3,})\\].*", Pattern.DOTALL);
 
-    static final Map<OverpassOutpoutFormat, Class<? extends AbstractReader>> outputFormatReaders = new ConcurrentHashMap<>();
+    static final Map<OverpassOutputFormat, Class<? extends AbstractReader>> outputFormatReaders = new ConcurrentHashMap<>();
 
     final String overpassServer;
@@ -165 +165 @@
      * @return the previous value associated with {@code format}, or {@code null} if there was no mapping
      */
-    public static final Class<? extends AbstractReader> registerOverpassOutpoutFormatReader(
-            OverpassOutpoutFormat format, Class<? extends AbstractReader> readerClass) {
+    public static final Class<? extends AbstractReader> registerOverpassOutputFormatReader(
+            OverpassOutputFormat format, Class<? extends AbstractReader> readerClass) {
         return outputFormatReaders.put(Objects.requireNonNull(format), Objects.requireNonNull(readerClass));
     }
 
     static {
-        registerOverpassOutpoutFormatReader(OverpassOutpoutFormat.OSM_XML, OverpassOsmReader.class);
-        registerOverpassOutpoutFormatReader(OverpassOutpoutFormat.OSM_JSON, OverpassOsmJsonReader.class);
+        registerOverpassOutputFormatReader(OverpassOutputFormat.OSM_XML, OverpassOsmReader.class);
+        registerOverpassOutputFormatReader(OverpassOutputFormat.OSM_JSON, OverpassOsmJsonReader.class);
     }
 
@@ -369 +369 @@
         Matcher m = OUTPUT_FORMAT_STATEMENT.matcher(overpassQuery);
         if (m.matches()) {
-            Class<? extends AbstractReader> readerClass = outputFormatReaders.get(OverpassOutpoutFormat.from(m.group(1)));
+            Class<? extends AbstractReader> readerClass = outputFormatReaders.get(OverpassOutputFormat.from(m.group(1)));
             if (readerClass != null) {
                 try {

trunk/src/org/openstreetmap/josm/io/audio/AudioPlayer.java

@@ -171 +171 @@
      * @param url The resource to play, which must be a WAV file or stream
      * @param seconds The number of seconds into the audio to start playing
-     * @param speed Rate at which audio playes (1.0 = real time, > 1 is faster)
+     * @param speed Rate at which audio plays (1.0 = real time, > 1 is faster)
      * @throws InterruptedException thread interrupted
      * @throws IOException audio fault exception, e.g. can't open stream,  unhandleable audio format
@@ -184 +184 @@
      * Pauses the currently playing audio stream. Does nothing if nothing playing.
      * @throws InterruptedException thread interrupted
-     * @throws IOException audio fault exception, e.g. can't open stream,  unhandleable audio format
+     * @throws IOException audio fault exception, e.g. can't open stream, unhandleable audio format
      */
     public static void pause() throws InterruptedException, IOException {

trunk/src/org/openstreetmap/josm/io/audio/JavaSoundPlayer.java

@@ -89 +89 @@
                     bytesToSkip -= skippedBytes;
                     if (skippedBytes == 0) {
-                        // Avoid inifinite loop
+                        // Avoid infinite loop
                         Logging.warn("Unable to skip bytes from audio input stream");
                         bytesToSkip = 0;

trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java

@@ -60 +60 @@
 
     /**
-     * Sets the cancelation status (authentication request canceled by user)
-     * @param canceled the cancelation status (authentication request canceled by user)
+     * Sets the cancellation status (authentication request canceled by user)
+     * @param canceled the cancellation status (authentication request canceled by user)
      */
     public void setCanceled(boolean canceled) {