Changeset 18928 in osm for applications/editors/josm/plugins/validator

Timestamp:

2009-12-03T21:02:38+01:00 (15 years ago)

Author:

guggis

Message:

'Updated to new referrer support in OsmPrimitive'

Location:

applications/editors/josm/plugins/validator

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/Test.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java (modified) (1 diff)

applications/editors/josm/plugins/validator/build.xml

@@ -26 +26 @@
           ** update before publishing 
         -->
-        <property name="commit.message" value="Updated build.xml" />            
-        <property name="plugin.main.version" value="2452" />
+        <property name="commit.message" value="Updated to new referrer support in OsmPrimitive" />              
+        <property name="plugin.main.version" value="2565" />
                 
                 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java

@@ -11 +11 @@
 
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.data.osm.BackreferencedDataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -61 +60 @@
     /** the progress monitor to use */
     protected ProgressMonitor progressMonitor;
-
-    /**
-     * the data structure with child->parent references
-     */
-    protected BackreferencedDataSet backreferenceDataSet;
-
     /**
      * Constructor
@@ -100 +93 @@
      */
     public void startTest(ProgressMonitor progressMonitor) {
-        backreferenceDataSet = new BackreferencedDataSet();
         if (progressMonitor == null) {
                 this.progressMonitor = NullProgressMonitor.INSTANCE;
@@ -135 +127 @@
         progressMonitor.finishTask();
         progressMonitor = null;
-        backreferenceDataSet = null;
     }
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java

@@ -144 +144 @@
         Set<DefaultMutableTreeNode> processedNodes = new HashSet<DefaultMutableTreeNode>();
 
-        DuplicateNode.clearBackreferences();
         LinkedList<TestError> errorsToFix = new LinkedList<TestError>();
         for (TreePath path : selectionPaths) {

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java

@@ -16 +16 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.BackreferencedDataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -31 +30 @@
  */
 public class DuplicateNode extends Test{
-
-        private static BackreferencedDataSet backreferences;
-
-        public static BackreferencedDataSet getBackreferenceDataSet() {
-                if (backreferences == null) {
-                        backreferences = new BackreferencedDataSet();
-                }
-                return backreferences;
-        }
-
-        public static void clearBackreferences() {
-                backreferences = null;
-        }
 
     protected static int DUPLICATE_NODE = 1;
@@ -112 +98 @@
         Node target = MergeNodesAction.selectTargetNode(nodes);
         if(checkAndConfirmOutlyingDeletes(nodes))
-            return MergeNodesAction.mergeNodes(Main.main.getEditLayer(),getBackreferenceDataSet(), nodes, target);
+            return MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodes, target);
 
         return null;// undoRedo handling done in mergeNodes

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java

@@ -104 +104 @@
 
         if (type != null && !w.isClosed()) {
-            for (OsmPrimitive parent: this.backreferenceDataSet.getParents(w)) {
+            for (OsmPrimitive parent: w.getReferrers()) {
                 if (parent instanceof Relation && "multipolygon".equals(parent.get("type")))
                     return;