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

Timestamp:

2013-10-27T05:35:41+01:00 (11 years ago)

Author:

Don-vip

Message:

code cleanup / robustness in edit layer handling

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• Command.java (modified) (1 diff)
• RelationMemberConflictResolverCommand.java (modified) (2 diffs)

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

@@ -86 +86 @@
      */
     public Command() {
-        this.layer = Main.isDisplayingMapView() ? Main.map.mapView.getEditLayer() : null;
+        this.layer = Main.main.getEditLayer();
     }
 

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

@@ -68 +68 @@
 
         // remember the layer
-        layer = Main.map.mapView.getEditLayer();
+        layer = Main.main.getEditLayer();
         return true;
     }
@@ -89 +89 @@
 
         Main.map.mapView.setActiveLayer(layer);
-        OsmDataLayer editLayer = Main.map.mapView.getEditLayer();
+        OsmDataLayer editLayer = Main.main.getEditLayer();
 
         // restore the former state