X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2Frequest%2FServerSCLHandlerValueRequest.java;fp=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2Frequest%2FServerSCLHandlerValueRequest.java;h=67d4d7a44cf10694dc3e0e653043e4969dd733a4;hb=3850fec72035293b9a4ede780d01aedc5fbc9056;hp=4a4164303613c1a2c9d963693804d727305cdb2a;hpb=1e957fc9da518f3bef8a2c19cad72772087e1b6a;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLHandlerValueRequest.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLHandlerValueRequest.java
index 4a4164303..67d4d7a44 100644
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLHandlerValueRequest.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLHandlerValueRequest.java
@@ -8,12 +8,14 @@ import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.procedure.adapter.TransientCacheListener;
 import org.simantics.db.common.request.IndexRoot;
+import org.simantics.db.common.request.PossibleTypedParent;
+import org.simantics.db.common.request.UnaryRead;
 import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.request.VariableRead;
 import org.simantics.db.layer0.scl.AbstractExpressionCompilationContext;
 import org.simantics.db.layer0.scl.AbstractExpressionCompilationRequest;
 import org.simantics.db.layer0.util.RuntimeEnvironmentRequest2;
 import org.simantics.db.layer0.variable.Variable;
+import org.simantics.document.base.ontology.DocumentationResource;
 import org.simantics.document.server.request.ServerSCLHandlerValueRequest.CompilationContext;
 import org.simantics.layer0.Layer0;
 import org.simantics.scl.compiler.elaboration.expressions.EApply;
@@ -37,7 +39,6 @@ import org.simantics.utils.datastructures.Pair;
 
 public class ServerSCLHandlerValueRequest extends AbstractExpressionCompilationRequest<CompilationContext, Variable> {
 
-	private final Variable context;
 	private final Pair<Resource,Resource> componentTypeAndRoot;
 	private final Resource literal;
 	protected String possibleExpectedValueType;
@@ -52,16 +53,19 @@ public class ServerSCLHandlerValueRequest extends AbstractExpressionCompilationR
 		}
 	}
 
-	private ServerSCLHandlerValueRequest(Variable context, Pair<Resource,Resource> componentTypeAndRoot, Resource literal, String possibleExpectedValueType) {
+	private ServerSCLHandlerValueRequest(Pair<Resource,Resource> componentTypeAndRoot, Resource literal, String possibleExpectedValueType) {
 		assert(literal != null);
-		this.context = context;
 		this.literal = literal;
 		this.componentTypeAndRoot = componentTypeAndRoot;
 		this.possibleExpectedValueType = possibleExpectedValueType;
 	}
 
 	public ServerSCLHandlerValueRequest(ReadGraph graph, Variable context) throws DatabaseException {
-		this(context, getComponentTypeAndRoot(graph, context), context.getRepresents(graph), resolveExpectedValueType(graph, context));
+		this(getComponentTypeAndRoot(graph, context), context.getRepresents(graph), resolveExpectedValueType(graph, context.getPredicateResource(graph)));
+	}
+
+	public ServerSCLHandlerValueRequest(ReadGraph graph, Resource s, Resource o, Resource p) throws DatabaseException {
+		this(getComponentTypeAndRoot(graph, s), o, resolveExpectedValueType(graph, p));
 	}
 
 	private static Pair<Resource,Resource> getComponentTypeAndRoot(ReadGraph graph, Variable property)  throws DatabaseException {
@@ -74,12 +78,14 @@ public class ServerSCLHandlerValueRequest extends AbstractExpressionCompilationR
 				return Pair.make(type, root);
 			}
 		}
-		parent = parent.getParent(graph);
+		while(represents == null) {
+			parent = parent.getParent(graph);
+			represents = parent.getPossibleRepresents(graph);
+		}
 		Resource root = graph.syncRequest(new IndexRoot(property.getRepresents(graph)));
 		return Pair.make(parent.getType(graph), root);
 	}
 
