Changeset 1750 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

Timestamp:

2009-07-08T21:50:32+02:00 (15 years ago)

Author:

Gubaer

Message:

new: replaced global conflict list by conflict list per layer, similar to datasets

File:

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

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

@@ -367 +367 @@
             RelationMember  m = clone.members.get(i);
             if (m.member.incomplete)
-            {
                 // TODO: emit some message that sorting failed
                 return;
-            }
             try
             {
@@ -765 +763 @@
                 DataSet dataSet = reader.parseOsm();
                 if (dataSet != null) {
-                    final MergeVisitor visitor = new MergeVisitor(Main.main
-                            .editLayer().data, dataSet);
+                    final MergeVisitor visitor = new MergeVisitor(Main.main.map.mapView.getEditLayer()
+                            .data, dataSet);
                     visitor.merge();
 
                     // copy the merged layer's data source info
                     for (DataSource src : dataSet.dataSources) {
-                        Main.main.editLayer().data.dataSources.add(src);
-                    }
-                    Main.main.editLayer().fireDataChange();
+                        Main.main.map.mapView.getEditLayer().data.dataSources.add(src);
+                    }
+                    Main.main.map.mapView.getEditLayer().fireDataChange();
 
                     if (visitor.getConflicts().isEmpty())
                         return;
                     final ConflictDialog dlg = Main.map.conflictDialog;
-                    dlg.add(visitor.getConflicts());
+                    dlg.getConflicts().add(visitor.getConflicts());
                     JOptionPane.showMessageDialog(Main.parent,
                             tr("There were conflicts during import."));