Changeset 23876 in osm for applications/editors/josm

Timestamp:

2010-10-27T21:08:23+02:00 (14 years ago)

Author:

oliverw

Message:

Removed incompleteAddresses stuff.

Location:

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit

Files:

• AddressEditAction.java (modified) (1 diff)
• gui/AddressEditDialog.java (modified) (13 diffs)
• gui/AddressEditSelectionEvent.java (modified) (4 diffs)
• gui/AssignAddressToStreetAction.java (modified) (4 diffs)

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditAction.java

@@ -73 +73 @@
         }
 
-        /* ----------------------------------------- */
+        /* 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);

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java

@@ -25 +25 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Collection;
 import java.util.List;
 
@@ -34 +35 @@
 import javax.swing.JSeparator;
 import javax.swing.JSplitPane;
-import javax.swing.JTabbedPane;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
@@ -43 +43 @@
 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 +55 @@
 
 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 +65 @@
         private AddressEditContainer editContainer;
         private JTable unresolvedTable;
-        private JTable incompleteTable;
         private JTable streetTable;
         
@@ -72 +73 @@
         };
         private JLabel streetLabel;
-        private JLabel incompleteAddressesLabel;
         private JLabel unresolvedAddressesLabel;
         private JMapViewer mapViewer;
-        private JLabel mapLabel;
+        
         
         /**
@@ -126 +126 @@
                         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 +132 @@
                         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 +158 @@
         }
 
-        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 +167 @@
                 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 +190 @@
                 
                 AddressEditSelectionEvent ev = new AddressEditSelectionEvent(e.getSource(),
-                                streetTable, unresolvedTable, incompleteTable, editContainer);
+                                streetTable, unresolvedTable, editContainer);
                 
                 for (AbstractAddressEditAction action : actions) {
@@ -241 +209 @@
                                 }
                         }       
-                        
-                        List<AddressNode> 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<AddressNode> unrAddresses = ev.getSelectedUnresolvedAddresses();
@@ -315 +275 @@
                 
         }
-
+        
+        class IncompleteAddressPresetHandler implements PresetHandler {
+                private List<OsmPrimitive> osmPrimitives;
+                
+                /**
+                 * @param osmPrimitives
+                 */
+                public IncompleteAddressPresetHandler(List<OsmPrimitive> osmPrimitives) {
+                        super();
+                        this.osmPrimitives = osmPrimitives;
+                }
+
+                @Override
+                public Collection<OsmPrimitive> getSelection() {
+                        // TODO Auto-generated method stub
+                        return osmPrimitives;
+                }
+
+                @Override
+                public void updateTags(List<Tag> tags) {
+                        
+                }
+                
+        }
 }

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditSelectionEvent.java

@@ -31 +31 @@
         private JTable streetTable;
         private JTable unresolvedAddressTable;
-        private JTable incompleteAddressTable;
         private AddressEditContainer addressContainer;
         
@@ -42 +41 @@
          * @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 +64 @@
         }
 
-        /**
-         * Gets the 'incomplete addresses' table component.
-         * @return
-         */
-        public JTable getIncompleteAddressTable() {
-                return incompleteAddressTable;
-        }
-
         public AddressEditContainer getAddressContainer() {
                 return addressContainer;
@@ -91 +81 @@
                         
                         return addressContainer.getStreetList().get(selRows);
-                }
-                return null;
-        }
-        
-        /**
-         * Gets the list containing the selected items of the 'incomplete addresses ' table.
-         * @return
-         */
-        public List<AddressNode> getSelectedIncompleteAddresses() {
-                if (incompleteAddressTable != null && 
-                                addressContainer != null &&
-                                addressContainer.getIncompleteAddresses() != null) {
-                        
-                        int[] selRows = incompleteAddressTable.getSelectedRows();
-                        
-                        List<AddressNode> nodes = new ArrayList<AddressNode>();
-                        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;

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AssignAddressToStreetAction.java

@@ -23 +23 @@
         public AssignAddressToStreetAction() {
                 super(tr("Assign address to street"));
-                // TODO Auto-generated constructor stub
         }
 
@@ -31 +30 @@
         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 +38 @@
                 
                 
-                if (streetNode != null && ev.getSelectedIncompleteAddresses() != null) {
+                if (streetNode != null && ev.getSelectedUnresolvedAddresses() != null) {
                         for (AddressNode addrNode : ev.getSelectedUnresolvedAddresses()) {
                                 addrNode.assignStreet(streetNode);
@@ -44 +46 @@
         }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.addressEdit.gui.AbstractAddressEditAction#updateEnabledState(org.openstreetmap.josm.plugins.addressEdit.gui.AddressEditSelectionEvent)
+         */
         @Override
         public void updateEnabledState(AddressEditSelectionEvent ev) {