From b217e90200d2e390fb080a6aee6c9e19607e77dc Mon Sep 17 00:00:00 2001 From: Antti Villberg Date: Mon, 26 Aug 2019 10:00:30 +0300 Subject: [PATCH] Improvements to SCL browse context contributions gitlab #364 Change-Id: Iaa5d45e3c1a1023ca62110066947d4a822037991 --- .../graph/ModelingViewpoint.pgraph | 10 +++ bundles/org.simantics.modeling/adapters.xml | 8 +++ .../adapters/SCLCheckedStateRule.java | 70 +++++++++++++++++++ .../modeling/adapters/SCLChildRule.java | 2 +- 4 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 bundles/org.simantics.modeling/src/org/simantics/modeling/adapters/SCLCheckedStateRule.java diff --git a/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph b/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph index 47931cc4f..98b7aa981 100644 --- a/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph +++ b/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph @@ -32,6 +32,9 @@ MOD.SCLLabelForegroundColorRule -- MOD.SCLLabelBackgroundColorRule.getColor ==> "Resource -> Maybe (Double, Double, Double) -> String -> Integer -> Maybe (Double, Double, Double)]" -- MOD.SCLCheckedStateRule.getState ==> "BrowseNodeRule CheckedState" MOD.SCLAction.action ==> "Resource -> ()" Maybe (Double, Double, Double) -> String -> Integer -> Maybe (Double, Double, Double)" +MOD.sclCheckedStateRule : L0.Template + @template %action %expression + %action : MOD.SCLCheckedStateRule + MOD.SCLCheckedStateRule.getState _ : MOD.SCLValue + L0.SCLValue.expression %expression + L0.HasValueType "Browsable a => a -> CheckedState" + MOD.sclAction : L0.Template @template %action %expression %action : MOD.SCLAction diff --git a/bundles/org.simantics.modeling/adapters.xml b/bundles/org.simantics.modeling/adapters.xml index 7693586d8..063a661c9 100644 --- a/bundles/org.simantics.modeling/adapters.xml +++ b/bundles/org.simantics.modeling/adapters.xml @@ -213,6 +213,14 @@ + + + + + + + diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/adapters/SCLCheckedStateRule.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/adapters/SCLCheckedStateRule.java new file mode 100644 index 000000000..0c7da8db1 --- /dev/null +++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/adapters/SCLCheckedStateRule.java @@ -0,0 +1,70 @@ +/******************************************************************************* + * Copyright (c) 2019 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: + * Semantum Oy - initial API and implementation + *******************************************************************************/ +package org.simantics.modeling.adapters; + +import org.simantics.browsing.ui.CheckedState; +import org.simantics.browsing.ui.model.check.CheckedStateRule; +import org.simantics.db.ReadGraph; +import org.simantics.db.Resource; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.layer0.variable.Variable; +import org.simantics.db.layer0.variable.VariableOrResource; +import org.simantics.db.layer0.variable.Variables; +import org.simantics.modeling.ModelingResources; +import org.simantics.scl.runtime.SCLContext; +import org.simantics.scl.runtime.function.Function1; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class SCLCheckedStateRule implements CheckedStateRule { + + private static final Logger LOGGER = LoggerFactory.getLogger(SCLCheckedStateRule.class); + + private Resource rule; + + public SCLCheckedStateRule(ReadGraph graph, Resource rule) { + this.rule = rule; + } + + @Override + public boolean isCompatible(Class contentType) { + return contentType.equals(Resource.class) || contentType.equals(Variable.class); + } + + @Override + public CheckedState getCheckedState(ReadGraph graph, Object content) throws DatabaseException { + + ModelingResources MOD = ModelingResources.getInstance(graph); + + Variable ruleVariable = Variables.getVariable(graph, rule); + + Function1 getLabels = ruleVariable.getPossiblePropertyValue(graph, MOD.SCLCheckedStateRule_getState); + if(getLabels == null) { + LOGGER.warn("Didn't find value for subject={}, predicate={}.", rule, ModelingResources.URIs.SCLCheckedStateRule_getState); + return CheckedState.NOT_CHECKED; + } + + SCLContext sclContext = SCLContext.getCurrent(); + Object oldGraph = sclContext.get("graph"); + try { + sclContext.put("graph", graph); + return getLabels.apply(VariableOrResource.make(content)); + } catch (Throwable t) { + LOGGER.error("Calculating checked state failed.", t); + throw new DatabaseException(t); + } finally { + sclContext.put("graph", oldGraph); + } + + } + +} diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/adapters/SCLChildRule.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/adapters/SCLChildRule.java index a04b9315f..1ea88caf4 100644 --- a/bundles/org.simantics.modeling/src/org/simantics/modeling/adapters/SCLChildRule.java +++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/adapters/SCLChildRule.java @@ -41,7 +41,7 @@ public class SCLChildRule implements ChildRule { Variable ruleVariable = Variables.getVariable(graph, rule); - Function1> getChildren = ruleVariable.getPossiblePropertyValue(graph, MOD.SCLChildRule_getChildren); + Function1> getChildren = ruleVariable.getPossiblePropertyValue(graph, MOD.SCLChildRule_getChildren); if(getChildren == null) return Collections.emptyList(); SCLContext sclContext = SCLContext.getCurrent(); -- 2.47.1