Author: xcoulon
Date: 2012-02-29 08:53:34 -0500 (Wed, 29 Feb 2012)
New Revision: 39192
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java
Log:
Fixed - JBIDE-10686
[Validation] Show error when trying to inject unsupported type with @Context
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java
===================================================================
---
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java 2012-02-29
13:38:59 UTC (rev 39191)
+++
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java 2012-02-29
13:53:34 UTC (rev 39192)
@@ -25,9 +25,12 @@
import org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsMetamodelBuilder;
import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsBaseElement;
import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsMetamodel;
+import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsResource;
import org.jboss.tools.ws.jaxrs.core.internal.utils.ConstantUtils;
import org.jboss.tools.ws.jaxrs.core.internal.utils.Logger;
import org.jboss.tools.ws.jaxrs.core.jdt.JdtUtils;
+import org.jboss.tools.ws.jaxrs.core.metamodel.EnumElementKind;
+import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsResource;
import org.jboss.tools.ws.jaxrs.core.metamodel.JaxrsMetamodelLocator;
public class JaxrsMetamodelValidator extends AbstractValidator {
@@ -52,13 +55,15 @@
if (jaxrsMetamodel == null) {
return validationResult;
}
- JaxrsBaseElement element =
jaxrsMetamodel.getElement(JdtUtils.getCompilationUnit(resource));
- if (element != null) {
- Logger.debug("Validating the JAX-RS Metamodel after {} was {}",
resource.getName(),
- ConstantUtils.getStaticFieldName(IResourceDelta.class, kind));
- List<ValidatorMessage> validationMessages = element.validate();
- for (ValidatorMessage validationMessage : validationMessages) {
- validationResult.add(validationMessage);
+ List<JaxrsBaseElement> elements =
jaxrsMetamodel.getElements(JdtUtils.getCompilationUnit(resource));
+ for(JaxrsBaseElement element : elements) {
+ if (element.getElementKind() == EnumElementKind.RESOURCE) {
+ Logger.debug("Validating the JAX-RS Metamodel after {} was {}",
resource.getName(),
+ ConstantUtils.getStaticFieldName(IResourceDelta.class, kind));
+ List<ValidatorMessage> validationMessages = element.validate();
+ for (ValidatorMessage validationMessage : validationMessages) {
+ validationResult.add(validationMessage);
+ }
}
}
}
Show replies by date