X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.issues.common%2Fsrc%2Forg%2Fsimantics%2Fissues%2Fcommon%2FAllVisibleIssues.java;fp=bundles%2Forg.simantics.issues.common%2Fsrc%2Forg%2Fsimantics%2Fissues%2Fcommon%2FAllVisibleIssues.java;h=a3e9f5f7e7fe64b4951f07ddb6da71571f8924b5;hb=0ffcb1180dcccf28e66a391338885be224ba1c47;hp=35ad0235190e951072228153d14574771d356c5a;hpb=342a2b006b88330280060c16c2ab50374468a4c6;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.issues.common/src/org/simantics/issues/common/AllVisibleIssues.java b/bundles/org.simantics.issues.common/src/org/simantics/issues/common/AllVisibleIssues.java
index 35ad02351..a3e9f5f7e 100644
--- a/bundles/org.simantics.issues.common/src/org/simantics/issues/common/AllVisibleIssues.java
+++ b/bundles/org.simantics.issues.common/src/org/simantics/issues/common/AllVisibleIssues.java
@@ -11,28 +11,22 @@
  *******************************************************************************/
 package org.simantics.issues.common;
 
-import gnu.trove.map.hash.TObjectByteHashMap;
-import gnu.trove.set.hash.THashSet;
-
-import java.util.Collection;
-import java.util.Collections;
+import java.util.List;
 import java.util.Set;
 
-import org.simantics.Simantics;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.request.BinaryRead;
 import org.simantics.db.common.request.ObjectsWithType;
 import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.adapter.Instances;
 import org.simantics.db.layer0.variable.Variable;
-import org.simantics.db.layer0.variable.Variables;
-import org.simantics.issues.common.preferences.IssuePrefs;
-import org.simantics.issues.ontology.IssueResource;
-import org.simantics.layer0.Layer0;
 import org.simantics.operation.Layer0X;
+import org.simantics.scl.db.SCLFunctions;
+import org.simantics.scl.runtime.tuple.Tuple0;
 import org.simantics.simulation.ontology.SimulationResource;
 
+import gnu.trove.set.hash.THashSet;
+
 /**
  * @author Tuukka Lehtonen
  */
@@ -48,73 +42,22 @@ public class AllVisibleIssues extends BinaryRead<Resource, Boolean, Set<Variable
 
     @Override
     public Set<Variable> perform(ReadGraph graph) throws DatabaseException {
-        Layer0 L0 = Layer0.getInstance(graph);
+        
         Layer0X L0X = Layer0X.getInstance(graph);
-        IssueResource ISSUE = IssueResource.getInstance(graph);
         SimulationResource SIMU = SimulationResource.getInstance(graph);
-
-        Resource project = Simantics.getProjectResource();
-        boolean showHidden = false;
-        boolean showNormal = true;
-        boolean showUser = true;
-        if (project != null) {
-            showHidden = IssuePrefs.showHiddenIssues(graph, project);
-            showNormal = IssuePrefs.showNormalIssues(graph, project);
-            showUser = IssuePrefs.showUserIssues(graph, project);
-        }
-
-        Instances issueIndex = graph.getPossibleAdapter(ISSUE.Issue, Instances.class);
-
-        // Cache for source activeness.
-        // 0 == not in cache, 1 == false, 2 == true
-        TObjectByteHashMap<Resource> sourceActivenessCache = new TObjectByteHashMap<Resource>();
-
-        Set<Variable> result = new THashSet<Variable>(1013);
-
+        Set<Variable> result = new THashSet<Variable>();
+        
         for (Resource model : graph.syncRequest(new ObjectsWithType(parameter, L0X.Activates, SIMU.Model))) {
-            Collection<Resource> modelIssues = graph.syncRequest(new ObjectsWithType(model, L0.ConsistsOf, ISSUE.Issue));
-            Collection<Resource> indexedIssues = issueIndex != null ? issueIndex.find(graph, model) : Collections.<Resource>emptyList();
-            Collection<Resource> issues = !indexedIssues.isEmpty() ? new THashSet<Resource>(modelIssues.size() + indexedIssues.size()) : modelIssues;
-            if (!indexedIssues.isEmpty()) {
-                issues.addAll(modelIssues);
-                issues.addAll(indexedIssues);
-            }
-
-            for (Resource issue : issues) {
-                // Filter out unwanted material
-                boolean resolved = graph.hasStatement(issue, ISSUE.Resolved);
-                if (parameter2 && resolved)
-                    continue;
-                boolean hidden = graph.hasStatement(issue, ISSUE.Hidden);
-                boolean user = graph.hasStatement(issue, ISSUE.UserIssue);
-                boolean normal = !hidden && !user;
-                if (!showHidden && hidden)
-                    continue;
-                if (!showUser && user)
-                    continue;
-                if (!showNormal && normal)
-                    continue;
-
-                Resource source = graph.getPossibleObject(issue, ISSUE.IssueSource_Manages_Inverse);
-                if (source != null) {
-                    byte cache = sourceActivenessCache.get(source);
-                    boolean active = cache == 2 ? true : false;
-                    if (cache == 0) {
-                        active = Boolean.TRUE.equals(graph.getPossibleRelatedValue(source, ISSUE.IssueSource_active));
-                        sourceActivenessCache.put(source, active ? (byte) 2 : (byte) 1);
-                    }
-                    if (!active)
-                        continue;
-                }
-
-                Variable var = Variables.getPossibleVariable(graph, issue);
-                if (var != null)
-                    result.add(var);
-            }
+            result.addAll(graph.syncRequest(new ModelVisibleIssues(model, false)));
         }
-
-        // System.out.println("AllActiveIssues returned " + result.size());
+        
+        List<Resource> libraries = SCLFunctions.evaluateGraph("Simantics/SharedOntologies", "getSharedOntologies", graph, Tuple0.INSTANCE); 
+        for (Resource library : libraries) {
+            result.addAll(graph.syncRequest(new ModelVisibleIssues(library, false)));
+        }
+        
         return result;
+        
     }
 
 }