Changeset 6786 in josm

Timestamp:

2014-01-30T16:25:42+01:00 (11 years ago)

Author:

akks

Message:

fix #9639: NPE when trying to upload data
(rough fix, needs checking) + fix Netbeans project

Location:

trunk

Files:

• netbeans/nbproject/project.properties (modified) (1 diff)
• src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java (modified) (1 diff)

trunk/netbeans/nbproject/project.properties

@@ -33 +33 @@
 file.reference.core=..
 file.reference.test-unit=../test/unit
-includes=org/**/*.java,gnu/**/*.java,oauth/**/*.java,com/**/*.java,images/**,org/openstreetmap/gui/**/*.png,data/**,styles/**,LICENSE,README,CONTRIBUTION,gpl-2.0.txt,gpl-3.0.txt
+includes=org/**/*.java,gnu/**/*.java,javax/**/*.java,oauth/**/*.java,com/**/*.java,images/**,org/openstreetmap/gui/**/*.png,data/**,styles/**,LICENSE,README,CONTRIBUTION,gpl-2.0.txt,gpl-3.0.txt
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -45 +45 @@
     public boolean checkUpload(APIDataSet apiDataSet) {
 
+        OsmValidator.initializeTests();
         Collection<Test> tests = OsmValidator.getEnabledTests(true);
         if (tests.isEmpty())