Changeset 24112 in osm for applications/editors/josm/plugins/FixAddresses/src

Timestamp:

2010-11-07T15:16:46+01:00 (14 years ago)

Author:

oliverw

Message:

Added toggle dialog for incomplete addresses (just show entries, but no actions yet).

Location:

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

Files:

• FixAddressesMapMode.java (added)
• FixAddressesPlugin.java (modified) (3 diffs)
• FixUnresolvedStreetsAction.java (modified) (1 diff)
• gui/IncompleteAddressesDialog.java (added)
• gui/IncompleteAddressesTableModel.java (modified) (1 diff)

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

@@ -15 +15 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.IconToggleButton;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.fixAddresses.gui.IncompleteAddressesDialog;
 
 /**
@@ -22 +25 @@
  */
 public class FixAddressesPlugin extends Plugin {
+        private static IncompleteAddressesDialog incompleteAddrDlg;
 
         /**
@@ -29 +33 @@
         public FixAddressesPlugin(PluginInformation info) {
                 super(info);
+                                
+                // Create action for edit...
+                FixUnresolvedStreetsAction action = new FixUnresolvedStreetsAction();           
+                SelectIncompleteAddressesAction incAddrAction = new SelectIncompleteAddressesAction();
                 
-                // Create action for edit...
-                FixUnresolvedStreetsAction action = new FixUnresolvedStreetsAction();
-                SelectIncompleteAddressesAction incAddrAction = new SelectIncompleteAddressesAction();
                 // ... and add it 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 
+        
         }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.Plugin#mapFrameInitialized(org.openstreetmap.josm.gui.MapFrame, org.openstreetmap.josm.gui.MapFrame)
+         */
+        @Override
+        public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+                // TODO Auto-generated method stub
+                super.mapFrameInitialized(oldFrame, newFrame);
+                
+                if (newFrame != null) {
+                        incompleteAddrDlg = new IncompleteAddressesDialog();
+                FixAddressesMapMode faMode = new FixAddressesMapMode(Main.map);
+                        IconToggleButton faModeButton = new IconToggleButton(faMode);
+                        faModeButton.setVisible(true);
+                        newFrame.addToggleDialog(incompleteAddrDlg);                                            
+                }
+        }
+        
+        
+
+        /**
+         * @return the incompleteAddrDlg
+         */
+        protected static IncompleteAddressesDialog getIncompleteAddrDlg() {
+                return incompleteAddrDlg;
+        }
 }

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

@@ -34 +34 @@
                                                 Shortcut.GROUP_MENU, InputEvent.ALT_DOWN_MASK
                                                 | InputEvent.SHIFT_DOWN_MASK), false);
-                setEnabled(false);
                 
-                addressEditContainer = new AddressEditContainer();
-                                
+                setEnabled(false);              
+                addressEditContainer = new AddressEditContainer();                              
                 DataSet.addSelectionListener(this);             
         }

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

@@ -76 +76 @@
                         return aNode.getPostCode();
                 case 4:
-                        aNode.getStreetName();                  
+                        return aNode.getStreetName();                   
                 default:
                         throw new RuntimeException("Invalid column index: " + column);