Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
- Timestamp:
- 2015-06-20T23:42:21+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
r8509 r8510 171 171 public void propertyChange(PropertyChangeEvent evt) { 172 172 if (evt.getPropertyName().equals(TagMergeModel.PROP_NUM_UNDECIDED_TAGS)) { 173 int newValue = (Integer) evt.getNewValue();173 int newValue = (Integer) evt.getNewValue(); 174 174 if (newValue == 0) { 175 175 tabbedPane.setTitleAt(1, tr("Tags")); … … 184 184 updateResolvedCompletely(); 185 185 } else if (evt.getPropertyName().equals(ListMergeModel.FROZEN_PROP)) { 186 boolean frozen = (Boolean) evt.getNewValue();186 boolean frozen = (Boolean) evt.getNewValue(); 187 187 if (evt.getSource() == nodeListMerger.getModel() && my instanceof Way) { 188 188 if (frozen) { … … 192 192 } else { 193 193 tabbedPane.setTitleAt(2, tr("Nodes(with conflicts)")); 194 tabbedPane.setToolTipTextAt(2, tr("Pending conflicts in the node list of this way"));194 tabbedPane.setToolTipTextAt(2, tr("Pending conflicts in the node list of this way")); 195 195 tabbedPane.setIconAt(2, mergeIncomplete); 196 196 } … … 208 208 updateResolvedCompletely(); 209 209 } else if (evt.getPropertyName().equals(PropertiesMergeModel.RESOLVED_COMPLETELY_PROP)) { 210 boolean resolved = (Boolean) evt.getNewValue();210 boolean resolved = (Boolean) evt.getNewValue(); 211 211 if (resolved) { 212 212 tabbedPane.setTitleAt(0, tr("Properties")); … … 242 242 243 243 if (my instanceof Node) { 244 tabbedPane.setEnabledAt(2, false);245 tabbedPane.setEnabledAt(3, false);244 tabbedPane.setEnabledAt(2, false); 245 tabbedPane.setEnabledAt(3, false); 246 246 } else if (my instanceof Way) { 247 247 nodeListMerger.populate(conflict); 248 248 tabbedPane.setEnabledAt(2, true); 249 249 tabbedPane.setEnabledAt(3, false); 250 tabbedPane.setTitleAt(3, tr("Members"));250 tabbedPane.setTitleAt(3, tr("Members")); 251 251 tabbedPane.setIconAt(3, null); 252 252 } else if (my instanceof Relation) { 253 253 relationMemberMerger.populate(conflict); 254 254 tabbedPane.setEnabledAt(2, false); 255 tabbedPane.setTitleAt(2, tr("Nodes"));255 tabbedPane.setTitleAt(2, tr("Nodes")); 256 256 tabbedPane.setIconAt(2, null); 257 257 tabbedPane.setEnabledAt(3, true);
Note:
See TracChangeset
for help on using the changeset viewer.