Changeset 10453 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java

Timestamp:

2016-06-22T00:48:51+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13023 - Replace uses of hasEditLayer() with new layer manager (patch by michael2402, modified) - gsoc-core

File:

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

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

@@ -333 +333 @@
 
         protected Set<OsmPrimitive> getTarget() {
-            if (!isEnabled() || Main.main == null || !Main.main.hasEditLayer()) {
+            if (!isEnabled()) {
                 return null;
             }
             OsmDataLayer layer = Main.getLayerManager().getEditLayer();
+            if (layer == null) {
+                return null;
+            }
             Set<OsmPrimitive> target = new HashSet<>();
             for (HistoryOsmPrimitive p : model.getSelectedPrimitives()) {
@@ -348 +351 @@
 
         public final void updateEnabledState() {
-            if (Main.main == null || !Main.main.hasEditLayer()) {
-                setEnabled(false);
-                return;
-            }
-            setEnabled(model.hasSelectedPrimitives());
+            setEnabled(Main.getLayerManager().getEditLayer() != null && model.hasSelectedPrimitives());
         }