Changeset 12907 in josm


Ignore:
Timestamp:
2017-09-29T13:26:48+02:00 (19 months ago)
Author:
bastiK
Message:

see #15273, see #15229 - fix tests and Jenkins warnings

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java

    r12906 r12907  
    252252                    try {
    253253                        argBounds = new Bounds(getopt.getOptarg(), ",", Bounds.ParseMethod.LEFT_BOTTOM_RIGHT_TOP, false);
    254                     } catch (IllegalArgumentException iae) {
     254                    } catch (IllegalArgumentException iae) { // NOPMD
    255255                        throw new IllegalArgumentException(tr("Unable to parse {0} parameter: {1}", "--bounds", iae.getMessage()));
    256256                    }
     
    292292                        double lat = LatLonParser.parseCoordinate(parts[1]);
    293293                        argAnchor = new LatLon(lat, lon);
    294                     } catch (IllegalArgumentException iae) {
     294                    } catch (IllegalArgumentException iae) { // NOPMD
    295295                        throw new IllegalArgumentException(tr("In option {0}: {1}", "--anchor", iae.getMessage()));
    296296                    }
     
    436436        Config.getPref().putBoolean("mappaint.auto_reload_local_styles", false); // unnecessary to listen for external changes
    437437        String projCode = Optional.ofNullable(argProjection).orElse("epsg:3857");
    438         Main.setProjection(Projections.getProjectionByCode(projCode.toUpperCase()));
     438        Main.setProjection(Projections.getProjectionByCode(projCode.toUpperCase(Locale.US)));
    439439
    440440        RightAndLefthandTraffic.initialize();
  • trunk/test/unit/org/openstreetmap/josm/gui/mappaint/RenderingCLIAreaTest.java

    r12906 r12907  
    3232    @Rule
    3333    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    34     public JOSMTestRules test = new JOSMTestRules().projection();
     34    public JOSMTestRules test = new JOSMTestRules().projection().territories();
    3535
    3636    @Parameterized.Parameters
     
    163163        RenderingCLI cli = new RenderingCLI();
    164164        cli.parseArguments(args);
    165         cli.initialize();
    166165        RenderingCLI.RenderingArea ra = cli.determineRenderingArea(null);
    167166        Assert.assertThat(ra.scale, scaleMatcher);
Note: See TracChangeset for help on using the changeset viewer.