Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditAction.java =================================================================== --- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditAction.java (revision 23875) +++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditAction.java (revision 23876) @@ -73,8 +73,9 @@ } - /* ----------------------------------------- */ + /* This code is abused to generate tag utility code */ + @SuppressWarnings("unused") private void generateTagCode(AddressEditContainer addrVisitor) { - /* This code is abused to generate tag utility code */ + for (String tag : addrVisitor.getTags()) { String methodName = createMethodName(tag); Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java =================================================================== --- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java (revision 23875) +++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java (revision 23876) @@ -25,4 +25,5 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.Collection; import java.util.List; @@ -34,5 +35,4 @@ import javax.swing.JSeparator; import javax.swing.JSplitPane; -import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.ListSelectionModel; @@ -43,5 +43,8 @@ import org.openstreetmap.gui.jmapviewer.MapMarkerDot; import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Tag; import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel.PresetHandler; import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer; import org.openstreetmap.josm.plugins.addressEdit.AddressNode; @@ -52,5 +55,4 @@ public class AddressEditDialog extends JFrame implements ActionListener, ListSelectionListener, IAddressEditContainerListener { - private static final String INCOMPLETE_HEADER_FMT = tr("Incomplete Addresses (%d)"); private static final String UNRESOLVED_HEADER_FMT = tr("Unresolved Addresses (%d)"); private static final String STREET_HEADER_FMT = tr("Streets (%d)"); @@ -63,5 +65,4 @@ private AddressEditContainer editContainer; private JTable unresolvedTable; - private JTable incompleteTable; private JTable streetTable; @@ -72,8 +73,7 @@ }; private JLabel streetLabel; - private JLabel incompleteAddressesLabel; private JLabel unresolvedAddressesLabel; private JMapViewer mapViewer; - private JLabel mapLabel; + /** @@ -126,23 +126,4 @@ unresolvedPanel.add(unresolvedButtons, BorderLayout.SOUTH); - /* Panel for incomplete addresses */ - JPanel incompletePanel = new JPanel(new BorderLayout()); - incompleteTable = new JTable(new IncompleteAddressesTableModel(editContainer)); - incompleteTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - incompleteTable.getSelectionModel().addListSelectionListener(this); - JScrollPane scroll3 = new JScrollPane(incompleteTable); - - incompletePanel.add(scroll3, BorderLayout.CENTER); - incompleteAddressesLabel = createHeaderLabel( - INCOMPLETE_HEADER_FMT, editContainer.getNumberOfUnresolvedAddresses()); - incompletePanel.add(incompleteAddressesLabel, BorderLayout.NORTH); - incompletePanel.setMinimumSize(new Dimension(350, 200)); - - - - /* Edit panel for incomplete addresses */ - JPanel incompleteEditPanel = new JPanel(); - incompleteEditPanel.setMinimumSize(new Dimension(350, 300)); - /* Map Panel */ JPanel mapPanel = new JPanel(new BorderLayout()); @@ -151,13 +132,8 @@ mapPanel.setMinimumSize(new Dimension(200, 200)); mapViewer.setVisible(false); - - JTabbedPane tab = new JTabbedPane(); - tab.addTab(tr("Properties"), incompleteEditPanel); - tab.addTab(tr("Map"), mapPanel); - + /* Combine panels */ - JSplitPane unresSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, streetPanel, unresolvedPanel); - JSplitPane addrSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, tab, incompletePanel); - JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, unresSplitPane, addrSplitPane); + JSplitPane unresSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, streetPanel, unresolvedPanel); + JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, unresSplitPane, mapPanel); this.getContentPane().add(pane, BorderLayout.CENTER); @@ -182,10 +158,4 @@ } - private JLabel createHeaderLabel(String text) { - JLabel label = new JLabel(text); - label.setFont(label.getFont().deriveFont(Font.BOLD)); - return label; - } - private JLabel createHeaderLabel(String fmtString, int n) { JLabel label = new JLabel(String.format(fmtString, n)); @@ -197,9 +167,7 @@ if (editContainer != null) { streetLabel.setText(String.format(STREET_HEADER_FMT, editContainer.getNumberOfStreets())); - incompleteAddressesLabel.setText(String.format(INCOMPLETE_HEADER_FMT, editContainer.getNumberOfIncompleteAddresses())); unresolvedAddressesLabel.setText(String.format(UNRESOLVED_HEADER_FMT, editContainer.getNumberOfUnresolvedAddresses())); } else { streetLabel.setText(String.format(STREET_HEADER_FMT, 0)); - incompleteAddressesLabel.setText(String.format(INCOMPLETE_HEADER_FMT, 0)); unresolvedAddressesLabel.setText(String.format(UNRESOLVED_HEADER_FMT, 0)); } @@ -222,5 +190,5 @@ AddressEditSelectionEvent ev = new AddressEditSelectionEvent(e.getSource(), - streetTable, unresolvedTable, incompleteTable, editContainer); + streetTable, unresolvedTable, editContainer); for (AbstractAddressEditAction action : actions) { @@ -241,12 +209,4 @@ } } - - List incAddresses = ev.getSelectedIncompleteAddresses(); - if (incAddresses != null) { - for (AddressNode aNode : incAddresses) { - Node node = (Node) aNode.getOsmObject(); - mapViewer.addMapMarker(new MapMarkerDot(Color.RED, node.getCoor().lat(), node.getCoor().lon())); - } - } List unrAddresses = ev.getSelectedUnresolvedAddresses(); @@ -315,4 +275,27 @@ } - + + class IncompleteAddressPresetHandler implements PresetHandler { + private List osmPrimitives; + + /** + * @param osmPrimitives + */ + public IncompleteAddressPresetHandler(List osmPrimitives) { + super(); + this.osmPrimitives = osmPrimitives; + } + + @Override + public Collection getSelection() { + // TODO Auto-generated method stub + return osmPrimitives; + } + + @Override + public void updateTags(List tags) { + + } + + } } Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditSelectionEvent.java =================================================================== --- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditSelectionEvent.java (revision 23875) +++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditSelectionEvent.java (revision 23876) @@ -31,5 +31,4 @@ private JTable streetTable; private JTable unresolvedAddressTable; - private JTable incompleteAddressTable; private AddressEditContainer addressContainer; @@ -42,9 +41,8 @@ * @param container The address container instance holding the entities for streets and addresses. */ - public AddressEditSelectionEvent(Object source, JTable selStreet, JTable unresolvedAddr, JTable incomplete, AddressEditContainer container) { + public AddressEditSelectionEvent(Object source, JTable selStreet, JTable unresolvedAddr, AddressEditContainer container) { super(source, -1, ""); this.streetTable = selStreet; this.unresolvedAddressTable = unresolvedAddr; - this.incompleteAddressTable = incomplete; this.addressContainer = container; } @@ -66,12 +64,4 @@ } - /** - * Gets the 'incomplete addresses' table component. - * @return - */ - public JTable getIncompleteAddressTable() { - return incompleteAddressTable; - } - public AddressEditContainer getAddressContainer() { return addressContainer; @@ -91,26 +81,4 @@ return addressContainer.getStreetList().get(selRows); - } - return null; - } - - /** - * Gets the list containing the selected items of the 'incomplete addresses ' table. - * @return - */ - public List getSelectedIncompleteAddresses() { - if (incompleteAddressTable != null && - addressContainer != null && - addressContainer.getIncompleteAddresses() != null) { - - int[] selRows = incompleteAddressTable.getSelectedRows(); - - List nodes = new ArrayList(); - for (int i = 0; i < selRows.length; i++) { - if (i >= 0 && i < addressContainer.getNumberOfIncompleteAddresses()) { - nodes.add(addressContainer.getIncompleteAddresses().get(selRows[i])); - } - } - return nodes; } return null; Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AssignAddressToStreetAction.java =================================================================== --- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AssignAddressToStreetAction.java (revision 23875) +++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AssignAddressToStreetAction.java (revision 23876) @@ -23,5 +23,4 @@ public AssignAddressToStreetAction() { super(tr("Assign address to street")); - // TODO Auto-generated constructor stub } @@ -31,4 +30,7 @@ private static final long serialVersionUID = -6180491357232121384L; + /* (non-Javadoc) + * @see org.openstreetmap.josm.plugins.addressEdit.gui.AbstractAddressEditAction#addressEditActionPerformed(org.openstreetmap.josm.plugins.addressEdit.gui.AddressEditSelectionEvent) + */ @Override public void addressEditActionPerformed(AddressEditSelectionEvent ev) { @@ -36,5 +38,5 @@ - if (streetNode != null && ev.getSelectedIncompleteAddresses() != null) { + if (streetNode != null && ev.getSelectedUnresolvedAddresses() != null) { for (AddressNode addrNode : ev.getSelectedUnresolvedAddresses()) { addrNode.assignStreet(streetNode); @@ -44,4 +46,7 @@ } + /* (non-Javadoc) + * @see org.openstreetmap.josm.plugins.addressEdit.gui.AbstractAddressEditAction#updateEnabledState(org.openstreetmap.josm.plugins.addressEdit.gui.AddressEditSelectionEvent) + */ @Override public void updateEnabledState(AddressEditSelectionEvent ev) {