Changeset 36102 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

Timestamp:

2023-07-24T15:55:23+02:00 (3 years ago)

Author:

taylor.smock

Message:

reltoolbox: Clean up a bunch of lint warnings

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java (modified) (6 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

@@ -14 +14 @@
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
@@ -112 +111 @@
 
     private final DefaultTableModel relationsData;
-    private ChosenRelation chosenRelation;
-    private JPanel chosenRelationPanel;
-    private ChosenRelationPopupMenu popupMenu;
-    private MultipolygonSettingsPopup multiPopupMenu;
-    private RoleComboBoxModel roleBoxModel;
-    private SortAndFixAction sortAndFixAction;
+    private final ChosenRelation chosenRelation;
+    private final JPanel chosenRelationPanel;
+    private final ChosenRelationPopupMenu popupMenu;
+    private final MultipolygonSettingsPopup multiPopupMenu;
+    private final RoleComboBoxModel roleBoxModel;
+    private final SortAndFixAction sortAndFixAction;
     // actions saved for unregistering on dialog destroying
     private final EnterRoleAction enterRoleAction;
@@ -149 +148 @@
         roleBox.setModel(roleBoxModel);
         roleBox.addMouseListener(relationMouseAdapter);
-        roleBox.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                if (e.getStateChange() == ItemEvent.DESELECTED) return;
-                String memberRole = roleBoxModel.getSelectedMembersRole();
-                String selectedRole = roleBoxModel.isAnotherRoleSelected() ? askForRoleName() : roleBoxModel.getSelectedRole();
-                if (memberRole != null && selectedRole != null && !memberRole.equals(selectedRole)) {
-                    applyRoleToSelection(selectedRole.trim());
-                }
+        roleBox.addItemListener(e -> {
+            if (e.getStateChange() == ItemEvent.DESELECTED) return;
+            String memberRole = roleBoxModel.getSelectedMembersRole();
+            String selectedRole = roleBoxModel.isAnotherRoleSelected() ? askForRoleName() : roleBoxModel.getSelectedRole();
+            if (memberRole != null && selectedRole != null && !memberRole.equals(selectedRole)) {
+                applyRoleToSelection(selectedRole.trim());
             }
         });
@@ -652 +648 @@
         private List<String> roles = new ArrayList<>();
         private int selectedIndex = -1;
-        private JComboBox<String> combobox;
+        private final JComboBox<String> combobox;
         private String membersRole;
         private final String EMPTY_ROLE = tr("<empty>");
@@ -709 +705 @@
 
         public String getSelectedMembersRole() {
-            return membersRole == EMPTY_ROLE ? "" : membersRole;
+            return EMPTY_ROLE.equals(membersRole) ? "" : membersRole;
         }
 
@@ -756 +752 @@
         @Override
         public void setSelectedItem(Object anItem) {
-            int newIndex = anItem == null ? -1 : roles.indexOf(anItem);
+            int newIndex = anItem instanceof String ? roles.indexOf((String) anItem) : -1;
             if (newIndex != selectedIndex) {
                 selectedIndex = newIndex;