X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2FFunctions.java;h=7837edcacc99662a4edf7639a366b0f3de4912d9;hb=25b0e1909c94977871479b469da722ed38e980c0;hp=979be3f26b8e6e63e64f3cba73a81b55f12fa4b2;hpb=2d99dd4ad7984f9d9935cb5f67f28d23ff7536dc;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
index 979be3f26..7837edcac 100644
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
@@ -25,7 +25,7 @@ import org.simantics.db.Statement;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.primitiverequest.Adapter;
 import org.simantics.db.common.procedure.adapter.TransientCacheListener;
-import org.simantics.db.common.request.UnaryRead;
+import org.simantics.db.common.request.BinaryRead;
 import org.simantics.db.common.request.UniqueRead;
 import org.simantics.db.common.request.WriteResultRequest;
 import org.simantics.db.common.utils.Logger;
@@ -68,6 +68,9 @@ import org.simantics.document.server.request.ServerSCLHandlerValueRequest;
 import org.simantics.document.server.request.ServerSCLValueRequest;
 import org.simantics.document.server.serverResponse.ServerResponse;
 import org.simantics.document.server.serverResponse.SuccessResponse;
+import org.simantics.document.server.state.StateNodeManager;
+import org.simantics.document.server.state.StateRealm;
+import org.simantics.document.server.state.StateSessionManager;
 import org.simantics.modeling.ModelingResources;
 import org.simantics.modeling.scl.SCLRealm;
 import org.simantics.modeling.scl.SCLSessionManager;
@@ -201,11 +204,11 @@ public class Functions {
                 }
                 
                 DirectQuerySupport dqs = graph.getService(DirectQuerySupport.class);
-                PrimitivePropertyStatementsProcedure foo = new PrimitivePropertyStatementsProcedure();
+                //PrimitivePropertyStatementsProcedure foo = new PrimitivePropertyStatementsProcedure();
 
-                dqs.forEachDirectPersistentStatement(graph, parentRes, foo);
+                DirectStatements ds = dqs.getDirectPersistentStatements(graph, parentRes);
 
-                for(Statement stm : foo.result) {
+                for(Statement stm : ds) {
                     Resource predicate = stm.getPredicate();
                     PropertyInfo info = graph.syncRequest(new PropertyInfoRequest(predicate));
 
@@ -1147,11 +1150,6 @@ public class Functions {
 
     	} else {
 
-        	String id = sclStateKey(graph, base, self, ref);
-
-        	SCLRealm realm = SCLSessionManager.getOrCreateSCLRealm(base.getURI(graph) + "/__scl__");
-        	realm.getConnection().setVariable(id, getSCLType(defaultValue), defaultValue);
-
     		return defaultValue;
 
     	}
@@ -1161,9 +1159,9 @@ public class Functions {
 
     	String id = sclStateKey(graph, base, self, ref);
 
-    	SCLRealm realm = SCLSessionManager.getOrCreateSCLRealm(base.getURI(graph)+"/__scl__");
-    	realm.getConnection().setVariable(id, getSCLType(value), value);
-    	realm.refreshVariablesSync();
+		StateRealm realm = (StateRealm) StateSessionManager.getInstance().getOrCreateRealm(graph, base.getURI(graph)+"/__scl__");
+		StateNodeManager nodeManager = (StateNodeManager) realm.getNodeManager();
+		nodeManager.setState(id, value);
 
     }
 
@@ -1256,11 +1254,11 @@ public class Functions {
 						return true;
 					}
 				} else {
-					Variable parentCp = graph.sync(new UnaryRead<Connection, Variable>(conn) {
+					Variable parentCp = graph.sync(new BinaryRead<Variable, Connection, Variable>(widget, conn) {
 			            @Override
 			            public Variable perform(ReadGraph graph) throws DatabaseException {
 			            	DocumentationResource DOC = DocumentationResource.getInstance(graph);
-			            	Collection<VariableConnectionPointDescriptor> descs = parameter.getConnectionPointDescriptors(graph, null);
+			            	Collection<VariableConnectionPointDescriptor> descs = parameter2.getConnectionPointDescriptors(graph, parameter, null);
 
 			        		for(VariableConnectionPointDescriptor desc : descs) {
 			        			if (DOC.Relations_partN.equals(desc.getConnectionPointResource(graph))) {
@@ -1312,5 +1310,33 @@ public class Functions {
             LOGGER.debug("", e);
         return e.getMessage();
     }
+    
+    static class StandardDocumentProperties implements DocumentProperties {
+
+		@Override
+		public Collection<String> getKeys(ReadGraph graph, Variable context) throws DatabaseException {
+			
+	        DocumentationResource DOC = DocumentationResource.getInstance(graph);
+			StandardGraphPropertyVariable asd = new StandardGraphPropertyVariable(graph, context, DOC.Properties_primitiveProperties);
+			Map<String, Variable> ps = primitiveProperties.getVariables(graph, asd, null);
+			return ps.keySet();
+			
+		}
+
+		@Override
+		public Object getValue(ReadGraph graph, Variable context, String key) throws DatabaseException {
+			
+	        DocumentationResource DOC = DocumentationResource.getInstance(graph);
+			StandardGraphPropertyVariable asd = new StandardGraphPropertyVariable(graph, context, DOC.Properties_primitiveProperties);
+			Map<String, Variable> ps = primitiveProperties.getVariables(graph, asd, null);
+			return ps.get(key).getValue(graph);
+			
+		}
+    	
+    }
+    
+    public static DocumentProperties primitiveProperties() throws DatabaseException {
+    	return new StandardDocumentProperties();
+    }
 
 }
\ No newline at end of file