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

Timestamp:

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

Author:

taylor.smock

Message:

reltoolbox: Clean up a bunch of lint warnings

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java (modified) (7 diffs)

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

@@ -11 +11 @@
 import java.awt.geom.GeneralPath;
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
@@ -41 +42 @@
 public class ChosenRelation implements ActiveLayerChangeListener, MapViewPaintable, DataSetListener {
     protected Relation chosenRelation = null;
-    private Set<ChosenRelationListener> chosenRelationListeners = new HashSet<>();
+    private final Set<ChosenRelationListener> chosenRelationListeners = new HashSet<>();
 
     public void set(Relation rel) {
-        if (rel == chosenRelation || (rel != null && chosenRelation != null && rel.equals(chosenRelation)))
+        if (Objects.equals(rel, chosenRelation))
             return; // new is the same as old
         Relation oldRel = chosenRelation;
@@ -73 +74 @@
             return false;
         else
-            return chosenRelation != null && r.equals(chosenRelation);
+            return r.equals(chosenRelation);
     }
 
@@ -150 +151 @@
         g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f * opacity));
 
-        drawRelations(g, mv, bbox, chosenRelation, new HashSet<Relation>());
+        drawRelations(g, mv, bbox, chosenRelation, new HashSet<>());
 
         g.setComposite(oldComposite);
@@ -178 +179 @@
                             }
                             g.draw(b);
-                        }   break;
+                        }
+                        break;
                     case RELATION:
                         Color oldColor = g.getColor();
@@ -195 +197 @@
     @Override
     public void relationMembersChanged(RelationMembersChangedEvent event) {
-        if (chosenRelation != null && event.getRelation().equals(chosenRelation)) {
+        if (event.getRelation().equals(chosenRelation)) {
             fireRelationChanged(chosenRelation);
         }
@@ -202 +204 @@
     @Override
     public void tagsChanged(TagsChangedEvent event) {
-        if (chosenRelation != null && event.getPrimitive().equals(chosenRelation)) {
+        if (event.getPrimitive().equals(chosenRelation)) {
             fireRelationChanged(chosenRelation);
         }