Changeset 20711 in osm for applications

Timestamp:

2010-03-28T12:45:43+02:00 (15 years ago)

Author:

guggis

Message:

Minor updates

Location:

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list

Files:

• TurnRestrictionsInDatasetView.java (modified) (1 diff)
• TurnRestrictionsInSelectionView.java (modified) (4 diffs)
• TurnRestrictionsListDialog.java (modified) (1 diff)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetView.java

@@ -35 +35 @@
                 DatasetEventManager.getInstance().addDatasetListener((DataSetListener)model, FireMode.IN_EDT);
                 if (Main.main.getEditLayer() != null) {
-                        model.setTurnRestrictions(Main.main.getEditLayer().data
-                                        .getRelations());
+                        model.setTurnRestrictions(Main.main.getEditLayer().data.getRelations());
                 }
         }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInSelectionView.java

@@ -2 +2 @@
 
 import java.awt.BorderLayout;
+import java.util.Collections;
 
 import javax.swing.DefaultListSelectionModel;
@@ -10 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
@@ -37 +39 @@
                 MapView.addEditLayerChangeListener((EditLayerChangeListener)model);
                 SelectionEventManager.getInstance().addSelectionListener((SelectionChangedListener)model, FireMode.IN_EDT_CONSOLIDATED);
-                if (Main.main.getEditLayer() != null) {
-                        model.setTurnRestrictions(Main.main.getEditLayer().data.getRelations());
+                TurnRestrictionsInSelectionListModel m = (TurnRestrictionsInSelectionListModel)model;
+                if (Main.main.getEditLayer() != null){
+                        m.initFromSelection(Main.main.getEditLayer().data.getSelected());
+                } else {
+                        m.initFromSelection(Collections.<OsmPrimitive>emptyList());
                 }
         }
@@ -44 +49 @@
         protected void unregisterAsListener() {
                 MapView.removeEditLayerChangeListener((EditLayerChangeListener)model);
-                SelectionEventManager.getInstance().removeSelectionListener((SelectionChangedListener)model);
+                SelectionEventManager.getInstance().removeSelectionListener((SelectionChangedListener)model);           
         }
 

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java

@@ -191 +191 @@
                         actZoomTo.updateEnabledState();
                         currentListView.revalidate();
-                        currentListView.repaint();
+                        currentListView.repaint();                      
                 }