Changeset 2936 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java
- Timestamp:
- 2010-02-04T21:04:02+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java
r2512 r2936 1 1 // License: GPL. For details, see LICENSE file. 2 2 package org.openstreetmap.josm.gui.conflict.pair.relation; 3 4 import java.util.logging.Logger;5 3 6 4 import javax.swing.JScrollPane; … … 9 7 import org.openstreetmap.josm.data.osm.Relation; 10 8 import org.openstreetmap.josm.data.osm.RelationMember; 9 import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver; 11 10 import org.openstreetmap.josm.gui.conflict.pair.ListMerger; 12 11 … … 14 13 * A UI component for resolving conflicts in the member lists of two {@see Relation} 15 14 */ 16 public class RelationMemberMerger extends ListMerger<RelationMember> {17 private static final Logger logger = Logger.getLogger(RelationMemberMerger.class.getName());15 public class RelationMemberMerger extends ListMerger<RelationMember> implements IConflictResolver { 16 //private static final Logger logger = Logger.getLogger(RelationMemberMerger.class.getName()); 18 17 19 18 @Override … … 62 61 super(new RelationMemberListMergeModel()); 63 62 } 63 64 public void deletePrimitive(boolean deleted) { 65 if (deleted) { 66 model.clearMerged(); 67 model.setFrozen(true); 68 } else { 69 model.setFrozen(false); 70 } 71 } 64 72 }
Note:
See TracChangeset
for help on using the changeset viewer.