Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Porhel2015-09-07 14:22:32 +0000
committerMaxime Porhel2015-09-10 09:36:43 +0000
commitb42ae394c3feff0be145cd52da1c37a43383cf72 (patch)
treec523ce415398fd9fcbc4e6c3279d456947b03815
parent4e64af432005735c97bca4c3a7eeeefb623af0b4 (diff)
downloadorg.eclipse.sirius-b42ae394c3feff0be145cd52da1c37a43383cf72.tar.gz
org.eclipse.sirius-b42ae394c3feff0be145cd52da1c37a43383cf72.tar.xz
org.eclipse.sirius-b42ae394c3feff0be145cd52da1c37a43383cf72.zip
[470859] Correct errors in the validation messages
Bug: 470859 Change-Id: If4b823b38f7ad115d3811b83ac19dfbeca5033ff Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.diagram/plugin.properties4
-rw-r--r--plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ContainerMappingChildrenPresentationConstraints.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.sirius.diagram/plugin.properties b/plugins/org.eclipse.sirius.diagram/plugin.properties
index 8efdeae169..50f4d4a034 100644
--- a/plugins/org.eclipse.sirius.diagram/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram/plugin.properties
@@ -113,7 +113,7 @@ constraint.noMappingFilterOnRegions.description = Validates that filtering nodes
constraint.noMappingFilterOnRegions.message = The Filter {0} is not supported on Region mapping.
constraint.noMappingFilterOnRegions.name = No mapping filter on regions constraint
constraint.noReusedBorderedNodesInRegion.description = Validates that a Region does not reuse Bordered Nodes.
-constraint.noReusedBorderedNodesInRegion.message = The Region mapping {0} should not reuse Bordered Node mappings. However, they can be placed as bordered node mappings of the parent RegionContainer mapping.
+constraint.noReusedBorderedNodesInRegion.message = The Region mapping {0} should not reuse Bordered Node mappings {1}. However, they can be placed as bordered node mappings of the parent RegionContainer mapping.
constraint.noReusedBorderedNodesInRegion.name = No reused bordered nodes in region constraint
constraint.noReusedNodesInRegionContainer.description = Validates that a Region Container mapping does not reuse children node mapping.
constraint.noReusedNodesInRegionContainer.message = The Region Container mapping {0} should not reuse nodes as sub node mappings.
@@ -133,7 +133,7 @@ constraint.regionStyle.name = RegionContainer and Region style constraint
constraint.representationExtensionDescriptionRepresentationName.message = {0}
constraint.representationExtensionDescriptionRepresentationName.name = Representation extension description representation name validation
constraint.reuseContainersInContainerList.description = Validates that List mappings does not reuse container mappings.
-constraint.reuseContainersInContainerList.message = The Container List Mapping {0} should not reuse a container mappings.
+constraint.reuseContainersInContainerList.message = The Container List Mapping {0} should not reuse container mappings {1}.
constraint.reuseContainersInContainerList.name = Reused Containers in Container List constraint
constraint.siriusValidationError.description = Validation Error
constraint.siriusValidationError.message = {0}
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ContainerMappingChildrenPresentationConstraints.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ContainerMappingChildrenPresentationConstraints.java
index 40d3a214ab..32c9e2a104 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ContainerMappingChildrenPresentationConstraints.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ContainerMappingChildrenPresentationConstraints.java
@@ -155,7 +155,7 @@ public class ContainerMappingChildrenPresentationConstraints extends AbstractCon
private IStatus validateReusedContainersInContainerList(IValidationContext ctx, ContainerMapping containerMapping) {
if (new ContainerMappingQuery(containerMapping).isListContainer()) {
if (!containerMapping.getReusedContainerMappings().isEmpty()) {
- return ctx.createFailureStatus(containerMapping.getReusedContainerMappings());
+ return ctx.createFailureStatus(containerMapping, containerMapping.getReusedContainerMappings());
}
}
return ctx.createSuccessStatus();
@@ -192,7 +192,7 @@ public class ContainerMappingChildrenPresentationConstraints extends AbstractCon
private IStatus validateReusedBorderedNodesInRegion(IValidationContext ctx, ContainerMapping containerMapping) {
if (new ContainerMappingQuery(containerMapping).isRegion()) {
if (!containerMapping.getReusedBorderedNodeMappings().isEmpty()) {
- return ctx.createFailureStatus(containerMapping.getReusedBorderedNodeMappings());
+ return ctx.createFailureStatus(containerMapping, containerMapping.getReusedBorderedNodeMappings());
}
}
return ctx.createSuccessStatus();

Back to the top