Merged changes from feature/scl to master.

[simantics/platform.git] / bundles / org.simantics.scl.runtime / scl / Databoard.scl

diff --git a/bundles/org.simantics.scl.runtime/scl/Databoard.scl b/bundles/org.simantics.scl.runtime/scl/Databoard.scl
index f8137662182f42b751b0654bd5175f540f1cd87e..87afb8e53b5058aed3a7de745bedab468a08e090 100644 (file)
--- a/bundles/org.simantics.scl.runtime/scl/Databoard.scl
+++ b/bundles/org.simantics.scl.runtime/scl/Databoard.scl
@@ -56,17 +56,11 @@ importJava "org.simantics.databoard.type.Datatype" where
     "Get a component type of a composite data type"\r
     @JavaName getComponentType\r
     datatypeComponentType :: Datatype -> ChildReference -> Datatype\r
     "Get a component type of a composite data type"\r
     @JavaName getComponentType\r
     datatypeComponentType :: Datatype -> ChildReference -> Datatype\r

-    \r
-    @private\r
-    @JavaName equals\r
-    datatypeEquals :: Datatype -> Datatype -> Boolean \r
+\r

 \r
 instance Show Datatype where\r
     show = showDatatype\r
 \r
 \r
 instance Show Datatype where\r
     show = showDatatype\r
 \r

-instance Eq Datatype where\r
-    (==) = datatypeEquals\r
-\r

 /// Binding ///\r
 \r
 importJava "org.simantics.databoard.binding.Binding" where\r
 /// Binding ///\r
 \r
 importJava "org.simantics.databoard.binding.Binding" where\r


@@ -81,10 +75,6 @@ importJava "org.simantics.databoard.binding.Binding" where
     @JavaName compare\r
     compareObjects :: Serializable a => a -> a -> Integer\r
 \r
     @JavaName compare\r
     compareObjects :: Serializable a => a -> a -> Integer\r
 \r

-    "Return true, if two serializable values are equal"    \r
-    @JavaName equals\r
-    serializableEq :: Serializable a => a -> a -> Boolean\r
-    \r

     "The default value of a serializable type"\r
     @JavaName createDefault\r
     serializableDefaultValue :: Serializable a => a\r
     "The default value of a serializable type"\r
     @JavaName createDefault\r
     serializableDefaultValue :: Serializable a => a\r


@@ -105,13 +95,6 @@ importJava "org.simantics.databoard.binding.Binding" where
     @JavaName getComponentBinding\r
     getComponentBinding :: Binding a -> ChildReference -> Binding b\r
     \r
     @JavaName getComponentBinding\r
     getComponentBinding :: Binding a -> ChildReference -> Binding b\r
     \r

-    @private\r
-    @JavaName equals\r
-    bindingEquals :: Binding a -> Binding a -> Boolean\r
-    \r
-instance Eq (Binding a) where\r
-   (==) = bindingEquals\r
-\r

 "Get a child data component of a composite serializable value"\r
 getSerializableComponent :: Serializable a => Serializable b => a -> ChildReference -> b\r
 getSerializableComponent object ref = getSerializableComponent_ object ref binding\r
 "Get a child data component of a composite serializable value"\r
 getSerializableComponent :: Serializable a => Serializable b => a -> ChildReference -> b\r
 getSerializableComponent object ref = getSerializableComponent_ object ref binding\r