Merge "Use trace level debug messages with ObjMap"

diff --git a/bundles/org.simantics.structural.ontology/graph/Structural.pgraph b/bundles/org.simantics.structural.ontology/graph/Structural.pgraph
index cf6f05ab2a087fcf9b2edac0178d415b97841ae4..5f7068162b6219acb8e9a1d46dde2b2c8eb34c9e 100644 (file)
--- 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 970e6f9e813dc710545aeed3d6c0ee1c6cf234cd..e43007637ac5ca616a89f33b3cc3f62247ad8fea 100644 (file)
--- 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));
                        }
                }