Changeset 10453 in josm for trunk/src/org/openstreetmap/josm/gui

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/ChangesetDialog.java (modified) (1 diff)
• dialogs/CommandStackDialog.java (modified) (4 diffs)
• dialogs/RelationListDialog.java (modified) (2 diffs)
• dialogs/SelectionListDialog.java (modified) (1 diff)
• dialogs/changeset/ChangesetContentPanel.java (modified) (2 diffs)
• dialogs/changeset/ChangesetDetailPanel.java (modified) (4 diffs)
• history/NodeListViewer.java (modified) (1 diff)
• layer/ValidatorLayer.java (modified) (1 diff)
• mappaint/MapPaintMenu.java (modified) (1 diff)
• tagging/presets/TaggingPresetSearchAction.java (modified) (1 diff)
• tagging/presets/TaggingPresetSearchPrimitiveDialog.java (modified) (1 diff)

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

@@ -316 +316 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            if (!Main.main.hasEditLayer())
+            if (Main.getLayerManager().getEditLayer() == null)
                 return;
             ChangesetListModel model = getCurrentChangesetListModel();

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

@@ -39 +39 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.PseudoCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.SideButton;
@@ -268 +269 @@
     private void buildTrees() {
         setTitle(tr("Command Stack"));
-        if (!Main.main.hasEditLayer())
+        if (Main.getLayerManager().getEditLayer() == null)
             return;
 
@@ -389 +390 @@
                 throw new IllegalStateException();
 
-            OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
-            if (editLayer == null) return;
-            editLayer.data.setSelected(getAffectedPrimitives(path));
+            DataSet dataSet = Main.getLayerManager().getEditDataSet();
+            if (dataSet == null) return;
+            dataSet.setSelected(getAffectedPrimitives(path));
         }
 
@@ -417 +418 @@
         public void actionPerformed(ActionEvent e) {
             super.actionPerformed(e);
-            if (!Main.main.hasEditLayer()) return;
             AutoScaleAction.autoScale("selection");
         }

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

@@ -339 +339 @@
         @Override
         public void mouseClicked(MouseEvent e) {
-            if (!Main.main.hasEditLayer()) return;
+            if (Main.getLayerManager().getEditLayer() == null) return;
             if (isDoubleClick(e)) {
                 if (e.isControlDown()) {
@@ -371 +371 @@
 
         protected void updateEnabledState() {
-            setEnabled(Main.main != null && Main.main.hasEditLayer());
+            setEnabled(Main.getLayerManager().getEditLayer() != null);
         }
 

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

@@ -310 +310 @@
 
         protected void updateEnabledState() {
-            setEnabled(Main.main != null && Main.main.hasEditLayer());
+            setEnabled(Main.getLayerManager().getEditLayer() != null);
         }
 

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());
         }
 

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

@@ -347 +347 @@
             if (!isEnabled())
                 return;
-            if (Main.main == null || !Main.main.hasEditLayer()) return;
             OsmDataLayer layer = Main.getLayerManager().getEditLayer();
+            if (layer == null) {
+                return;
+            }
             Set<OsmPrimitive> target = new HashSet<>();
             for (OsmPrimitive p: layer.data.allPrimitives()) {
@@ -363 +365 @@
 
         public void updateEnabledState() {
-            if (Main.main == null || !Main.main.hasEditLayer()) {
-                setEnabled(false);
-                return;
-            }
-            setEnabled(currentChangeset != null);
+            setEnabled(Main.getLayerManager().getEditLayer() != null && currentChangeset != null);
         }
 
@@ -408 +406 @@
             if (!isEnabled())
                 return;
-            if (Main.main == null || !Main.main.hasEditLayer()) return;
             OsmDataLayer layer = Main.getLayerManager().getEditLayer();
+            if (layer == null) {
+                return;
+            }
             Set<OsmPrimitive> target = new HashSet<>();
             for (OsmPrimitive p: layer.data.allPrimitives()) {
@@ -425 +425 @@
 
         public void updateEnabledState() {
-            if (Main.main == null || !Main.main.hasEditLayer()) {
-                setEnabled(false);
-                return;
-            }
-            setEnabled(currentChangeset != null);
+            setEnabled(Main.getLayerManager().getEditLayer() != null && currentChangeset != null);
         }
 

trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java

@@ -266 +266 @@
 
         public void updateEnabledState() {
-            if (!Main.main.hasEditLayer()) {
-                setEnabled(false);
-                return;
-            }
-            setEnabled(getPrimitiveToZoom() != null);
+            setEnabled(Main.getLayerManager().getEditLayer() != null && getPrimitiveToZoom() != null);
         }
     }

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

@@ -163 +163 @@
     @Override
     public void layerRemoving(LayerRemoveEvent e) {
-        if (e.getRemovedLayer() instanceof OsmDataLayer && Main.isDisplayingMapView() && !Main.main.hasEditLayer()) {
+        // Removed layer is still in that list.
+        if (e.getRemovedLayer() instanceof OsmDataLayer && e.getSource().getLayersOfType(OsmDataLayer.class).size() <= 1) {
             Main.getLayerManager().removeLayer(this);
         } else if (e.getRemovedLayer() == this) {

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java

@@ -66 +66 @@
         @Override
         public void updateEnabledState() {
-            setEnabled(Main.isDisplayingMapView() && (Main.main.hasEditLayer() || mapHasGpxorMarkerLayer()));
+            setEnabled(Main.isDisplayingMapView() && (Main.getLayerManager().getEditLayer() != null || mapHasGpxorMarkerLayer()));
         }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchAction.java

@@ -30 +30 @@
     public void actionPerformed(ActionEvent e) {
 
-        if (!Main.main.hasEditLayer())
+        if (Main.getLayerManager().getEditLayer() == null)
             return;
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java

@@ -45 +45 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            if (Main.main.hasEditLayer()) {
+            if (Main.getLayerManager().getEditLayer() != null) {
                 TaggingPresetSearchPrimitiveDialog.getInstance().showDialog();
             }