Changeset 11621 in josm

Timestamp:

2017-02-25T21:21:27+01:00 (7 years ago)

Author:

Don-vip

Message:

checkstyle - fix CommentsIndentation errors

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/DownloadAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/DownloadAction.java

@@ -33 +33 @@
     public DownloadAction() {
         super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."),
-                // CHECKSTYLE.OFF: LineLength
-                Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM...")), KeyEvent.VK_DOWN, Shortcut.CTRL_SHIFT), true);
-                // CHECKSTYLE.ON: LineLength
+              Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM...")), KeyEvent.VK_DOWN, Shortcut.CTRL_SHIFT),
+              true);
         putValue("help", ht("/Action/Download"));
     }

trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

@@ -443 +443 @@
     @Override
     public void visit(Way w) {
-        if (w.getNodesCount() > 0 // do not consider empty ways
-                && !w.hasKey("addr:interpolation") // ignore addr:interpolation ways as they are not physical features and most of
-                                                   // the time very near the associated highway, which is perfectly normal, see #9332
-                && !w.hasTag("highway", "platform") && !w.hasTag("railway", "platform") // similarly for public transport platforms
+        // do not consider empty ways
+        if (w.getNodesCount() > 0
+                // ignore addr:interpolation ways as they are not physical features and most of
+                // the time very near the associated highway, which is perfectly normal, see #9332
+                && !w.hasKey("addr:interpolation")
+                // similarly for public transport platforms
+                && !w.hasTag("highway", "platform") && !w.hasTag("railway", "platform")
                 ) {
             ways.addAll(getWaySegments(w));

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

@@ -277 +277 @@
         }
 
-        /* we must have got at least one waypoint now */
-
+        // we must have got at least one waypoint now
         ((ArrayList<WayPoint>) waypoints).sort(Comparator.comparingDouble(o -> o.time));
 
-        firstTime = -1.0; /* this time of the first waypoint, not first trackpoint */
+        firstTime = -1.0; // this time of the first waypoint, not first trackpoint
         for (WayPoint w : waypoints) {
             if (firstTime < 0.0) {
@@ -288 +287 @@
             double offset = w.time - firstTime;
             AudioMarker am = new AudioMarker(w.getCoor(), w, url, ml, w.time, offset);
-            /*
-             * timeFromAudio intended for future use to shift markers of this type on synchronization
-             */
+            // timeFromAudio intended for future use to shift markers of this type on synchronization
             if (w == wayPointFromTimeStamp) {
                 am.timeFromAudio = true;
@@ -298 +295 @@
 
         if (timedMarkersOmitted && !markers.timedMarkersOmitted) {
-            JOptionPane
-            .showMessageDialog(
-                    Main.parent,
-                    // CHECKSTYLE.OFF: LineLength
-                    tr("Some waypoints with timestamps from before the start of the track or after the end were omitted or moved to the start."));
-                    // CHECKSTYLE.ON: LineLength
+            JOptionPane.showMessageDialog(Main.parent,
+                tr("Some waypoints with timestamps from before the start of the track or after the end were omitted or moved to the start."));
             markers.timedMarkersOmitted = timedMarkersOmitted;
         }
         if (untimedMarkersOmitted && !markers.untimedMarkersOmitted) {
-            JOptionPane
-            .showMessageDialog(
-                    Main.parent,
-                    tr("Some waypoints which were too far from the track to sensibly estimate their time were omitted."));
+            JOptionPane.showMessageDialog(Main.parent,
+                tr("Some waypoints which were too far from the track to sensibly estimate their time were omitted."));
             markers.untimedMarkersOmitted = untimedMarkersOmitted;
         }

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java

@@ -267 +267 @@
         }
         // RFC3490 3.1. 1)
-//      Whenever dots are used as label separators, the following
-//      characters MUST be recognized as dots: U+002E (full stop), U+3002
-//      (ideographic full stop), U+FF0E (fullwidth full stop), U+FF61
-//      (halfwidth ideographic full stop).
+        // Whenever dots are used as label separators, the following
+        // characters MUST be recognized as dots: U+002E (full stop), U+3002
+        // (ideographic full stop), U+FF0E (fullwidth full stop), U+FF61
+        // (halfwidth ideographic full stop).
         final String[][] otherDots = {
                 {"b\u3002", "b."},

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java

@@ -189 +189 @@
         final Map<String, String[]> info = new HashMap<>();
 
-//        <td><span class="domain tld"><a href="/domains/root/db/ax.html">.ax</a></span></td>
         final Pattern domain = Pattern.compile(".*<a href=\"/domains/root/db/([^.]+)\\.html");
-//        <td>country-code</td>
         final Pattern type = Pattern.compile("\\s+<td>([^<]+)</td>");
-//        <!-- <td>Åland Islands<br/><span class="tld-table-so">Ålands landskapsregering</span></td> </td> -->
-//        <td>Ålands landskapsregering</td>
         final Pattern comment = Pattern.compile("\\s+<td>([^<]+)</td>");
 
@@ -228 +224 @@
                         }
                         // Don't save unused entries
-                        if (com.contains("Not assigned") || com.contains("Retired") || typ.equals("test")) {
-    //                        System.out.println("Ignored: " + typ + " " + dom + " " +com);
-                        } else {
+                        if (!com.contains("Not assigned") && !com.contains("Retired") && !typ.equals("test")) {
                             info.put(dom.toLowerCase(Locale.ENGLISH), new String[]{typ, com});
-    //                        System.out.println("Storing: " + typ + " " + dom + " " +com);
                         }
                     } else {

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java

@@ -408 +408 @@
         UrlValidator validator = new UrlValidator();
         assertTrue(validator.isValid("http://xn--h1acbxfam.idn.icann.org/"));
-//        assertTrue(validator.isValid("http://xn--e1afmkfd.xn--80akhbyknj4f"));
         // Internationalized country code top-level domains
         assertTrue(validator.isValid("http://test.xn--lgbbat1ad8j")); //Algeria
@@ -441 +440 @@
         assertTrue(validator.isValid("http://test.xn--pgbs0dh")); // Tunisia
         assertTrue(validator.isValid("http://test.xn--mgbaam7a8h")); // United Arab Emirates
-        // Proposed internationalized ccTLDs
-//        assertTrue(validator.isValid("http://test.xn--54b7fta0cc")); // Bangladesh
-//        assertTrue(validator.isValid("http://test.xn--90ae")); // Bulgaria
-//        assertTrue(validator.isValid("http://test.xn--node")); // Georgia
-//        assertTrue(validator.isValid("http://test.xn--4dbrk0ce")); // Israel
-//        assertTrue(validator.isValid("http://test.xn--mgb9awbf")); // Oman
-//        assertTrue(validator.isValid("http://test.xn--j1amh")); // Ukraine
-//        assertTrue(validator.isValid("http://test.xn--mgb2ddes")); // Yemen
-        // Test TLDs
-//        assertTrue(validator.isValid("http://test.xn--kgbechtv")); // Arabic
-//        assertTrue(validator.isValid("http://test.xn--hgbk6aj7f53bba")); // Persian
-//        assertTrue(validator.isValid("http://test.xn--0zwm56d")); // Chinese
-//        assertTrue(validator.isValid("http://test.xn--g6w251d")); // Chinese
-//        assertTrue(validator.isValid("http://test.xn--80akhbyknj4f")); // Russian
-//        assertTrue(validator.isValid("http://test.xn--11b5bs3a9aj6g")); // Hindi
-//        assertTrue(validator.isValid("http://test.xn--jxalpdlp")); // Greek
-//        assertTrue(validator.isValid("http://test.xn--9t4b11yi5a")); // Korean
-//        assertTrue(validator.isValid("http://test.xn--deba0ad")); // Yiddish
-//        assertTrue(validator.isValid("http://test.xn--zckzah")); // Japanese
-//        assertTrue(validator.isValid("http://test.xn--hlcj6aya9esc7a")); // Tamil
     }
 

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java

@@ -87 +87 @@
     public void testRequestParameter4() throws RequestHandlerBadRequestException {
         assertEquals(Collections.singletonMap("/?:@-._~!$'()* ,;", "/?:@-._~!$'()* ,;=="), getRequestParameter(
-                // CHECKSTYLE.OFF: LineLength
-                "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;="));
-                // CHECKSTYLE.ON: LineLength
+            "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;="
+        ));
     }