X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2FcomponentTypeEditor%2FDerivedPropertiesSection.java;fp=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2FcomponentTypeEditor%2FDerivedPropertiesSection.java;h=0f7bff3969dbf649e2a4740de2c586312a80a0a2;hp=869d5e32aada675fb56981116fd2eb8ac0961c56;hb=e6e555f4c17e686c44d0681a01eab17d0ec6f2aa;hpb=3260b37ec9ce61bc8a1383a5fc9ab8d8ab9d1fae

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/DerivedPropertiesSection.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/DerivedPropertiesSection.java
index 869d5e32a..0f7bff396 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/DerivedPropertiesSection.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/DerivedPropertiesSection.java
@@ -32,14 +32,25 @@ import org.simantics.db.ReadGraph;
 import org.simantics.db.RequestProcessor;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
-import org.simantics.db.common.request.PossibleIndexRoot;
+import org.simantics.db.common.procedure.adapter.TransientCacheAsyncListener;
 import org.simantics.db.common.request.UniqueRead;
 import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.request.PropertyInfo;
+import org.simantics.db.layer0.request.PropertyInfoRequest;
+import org.simantics.db.layer0.variable.StandardGraphChildVariable;
+import org.simantics.db.layer0.variable.StandardGraphPropertyVariable;
+import org.simantics.db.layer0.variable.Variable;
 import org.simantics.layer0.Layer0;
+import org.simantics.modeling.scl.CompileProceduralSCLMonitorRequest;
+import org.simantics.modeling.scl.CompileSCLMonitorRequest;
 import org.simantics.modeling.userComponent.ComponentTypeCommands;
+import org.simantics.scl.runtime.SCLContext;
+import org.simantics.scl.runtime.function.Function1;
 import org.simantics.scl.runtime.function.Function4;
 import org.simantics.structural.stubs.StructuralResource2;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DerivedPropertiesSection implements ComponentTypeViewerSection {
     private static final String[] COLUMN_NAMES = {
@@ -62,6 +73,8 @@ public class DerivedPropertiesSection implements ComponentTypeViewerSection {
         }
     };
     
+    private static final Logger LOGGER = LoggerFactory.getLogger(DerivedPropertiesSection.class);
+    
     ComponentTypeViewerData data;
     Table table;
     TableColumn[] columns;
@@ -267,23 +280,33 @@ public class DerivedPropertiesSection implements ComponentTypeViewerSection {
 
                     StructuralResource2 STR = StructuralResource2.getInstance(graph);
 
-                    Resource indexRoot = graph.syncRequest(new PossibleIndexRoot(componentType));
-
+                    // TODO: this is a bit hackish but should get the job done in most parts and
+                    // importantly indicates something for the user
+                    PropertyInfo info = graph.syncRequest(new PropertyInfoRequest(relation), TransientCacheAsyncListener.<PropertyInfo>instance());
+                    Variable parent = new StandardGraphChildVariable(null, null, componentType) {
+                        
+                        public Resource getType(ReadGraph graph) throws DatabaseException {
+                            return componentType;
+                        };
+                        
+                        public Variable getPossibleProperty(ReadGraph graph, String name) throws DatabaseException {
+                            Variable prop = super.getPossibleProperty(graph, name);
+                            if (prop != null) {
+                                return prop;
+                            } else {
+                                return getChild(graph, name);
+                            }
+                        };
+                    };
+                    
                     for(Resource literal : graph.getAssertedObjects(componentType, relation)) {
 
                         try {
-                            // TODO validation
+                            Variable context = new StandardGraphPropertyVariable(parent, null, null, info, literal);
                             if(graph.isInstanceOf(componentType, STR.ProceduralComponentType)) {
-                                //Layer0 L0 = Layer0.getInstance(graph);
-                                //Resource environment = graph.getPossibleObject(literal, L0.SCLValue_environment); 
-                                //ContextModule context = graph.sync(new TypeMonitorContextRequest(componentType));
-                                //String SCLMain = graph.syncRequest(new SCLMainModuleRequest(indexRoot));
-                                //CompilationContext cc = new CompilationContext(environment, context, SCLMain);
-                                //graph.syncRequest(new ActualCompileRequest(expression, cc), TransientCacheListener.<CompiledExpression>instance());
+                                CompileProceduralSCLMonitorRequest.compileAndEvaluate(graph, context);
                             } else {
-                                //CompilationContext cc = new CompileSCLMonitorRequest(literal, componentType, indexRoot).getContext(graph);
-                                //graph.syncRequest(new ActualCompileRequest(expression, cc), TransientCacheListener.<CompiledExpression>instance());
-                                //graph.syncRequest(new CompileSCLMonitorRequest(graph, context));
+                                compileAndEvaluate(graph, context, expression);
                             }
                             
                         } catch (Exception e) {
@@ -292,22 +315,39 @@ public class DerivedPropertiesSection implements ComponentTypeViewerSection {
                             if(index > 0) msg = msg.substring(index);
                             return msg;
                         }
-                        
                     }
-                    
                     return null;
-                    
                 }
                 
             });
         } catch (DatabaseException e) {
-            e.printStackTrace();
+            LOGGER.error("Could not validate ", e);
         }
-
         return null;
-
     }
 
+    public static void compileAndEvaluate(ReadGraph graph, Variable context, String expression) throws DatabaseException {
+        SCLContext sclContext = SCLContext.getCurrent();
+        Object oldGraph = sclContext.get("graph");
+        try {
+            CompileSCLMonitorRequest compileSCLMonitorRequest = new CompileSCLMonitorRequest(graph, context) {
+                @Override
+                protected String getExpressionText(ReadGraph graph) throws DatabaseException {
+                    return expression;
+                }
+            };
+            Function1<Variable,Object> exp = graph.syncRequest(compileSCLMonitorRequest);
+            sclContext.put("graph", graph);
+            //return exp.apply(context.getParent(graph));
+        } catch (DatabaseException e) {
+            throw (DatabaseException)e;
+        } catch (Throwable t) {
+            throw new DatabaseException(t);
+        } finally {
+            sclContext.put("graph", oldGraph);
+        }
+    }
+    
     @Override
     public void update(ComponentTypePropertiesResult result) {
         if (table.isDisposed())