Changeset 8836 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
- Timestamp:
- 2015-10-08T00:22:36+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
r8510 r8836 270 270 */ 271 271 class KeepMineAction extends AbstractAction implements ListSelectionListener { 272 publicKeepMineAction() {272 KeepMineAction() { 273 273 ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeepmine"); 274 274 if (icon != null) { … … 302 302 */ 303 303 class KeepTheirAction extends AbstractAction implements ListSelectionListener { 304 publicKeepTheirAction() {304 KeepTheirAction() { 305 305 ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeeptheir"); 306 306 if (icon != null) { … … 339 339 private final Set<Adjustable> synchronizedAdjustables; 340 340 341 publicAdjustmentSynchronizer() {341 AdjustmentSynchronizer() { 342 342 synchronizedAdjustables = new HashSet<>(); 343 343 } … … 400 400 class UndecideAction extends AbstractAction implements ListSelectionListener { 401 401 402 publicUndecideAction() {402 UndecideAction() { 403 403 ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagundecide"); 404 404 if (icon != null) {
Note:
See TracChangeset
for help on using the changeset viewer.