Changeset 8444 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation
- Timestamp:
- 2015-06-02T16:41:37+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
r8291 r8444 109 109 CheckParameterUtil.ensureParameterNotNull(my, "my"); 110 110 CheckParameterUtil.ensureParameterNotNull(their, "their"); 111 if (! 111 if (!isFrozen()) 112 112 throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Cannot build resolution command")); 113 113 List<RelationMember> entries = getMergedEntries(); -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
r8308 r8444 79 79 protected void renderForeground(ListMergeModel<Node>.EntriesTableModel model, RelationMember member, int row, int col, boolean isSelected) { 80 80 Color fgc = ConflictColors.FGCOLOR.get(); 81 if (col == 0 && model.isParticipatingInCurrentComparePair() && ! 81 if (col == 0 && model.isParticipatingInCurrentComparePair() && !model.getListMergeModel().isFrozen()) { 82 82 fgc = ConflictColors.FGCOLOR_PARTICIPATING_IN_COMPARISON.get(); 83 83 }
Note:
See TracChangeset
for help on using the changeset viewer.