Changeset 23884 in osm

Timestamp:

2010-10-27T22:45:07+02:00 (14 years ago)

Author:

oliverw

Message:

Use selection for editing, if available.

Location:

applications/editors/josm/plugins/AddressEdit

Files:

• .externalToolBuilders/org.eclipse.jdt.core.javabuilder (2).launch (deleted)
• .project (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/addressEdit/AddressEditAction.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/addressEdit/gui/IncompleteAddressesTableModel.java (modified) (1 diff)

applications/editors/josm/plugins/AddressEdit/.project

@@ -7 +7 @@
         <buildSpec>
                 <buildCommand>
-                        <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-                        <triggers>full,incremental,</triggers>
+                        <name>org.eclipse.jdt.core.javabuilder</name>
                         <arguments>
-                                <dictionary>
-                                        <key>LaunchConfigHandle</key>
-                                        <value>&lt;project&gt;/.externalToolBuilders/org.eclipse.jdt.core.javabuilder (2).launch</value>
-                                </dictionary>
                         </arguments>
                 </buildCommand>

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

@@ -10 +10 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.plugins.addressEdit.gui.AddressEditDialog;
@@ -21 +22 @@
         private static final long serialVersionUID = 1L;
         private AddressEditContainer addressEditContainer;
+        private Collection<? extends OsmPrimitive> newSelection;
 
         public AddressEditAction() {
@@ -31 +33 @@
                 setEnabled(false);
                 
+                addressEditContainer = new AddressEditContainer();
+                DataSet.addSelectionListener(this);             
         }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.data.SelectionChangedListener#selectionChanged(java.util.Collection)
+         */
         @Override
         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-                synchronized (this) {
-                        collectAddressesAndStreets(newSelection);
+                this.newSelection = newSelection;
+                if (addressEditContainer != null) {
+                        addressEditContainer.invalidate(newSelection);
                 }
         }
 
+        /* (non-Javadoc)
+         * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+         */
         @Override
-        public void actionPerformed(ActionEvent arg0) {
-                addressEditContainer = new AddressEditContainer();
+        public void actionPerformed(ActionEvent arg0) {         
                 if (addressEditContainer != null) {
-                        addressEditContainer.attachToDataSet();
+                        addressEditContainer.attachToDataSet(newSelection);
                         try {
                                 AddressEditDialog dlg = new AddressEditDialog(addressEditContainer);
@@ -53 +63 @@
                 }
         }
+        
 
-        private void collectAddressesAndStreets(
-                        final Collection<? extends OsmPrimitive> osmData) {
-                if (osmData == null || osmData.isEmpty())
-                        return;
-
-                
-        }
-
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.actions.JosmAction#updateEnabledState()
+         */
         @Override
         protected void updateEnabledState() {

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

@@ -130 +130 @@
                 if (newSegment != null) {
                         String name = newSegment.getName();
+                        if (StringUtils.isNullOrEmpty(name)) return;
+                        
                         StreetNode sNode = null;
                         if (streetDict.containsKey(name)) {
@@ -293 +295 @@
          * be called immediately before an edit session starts.
          */
-        public void attachToDataSet() {
+        public void attachToDataSet(Collection<? extends OsmPrimitive> dataToExamine) {         
                 Main.main.getCurrentDataSet().addDataSetListener(this);
-                invalidate();
+                if (dataToExamine != null && dataToExamine.size() > 0) {
+                        invalidate(dataToExamine); // use given data set (usually the current selection)
+                } else {
+                        invalidate(); // use current data set
+                }
         }
         

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

@@ -15 +15 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-
 
 import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;