Improvements to constraint-based issues

[simantics/platform.git] / bundles / org.simantics.issues.common / src / org / simantics / issues / common / AllActiveIssues.java

diff --git a/bundles/org.simantics.issues.common/src/org/simantics/issues/common/AllActiveIssues.java b/bundles/org.simantics.issues.common/src/org/simantics/issues/common/AllActiveIssues.java
index 72728018561bcb598967ca78fe8b4abebda74c5d..006e779d47cb105311e11bf66906ca2c1c4de85a 100644 (file)
--- a/bundles/org.simantics.issues.common/src/org/simantics/issues/common/AllActiveIssues.java
+++ b/bundles/org.simantics.issues.common/src/org/simantics/issues/common/AllActiveIssues.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * Copyright (c) 2007, 2019 Association for Decentralized Information Management
  * in Industry THTH ry.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,11 +8,11 @@
  *
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
+ *     Semantum Oy - Reorganization
  *******************************************************************************/
 package org.simantics.issues.common;
 
-import gnu.trove.set.hash.THashSet;
-
+import java.util.List;
 import java.util.Set;
 
 import org.simantics.db.ReadGraph;
@@ -20,12 +20,13 @@ import org.simantics.db.Resource;
 import org.simantics.db.common.request.ObjectsWithType;
 import org.simantics.db.common.request.ResourceRead;
 import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.adapter.Instances;
-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 Antti Villberg
  */
@@ -37,20 +38,23 @@ public class AllActiveIssues extends ResourceRead<Set<Resource>> {
 
     @Override
     public Set<Resource> 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);
-        Set<Resource> result = new THashSet<Resource>();
-        Instances indexedIssues = graph.getPossibleAdapter(ISSUE.Issue, Instances.class);
+        Set<Resource> result = new THashSet<>();
+
         for (Resource model : graph.syncRequest(new ObjectsWithType(resource, L0X.Activates, SIMU.Model))) {
-            for (Resource issue : graph.syncRequest(new ObjectsWithType(model, L0.ConsistsOf, ISSUE.Issue))) {
-                result.add(issue);
-            }
-            if (indexedIssues != null)
-                result.addAll(indexedIssues.find(graph, model));
+            result.addAll(graph.syncRequest(new AllModelIssues(model, false)));
         }
+
+        List<Resource> libraries = SCLFunctions.evaluateDB("Simantics/SharedOntologies", "getSharedOntologies", Tuple0.INSTANCE); 
+
+        for (Resource library : libraries) {
+            result.addAll(graph.syncRequest(new AllModelIssues(library, false)));
+        }
+
         return result;
+
     }
 
 }