X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.issues.common%2Fsrc%2Forg%2Fsimantics%2Fissues%2Fcommon%2FActiveProjectIssueSources.java;h=b44e80f7407d19acefe31ccd02ff174ede3418e4;hb=0d9b90834ce56b292c00b1a39850ed842c3e4d42;hp=96ab7ca10c569460dd9bb205795f98b04fd9325d;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

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 96ab7ca10..b44e80f74 100644
--- 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,43 +1,42 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2011 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.issues.common;
-
-import java.util.ArrayList;
-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.exception.DatabaseException;
-import org.simantics.db.layer0.request.ActiveModels;
-
-/**
- * @author Tuukka Lehtonen
- */
-public class ActiveProjectIssueSources extends ResourceRead<Collection<Resource>> {
-
-    public ActiveProjectIssueSources(Resource resource) {
-        super(resource);
-    }
-
-    @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;
-    	
-    }
-
-}
+/*******************************************************************************
+ * 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
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *     Semantum Oy - #6948
+ *******************************************************************************/
+package org.simantics.issues.common;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+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 ResourceRead2<Collection<Resource>> {
+
+    public ActiveProjectIssueSources(Resource resource, Resource expectedType) {
+        super(resource, expectedType);
+    }
+
+    @Override
+    public Collection<Resource> perform(ReadGraph graph) throws DatabaseException {
+        ArrayList<Resource> result = new ArrayList<>();
+        for (Resource model : graph.syncRequest(new ActiveModels(resource))) {
+            result.addAll(graph.syncRequest(new ActiveModelIssueSources(model, resource2)));
+        }
+        return result;
+    }
+
+}