From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 21 Aug 2019 07:04:42 +0000 (+0000)
Subject: Merge "Name clash in structural ontology"
X-Git-Tag: v1.43.0~136^2~109
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=4a564f24b3d4017806dc037ee94d14d91cbc34a9;hp=5b0c7af1c0845daa63a2ab7600a460a6573c6a56

Merge "Name clash in structural ontology"
---

diff --git a/bundles/org.simantics.structural.ontology/graph/Structural.pgraph b/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
index cf6f05ab2..5f7068162 100644
--- a/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
+++ b/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
@@ -309,16 +309,16 @@ STR.Property <T L0.FunctionalRelation <T L0.PropertyRelation
             L0.HasValueType "String"
 
 STR.Component
-  L0.HasConstraint STR.ConnectionConstraint : L0.Constraint
+  L0.HasConstraint STR.ConnectionValidationConstraint : L0.Constraint
     L0.Constraint.Validator
       STR.Functions.connectionValidator : L0.Function
 
-STR.ConnectionConstraint.ErrorIssue
+STR.ConnectionValidationConstraint.ErrorIssue
   @ISSUE.issue ISSUE.Severity.Error
     STR.Functions.connectionIssueDescription : L0.Function
       L0.HasValueType "String" 
   
-STR.ConnectionConstraint.Source <T ISSUE.Sources.DependencyTracker
+STR.ConnectionValidationConstraint.Source <T ISSUE.Sources.DependencyTracker
   L0.HasLabel "Structural connection validity"
   @L0.assert ISSUE.Sources.DependencyTracker.HasType STR.Component
   @L0.assert ISSUE.Sources.DependencyTracker.HasSearchType STR.Connection
diff --git a/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java b/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
index 970e6f9e8..e43007637 100644
--- a/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
+++ b/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
@@ -749,7 +749,7 @@ public class Functions {
 
 		for(Resource req : requiredConnections) {
 			if(!connections.contains(req)) {
-				result.add(new StandardIssue(sr.ConnectionConstraint_ErrorIssue, component, req));
+				result.add(new StandardIssue(sr.ConnectionValidationConstraint_ErrorIssue, component, req));
 			}
 		}