Ticket #12570: 12570-internet-tags.patch

File 12570-internet-tags.patch, 2.8 KB (added by simon04, 10 years ago)
  • src/org/openstreetmap/josm/data/validation/routines/AbstractValidator.java

    diff --git a/src/org/openstreetmap/josm/data/validation/routines/AbstractValidator.java b/src/org/openstreetmap/josm/data/validation/routines/AbstractValidator.java
    index 9973871..ce65a8c 100644
    a b public abstract class AbstractValidator {  
    1717    public abstract boolean isValid(String value);
    1818
    1919    /**
     20     * Returns the name of this validator
     21     * @return the name of this validator
     22     */
     23    public abstract String getValidatorName();
     24
     25    /**
    2026     * Replies the error message.
    2127     * @return the errorMessage
    2228     */
  • src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java

    diff --git a/src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java b/src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java
    index 2c939af..d5b81f0 100644
    a b public class EmailValidator extends AbstractValidator {  
    186186        return true;
    187187    }
    188188
     189    @Override
     190    public String getValidatorName() {
     191        return tr("Email validator");
     192    }
     193
    189194    /**
    190195     * Returns true if the domain component of an email address is valid.
    191196     *
  • src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java

    diff --git a/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java b/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
    index 621996f..4a9fbbe 100644
    a b public class UrlValidator extends AbstractValidator {  
    350350        return true;
    351351    }
    352352
     353    @Override
     354    public String getValidatorName() {
     355        return tr("URL validator");
     356    }
     357
    353358    /**
    354359     * Validate scheme. If schemes[] was initialized to a non null,
    355360     * then only those schemes are allowed.
  • src/org/openstreetmap/josm/data/validation/tests/InternetTags.java

    diff --git a/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java b/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java
    index 15d54cf..591ae2f 100644
    a b public class InternetTags extends Test {  
    134134                return doValidateTag(p, k, proto+value, validator, code);
    135135            }
    136136            String msg = tr("''{0}'': {1}", k, errMsg);
    137             error = new TestError(this, Severity.WARNING, msg, code, p);
     137            // todo obtain English message for ignore functionality
     138            error = new TestError(this, Severity.WARNING, validator.getValidatorName(), msg, msg, code, p);
    138139        }
    139140        return error;
    140141    }