Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 2982) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 2983) @@ -24,6 +24,9 @@ import javax.swing.table.TableModel; +import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.PrimitiveId; +import org.openstreetmap.josm.gui.HelpAwareOptionPane; +import org.openstreetmap.josm.gui.help.HelpUtil; /** @@ -310,4 +313,30 @@ } + protected void alertCopyFailedForDeletedPrimitives(List deletedIds) { + List items = new ArrayList(); + for (int i=0; i MAX_DELETED_PRIMITIVE_IN_DIALOG) { + items.add(tr("{0} more...", deletedIds.size() - MAX_DELETED_PRIMITIVE_IN_DIALOG)); + } + StringBuffer sb = new StringBuffer(); + sb.append(""); + sb.append(tr("The following primitives could not be copied to the target primitive
because they are deleted in the target dataset:")); + sb.append("
    "); + for (String item: items) { + sb.append("
  • ").append(item).append("
    • "); + } + sb.append("
"); + sb.append(""); + HelpAwareOptionPane.showOptionDialog( + Main.parent, + sb.toString(), + tr("Merging deleted primitives failed"), + JOptionPane.WARNING_MESSAGE, + HelpUtil.ht("/Dialog/ConflictResolution#MergingDeletedPrimitivesFailed") + ); + } + private void copy(ListRole sourceRole, int[] rows, int position) { List newItems = new ArrayList(rows.length); @@ -327,12 +356,5 @@ fireModelDataChanged(); if (!deletedIds.isEmpty()) { - List items = new ArrayList(); - for (int i=0; i MAX_DELETED_PRIMITIVE_IN_DIALOG) { - items.add(tr("{0} more...", deletedIds.size() - MAX_DELETED_PRIMITIVE_IN_DIALOG)); - } - JOptionPane.showMessageDialog(null, tr("Following primitives could not be added because they are deleted: {0}", items)); + alertCopyFailedForDeletedPrimitives(deletedIds); } }