Changeset 1798 in josm

Timestamp:

2009-07-16T19:19:05+02:00 (15 years ago)

Author:

Gubaer

Message:

ticket #2954: patch by plaicy - Creating new relations doesn't work

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• GenericRelationEditor.java (modified) (1 diff)
• MemberTableModel.java (modified) (3 diffs)
• RelationEditor.java (modified) (2 diffs)

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

@@ -541 +541 @@
             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()) {

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

@@ -113 +113 @@
         }
         fireTableDataChanged();
+        getSelectionModel();
         listSelectionModel.clearSelection();
         for (int row : selectedRows) {
@@ -133 +134 @@
         }
         fireTableDataChanged();
+        getSelectionModel();
         listSelectionModel.clearSelection();
         for (int row : selectedRows) {
@@ -209 +211 @@
             int row = members.indexOf(member);
             if (row >= 0) {
+                getSelectionModel();
                 listSelectionModel.addSelectionInterval(row,row);
                 min = Math.min(row, min);

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

@@ -41 +41 @@
     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;
 
@@ -102 +104 @@
         );
 
-        this.relationSnapshot = new Relation(relation);
+        this.relationSnapshot = (relation == null) ? null : new Relation(relation);
         this.relation = relation;
         this.layer = layer;