From: Antti Villberg Date: Wed, 27 Sep 2017 14:28:14 +0000 (+0300) Subject: Introduced possibleUriOf for Browsable class in Simantics/DB X-Git-Tag: v1.31.0~165 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=5887fe12f827ef474590d61c86d0de32fca8550e;p=simantics%2Fplatform.git Introduced possibleUriOf for Browsable class in Simantics/DB Imported possibleUriOfResource for Browsable Resource implementation. Browsable Variable uses the same uri implementation for both uriOf and possibleUriOf since Variables always have a URI. Also added yet another utility function possiblePredicateByNameFromType to Simantics/DB. refs #7512 Change-Id: I2363aed7ed67ba84bd992847187fe8ac6c7b6bce --- diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java index c04ca3cd1..dc253137f 100644 --- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java +++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java @@ -1341,6 +1341,11 @@ public class Layer0Utils { } return result; } + + public static Resource getPossiblePredicateByNameFromType(ReadGraph graph, Resource type, String name) throws DatabaseException { + Map domain = getDomainOf(graph, type); + return domain.get(name); + } public static Resource getPossiblePredicateByName(ReadGraph graph, Resource instance, String predicateName) throws DatabaseException { for(Resource type : graph.getPrincipalTypes(instance)) { diff --git a/bundles/org.simantics.scl.db/scl/Simantics/DB.scl b/bundles/org.simantics.scl.db/scl/Simantics/DB.scl index b24df17f8..a35092bd9 100644 --- a/bundles/org.simantics.scl.db/scl/Simantics/DB.scl +++ b/bundles/org.simantics.scl.db/scl/Simantics/DB.scl @@ -58,6 +58,10 @@ importJava "org.simantics.db.ReadGraph" where @private @JavaName getURI uriOfResource :: Resource -> String + + @private + @JavaName getPossibleURI + possibleUriOfResource :: Resource -> Maybe String @JavaName getObjects objects_ :: Resource -> Resource -> Collection Resource @@ -167,7 +171,10 @@ class Browsable a where "Returns the URI of the given value." uriOf :: a -> String - + + "Returns the URI of the given value if it exists or Nothing." + possibleUriOf :: a -> Maybe String + "Reads the name of the value." nameOf :: a -> String possibleNameOf :: a -> Maybe String @@ -186,6 +193,7 @@ class Browsable a where instance Browsable Resource where fromUri = resource uriOf = uriOfResource + possibleUriOf = possibleUriOfResource nameOf r = relatedValue r L0.HasName possibleNameOf r = possibleRelatedValue r L0.HasName @inline @@ -356,6 +364,8 @@ importJava "org.simantics.db.layer0.util.Layer0Utils" where copyTo_ :: Resource -> Resource -> Collection Resource @JavaName getPossiblePredicateByName possiblePredicateByName :: Resource -> String -> Maybe Resource + @JavaName getPossiblePredicateByNameFromType + possiblePredicateByNameFromType :: Resource -> String -> Maybe Resource copyTo :: Resource -> Resource -> Resource copyTo targetContainer source = do diff --git a/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl b/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl index 9a6ffde8c..d3127e69a 100644 --- a/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl +++ b/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl @@ -405,6 +405,7 @@ instance Show Variable where instance Browsable Variable where fromUri = variable uriOf = uri + possibleUriOf v = Just (uri v) nameOf = name possibleNameOf v = Just (name v) children v = collectionToList (children_ v)