Changeset 7489 in josm for trunk

Timestamp:

2014-09-04T01:12:48+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10393 - Validation of URLs and e-mails in relevant tags, using modified subset of Apache Commons Validator 1.4

Location:

trunk

Files:

• CONTRIBUTION (modified) (1 diff)
• README (modified) (3 diffs)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/routines (added)
• src/org/openstreetmap/josm/data/validation/routines/AbstractValidator.java (added)
• src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java (added)
• src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java (added)
• src/org/openstreetmap/josm/data/validation/routines/InetAddressValidator.java (added)
• src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java (added)
• src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java (added)
• src/org/openstreetmap/josm/data/validation/routines/package.html (added)
• src/org/openstreetmap/josm/data/validation/tests/InternetTags.java (added)

trunk/CONTRIBUTION

@@ -42 +42 @@
 is from Matthias Käppler and licensed with the Apache License 2.0.
 
+The mail/url validator routines use code from Apache Commons
+Validator which is licensed with Apache license version 2.0.
+
 The NTv2 transformation code (http://jgridshift.sourceforge.net/)
 is from Peter Yuill and licensed with LGPL.

trunk/README

@@ -17 +17 @@
 You need JRE Version 7, or later.
 
-Microsoft Windows and Apple Mac OS X users should visit http://www.java.com
+Microsoft Windows and Apple Mac OS X users should visit https://www.java.com
 and download the latest Java executable for their system.
 
@@ -144 +144 @@
     src/org/apache/commons/codec (svn external)
     -> http://svn.apache.org/repos/asf/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec
+* Apache commons validator: Improved validator routines
+    src/org/openstreetmap/josm/data/validation/routines
+    -> http://commons.apache.org/proper/commons-validator
 * SVG Salamander: Support for SVG image format
     src/com/kitfox/svg
-    -> http://svgsalamander.java.net/
+    -> https://svgsalamander.java.net/
 * Metadata Extractor: Read EXIF Metadata of photos
     src/com/drew
-    -> http://www.drewnoakes.com/code/exif/
+    -> https://www.drewnoakes.com/code/exif/
 * Signpost: OAuth library
     src/oauth, src/com/google
-    -> http://code.google.com/p/oauth-signpost/
+    -> https://code.google.com/p/oauth-signpost/
 * GNU getopt Java port: Command line argument processing library
     src/gnu/getopt
-    -> http://www.urbanophile.com/~arenn/hacking/download.html
+    -> http://www.urbanophile.com/arenn/hacking/download.html
 * MultiSplitPane: Small lib for GUI layout management
     src/org/openstreetmap/josm/gui/MultiSplitLayout.java, MultiSplitPane.java
@@ -161 +164 @@
 * swinghelper: Class CheckThreadViolationRepaintManager to find classpath violations
     src/org/jdesktop/swinghelper/debug/CheckThreadViolationRepaintManager.java
-    -> http://java.net/projects/swinghelper
-
-
+    -> https://java.net/projects/swinghelper

trunk/build.xml

@@ -128 +128 @@
             <zipfileset dir="styles" prefix="styles"/>
             <zipfileset dir="${src.dir}/org/openstreetmap/gui/jmapviewer/images" prefix="org/openstreetmap/gui/jmapviewer/images"/>
-            <!-- All jar files necessary to run only JOSM (no tests) -->
-            <!-- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar"/>  -->
-            <!-- <zipfileset src="lib/signpost-core-1.2.1.1.jar"/> -->
         </jar>
     </target>

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -37 +37 @@
 import org.openstreetmap.josm.data.validation.tests.DuplicatedWayNodes;
 import org.openstreetmap.josm.data.validation.tests.Highways;
+import org.openstreetmap.josm.data.validation.tests.InternetTags;
 import org.openstreetmap.josm.data.validation.tests.Lanes;
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
@@ -121 +122 @@
         Lanes.class, // 3100 .. 3199
         ConditionalKeys.class, // 3200 .. 3299
+        InternetTags.class, // 3300 .. 3399
     };