Changeset 11354 in josm for trunk/src/org

Timestamp:

2016-12-02T23:39:45+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14078 - NPE

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

@@ -33 +33 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
@@ -196 +197 @@
     public void prepareForEditing() {
         AutoCompletionList acList = new AutoCompletionList();
-        Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithMemberRoles(acList);
+        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
+        if (editLayer != null) {
+            editLayer.data.getAutoCompletionManager().populateWithMemberRoles(acList);
+        }
         tfRole.setAutoCompletionList(acList);
         AutoCompletingTextField editor = (AutoCompletingTextField) tblResolver.getColumnModel().getColumn(2).getCellEditor();
@@ -203 +207 @@
         }
         AutoCompletionList acList2 = new AutoCompletionList();
-        Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithKeys(acList2);
+        if (editLayer != null) {
+            editLayer.data.getAutoCompletionManager().populateWithKeys(acList2);
+        }
         tfKey.setAutoCompletionList(acList2);
     }