Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java (revision 24112)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java (revision 24112)
@@ -0,0 +1,35 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program.
+ * If not, see .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Cursor;
+
+import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.gui.MapFrame;
+
+
+@SuppressWarnings("serial")
+public class FixAddressesMapMode extends MapMode {
+
+ public FixAddressesMapMode(MapFrame mapFrame) {
+ super(tr("Fix adresses"), "incompleteaddress_24",
+ tr("Show dialog with incomplete addresses"),
+ mapFrame,
+ Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+ }
+
+
+}
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java (revision 24110)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java (revision 24112)
@@ -15,6 +15,9 @@
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,4 +25,5 @@
*/
public class FixAddressesPlugin extends Plugin {
+ private static IncompleteAddressesDialog incompleteAddrDlg;
/**
@@ -29,13 +33,42 @@
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;
+ }
}
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java (revision 24110)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java (revision 24112)
@@ -34,8 +34,7 @@
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);
}
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java (revision 24112)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java (revision 24112)
@@ -0,0 +1,128 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program.
+ * If not, see .
+ */
+package org.openstreetmap.josm.plugins.fixAddresses.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.BorderLayout;
+
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+
+import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataSetListener;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
+import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
+import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
+import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
+import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
+import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
+import org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer;
+
+@SuppressWarnings("serial")
+public class IncompleteAddressesDialog extends ToggleDialog implements DataSetListener {
+ private AddressEditContainer container;
+
+ /**
+ * @param name
+ * @param iconName
+ * @param tooltip
+ * @param shortcut
+ * @param preferredHeight
+ * @param container
+ */
+ public IncompleteAddressesDialog() {
+ super(tr("Incomplete Addresses"), "incompleteaddress_24", tr("Show incomplete addresses"), null, 150);
+ this.container = new AddressEditContainer();
+
+ JPanel p = new JPanel(new BorderLayout());
+
+ JTable incompleteAddr = new JTable(new IncompleteAddressesTableModel(container));
+ JScrollPane sp = new JScrollPane(incompleteAddr);
+ p.add(sp, BorderLayout.CENTER);
+ this.add(p);
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.gui.dialogs.ToggleDialog#hideNotify()
+ */
+ @Override
+ public void hideNotify() {
+ super.hideNotify();
+ DatasetEventManager.getInstance().removeDatasetListener(this);
+ }
+
+
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.gui.dialogs.ToggleDialog#showNotify()
+ */
+ @Override
+ public void showNotify() {
+ super.showNotify();
+ DatasetEventManager.getInstance().addDatasetListener(this, FireMode.IN_EDT_CONSOLIDATED);
+ }
+
+
+
+ @Override
+ public void dataChanged(DataChangedEvent event) {
+ container.invalidate();
+ }
+
+ @Override
+ public void nodeMoved(NodeMovedEvent event) {
+
+ }
+
+ @Override
+ public void otherDatasetChange(AbstractDatasetChangedEvent event) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void primtivesAdded(PrimitivesAddedEvent event) {
+ container.invalidate();
+
+ }
+
+ @Override
+ public void primtivesRemoved(PrimitivesRemovedEvent event) {
+ container.invalidate();
+ }
+
+ @Override
+ public void relationMembersChanged(RelationMembersChangedEvent event) {
+ container.invalidate();
+ }
+
+ @Override
+ public void tagsChanged(TagsChangedEvent event) {
+ container.invalidate();
+
+ }
+
+ @Override
+ public void wayNodesChanged(WayNodesChangedEvent event) {
+ container.invalidate();
+ }
+
+
+}
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java (revision 24110)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java (revision 24112)
@@ -76,5 +76,5 @@
return aNode.getPostCode();
case 4:
- aNode.getStreetName();
+ return aNode.getStreetName();
default:
throw new RuntimeException("Invalid column index: " + column);