X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.ui%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fui%2Fissues%2FSCLIssuesContentProvider.java;h=4772ad5ba7996b89baa875c4cf24db9e70e940e4;hp=eb5c25e4ac0ac3f402b7c78c466db586065a05fc;hb=7045f0f516c243563976207abcec13a68891ff1d;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07

diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/issues/SCLIssuesContentProvider.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/issues/SCLIssuesContentProvider.java
index eb5c25e4a..4772ad5ba 100644
--- a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/issues/SCLIssuesContentProvider.java
+++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/issues/SCLIssuesContentProvider.java
@@ -9,6 +9,7 @@ import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.widgets.Control;
 import org.simantics.scl.compiler.errors.CompilationError;
+import org.simantics.scl.compiler.errors.DoesNotExist;
 import org.simantics.scl.compiler.errors.Failable;
 import org.simantics.scl.compiler.errors.Failure;
 import org.simantics.scl.compiler.module.Module;
@@ -16,6 +17,7 @@ import org.simantics.scl.compiler.module.repository.ModuleRepository;
 import org.simantics.scl.compiler.module.repository.UpdateListener;
 
 import gnu.trove.map.hash.THashMap;
+import gnu.trove.procedure.TObjectObjectProcedure;
 import gnu.trove.procedure.TObjectProcedure;
 
 public class SCLIssuesContentProvider implements IStructuredContentProvider {
@@ -27,7 +29,7 @@ public class SCLIssuesContentProvider implements IStructuredContentProvider {
     boolean disposed = false;
     AtomicBoolean refreshInProgress = new AtomicBoolean(false);
     
-    THashMap<String, Failure> currentFailures = new THashMap<String, Failure>();
+    THashMap<String, CompilationError[]> currentFailures = new THashMap<String, CompilationError[]>();
     THashMap<String, UpdateListener> updateListeners = new THashMap<String, UpdateListener>(); 
     
     @Override
@@ -39,16 +41,19 @@ public class SCLIssuesContentProvider implements IStructuredContentProvider {
     }
     
     private UpdateListener getUpdateListener(String moduleName) {
-        UpdateListener listener = updateListeners.get(moduleName);
-        if(listener == null) {
-            listener = new UpdateListener() {
-                @Override
-                public void notifyAboutUpdate() {
-                    if(!disposed)
-                        listenModule(moduleName);
-                }
-            };
-            updateListeners.put(moduleName, listener);
+        UpdateListener listener;
+        synchronized(updateListeners) {
+            listener = updateListeners.get(moduleName);
+            if(listener == null) {
+                listener = new UpdateListener() {
+                    @Override
+                    public void notifyAboutUpdate() {
+                        if(!disposed)
+                            listenModule(moduleName);
+                    }
+                };
+                updateListeners.put(moduleName, listener);
+            }
         }
         return listener;
     }
@@ -60,11 +65,22 @@ public class SCLIssuesContentProvider implements IStructuredContentProvider {
         synchronized(currentFailures) {
             if(result instanceof Failure) {
                 Failure failure = (Failure)result;
-                currentFailures.put(moduleName, failure);
+                currentFailures.put(moduleName, failure.errors);
             }
-            else
+            else if(result == DoesNotExist.INSTANCE) {
                 if(currentFailures.remove(moduleName) == null)
                     return;
+            }
+            else {
+                CompilationError[] warnings = result.getResult().getWarnings();
+                if(warnings.length == 0) {
+                    if(currentFailures.remove(moduleName) == null)
+                        return;
+                }
+                else {
+                    currentFailures.put(moduleName, warnings);
+                }
+            }
         }
         refresh();
     }
@@ -106,7 +122,20 @@ public class SCLIssuesContentProvider implements IStructuredContentProvider {
 
     @Override
     public void dispose() {
+        if(this.disposed)
+            return;
         this.disposed = true;
+        if(repository != null)
+            synchronized(updateListeners) {
+                updateListeners.forEachEntry(new TObjectObjectProcedure<String, UpdateListener>() {
+                    @Override
+                    public boolean execute(String moduleName, UpdateListener listener) {
+                        listener.stopListening();
+                        return true;
+                    }
+                });
+                updateListeners.clear();
+            }
     }
 
     @Override
@@ -116,8 +145,8 @@ public class SCLIssuesContentProvider implements IStructuredContentProvider {
             String[] moduleNames = currentFailures.keySet().toArray(new String[currentFailures.size()]);
             Arrays.sort(moduleNames);
             for(String moduleName : moduleNames) {
-                Failure failure = currentFailures.get(moduleName);
-                for(CompilationError error : failure.errors)
+                CompilationError[] errors = currentFailures.get(moduleName);
+                for(CompilationError error : errors)
                     result.add(new SCLIssuesTableEntry(moduleName, error));
                 if(result.size() >= MAX_ISSUE_COUNT)
                     break;