-
     public static List<TCon> getEffects(ReadGraph graph, Variable context) throws DatabaseException {
         try {
         	ServerSCLHandlerValueRequest req = new ServerSCLHandlerValueRequest(graph, context);
@@ -128,25 +134,18 @@ public class ServerSCLHandlerValueRequest extends AbstractExpressionCompilationR
 	@Override
 	protected CompilationContext getCompilationContext(ReadGraph graph) throws DatabaseException {
 		
-		return graph.syncRequest(new VariableRead<CompilationContext>(context) {
+		return graph.syncRequest(new UnaryRead<Pair<Resource,Resource>,CompilationContext>(componentTypeAndRoot) {
 			
 			@Override
 			public CompilationContext perform(ReadGraph graph) throws DatabaseException {
 				
-				Pair<Resource,Resource> parameter = getComponentTypeAndRoot(graph, variable);
 				RuntimeEnvironment runtimeEnvironment = graph.syncRequest(getRuntimeEnvironmentRequest(parameter.first, parameter.second));
-				
 				Map<String, ComponentTypeProperty> propertyMap =
 						graph.syncRequest(new ReadComponentTypeInterfaceRequest(parameter.first, runtimeEnvironment.getEnvironment()),
 								TransientCacheListener.<Map<String, ComponentTypeProperty>>instance());
-
-//				Map<String, ComponentTypeProperty> result = new HashMap<String,ComponentTypeProperty>(propertyMap); 
-//				for(DataDefinition dd : Functions.dataDefinitions(graph, variable)) {
-//					result.put(dd.target, null);
-//				}
-				
 				return new CompilationContext(runtimeEnvironment, propertyMap);
 				
+				
 			}
 			
 		});
@@ -229,10 +228,7 @@ public class ServerSCLHandlerValueRequest extends AbstractExpressionCompilationR
 
 	@Override
 	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((context == null) ? 0 : context.hashCode());
-		return result;
+		return 31*(31*getClass().hashCode() + literal.hashCode()) + componentTypeAndRoot.hashCode();
 	}
 
 	@Override
@@ -244,27 +240,22 @@ public class ServerSCLHandlerValueRequest extends AbstractExpressionCompilationR
 		if (getClass() != obj.getClass())
 			return false;
 		ServerSCLHandlerValueRequest other = (ServerSCLHandlerValueRequest) obj;
-		if (context == null) {
-			if (other.context != null)
-				return false;
-		} else if (!context.equals(other.context))
-			return false;
-		return true;
+		return literal.equals(other.literal) && componentTypeAndRoot.equals(other.componentTypeAndRoot);
+	}
+	
+	private static Pair<Resource,Resource> getComponentTypeAndRoot(ReadGraph graph, Resource component)  throws DatabaseException {
+		if(component != null) {
+			Resource type = graph.syncRequest(new FindPossibleComponentTypeRequest(component));
+			if(type != null) {
+				Resource root = graph.syncRequest(new IndexRoot(type));
+				return Pair.make(type, root);
+			} else {
+				Resource doc = graph.syncRequest(new PossibleTypedParent(component, DocumentationResource.getInstance(graph).Document));
+				Resource root = graph.syncRequest(new IndexRoot(component));
+				return Pair.make(graph.getSingleType(doc), root);
+			}
+		}
+		throw new IllegalStateException();
 	}
-
-//	@Override
-//	public int hashCode() {
-//		return 31*(31*getClass().hashCode() + literal.hashCode()) + componentTypeAndRoot.hashCode();
-//	}
-//
-//	@Override
-//	public boolean equals(Object obj) {
-//		if(this == obj)
-//			return true;
-//		if(obj == null || obj.getClass() != getClass())
-//			return false;
-//		ServerSCLHandlerValueRequest other = (ServerSCLHandlerValueRequest)obj;
-//		return literal.equals(other.literal) && componentTypeAndRoot.equals(other.componentTypeAndRoot);
-//	}
 	
 }