Changeset 10413 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

Timestamp:

2016-06-18T00:06:41+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12983 - replace calls to Main.main.get[Active|Edit]Layer() by Main.getLayerManager().get[Active|Edit]Layer() - gsoc-core

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (modified) (4 diffs)

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

@@ -121 +121 @@
         ChangesetCache.getInstance().addChangesetCacheListener(inActiveDataLayerModel);
         Main.getLayerManager().addActiveLayerChangeListener(inActiveDataLayerModel);
-        OsmDataLayer editLayer = Main.main.getEditLayer();
+        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
         if (editLayer != null) {
             editLayer.data.addDataSetListener(inActiveDataLayerModel);
@@ -134 +134 @@
         ChangesetCache.getInstance().removeChangesetCacheListener(inActiveDataLayerModel);
         Main.getLayerManager().removeActiveLayerChangeListener(inActiveDataLayerModel);
-        OsmDataLayer editLayer = Main.main.getEditLayer();
+        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
         if (editLayer != null) {
             editLayer.data.removeDataSetListener(inActiveDataLayerModel);
@@ -237 +237 @@
 
     protected void initWithCurrentData() {
-        OsmDataLayer editLayer = Main.main.getEditLayer();
+        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
         if (editLayer != null) {
             inSelectionModel.initFromPrimitives(editLayer.data.getAllSelected());
@@ -323 +323 @@
                 return;
 
-            DataSet ds = Main.main.getEditLayer().data;
+            DataSet ds = Main.getLayerManager().getEditLayer().data;
             selectObjectsByChangesetIds(ds, sel);
         }