Changeset 36213 in osm for applications/editors/josm/plugins/reltoolbox

Timestamp:

2024-02-27T07:26:35+01:00 (9 months ago)

Author:

GerdP

Message:

fix #23515: IllegalArgumentException in Relation Toolbox after undo

• add check if relation is still in dataset
• fix some sonarlimt / checkstyle issues

File:

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

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

@@ -41 +41 @@
  */
 public class ChosenRelation implements ActiveLayerChangeListener, MapViewPaintable, DataSetListener {
-    protected Relation chosenRelation = null;
+    protected Relation chosenRelation;
     private final Set<ChosenRelationListener> chosenRelationListeners = new HashSet<>();
 
@@ -162 +162 @@
             for (OsmPrimitive element : rel.getMemberPrimitives()) {
                 if (null != element.getType()) {
-                    switch(element.getType()) {
+                    switch (element.getType()) {
                     case NODE:
                         Node node = (Node) element;
@@ -212 +212 @@
     public void dataChanged(DataChangedEvent event) {
         if (chosenRelation != null) {
-            fireRelationChanged(chosenRelation);
+            if (chosenRelation.getDataSet() == null)
+                clear();
+            else
+                fireRelationChanged(chosenRelation);
         }
     }