Changeset 3071 in josm for trunk

Timestamp:

2010-03-03T06:24:53+01:00 (14 years ago)

Author:

mjulius

Message:

fixes #4648 - User panel not showing data when toggled from hidden to shown

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• gui/dialogs/UserListDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -245 +245 @@
      */
     public boolean hasEditLayer() {
-        if (map == null) return false;
-        if (map.mapView == null) return false;
-        if (map.mapView.getEditLayer() == null) return false;
+        if (getEditLayer() == null) return false;
         return true;
     }
@@ -270 +268 @@
         if (!hasEditLayer()) return null;
         return getEditLayer().data;
+    }
+
+    /**
+     * Returns the currently active  layer
+     *
+     * @return the currently active layer. null, if currently no active layer exists
+     */
+    public Layer getActiveLayer() {
+        if (map == null) return null;
+        if (map.mapView == null) return null;
+        return map.mapView.getActiveLayer();
     }
 

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

@@ -145 +145 @@
     }
 
+    @Override
+    public void showDialog() {
+        super.showDialog();
+        Layer layer = Main.main.getActiveLayer();
+        if (layer instanceof OsmDataLayer) {
+            refresh(((OsmDataLayer)layer).data.getSelected());
+        }
+
+    }
+
     class SelectUsersPrimitivesAction extends AbstractAction implements ListSelectionListener{
         public SelectUsersPrimitivesAction() {