From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Tue, 19 Feb 2019 08:33:48 +0000 (+0000)
Subject: Merge "Data types imported from Java cannot be trivial"
X-Git-Tag: v1.43.0~136^2~195
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=f221f8bf7f4cf7914af32d4bdf272c86a6156322;hp=1fbb823eb5855b28d3de0c743d13d67e9c65868e

Merge "Data types imported from Java cannot be trivial"
---

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java
index 56e8eb3b6..621c97684 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/compilation/Elaboration.java
@@ -374,7 +374,8 @@ public class Elaboration {
             }
             
             boolean trivialDataType = dataTypeAst.constructors.length == 1 &&
-                    dataTypeAst.constructors[0].parameters.length == 1;
+                    dataTypeAst.constructors[0].parameters.length == 1 &&
+                    !external;
             if(className == null && !trivialDataType)
                 className = compilationContext.namingPolicy.getDataTypeClassName(dataTypeAst.name);