Changeset 11357 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
- Timestamp:
- 2016-12-03T18:16:10+01:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r10957 r11357 141 141 popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("conflict")); 142 142 143 finalResolveToMyVersionAction resolveToMyVersionAction = new ResolveToMyVersionAction();144 finalResolveToTheirVersionAction resolveToTheirVersionAction = new ResolveToTheirVersionAction();143 ResolveToMyVersionAction resolveToMyVersionAction = new ResolveToMyVersionAction(); 144 ResolveToTheirVersionAction resolveToTheirVersionAction = new ResolveToTheirVersionAction(); 145 145 addListSelectionListener(resolveToMyVersionAction); 146 146 addListSelectionListener(resolveToTheirVersionAction); 147 final JMenuItem btnResolveMy = popupMenuHandler.addAction(resolveToMyVersionAction); 148 final JMenuItem btnResolveTheir = popupMenuHandler.addAction(resolveToTheirVersionAction); 149 150 popupMenuHandler.addListener(new PopupMenuListener() { 151 @Override 152 public void popupMenuWillBecomeVisible(PopupMenuEvent e) { 153 btnResolveMy.setVisible(ExpertToggleAction.isExpert()); 154 btnResolveTheir.setVisible(ExpertToggleAction.isExpert()); 155 } 156 157 @Override 158 public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { 159 // Do nothing 160 } 161 162 @Override 163 public void popupMenuCanceled(PopupMenuEvent e) { 164 // Do nothing 165 } 166 }); 147 JMenuItem btnResolveMy = popupMenuHandler.addAction(resolveToMyVersionAction); 148 JMenuItem btnResolveTheir = popupMenuHandler.addAction(resolveToTheirVersionAction); 149 150 popupMenuHandler.addListener(new ResolveButtonsPopupMenuListener(btnResolveTheir, btnResolveMy)); 167 151 } 168 152 … … 343 327 public String helpTopic() { 344 328 return ht("/Dialog/ConflictList"); 329 } 330 331 static final class ResolveButtonsPopupMenuListener implements PopupMenuListener { 332 private final JMenuItem btnResolveTheir; 333 private final JMenuItem btnResolveMy; 334 335 private ResolveButtonsPopupMenuListener(JMenuItem btnResolveTheir, JMenuItem btnResolveMy) { 336 this.btnResolveTheir = btnResolveTheir; 337 this.btnResolveMy = btnResolveMy; 338 } 339 340 @Override 341 public void popupMenuWillBecomeVisible(PopupMenuEvent e) { 342 btnResolveMy.setVisible(ExpertToggleAction.isExpert()); 343 btnResolveTheir.setVisible(ExpertToggleAction.isExpert()); 344 } 345 346 @Override 347 public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { 348 // Do nothing 349 } 350 351 @Override 352 public void popupMenuCanceled(PopupMenuEvent e) { 353 // Do nothing 354 } 345 355 } 346 356
Note:
See TracChangeset
for help on using the changeset viewer.