From: jussi.koskela <jussi.koskela@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Wed, 3 Dec 2014 14:46:07 +0000 (+0000)
Subject: (fixes #5528) Name collision: getType SCL function
X-Git-Tag: v1.29.0~143
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=1041771367cf64c62869d888d8587e71eaba645a;p=simantics%2Fsysdyn.git

(fixes #5528) Name collision: getType SCL function

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@30636 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl b/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl
index 878dffb5..c0b0eb36 100644
--- a/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl
+++ b/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl
@@ -31,8 +31,9 @@ importJava "org.simantics.sysdyn.utils.DocumentationUtils" where
     @JavaName getName
     getName :: Resource -> <ReadGraph> String
     
+    // Renamed getType -> getElementType due to name collision
     @JavaName getType
-    getType :: Resource -> <ReadGraph> String
+    getElementType :: Resource -> <ReadGraph> String
 
     @JavaName getUnit
     getUnit :: Resource -> <ReadGraph> String