Changeset 6084 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
- Timestamp:
- 2013-07-26T13:38:17+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
r5998 r6084 272 272 } 273 273 274 @Override 274 275 public void actionPerformed(ActionEvent arg0) { 275 276 setVisible(false); … … 287 288 } 288 289 290 @Override 289 291 public void actionPerformed(ActionEvent arg0) { 290 292 setVisible(false); … … 305 307 } 306 308 309 @Override 307 310 public void propertyChange(PropertyChangeEvent evt) { 308 311 if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) { … … 334 337 } 335 338 339 @Override 336 340 public void propertyChange(PropertyChangeEvent evt) { 337 341 if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) { … … 471 475 } 472 476 477 @Override 473 478 public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, 474 479 boolean hasFocus, int row, int column) {
Note:
See TracChangeset
for help on using the changeset viewer.