Changeset 13207 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2017-12-17T01:25:46+01:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java
r13204 r13207 231 231 } catch (NumberFormatException nfe) { 232 232 throw new IllegalArgumentException( 233 tr("Expected integer number for option {0}, but got ''{1}''", "--zoom", getopt.getOptarg()) );233 tr("Expected integer number for option {0}, but got ''{1}''", "--zoom", getopt.getOptarg()), nfe); 234 234 } 235 235 if (argZoom < 0) … … 242 242 argBounds = new Bounds(getopt.getOptarg(), ",", Bounds.ParseMethod.LEFT_BOTTOM_RIGHT_TOP, false); 243 243 } catch (IllegalArgumentException iae) { // NOPMD 244 throw new IllegalArgumentException(tr("Unable to parse {0} parameter: {1}", "--bounds", iae.getMessage()) );244 throw new IllegalArgumentException(tr("Unable to parse {0} parameter: {1}", "--bounds", iae.getMessage()), iae); 245 245 } 246 246 } … … 268 268 } catch (NumberFormatException nfe) { 269 269 throw new IllegalArgumentException( 270 tr("Expected floating point number for option {0}, but got ''{1}''", "--scale", getopt.getOptarg()) );270 tr("Expected floating point number for option {0}, but got ''{1}''", "--scale", getopt.getOptarg()), nfe); 271 271 } 272 272 break; … … 282 282 argAnchor = new LatLon(lat, lon); 283 283 } catch (IllegalArgumentException iae) { // NOPMD 284 throw new IllegalArgumentException(tr("In option {0}: {1}", "--anchor", iae.getMessage()) );284 throw new IllegalArgumentException(tr("In option {0}: {1}", "--anchor", iae.getMessage()), iae); 285 285 } 286 286 break; … … 290 290 } catch (NumberFormatException nfe) { 291 291 throw new IllegalArgumentException( 292 tr("Expected floating point number for option {0}, but got ''{1}''", "--width-m", getopt.getOptarg()) );292 tr("Expected floating point number for option {0}, but got ''{1}''", "--width-m", getopt.getOptarg()), nfe); 293 293 } 294 294 if (argWidthM <= 0) throw new IllegalArgumentException( … … 300 300 } catch (NumberFormatException nfe) { 301 301 throw new IllegalArgumentException( 302 tr("Expected floating point number for option {0}, but got ''{1}''", "--height-m", getopt.getOptarg()) );302 tr("Expected floating point number for option {0}, but got ''{1}''", "--height-m", getopt.getOptarg()), nfe); 303 303 } 304 304 if (argHeightM <= 0) throw new IllegalArgumentException( … … 310 310 } catch (NumberFormatException nfe) { 311 311 throw new IllegalArgumentException( 312 tr("Expected integer number for option {0}, but got ''{1}''", "--width-px", getopt.getOptarg()) );312 tr("Expected integer number for option {0}, but got ''{1}''", "--width-px", getopt.getOptarg()), nfe); 313 313 } 314 314 if (argWidthPx <= 0) throw new IllegalArgumentException( … … 320 320 } catch (NumberFormatException nfe) { 321 321 throw new IllegalArgumentException( 322 tr("Expected integer number for option {0}, but got ''{1}''", "--height-px", getopt.getOptarg()) );322 tr("Expected integer number for option {0}, but got ''{1}''", "--height-px", getopt.getOptarg()), nfe); 323 323 } 324 324 if (argHeightPx <= 0) throw new IllegalArgumentException( … … 333 333 } catch (NumberFormatException nfe) { 334 334 throw new IllegalArgumentException( 335 tr("Expected integer number for option {0}, but got ''{1}''", "--max-image-size", getopt.getOptarg()) );335 tr("Expected integer number for option {0}, but got ''{1}''", "--max-image-size", getopt.getOptarg()), nfe); 336 336 } 337 337 if (argMaxImageSize < 0) throw new IllegalArgumentException( … … 551 551 return OsmReader.parseDataSet(Files.newInputStream(Paths.get(argInput)), null); 552 552 } catch (IllegalDataException e) { 553 throw new IllegalDataException(tr("In .osm data file ''{0}'' - ", argInput) + e.getMessage() );553 throw new IllegalDataException(tr("In .osm data file ''{0}'' - ", argInput) + e.getMessage(), e); 554 554 } 555 555 } -
trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
r12620 r13207 328 328 throw new OsmOAuthAuthorizationException(tr("Failed to authenticate user ''{0}'' with password ''***'' as OAuth user", 329 329 userName)); 330 } catch (OsmOAuthAuthorizationException e) { 331 Logging.debug(e); 332 throw new OsmLoginFailedException(e.getCause()); 333 } catch (IOException e) { 330 } catch (OsmOAuthAuthorizationException | IOException e) { 334 331 throw new OsmLoginFailedException(e); 335 332 } finally {
Note:
See TracChangeset
for help on using the changeset viewer.