Changeset 27470 in osm for applications/editors/josm

Timestamp:

2012-01-15T20:35:19+01:00 (13 years ago)

Author:

frederik

Message:

properly handle anonymous contributions in JOSM license change plugin. fixes #7269.

Location:

applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange

Files:

• CheckAction.java (modified) (3 diffs)
• LicenseChangePlugin.java (modified) (1 diff)

applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java

@@ -87 +87 @@
     {
         private Check licenseCheck;
-        private Collection<OsmPrimitive> validatedPrimitives;
-        private Collection<OsmPrimitive> formerValidatedPrimitives;
+        private Collection<OsmPrimitive> checkedPrimitives;
+        private Collection<OsmPrimitive> formerCheckedPrimitives;
         private boolean canceled;
         private List<LicenseProblem> problems;
@@ -94 +94 @@
         /**
          *
-         * @param validatedPrimitives the collection of primitives to validate.
-         * @param formerValidatedPrimitives the last collection of primitives being validates. May be null.
+         * @param checkedPrimitives the collection of primitives to validate.
+         * @param formerCheckedPrimitives the last collection of primitives being validates. May be null.
          */
-        public CheckTask(Collection<OsmPrimitive> validatedPrimitives, Collection<OsmPrimitive> formerValidatedPrimitives) 
+        public CheckTask(Collection<OsmPrimitive> checkedPrimitives, Collection<OsmPrimitive> formerCheckedPrimitives) 
         {
             super(tr("Loading"), false /*don't ignore exceptions */);
 
-            this.validatedPrimitives  = validatedPrimitives;
-            this.formerValidatedPrimitives = formerValidatedPrimitives;
+            this.checkedPrimitives  = checkedPrimitives;
+            this.formerCheckedPrimitives = formerCheckedPrimitives;
             this.licenseCheck = new BasicLicenseCheck(plugin);
         }
@@ -141 +141 @@
         {
             getProgressMonitor().indeterminateSubTask(tr("Loading from Quick History Service..."));
-            plugin.loadDataFromQuickHistoryService(validatedPrimitives);
+            plugin.loadDataFromQuickHistoryService(checkedPrimitives);
             problems = new ArrayList<LicenseProblem>(200);
             int testCounter = 0;
             getProgressMonitor().indeterminateSubTask(tr("Analyzing..."));
-            //licenseCheck.startCheck(getProgressMonitor().createSubTaskMonitor(validatedPrimitives.size(), false));
+            //licenseCheck.startCheck(getProgressMonitor().createSubTaskMonitor(checkedPrimitives.size(), false));
             licenseCheck.startCheck(getProgressMonitor());
-            licenseCheck.visit(validatedPrimitives);
+            licenseCheck.visit(checkedPrimitives);
             licenseCheck.endCheck();
             problems.addAll(licenseCheck.getProblems());

applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangePlugin.java

@@ -174 +174 @@
                 String s = atts.getValue("severity");
 
-                if (!"undecided".equals(d) && !"no".equals(d)) return;
+                if (!"undecided".equals(d) && !"no".equals(d) && !"anonymous".equals(d)) return;
 
                 if ("normal".equals(s) && "first".equals(v)) s = "first";