Ignore:
Timestamp:
2010-02-23T08:58:12+01:00 (11 years ago)
Author:
jttt
Message:

Fix #4467 Don't silently drop locally deleted member primitives from downloaded ways and relation (fix the issue when deleted primitive is referenced)

Location:
trunk/src/org/openstreetmap/josm/data/conflict
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

    r2979 r3034  
    2121    private final T my;
    2222    private final T their;
     23    private final boolean isMyDeleted;
    2324
    2425    public Conflict(T my, T their) {
     26        this(my, their, false);
     27    }
     28
     29    public Conflict(T my, T their, boolean isMyDeleted) {
    2530        this.my = my;
    2631        this.their = their;
     32        this.isMyDeleted = isMyDeleted;
    2733    }
    2834
     
    96102        return true;
    97103    }
     104
     105    /**
     106     *
     107     * @return True if my primitive was deleted but it has set non deleted status because it's referred by another
     108     * primitive and references to deleted primitives are not allowed.
     109     */
     110    public boolean isMyDeleted() {
     111        return isMyDeleted;
     112    }
    98113}
  • trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

    r2949 r3034  
    3333 * </ul>
    3434 */
    35 public class ConflictCollection implements Iterable<Conflict<?>>{
    36     private final List<Conflict<?>> conflicts;
     35public class ConflictCollection implements Iterable<Conflict<? extends OsmPrimitive>>{
     36    private final List<Conflict<? extends OsmPrimitive>> conflicts;
    3737    private CopyOnWriteArrayList<IConflictListener> listeners;
    3838
Note: See TracChangeset for help on using the changeset viewer.