Author: scabanovich Date: 2010-09-06 05:40:52 -0400 (Mon, 06 Sep 2010) New Revision: 24732 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java Log: https://jira.jboss.org/browse/JBIDE-6950 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-09-06 08:07:23 UTC (rev 24731) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-09-06 09:40:52 UTC (rev 24732) @@ -108,7 +108,7 @@ IJavaProject javaProject; private BeansXmlValidationDelegate beansXmlValidator = new BeansXmlValidationDelegate(this); - private AnnotationValidationDelegate annptationValidator = new AnnotationValidationDelegate(this); + private AnnotationValidationDelegate annotationValidator = new AnnotationValidationDelegate(this); /* * (non-Javadoc) @@ -298,11 +298,18 @@ Set<String> scopes = cdiProject.getScopeNames(); for (String scope: scopes) { - annptationValidator.validateScopeType(cdiProject.getScope(scope)); + IScope s = cdiProject.getScope(scope); + if(s == null || isResourceFromAnotherProject(s.getResource())) { + continue; + } + annotationValidator.validateScopeType(s); } List<IFile> beansXmls = getAllBeansXmls(); for (IFile beansXml : beansXmls) { + if(isResourceFromAnotherProject(beansXml)) { + continue; + } beansXmlValidator.validateBeansXml(beansXml); } @@ -318,6 +325,9 @@ if (reporter.isCancelled() || file == null || !file.isAccessible()) { return; } + if(isResourceFromAnotherProject(file)) { + return; + } displaySubtask(CDIValidationMessages.VALIDATING_RESOURCE, new String[] {file.getProject().getName(), file.getName()}); if("beans.xml".equalsIgnoreCase(file.getName()) && CDIPreferences.shouldValidateBeansXml(file.getProject())) { @@ -335,7 +345,7 @@ validateQualifier(qualifier); IScope scope = cdiProject.getScope(file.getFullPath()); - annptationValidator.validateScopeType(scope); + annotationValidator.validateScopeType(scope); IInterceptorBinding binding = cdiProject.getInterceptorBinding(file.getFullPath()); validateInterceptorBinding(binding); @@ -392,6 +402,10 @@ return beansXmls; } + private boolean isResourceFromAnotherProject(IResource resource) { + return resource != null && !resource.getProject().getName().equals(projectName); + } + /** * Validates a bean. * @@ -404,6 +418,9 @@ if(bean.getBeanClass().isReadOnly()) { return; } + if(isResourceFromAnotherProject(bean.getResource())) { + return; + } // Collect all relations between the bean and other CDI elements. String name = bean.getName(); if (name != null) { @@ -1844,6 +1861,9 @@ // validate sources only return; } + if(isResourceFromAnotherProject(resource)) { + return; + } List<IAnnotationDeclaration> as = stereotype.getAnnotationDeclarations(); // 1. non-empty name @@ -1889,7 +1909,7 @@ } try { - annptationValidator.validateStereotypeAnnotationTypeAnnotations(stereotype, resource); + annotationValidator.validateStereotypeAnnotationTypeAnnotations(stereotype, resource); } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); } @@ -1904,6 +1924,9 @@ // validate sources only return; } + if(isResourceFromAnotherProject(resource)) { + return; + } /* * 9.5.2. Interceptor binding types with members * array-valued or annotation-valued member of an interceptor binding type is not annotated @Nonbinding (Non-Portable behavior) @@ -1925,6 +1948,9 @@ // validate sources only return; } + if(isResourceFromAnotherProject(resource)) { + return; + } /* * 5.2.5. Qualifier annotations with members * - array-valued or annotation-valued member of a qualifier type is not annotated @Nonbinding (Non-Portable behavior) @@ -1935,7 +1961,7 @@ * Qualifier annotation type should be annotated with @Target({METHOD, FIELD, PARAMETER, TYPE}) */ try { - annptationValidator.validateQualifierAnnotationTypeAnnotations(qualifier, resource); + annotationValidator.validateQualifierAnnotationTypeAnnotations(qualifier, resource); } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); }