Changeset 24978 in osm

Timestamp:

2011-01-05T14:05:35+01:00 (14 years ago)

Author:

oliverw

Message:

Implemented basic infrastructure for new problem/solution approach.

Location:

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses

Files:

• AddressEditContainer.java (modified) (7 diffs)
• IOSMEntity.java (modified) (1 diff)
• IProblem.java (added)
• IProblemVisitor.java (added)
• ISolution.java (added)
• OSMAddress.java (modified) (2 diffs)
• OSMEntityBase.java (modified) (1 diff)
• Problem.java (added)
• ProblemType.java (added)
• SolutionType.java (added)
• gui/actions/AbstractAddressEditAction.java (modified) (1 diff)

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java

@@ -52 +52 @@
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -70 +71 @@
  */
 
-public class AddressEditContainer implements Visitor, DataSetListener, IAddressEditContainerListener {
+public class AddressEditContainer implements Visitor, DataSetListener, IAddressEditContainerListener, IProblemVisitor {
         
         private Collection<? extends OsmPrimitive> workingSet;
@@ -98 +99 @@
         private HashMap<String, String> values = new HashMap<String, String>();
         
+        /** The list containing the problems */
+        private List<IProblem> problems = new ArrayList<IProblem>();
+        
         /** The change listeners. */
         private List<IAddressEditContainerListener> listeners = new ArrayList<IAddressEditContainerListener>();
@@ -214 +218 @@
                 if (aNode != null) {
                         addAndClassifyAddress(aNode);
+                        aNode.visit(this);
                 } 
                 markNodeAsVisited(n);
@@ -463 +468 @@
                 return all; 
         }
+        
+        /**
+         * @return the problems
+         */
+        protected List<IProblem> getProblems() {
+                return problems;
+        }
+        
+        /**
+         * Clears the problem list.
+         */
+        protected void clearProblems() {
+                problems.clear();
+        }
 
         /**
@@ -540 +559 @@
                         shadowUnresolvedAddresses.clear();
                         shadowIncompleteAddresses.clear();
+                        
                         // update clients
                         fireContainerChanged();
@@ -674 +694 @@
                 fireEntityChanged(entity);      
         }
+        
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.IProblemVisitor#addProblem(org.openstreetmap.josm.plugins.fixAddresses.IProblem)
+         */
+        @Override
+        public void addProblem(IProblem problem) {
+                problems.add(problem);
+        }
+
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.IProblemVisitor#removeProblemsOfSource(org.openstreetmap.josm.plugins.fixAddresses.IOSMEntity)
+         */
+        @Override
+        public void removeProblemsOfSource(IOSMEntity entity) {
+                CheckParameterUtil.ensureParameterNotNull(entity, "entity");
+                
+                List<IProblem> problemsToRemove = new ArrayList<IProblem>();
+                for (IProblem problem : problems) {
+                        if (problem.getSource() == entity) {
+                                problemsToRemove.add(problem);
+                        }
+                }
+                
+                for (IProblem iProblem : problemsToRemove) {
+                        problems.remove(iProblem);
+                }
+        }
 }

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java

@@ -70 +70 @@
          */
         public void removeCommandListener(ICommandListener listener);
+        
+        /**
+         * Collects problems and possible solutions.
+         *
+         * @param visitor the problem visitor
+         */
+        public void visit(IProblemVisitor visitor);
 }

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java

@@ -628 +628 @@
         }
         
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.OSMEntityBase#visit(org.openstreetmap.josm.plugins.fixAddresses.IProblemVisitor)
+         */
+        public void visit(IProblemVisitor visitor) {
+                CheckParameterUtil.ensureParameterNotNull(visitor, "visitor");
+                
+                if (!hasStreetName()) {
+                        
+                }
+        }
+        
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.OSMEntityBase#toString()
+         */
         @Override
         public String toString() {
@@ -633 +647 @@
         }
 
+        /**
+         * Gets the formatted string representation of the given node.
+         *
+         * @param node the node
+         * @return the format string
+         */
         public static String getFormatString(OSMAddress node) {
                 // TODO: Add further countries here

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMEntityBase.java

@@ -202 +202 @@
                 return this.getName().compareTo(o.getName());
         }
+        
+        @Override
+        public void visit(IProblemVisitor visitor) {
+                // do nothing
+        }
 
         /* (non-Javadoc)

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java

@@ -175 +175 @@
         @Override
         public void entityChanged(IOSMEntity node) {
+                container.removeProblemsOfSource(node); // clear problems of changed node...
+                node.visit(container);                                  // .. and revisit it.
                 updateEnabledState();           
         }