Changeset 17333 in josm for trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

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)

File:

• trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java (modified) (6 diffs)

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 {