From 7524ce60458c9a6e6ff9f92fa74018d105b81076 Mon Sep 17 00:00:00 2001
From: Antti Villberg <antti.villberg@semantum.fi>
Date: Tue, 20 Aug 2019 16:16:13 +0300
Subject: [PATCH] Name clash in structural ontology

gitlab #350

Change-Id: Iaddf776424c58a3392078178e5cd9bf7c371f249
---
 .../graph/Structural.pgraph                                 | 6 +++---
 .../src/org/simantics/structural2/Functions.java            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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));
 			}
 		}
 
-- 
2.43.2