Changeset 8540 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

2015-06-27T21:43:35+02:00 (9 years ago)

Author:

Don-vip

Message:

fix remaining checkstyle issues

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• ConditionalKeys.java (modified) (1 diff)
• Highways.java (modified) (3 diffs)
• MapCSSTagChecker.java (modified) (1 diff)
• OpeningHourTest.java (modified) (1 diff)

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

@@ -27 +27 @@
 
     private final OpeningHourTest openingHourTest = new OpeningHourTest();
-    private static final Set<String> RESTRICTION_TYPES = new HashSet<>(Arrays.asList("oneway", "toll", "noexit", "maxspeed", "minspeed", "maxstay",
-            "maxweight", "maxaxleload", "maxheight", "maxwidth", "maxlength", "overtaking", "maxgcweight", "maxgcweightrating", "fee"));
+    private static final Set<String> RESTRICTION_TYPES = new HashSet<>(Arrays.asList("oneway", "toll", "noexit", "maxspeed", "minspeed",
+            "maxstay", "maxweight", "maxaxleload", "maxheight", "maxwidth", "maxlength", "overtaking", "maxgcweight", "maxgcweightrating",
+            "fee"));
     private static final Set<String> RESTRICTION_VALUES = new HashSet<>(Arrays.asList("yes", "official", "designated", "destination",
             "delivery", "permissive", "private", "agricultural", "forestry", "no"));

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

@@ -93 +93 @@
             }
             if (n.hasKey("source:maxspeed")) {
-                // Check maxspeed but not context against highway for nodes as maxspeed is not set on highways here but on signs, speed cameras, etc.
+                // Check maxspeed but not context against highway for nodes
+                // as maxspeed is not set on highways here but on signs, speed cameras, etc.
                 testSourceMaxspeed(n, false);
             }
@@ -209 +210 @@
                 }
                 if ((leftByPedestrians || leftByCyclists) && leftByCars) {
-                    errors.add(new TestError(this, Severity.OTHER, tr("Missing pedestrian crossing information"), MISSING_PEDESTRIAN_CROSSING, n));
+                    errors.add(new TestError(this, Severity.OTHER, tr("Missing pedestrian crossing information"),
+                            MISSING_PEDESTRIAN_CROSSING, n));
                     return;
                 }
@@ -244 +246 @@
             String country = value.substring(0, index);
             if (!ISO_COUNTRIES.contains(country)) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Unknown country code: {0}", country), SOURCE_MAXSPEED_UNKNOWN_COUNTRY_CODE, p));
+                errors.add(new TestError(this, Severity.WARNING,
+                        tr("Unknown country code: {0}", country), SOURCE_MAXSPEED_UNKNOWN_COUNTRY_CODE, p));
             }
             // Check context

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

@@ -431 +431 @@
             final StringBuffer sb = new StringBuffer();
             while (m.find()) {
-                final String argument = determineArgument((Selector.GeneralSelector) matchingSelector, Integer.parseInt(m.group(1)), m.group(2), p);
+                final String argument = determineArgument((Selector.GeneralSelector) matchingSelector,
+                        Integer.parseInt(m.group(1)), m.group(2), p);
                 try {
                     // Perform replacement with null-safe + regex-safe handling

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

@@ -192 +192 @@
      * @return a list of {@link TestError} or an empty list
      */
-    public List<OpeningHoursTestError> checkOpeningHourSyntax(final String key, final String value, CheckMode mode, boolean ignoreOtherSeverity) {
+    public List<OpeningHoursTestError> checkOpeningHourSyntax(final String key, final String value, CheckMode mode,
+            boolean ignoreOtherSeverity) {
         if (ENGINE == null || value == null || value.trim().isEmpty()) {
             return Collections.emptyList();