Changeset 11357 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Timestamp:

2016-12-03T18:16:10+01:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - SIC_INNER_SHOULD_BE_STATIC_ANON

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -141 +141 @@
         popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("conflict"));
 
-        final ResolveToMyVersionAction resolveToMyVersionAction = new ResolveToMyVersionAction();
-        final ResolveToTheirVersionAction resolveToTheirVersionAction = new ResolveToTheirVersionAction();
+        ResolveToMyVersionAction resolveToMyVersionAction = new ResolveToMyVersionAction();
+        ResolveToTheirVersionAction resolveToTheirVersionAction = new ResolveToTheirVersionAction();
         addListSelectionListener(resolveToMyVersionAction);
         addListSelectionListener(resolveToTheirVersionAction);
-        final JMenuItem btnResolveMy = popupMenuHandler.addAction(resolveToMyVersionAction);
-        final JMenuItem btnResolveTheir = popupMenuHandler.addAction(resolveToTheirVersionAction);
-
-        popupMenuHandler.addListener(new PopupMenuListener() {
-            @Override
-            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-                btnResolveMy.setVisible(ExpertToggleAction.isExpert());
-                btnResolveTheir.setVisible(ExpertToggleAction.isExpert());
-            }
-
-            @Override
-            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
-                // Do nothing
-            }
-
-            @Override
-            public void popupMenuCanceled(PopupMenuEvent e) {
-                // Do nothing
-            }
-        });
+        JMenuItem btnResolveMy = popupMenuHandler.addAction(resolveToMyVersionAction);
+        JMenuItem btnResolveTheir = popupMenuHandler.addAction(resolveToTheirVersionAction);
+
+        popupMenuHandler.addListener(new ResolveButtonsPopupMenuListener(btnResolveTheir, btnResolveMy));
     }
 
@@ -343 +327 @@
     public String helpTopic() {
         return ht("/Dialog/ConflictList");
+    }
+
+    static final class ResolveButtonsPopupMenuListener implements PopupMenuListener {
+        private final JMenuItem btnResolveTheir;
+        private final JMenuItem btnResolveMy;
+
+        private ResolveButtonsPopupMenuListener(JMenuItem btnResolveTheir, JMenuItem btnResolveMy) {
+            this.btnResolveTheir = btnResolveTheir;
+            this.btnResolveMy = btnResolveMy;
+        }
+
+        @Override
+        public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+            btnResolveMy.setVisible(ExpertToggleAction.isExpert());
+            btnResolveTheir.setVisible(ExpertToggleAction.isExpert());
+        }
+
+        @Override
+        public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+            // Do nothing
+        }
+
+        @Override
+        public void popupMenuCanceled(PopupMenuEvent e) {
+            // Do nothing
+        }
     }