Revert "[443345] Annotation validation test failures after platform pre-req update in 3.7.0 build"
This reverts commit 0659a9d7588fd930e949a30165b8863b2ff5aaeb.
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java
index d00a830..25de988 100644
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java
+++ b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java
@@ -116,17 +116,13 @@
if (annotationMirror != null) {
AnnotationValue annotationValue = AnnotationUtils.getAnnotationValue(annotationMirror, attributeName);
if (annotationValue != null) {
- String value = annotationValue.toString();
- if (value.startsWith("") && value.endsWith("")) {
- value = value.substring(1, value.length() -1);
- }
- if (value.trim().length() == 0) {
+ if (annotationValue.toString().trim().length() == 0) {
printError(annotationValue.getPosition(), JAXWSCoreMessages.bind(
JAXWSCoreMessages.EMPTY_ATTRIBUTE_VALUE, new Object[] { annotationName, attributeName }));
- } else if (!XMLChar.isValidName(value)) {
+ } else if (!XMLChar.isValidName(annotationValue.toString())) {
printError(annotationValue.getPosition(), JAXWSCoreMessages.bind(
JAXWSCoreMessages.INVALID_NCNAME_ATTRIBUTE, new Object[] { annotationName,
- attributeName, value }));
+ attributeName, annotationValue.toString() }));
}
}
}
