Changeset 13849 in josm for trunk/src/org/openstreetmap/josm/data
- Timestamp:
- 2018-05-26T19:36:19+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/Preferences.java
r13838 r13849 406 406 continue; 407 407 Utils.instanceOfAndCast(e.getValue(), ListSetting.class) 408 .map( d -> d.getValue())408 .map(ListSetting::getValue) 409 409 .map(lst -> ColorInfo.fromPref(lst, false)) 410 410 .ifPresent(info -> all.put(e.getKey(), info)); … … 414 414 continue; 415 415 Utils.instanceOfAndCast(e.getValue(), ListSetting.class) 416 .map( d -> d.getValue())416 .map(ListSetting::getValue) 417 417 .map(lst -> ColorInfo.fromPref(lst, true)) 418 418 .ifPresent(infoDef -> { -
trunk/src/org/openstreetmap/josm/data/projection/ProjectionCLI.java
r13207 r13849 33 33 public static final ProjectionCLI INSTANCE = new ProjectionCLI(); 34 34 35 private boolean argInverse = false; // NOPMD36 private boolean argSwitchInput = false; // NOPMD37 private boolean argSwitchOutput = false; // NOPMD35 private boolean argInverse; 36 private boolean argSwitchInput; 37 private boolean argSwitchOutput; 38 38 39 39 @Override … … 77 77 if (arg.isEmpty()) throw new IllegalArgumentException("non-empty argument expected"); 78 78 if (arg.startsWith("+")) { 79 if ( arg.equals("+to")) {79 if ("+to".equals(arg)) { 80 80 toTokenSeen = true; 81 81 } else { … … 142 142 } 143 143 144 if (files.isEmpty() || files.get(0).equals("-")) {144 if (files.isEmpty() || "-".equals(files.get(0))) { 145 145 processInput(fromProj, toProj, new BufferedReader(new InputStreamReader(System.in, Charset.defaultCharset()))); 146 146 } else { … … 174 174 } 175 175 176 private CustomProjection createProjection(String params) throws ProjectionConfigurationException {176 private static CustomProjection createProjection(String params) throws ProjectionConfigurationException { 177 177 CustomProjection proj = new CustomProjection(); 178 178 proj.update(params); -
trunk/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java
r11129 r13849 37 37 38 38 String natural = w.get("natural"); 39 if (natural == null) 39 if (natural == null) { 40 40 return; 41 else if ("coastline".equals(natural) && Geometry.isClockwise(w)) {41 } else if ("coastline".equals(natural) && Geometry.isClockwise(w)) { 42 42 reportError(w, tr("Reversed coastline: land not on left side"), WRONGLY_ORDERED_COAST); 43 43 } else if ("land".equals(natural) && Geometry.isClockwise(w)) { 44 44 reportError(w, tr("Reversed land: land not on left side"), WRONGLY_ORDERED_LAND); 45 } else 46 return; 47 45 } 48 46 } 49 47
Note:
See TracChangeset
for help on using the changeset viewer.