Remove SSCD from error message
If a branch of a direct dispatch choice has the
dfdl:inputValueCalcProperty, you get an error that contains the SSCD,
which for a very deeply nested choice is not all that short. This change
removes the SSCD from the error message.
DAFFODIL-2161
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoiceGroup.scala b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoiceGroup.scala
index 944d7ff..2f9c2b9 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoiceGroup.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ChoiceGroup.scala
@@ -162,7 +162,7 @@
case regular => regular
}
if (realBranch.isOptional) {
- schemaDefinitionErrorButContinue("Branch of choice %s must be non-optional.".format(realBranch.path))
+ realBranch.schemaDefinitionErrorButContinue("Branch of choice must be non-optional.")
false
} else true
}
@@ -172,7 +172,7 @@
final lazy val branchesAreNotIVCElements = LV('branchesAreNotIVCElements) {
val branchesOk = groupMembers map { branch =>
if (!branch.isRepresented) {
- schemaDefinitionErrorButContinue("Branch of choice %s cannot have the dfdl:inputValueCalc property.".format(branch.path))
+ branch.schemaDefinitionErrorButContinue("Branch of choice cannot have the dfdl:inputValueCalc property.")
false
} else true
}
