Ignore:
Timestamp:
2015-05-18T23:34:11+02:00 (9 years ago)
Author:
Don-vip
Message:
  • global use of String.isEmpty()
  • Correctness - Method throws alternative exception from catch block without history
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java

    r8390 r8394  
    315315
    316316        /**
     317         * Constructs a new {@code ChangesetQueryUrlException} with the specified cause and detail message.
     318         *
     319         * @param message the detail message. The detail message is saved for later retrieval by the {@link #getMessage()} method.
     320         * @param  cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
     321         *         (A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or unknown.)
     322         */
     323        public ChangesetQueryUrlException(String message, Throwable cause) {
     324            super(message, cause);
     325        }
     326
     327        /**
    317328         * Constructs a new {@code ChangesetQueryUrlException} with the specified cause and a detail message of
    318329         * <tt>(cause==null ? null : cause.toString())</tt> (which typically contains the class and detail message of <tt>cause</tt>).
    … …  
    329340        protected int parseUid(String value) throws ChangesetQueryUrlException {
    330341            if (value == null || value.trim().isEmpty())
    331                 throw new ChangesetQueryUrlException(tr("Unexpected value for ''{0}'' in changeset query url, got {1}", "uid", value));
     342                throw new ChangesetQueryUrlException(
     343                        tr("Unexpected value for ''{0}'' in changeset query url, got {1}", "uid", value));
    332344            int id;
    333345            try {
    334346                id = Integer.parseInt(value);
    335347                if (id <= 0)
    336                     throw new ChangesetQueryUrlException(tr("Unexpected value for ''{0}'' in changeset query url, got {1}", "uid", value));
     348                    throw new ChangesetQueryUrlException(
     349                            tr("Unexpected value for ''{0}'' in changeset query url, got {1}", "uid", value));
    337350            } catch(NumberFormatException e) {
    338                 throw new ChangesetQueryUrlException(tr("Unexpected value for ''{0}'' in changeset query url, got {1}", "uid", value));
     351                throw new ChangesetQueryUrlException(
     352                        tr("Unexpected value for ''{0}'' in changeset query url, got {1}", "uid", value), e);
    339353            }
    340354            return id;
    … …  
    343357        protected boolean parseBoolean(String value, String parameter) throws ChangesetQueryUrlException {
    344358            if (value == null || value.trim().isEmpty())
    345                 throw new ChangesetQueryUrlException(tr("Unexpected value for ''{0}'' in changeset query url, got {1}", parameter, value));
     359                throw new ChangesetQueryUrlException(
     360                        tr("Unexpected value for ''{0}'' in changeset query url, got {1}", parameter, value));
    346361            switch (value) {
    347362            case "true":
    … …  
    350365                return false;
    351366            default:
    352                 throw new ChangesetQueryUrlException(tr("Unexpected value for ''{0}'' in changeset query url, got {1}", parameter, value));
     367                throw new ChangesetQueryUrlException(
     368                        tr("Unexpected value for ''{0}'' in changeset query url, got {1}", parameter, value));
    353369            }
    354370        }
    … …  
    356372        protected Date parseDate(String value, String parameter) throws ChangesetQueryUrlException {
    357373            if (value == null || value.trim().isEmpty())
    358                 throw new ChangesetQueryUrlException(tr("Unexpected value for ''{0}'' in changeset query url, got {1}", parameter, value));
     374                throw new ChangesetQueryUrlException(
     375                        tr("Unexpected value for ''{0}'' in changeset query url, got {1}", parameter, value));
    359376            DateFormat formatter = DateUtils.newIsoDateTimeFormat();
    360377            try {
    361378                return formatter.parse(value);
    362379            } catch(ParseException e) {
    363                 throw new ChangesetQueryUrlException(tr("Unexpected value for ''{0}'' in changeset query url, got {1}", parameter, value));
     380                throw new ChangesetQueryUrlException(
     381                        tr("Unexpected value for ''{0}'' in changeset query url, got {1}", parameter, value), e);
    364382            }
    365383        }
    … …  
    368386            String[] dates = value.split(",");
    369387            if (dates == null || dates.length == 0 || dates.length > 2)
    370                 throw new ChangesetQueryUrlException(tr("Unexpected value for ''{0}'' in changeset query url, got {1}", "time", value));
     388                throw new ChangesetQueryUrlException(
     389                        tr("Unexpected value for ''{0}'' in changeset query url, got {1}", "time", value));
    371390            if (dates.length == 1)
    372391                return new Date[]{parseDate(dates[0], "time")};
    … …  
    395414                case "uid":
    396415                    if (queryParams.containsKey("display_name"))
    397                         throw new ChangesetQueryUrlException(tr("Cannot create a changeset query including both the query parameters ''uid'' and ''display_name''"));
     416                        throw new ChangesetQueryUrlException(
     417                                tr("Cannot create a changeset query including both the query parameters ''uid'' and ''display_name''"));
    398418                    csQuery.forUser(parseUid(queryParams.get("uid")));
    399419                    break;
    400420                case "display_name":
    401421                    if (queryParams.containsKey("uid"))
    402                         throw new ChangesetQueryUrlException(tr("Cannot create a changeset query including both the query parameters ''uid'' and ''display_name''"));
     422                        throw new ChangesetQueryUrlException(
     423                                tr("Cannot create a changeset query including both the query parameters ''uid'' and ''display_name''"));
    403424                    csQuery.forUser(queryParams.get("display_name"));
    404425                    break;
    … …  
    435456                    break;
    436457                default:
    437                     throw new ChangesetQueryUrlException(tr("Unsupported parameter ''{0}'' in changeset query string", k));
     458                    throw new ChangesetQueryUrlException(
     459                            tr("Unsupported parameter ''{0}'' in changeset query string", k));
    438460                }
    439461            }
Note: See TracChangeset for help on using the changeset viewer.