Changeset 1866 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

Timestamp:

2009-07-28T20:01:00+02:00 (16 years ago)

Author:

Gubaer

Message:

fixed #3116: NullPointerException when creating a relation without the data layer selected

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

@@ -89 +89 @@
     }
 
-    protected RelationEditor(OsmDataLayer layer, Relation relation, Collection<RelationMember> selectedMembers) {
+    /**
+     * Creates a new relation editor
+     * 
+     * @param layer  the {@see OsmDataLayer} in whose context a relation is edited. Must not be null.
+     * @param relation the relation. Can be null if a new relation is to be edited.
+     * @param selectedMembers  a collection of members in <code>relation</code> which the editor
+     * should display selected when the editor is first displayed on screen
+     * @throws IllegalArgumentException thrown if layer is null
+     */
+    protected RelationEditor(OsmDataLayer layer, Relation relation, Collection<RelationMember> selectedMembers)  throws IllegalArgumentException{
         // Initalizes ExtendedDialog
         super(Main.parent,
@@ -96 +105 @@
                 false
         );
+        if (layer == null)
+            throw new IllegalArgumentException(tr("parameter ''layer'' must not be null", "layer"));
         this.layer = layer;
         setRelation(relation);