Index: src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java =================================================================== --- src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java (revision 38805) +++ src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java (working copy) @@ -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 validationMessages = element.validate(); - for (ValidatorMessage validationMessage : validationMessages) { - validationResult.add(validationMessage); + List 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 validationMessages = element.validate(); + for (ValidatorMessage validationMessage : validationMessages) { + validationResult.add(validationMessage); + } } } }