Ticket #2954: relation.patch

test/unit/org/openstreetmap/josm/data/osm/RelationTest.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class RelationTest {
+    @Test(expected=NullPointerException.class)
+    public void createNewRelation() {
+        new Relation(null);
+    }
+
+    @Test
+    public void equalSemenaticsToNull() {
+        Relation relation = new Relation();
+        assertFalse(relation.hasEqualTechnicalAttributes(null));
+    }
+
+}

src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -112 +112 @@
             members.set(row-1, member1);
         }
         fireTableDataChanged();
+        getSelectionModel();
         listSelectionModel.clearSelection();
         for (int row : selectedRows) {
             row--;
@@ -132 +133 @@
             members.set(row+1, member1);
         }
         fireTableDataChanged();
+        getSelectionModel();
         listSelectionModel.clearSelection();
         for (int row : selectedRows) {
             row++;
@@ -208 +210 @@
         for (RelationMember member: selectedMembers) {
             int row = members.indexOf(member);
             if (row >= 0) {
+                getSelectionModel();
                 listSelectionModel.addSelectionInterval(row,row);
                 min = Math.min(row, min);
             }

src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -540 +540 @@
             // tags, don't add an empty relation
             if(memberTableModel.getRowCount() == 0 && tagEditorModel.getKeys().isEmpty())
                 return;
-            Relation clone = new Relation(getRelation());
-            tagEditorModel.applyToPrimitive(clone);
-            memberTableModel.applyToRelation(clone);
-            Main.main.undoRedo.add(new AddCommand(clone));
+            Relation newRelation = new Relation();
+            tagEditorModel.applyToPrimitive(newRelation);
+            memberTableModel.applyToRelation(newRelation);
+            Main.main.undoRedo.add(new AddCommand(newRelation));
             DataSet.fireSelectionChanged(Main.ds.getSelected());
         } else if (! memberTableModel.hasSameMembersAs(getRelation()) || tagEditorModel.isDirty()) {
             Relation editedRelation = new Relation(getRelation());

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

@@ -40 +40 @@
      */
     private Relation relation;
 
-    /** The version of the relation when editing is started. */
+    /**
+     * The version of the relation when editing is started.  This is
+     * null if a new relation is created. */
     private Relation relationSnapshot;
 
     /** the data layer the relation belongs to */
@@ -101 +103 @@
                         false
         );
 
-        this.relationSnapshot = new Relation(relation);
+        this.relationSnapshot = (relation == null) ? null : new Relation(relation);
         this.relation = relation;
         this.layer = layer;
     }