Changeset 13434 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

Timestamp:

2018-02-18T05:02:23+01:00 (6 years ago)

Author:

Don-vip

Message:

see #8039, see #10456 - support read-only data layers

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

@@ -35 +35 @@
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.ChangesetCache;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
@@ -42 +43 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -72 +72 @@
     private final ZoomInCurrentLayerAction       actZoomInCurrentLayerAction = new ZoomInCurrentLayerAction();
     // CHECKSTYLE.ON: SingleSpaceSeparator
-    
+
     private JButton btnOpenChangesetPopupMenu;
 
@@ -374 +374 @@
                             + "edit layer ''{1}''.</html>",
                             currentChangeset.getId(),
-                            Utils.escapeReservedCharactersHTML(MainApplication.getLayerManager().getEditLayer().getName())
+                            Utils.escapeReservedCharactersHTML(MainApplication.getLayerManager().getActiveDataSet().getName())
                     ),
                     tr("Nothing to select"),
@@ -383 +383 @@
 
         @Override
-        public void actionPerformed(ActionEvent arg0) {
+        public void actionPerformed(ActionEvent e) {
             if (!isEnabled())
                 return;
-            OsmDataLayer layer = MainApplication.getLayerManager().getEditLayer();
-            if (layer == null) {
+            DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
+            if (ds == null) {
                 return;
             }
             Set<OsmPrimitive> target = new HashSet<>();
-            for (OsmPrimitive p: layer.data.allPrimitives()) {
+            for (OsmPrimitive p: ds.allPrimitives()) {
                 if (p.isUsable() && p.getChangesetId() == currentChangeset.getId()) {
                     target.add(p);
@@ -400 +400 @@
                 return;
             }
-            layer.data.setSelected(target);
+            ds.setSelected(target);
         }
 
         public void updateEnabledState() {
-            setEnabled(MainApplication.getLayerManager().getEditLayer() != null && currentChangeset != null);
+            setEnabled(MainApplication.getLayerManager().getActiveDataSet() != null && currentChangeset != null);
         }
 
@@ -433 +433 @@
                             + "edit layer ''{1}''.</html>",
                             currentChangeset.getId(),
-                            MainApplication.getLayerManager().getEditLayer().getName()
+                            MainApplication.getLayerManager().getActiveDataSet().getName()
                     ),
                     tr("Nothing to zoom to"),
@@ -442 +442 @@
 
         @Override
-        public void actionPerformed(ActionEvent arg0) {
+        public void actionPerformed(ActionEvent e) {
             if (!isEnabled())
                 return;
-            OsmDataLayer layer = MainApplication.getLayerManager().getEditLayer();
-            if (layer == null) {
+            DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
+            if (ds == null) {
                 return;
             }
             Set<OsmPrimitive> target = new HashSet<>();
-            for (OsmPrimitive p: layer.data.allPrimitives()) {
+            for (OsmPrimitive p: ds.allPrimitives()) {
                 if (p.isUsable() && p.getChangesetId() == currentChangeset.getId()) {
                     target.add(p);
@@ -459 +459 @@
                 return;
             }
-            layer.data.setSelected(target);
+            ds.setSelected(target);
             AutoScaleAction.zoomToSelection();
         }
 
         public void updateEnabledState() {
-            setEnabled(MainApplication.getLayerManager().getEditLayer() != null && currentChangeset != null);
+            setEnabled(MainApplication.getLayerManager().getActiveDataSet() != null && currentChangeset != null);
         }