X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.ui%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fui%2Fissues%2FSCLIssuesContentProvider.java;h=4e386e685b3c168bfdec4c47189a9fae8bea100f;hb=55000f9fd660583f42883812c73cf980b34db442;hp=905e6995f682a11eac0b1919194e6826cec65c8e;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

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 905e6995f..4e386e685 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
@@ -1,130 +1,73 @@
-package org.simantics.scl.ui.issues;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-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.Failable;
-import org.simantics.scl.compiler.errors.Failure;
-import org.simantics.scl.compiler.module.Module;
-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.TObjectProcedure;
-
-public class SCLIssuesContentProvider implements IStructuredContentProvider {
-
-    public static final int MAX_ISSUE_COUNT = 1000;
-    
-    Viewer viewer;
-    ModuleRepository repository;
-    boolean disposed = false;
-    AtomicBoolean refreshInProgress = new AtomicBoolean(false);
-    
-    THashMap<String, Failure> currentFailures = new THashMap<String, Failure>();
-    THashMap<String, UpdateListener> updateListeners = new THashMap<String, UpdateListener>(); 
-    
-    @Override
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-        this.viewer = viewer;
-        this.repository = (ModuleRepository)newInput;
-        if(newInput != null)
-            listenIssues();
-    }
-    
-    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);
-        }
-        return listener;
-    }
-    
-    private void listenModule(String moduleName) {
-        if(repository == null)
-            return;
-        Failable<Module> result = repository.getModule(moduleName, getUpdateListener(moduleName));
-        synchronized(currentFailures) {
-            if(result instanceof Failure) {
-                Failure failure = (Failure)result;
-                currentFailures.put(moduleName, failure);
-            }
-            else
-                if(currentFailures.remove(moduleName) == null)
-                    return;
-        }
-        refresh();
-    }
-    
-    private void refresh() {
-        if(!refreshInProgress.compareAndSet(false, true))
-            return;
-        if(viewer == null)
-            return;
-        Control control = viewer.getControl();
-        if(control.isDisposed() || disposed)
-            return;
-        control.getDisplay().asyncExec(new Runnable() {
-            @Override
-            public void run() {
-                if(control.isDisposed() || disposed)
-                    return;
-                refreshInProgress.set(false);
-                viewer.refresh();
-            }
-        });
-    }
-
-    private void listenIssues() {
-        new Thread() {
-            public void run() {
-                if(repository == null)
-                    return;
-                repository.getSourceRepository().forAllModules(new TObjectProcedure<String>() {
-                    @Override
-                    public boolean execute(String moduleName) {
-                        listenModule(moduleName);
-                        return true;
-                    }
-                });
-            }
-        }.start();
-    }
-
-    @Override
-    public void dispose() {
-        this.disposed = true;
-    }
-
-    @Override
-    public Object[] getElements(Object inputElement) {
-        ArrayList<SCLIssuesTableEntry> result = new ArrayList<SCLIssuesTableEntry>();
-        synchronized(currentFailures) {
-            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)
-                    result.add(new SCLIssuesTableEntry(moduleName, error));
-                if(result.size() >= MAX_ISSUE_COUNT)
-                    break;
-            }
-        }
-        Collections.sort(result);
-        return result.toArray();
-    }
-
-}
+package org.simantics.scl.ui.issues;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Control;
+import org.simantics.scl.osgi.issues.SCLIssueFactoryProvider;
+import org.simantics.scl.osgi.issues.SCLIssueProviderFactory.SCLIssueProvider;
+import org.simantics.scl.osgi.issues.SCLIssuesTableEntry;
+
+public class SCLIssuesContentProvider implements IStructuredContentProvider {
+
+    public static final int MAX_ISSUE_COUNT = 1000;
+
+    private Viewer viewer;
+    boolean disposed = false;
+    private AtomicBoolean refreshInProgress = new AtomicBoolean(false);
+    private List<SCLIssueProvider> issueProviders = new ArrayList<>();
+
+    @Override
+    public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+        this.viewer = viewer;
+        if (!issueProviders.isEmpty()) {
+            issueProviders.forEach(p -> p.dispose());
+            issueProviders.clear();
+        }
+        if(newInput != null) {
+            issueProviders = SCLIssueFactoryProvider.getSCLIssueProviderFactories().stream().map(f -> f.getSCLIssueProvider()).collect(Collectors.toList());
+            issueProviders.forEach(p -> p.listenIssues(() -> refresh()));
+        }
+    }
+
+    private void refresh() {
+        if(!refreshInProgress.compareAndSet(false, true))
+            return;
+        if(viewer == null)
+            return;
+        Control control = viewer.getControl();
+        if(control.isDisposed() || disposed)
+            return;
+        control.getDisplay().asyncExec(new Runnable() {
+            @Override
+            public void run() {
+                if(control.isDisposed() || disposed)
+                    return;
+                refreshInProgress.set(false);
+                viewer.refresh();
+            }
+        });
+    }
+
+    public void dispose() {
+        if(this.disposed)
+            return;
+        issueProviders.forEach(p -> p.dispose());
+        issueProviders.clear();
+        this.disposed = true;
+    }
+
+    @Override
+    public Object[] getElements(Object inputElement) {
+        ArrayList<SCLIssuesTableEntry> result = new ArrayList<>();
+        issueProviders.forEach(p -> result.addAll(p.getIssues()));
+        Collections.sort(result);
+        return result.toArray();
+    }
+
+}