Better support for ontological profiles

[simantics/platform.git] / bundles / org.simantics.diagram.profile / src / org / simantics / diagram / profile / view / DirectProfileEntries.java

diff --git a/bundles/org.simantics.diagram.profile/src/org/simantics/diagram/profile/view/DirectProfileEntries.java b/bundles/org.simantics.diagram.profile/src/org/simantics/diagram/profile/view/DirectProfileEntries.java
index 3da411b0cec5be1fb89b9e2d8598e8a157139031..7ad7b0e6d5e81b536f286219e20a78eb0caa5325 100644 (file)
--- a/bundles/org.simantics.diagram.profile/src/org/simantics/diagram/profile/view/DirectProfileEntries.java
+++ b/bundles/org.simantics.diagram.profile/src/org/simantics/diagram/profile/view/DirectProfileEntries.java
@@ -21,20 +21,20 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.scenegraph.profile.ProfileUtils;
 
-public class DirectProfileEntries extends UnaryRead<ResourcePair, List<ResourcePair>> {
+public class DirectProfileEntries extends UnaryRead<ProfileTuple, List<ProfileTuple>> {
 
-       public DirectProfileEntries(ResourcePair resource) {
-               super(resource);
+       public DirectProfileEntries(ProfileTuple tuple) {
+               super(tuple);
        }
 
        @Override
-       public List<ResourcePair> perform(ReadGraph graph) throws DatabaseException {
+       public List<ProfileTuple> perform(ReadGraph graph) throws DatabaseException {
                DiagramResource dr = DiagramResource.getInstance(graph);
-               ArrayList<ResourcePair> entries = new ArrayList<ResourcePair>();
-               Resource list = graph.getPossibleObject(parameter.getSecond(), dr.HasEntries);
+               List<ProfileTuple> entries = new ArrayList<>();
+               Resource list = graph.getPossibleObject(parameter.getEntry(), dr.HasEntries);
                if(list == null) return entries;
                for(Resource entry : ProfileUtils.getProfileChildrenFromEntries(graph, list)) {
-                       entries.add(new ResourcePair(parameter.getFirst(), entry));
+                       entries.add(new ProfileTuple(parameter.getBaseProfile(), entry, parameter.getRuntimeDiagram()));
                }
                return entries;
        }