Ticket #13948: validator_seems_to_hang_2.patch

ValidatorTreePanel.java

@@ -104 +104 @@
                 removeKeyListener(keyListener);
             }
         }
+        addDataSetListener();
+    }
+
+    private void addDataSetListener() {
+        if (getErrors().isEmpty())
+            return;
         DataSet ds = Main.getLayerManager().getEditDataSet();
         if (ds != null) {
             ds.addDataSetListener(this);
@@ -302 +308 @@
      */
     public final void setErrorList(List<TestError> errors) {
         this.errors = errors;
+        addDataSetListener();
         if (isVisible()) {
             buildTree();
         }
@@ -320 +327 @@
                 errors.add(error);
             }
         }
+        addDataSetListener();
         if (isVisible()) {
             buildTree();
         }
@@ -442 +450 @@
                 err.getPrimitives().removeAll(event.getPrimitives());
             } catch (UnsupportedOperationException e) {
                 if (event.getPrimitives().containsAll(err.getPrimitives())) {
-                    err.getPrimitives().clear();
+                    try {
+                        err.getPrimitives().clear();
+                    } catch (UnsupportedOperationException e2) {
+                        Main.warn(e, "Unable to remove primitives from "+err+'.');
+                    }
                 } else {
                     Main.warn(e, "Unable to remove primitives from "+err+'.');
                 }