Changeset 2083 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

Timestamp:

09.09.2009 00:46:01 (3 years ago)

Author:

Gubaer

Message:

Removed deprecated constructors in ExtendedDialog
Turned most of the fields in the OSM data classes into private fields

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

@@ -42 +42 @@
             public boolean isCellEditable(int row, int column) {
                 switch(column) {
-                    case 1: return true;
-                    default: return false;
+                case 1: return true;
+                default: return false;
                 }
             }
@@ -52 +52 @@
     protected void setValueAt(DefaultTableModel model, Object value, int row, int col) {
         if (model == getMergedTableModel() && col == 1) {
-            RelationMember member = getMergedEntries().get(row);
-            member.role = (String)value;
+            RelationMember memberOld = getMergedEntries().get(row);
+            RelationMember memberNew = new RelationMember((String)value,memberOld.getMember());
+            getMergedEntries().remove(row);
+            getMergedEntries().add(row,memberNew);
             fireModelDataChanged();
         }