Changeset 348 in josm

Timestamp:

2007-10-07T19:36:54+02:00 (17 years ago)

Author:

framm

Message:

• bugfix refresh relation list
• bugfix NPE on clicking "select" in relation editors with no members selected

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/UndoRedoHandler.java (modified) (3 diffs)
• gui/dialogs/RelationEditor.java (modified) (3 diffs)
• gui/dialogs/RelationListDialog.java (modified) (4 diffs)
• gui/layer/OsmDataLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -42 +42 @@
                         OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer();
                         data.setModified(true);
+                        data.fireDataChange();
                 }
                 fireCommandsChanged();
@@ -58 +59 @@
                         OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer();
                         data.setModified(data.uploadedModified || !commands.isEmpty());
+                        data.fireDataChange();
                         fireCommandsChanged();
                 }               
@@ -76 +78 @@
                         OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer();
                         data.setModified(true);
+                        data.fireDataChange();
                         fireCommandsChanged();
                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java

@@ -13 +13 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Map.Entry;
@@ -174 +175 @@
                 
             memberData.setColumnIdentifiers(new String[]{tr("Role"),tr("Occupied By")});
-                memberTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+                memberTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
                 memberTable.getColumnModel().getColumn(1).setCellRenderer(new OsmPrimitivRenderer());
                 /*
@@ -228 +229 @@
                 buttonPanel.add(createButton(marktr("Select"),"select", tr("Highlight the member from the current table row as JOSM's selection"), KeyEvent.VK_S, new ActionListener() {
                         public void actionPerformed(ActionEvent e) {
-                                int row = memberTable.getSelectedRow();
-                                OsmPrimitive p = (OsmPrimitive) memberTable.getValueAt(row, 1);
-                                Main.ds.setSelected(Collections.singleton(p));
+                                int[] rows = memberTable.getSelectedRows();
+                                ArrayList<OsmPrimitive> sel = new ArrayList<OsmPrimitive>(rows.length);
+                                for (int i : rows) { sel.add((OsmPrimitive)memberTable.getValueAt(i, 1)); }
+                                Main.ds.setSelected(sel);
                         }
                 }));

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.layer.DataChangeListener;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -42 +46 @@
  * @author Frederik Ramm <frederik@remote.org>
  */
-public class RelationListDialog extends ToggleDialog {
+public class RelationListDialog extends ToggleDialog implements LayerChangeListener, DataChangeListener {
 
         /**
@@ -95 +99 @@
                         }
                 }));
-                
+                Layer.listeners.add(this);
                 add(buttonPanel, BorderLayout.SOUTH);
-                
-                /*
-                DataSet.dataListeners.add(new DataChangedListener() {
-                        public void dataChanged() {
-                                updateList();
-                                repaint();
-                        }
-                });
-                */
         }
 
@@ -133 +128 @@
         }
         
+        public void activeLayerChange(Layer a, Layer b) {
+                if (a instanceof OsmDataLayer && b instanceof OsmDataLayer) {
+                        ((OsmDataLayer)a).listenerDataChanged.remove(this);
+                        ((OsmDataLayer)b).listenerDataChanged.add(this);
+                        updateList();
+                        repaint();
+                }
+        }
+        
+        public void layerRemoved(Layer a) {
+                if (a instanceof OsmDataLayer) {
+                        ((OsmDataLayer)a).listenerDataChanged.remove(this);
+                }
+        }
+        public void layerAdded(Layer a) {
+                if (a instanceof OsmDataLayer) {
+                        ((OsmDataLayer)a).listenerDataChanged.add(this);
+                }
+        }       
+        public void dataChanged(OsmDataLayer l) {
+                updateList();
+                repaint();
+        }
+        
 }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -109 +109 @@
 
         public final LinkedList<ModifiedChangedListener> listenerModified = new LinkedList<ModifiedChangedListener>();
-
+        public final LinkedList<DataChangeListener> listenerDataChanged = new LinkedList<DataChangeListener>();
+        
         private SimplePaintVisitor mapPainter = new SimplePaintVisitor();
 
@@ -177 +178 @@
                 for (DataSource src : ((OsmDataLayer)from).data.dataSources) 
                         data.dataSources.add(src);
+                fireDataChange();
                 
                 if (visitor.conflicts.isEmpty())
@@ -315 +317 @@
         this.mapPainter = mapPainter;
     }
+        
+        public void fireDataChange() {
+                for (DataChangeListener dcl : listenerDataChanged) {
+                        dcl.dataChanged(this);
+                }
+        }
 }