X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.db%2Fscl%2FSimantics%2FVariables.scl;h=473f4431a0b9419493346685681461e434ba24ea;hp=c54048a7387591409cd4eb543780f5d2a982709b;hb=3448b94a8e90047c88eb62a0542c1596acb701b8;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl b/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl
index c54048a73..473f4431a 100644
--- a/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl
+++ b/bundles/org.simantics.scl.db/scl/Simantics/Variables.scl
@@ -2,32 +2,6 @@ include "Simantics/Model"
 include "Simantics/DB"
 import "Simantics/DB" as DB
 
-importJava "java.lang.Object" where
-    @JavaName equals
-    """
-Function **variableEquals** compares the given input variables and returns True if they are the same.
-
-Example:
-
-    import "Simantics/Variables"
-    import "Apros/Module"
-    my_variable_1 = moduleVariable "PO01"
-    my_variable_2 = moduleVariable "PO02"
-    variableEquals my_variable_1 my_variable_2
-    
-    > False
-    
-    """
-    variableEquals :: Variable -> Variable -> Boolean
-    @JavaName hashCode
-    variableHash :: Variable -> Integer
-
-instance Eq Variable where
-    (==) = variableEquals
-    
-instance Hashable Variable where
-    hashP = hashP . variableHash
-
 importJava "org.simantics.db.layer0.variable.Variables" where
     @JavaName getVariable
     """
@@ -119,6 +93,10 @@ importJava "org.simantics.db.layer0.variable.Variable" where
     
     @JavaName getProperties
     properties_ :: Variable -> <ReadGraph> Collection Variable
+    
+    @JavaName getProperties
+    propertiesClassified_ :: Variable -> Resource -> <ReadGraph> Collection Variable
+    
     @JavaName getChildren
     children_ :: Variable -> <ReadGraph> Collection Variable
     
@@ -420,4 +398,8 @@ instance Browsable Variable where
     valueOf v = untypedValue v
     variantValueOf v = createVariant (datatype v) (untypedValue v :: Dynamic)
     child = child_
-    possibleChild = possibleChild_
\ No newline at end of file
+    possibleChild = possibleChild_
+
+propertiesClassified :: Variable -> Resource -> <ReadGraph> [Variable]
+propertiesClassified parent classified = do
+    collectionToList $ propertiesClassified_ parent classified
\ No newline at end of file