Changeset 24106 in osm for applications/editors

Timestamp:

2010-11-07T12:24:51+01:00 (14 years ago)

Author:

oliverw

Message:

Added "convert street/addresses" to relation.

Location:

applications/editors/josm/plugins/FixAddresses

Files:

• images/convert2rel_24.png (added)
• src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java (added)

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

@@ -58 +58 @@
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ApplyAllGuessesAction;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AssignAddressToStreetAction;
+import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ConvertToRelationAction;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.GuessAddressDataAction;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.RemoveAddressTagsAction;
@@ -82 +83 @@
         private SelectAddressesInMapAction selectAddressesInMapAction = new SelectAddressesInMapAction();
         private RemoveAddressTagsAction removeAddressTagsAction = new RemoveAddressTagsAction();
+        private ConvertToRelationAction convertToRelationAction = new ConvertToRelationAction();
         
         private AbstractAddressEditAction[] actions = new AbstractAddressEditAction[] {
@@ -88 +90 @@
                 applyAllGuessesAction,
                 selectAddressesInMapAction,
-                removeAddressTagsAction
+                removeAddressTagsAction,
+                convertToRelationAction
         };
         private JLabel streetLabel;
@@ -127 +130 @@
                         headerPanel.add(streetLabel);
                         
+                        JPanel streetButtonPanel = new JPanel(new GridLayout(1, 4));
+                        SideButton convertToRel = new SideButton(convertToRelationAction);                                                                                                                         
+                        streetButtonPanel.add(convertToRel);
+                        
+                        streetPanel.add(streetButtonPanel, BorderLayout.SOUTH);
                         streetPanel.add(headerPanel, BorderLayout.NORTH);
                         streetPanel.setMinimumSize(new Dimension(350, 200));

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

@@ -45 +45 @@
         private AddressEditSelectionEvent event;
         protected AddressEditContainer container;
-        private List<Command> commands;
+        protected List<Command> commands;
         private String txName;