Changeset 24210 in osm

Timestamp:

2010-11-12T23:30:53+01:00 (14 years ago)

Author:

oliverw

Message:

• Added preferences class.
• Added option to select also guessed obejcts.

Location:

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

Files:

• FixAddressesPlugin.java (modified) (3 diffs)
• FixAddressesPreferences.java (added)
• OSMAddress.java (modified) (3 diffs)
• gui/actions/SelectAddressesInMapAction.java (modified) (2 diffs)

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

@@ -26 +26 @@
 public class FixAddressesPlugin extends Plugin {
         private static IncompleteAddressesDialog incompleteAddrDlg;
+        private static FixAddressesPreferences preferences; 
 
         /**
@@ -34 +35 @@
                 super(info);
                                 
-                // Create action for edit...
+                // Create actions...
                 FixUnresolvedStreetsAction action = new FixUnresolvedStreetsAction();           
                 SelectIncompleteAddressesAction incAddrAction = new SelectIncompleteAddressesAction();
                 
-                // ... and add it to the tools menu in main
+                // ... and add them to the tools menu in main
                 Main.main.menu.toolsMenu.addSeparator();
         Main.main.menu.toolsMenu.add(action);
         Main.main.menu.toolsMenu.add(incAddrAction);
         
-        // Create dialog 
-        
+        // create preferences instance
+        preferences = (FixAddressesPreferences) new FixAddressesPreferences.Factory().createPreferenceSetting();        
         }
 
@@ -72 +73 @@
                 return incompleteAddrDlg;
         }
+        
+        /**
+         * Gets the preferences instance for this plugin.
+         *
+         * @return the preferences
+         */
+        public static FixAddressesPreferences getPreferences() {
+                return preferences;
+        }
 }

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

@@ -14 +14 @@
 package org.openstreetmap.josm.plugins.fixAddresses;
 
+import java.util.Collection;
 import java.util.HashMap;
 
@@ -448 +449 @@
         
         /**
+         * Gets all guessed objects or an empty list, if no guesses have been made yet.
+         *
+         * @return the guessed objects.
+         */
+        public Collection<OsmPrimitive> getGuessedObjects() {
+                if (guessedObjects == null) return null;
+                
+                return guessedObjects.values();
+        }
+        
+        /**
          * Check if this instance needs guessed values. This is the case, if the underlying OSM node
          * has either no street name, post code or city.
@@ -497 +509 @@
         public void setGuessedValue(String tag, String value, OsmPrimitive osm) {
                 CheckParameterUtil.ensureParameterNotNull(tag, "tag");
-                CheckParameterUtil.ensureParameterNotNull(value, "value");
-                CheckParameterUtil.ensureParameterNotNull(osm, "osm");
-                
-                guessedValues.put(tag, value);
-                guessedObjects.put(tag, osm);
-                fireEntityChanged(this);
+
+                if (value != null && osm != null) {
+                        guessedValues.put(tag, value);
+                        guessedObjects.put(tag, osm);
+                        fireEntityChanged(this);
+                }
         }
         

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

@@ -36 +36 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer;
+import org.openstreetmap.josm.plugins.fixAddresses.FixAddressesPlugin;
 import org.openstreetmap.josm.plugins.fixAddresses.OSMAddress;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.AddressEditSelectionEvent;
@@ -102 +103 @@
                 for (OSMAddress aNode : addrToSel) {
                         sel.add(aNode.getOsmObject());
+                        
+                        // Select also guessed objects, if wished
+                        if (FixAddressesPlugin.getPreferences().isSelectGuessedObjects()) {
+                                for (OsmPrimitive osmPrimitive : aNode.getGuessedObjects()) {
+                                        sel.add(osmPrimitive);
+                                }
+                        }
                 }