Changeset 2569 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair
- Timestamp:
- 2009-12-04T15:53:55+01:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/conflict/pair
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
r2512 r2569 15 15 import java.util.HashMap; 16 16 import java.util.Observable; 17 import java.util.logging.Logger;18 17 19 18 import javax.swing.AbstractListModel; … … 120 119 return entries.get(MERGED_ENTRIES); 121 120 } 121 122 122 protected ArrayList<T> getMyEntries() { 123 123 return entries.get(MY_ENTRIES); 124 124 } 125 125 126 protected ArrayList<T> getTheirEntries() { 126 127 return entries.get(THEIR_ENTRIES); -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
r2512 r2569 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 6 import java.util.ArrayList; 6 7 import java.util.logging.Logger; 7 8 … … 16 17 * The model for merging two lists of relation members 17 18 * 18 *19 19 */ 20 20 public class RelationMemberListMergeModel extends ListMergeModel<RelationMember>{ … … 24 24 @Override 25 25 public boolean isEqualEntry(RelationMember e1, RelationMember e2) { 26 boolean ret = e1.getRole().equals(e2.getRole()); 27 if (!e1.getMember().isNew() ) { 28 ret = ret && (e1.getMember().getId() == e2.getMember().getId()); 29 } else { 30 ret = ret && (e1 == e2); 31 } 32 return ret; 26 return e1.equals(e2); 33 27 } 34 28 … … 119 113 if (! isFrozen()) 120 114 throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Can't build resolution command")); 121 return new RelationMemberConflictResolverCommand(my, their, getMergedEntries()); 115 ArrayList<RelationMember> entries = getMergedEntries(); 116 return new RelationMemberConflictResolverCommand(my, their, entries); 122 117 } 123 118 }
Note:
See TracChangeset
for help on using the changeset viewer.