Preliminary support for purely Variable based dynamic issue sources

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

diff --git a/bundles/org.simantics.issues.common/src/org/simantics/issues/common/ActiveProjectIssueSources.java b/bundles/org.simantics.issues.common/src/org/simantics/issues/common/ActiveProjectIssueSources.java
index 3f593e6431cc6c0084d5e54be284d1e1fbc80ec0..b44e80f7407d19acefe31ccd02ff174ede3418e4 100644 (file)
--- a/bundles/org.simantics.issues.common/src/org/simantics/issues/common/ActiveProjectIssueSources.java
+++ b/bundles/org.simantics.issues.common/src/org/simantics/issues/common/ActiveProjectIssueSources.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management
+ * Copyright (c) 2007, 2017 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,6 +8,7 @@
  *
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
+ *     Semantum Oy - #6948
  *******************************************************************************/
 package org.simantics.issues.common;
 
@@ -16,28 +17,26 @@ import java.util.Collection;
 
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
-import org.simantics.db.common.request.ResourceRead;
+import org.simantics.db.common.request.ResourceRead2;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.request.ActiveModels;
 
 /**
  * @author Tuukka Lehtonen
  */
-public class ActiveProjectIssueSources extends ResourceRead<Collection<Resource>> {
+public class ActiveProjectIssueSources extends ResourceRead2<Collection<Resource>> {
 
-    public ActiveProjectIssueSources(Resource resource) {
-        super(resource);
+    public ActiveProjectIssueSources(Resource resource, Resource expectedType) {
+        super(resource, expectedType);
     }
 
     @Override
     public Collection<Resource> perform(ReadGraph graph) throws DatabaseException {
-       
-       ArrayList<Resource> result = new ArrayList<Resource>();
-       for(Resource model : graph.sync(new ActiveModels(resource))) {
-               result.addAll(graph.sync(new ActiveModelIssueSources(model)));
-       }
-       return result;
-       
+        ArrayList<Resource> result = new ArrayList<>();
+        for (Resource model : graph.syncRequest(new ActiveModels(resource))) {
+            result.addAll(graph.syncRequest(new ActiveModelIssueSources(model, resource2)));
+        }
+        return result;
     }
 
 }