[528436] Increased robustness of query registry listener handling

Change-Id: Ica658bb1d710e6ab928f95a4016390fefaba9c64 Signed-off-by: Zoltan Ujhelyi <[email protected]> (cherry picked from commit 169e3e8)
eclipse-viatra · Jan 27, 2018 · 5130899 · 5130899
1 parent c04ec07
commit 5130899
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/...uery.runtime/src/org/eclipse/viatra/query/runtime/registry/view/AbstractRegistryView.java b/...uery.runtime/src/org/eclipse/viatra/query/runtime/registry/view/AbstractRegistryView.java
@@ -109,11 +109,13 @@ public Set<IQuerySpecificationRegistryEntry> getEntries(String fullyQualifiedNam
 
     @Override
     public void addViewListener(IQuerySpecificationRegistryChangeListener listener) {
+        checkArgument(listener != null, "Null listener not supported");
         listeners.add(listener);
     }
 
     @Override
     public void removeViewListener(IQuerySpecificationRegistryChangeListener listener) {
+        checkArgument(listener != null, "Null listener not supported");
         listeners.remove(listener);
     }
 

diff --git a/...rowser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeInput.xtend b/...rowser/src/org/eclipse/viatra/query/tooling/ui/queryregistry/QueryRegistryTreeInput.xtend
@@ -39,7 +39,7 @@ class QueryRegistryTreeInput {
     @Accessors(PUBLIC_GETTER)
     IRegistryView view
 
-    @Accessors(PUBLIC_GETTER, PUBLIC_SETTER)
+    @Accessors(PUBLIC_GETTER)
     IQuerySpecificationRegistryChangeListener listener
 
     new(IQuerySpecificationRegistry registry) {
@@ -57,7 +57,16 @@ class QueryRegistryTreeInput {
             val entry = new QueryRegistryTreeEntry(treePackage.pckg, it)
             treePackage.pckg.entries.put(fullyQualifiedName, entry)
         ]
-        view.addViewListener(listener)
+    }
+
+    def void setListener(IQuerySpecificationRegistryChangeListener listener) {
+        if (this.listener !== null) {
+            view.removeViewListener(this.listener)
+        }
+        this.listener = listener
+        if (listener !== null) {
+            view.addViewListener(listener)
+        }
     }
 
     def QueryRegistryTreeInputChange addEntryToInput(IQuerySpecificationRegistryEntry entry) {