Changeset 10413 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2016-06-18T00:06:41+02:00 (7 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

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• Command.java (modified) (1 diff)
• conflict/RelationMemberConflictResolverCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -131 +131 @@
      */
     public Command() {
-        this.layer = Main.main == null ? null : Main.main.getEditLayer();
+        this.layer = Main.getLayerManager().getEditLayer();
     }
 

trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java

@@ -84 +84 @@
 
         Main.getLayerManager().setActiveLayer(layer);
-        OsmDataLayer editLayer = Main.main.getEditLayer();
+        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
 
         // restore the former state