From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Thu, 31 Aug 2017 08:06:08 +0000 (+0300)
Subject: (refs #7457) Make default ComponentType name prefix an assertion
X-Git-Tag: v1.31.0~212
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F897%2F4;p=simantics%2Fplatform.git

(refs #7457) Make default ComponentType name prefix an assertion

Change-Id: I245960d29a5ac7a27af568174f5d62669382ad68
---

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/NewComponentType.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/NewComponentType.java
index 813b6c3c1..f187762ca 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/NewComponentType.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/NewComponentType.java
@@ -42,7 +42,8 @@ public class NewComponentType {
         String defaultName = graph.getRelatedValue(indexRoot, MOD.StructuralModel_HasDefaultComponentTypeName, Bindings.STRING);
         String name = NameUtils.findFreshName(graph, defaultName, library);
         graph.claimLiteral(componentType, L0.HasName, name + "@1");
-        graph.claimLiteral(componentType, L0X.HasGeneratedNamePrefix, "");
+        // #7457: replaced by assertion in STR.ComponentType
+        //graph.claimLiteral(componentType, L0X.HasGeneratedNamePrefix, "");
 
         // Substructure
         Resource substructureType = graph.getSingleObject(indexRoot, MOD.StructuralModel_HasComponentTypeSubstructureType);
diff --git a/bundles/org.simantics.structural.ontology/graph/Structural.pgraph b/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
index eba1f52fe..aa31879c5 100644
--- a/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
+++ b/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
@@ -23,6 +23,7 @@ STR.ComponentType <T L0.Type
     >-- STR.ComponentType.HasDefaultPropertyRelationType <R L0.IsRelatedTo
     >-- STR.ComponentType.HasDefaultPropertyValueType <R L0.IsRelatedTo
     >-- STR.ComponentType.HasDefaultMonitorValueType --> STR.MonitorValueType <R L0.IsRelatedTo
+    @L0.assert L0X.HasGeneratedNamePrefix ""
 
 STR.MonitorValueType <T L0.Entity
 STR.MonitorValue <T L0.SCLValue : STR.MonitorValueType