Author: scabanovich Date: 2011-07-12 13:24:37 -0400 (Tue, 12 Jul 2011) New Revision: 32864 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java 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/CDIValidationMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties Log: JBIDE-9313 https://issues.jboss.org/browse/JBIDE-9313 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2011-07-12 17:24:11 UTC (rev 32863) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2011-07-12 17:24:37 UTC (rev 32864) @@ -42,7 +42,6 @@ defaultPreferences.put(CDIPreferences.AMBIGUOUS_EL_NAMES, CDIPreferences.WARNING); defaultPreferences.put(CDIPreferences.UNPROXYABLE_BEAN_TYPE, CDIPreferences.WARNING); defaultPreferences.put(CDIPreferences.INJECT_RESOLVES_TO_NULLABLE_BEAN, CDIPreferences.WARNING); - defaultPreferences.put(CDIPreferences.INJECTED_DECORATOR_OR_INTERCEPTOR, CDIPreferences.WARNING); defaultPreferences.put(CDIPreferences.ILLEGAL_LIFECYCLE_CALLBACK_INTERCEPTOR_BINDING, CDIPreferences.WARNING); defaultPreferences.put(CDIPreferences.MISSING_NONBINDING_IN_INTERCEPTOR_BINDING_TYPE_MEMBER, CDIPreferences.WARNING); defaultPreferences.put(CDIPreferences.ILLEGAL_CONDITIONAL_OBSERVER, CDIPreferences.WARNING); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java 2011-07-12 17:24:11 UTC (rev 32863) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java 2011-07-12 17:24:37 UTC (rev 32864) @@ -194,8 +194,6 @@ public static final String INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE = INSTANCE.createSeverityOption("interceptorOrDecoratorIsAlternative"); //$NON-NLS-1$ // - interceptor declared using @Interceptor does not declare any interceptor binding (9.2 non-portable) public static final String MISSING_INTERCEPTOR_BINDING = INSTANCE.createSeverityOption("missingInterceptorBinding"); //$NON-NLS-1$ -// - a decorator or intercpetor can not be injected - public static final String INJECTED_DECORATOR_OR_INTERCEPTOR = INSTANCE.createSeverityOption("injectedDecorator"); //$NON-NLS-1$ // 8.3. Decorator resolution // - If a decorator matches a managed bean, and the managed bean class is declared final, the container automatically detects // the problem and treats it as a deployment problem. 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 2011-07-12 17:24:11 UTC (rev 32863) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-12 17:24:37 UTC (rev 32864) @@ -1524,12 +1524,9 @@ * 5.1.4. Inter-module injection * - a decorator can not be injected * - an interceptor can not be injected + * It is not an error - container just never attempts to inject them. */ - if(bean instanceof IDecorator) { - addError(CDIValidationMessages.INJECTED_DECORATOR, CDIPreferences.INJECTED_DECORATOR_OR_INTERCEPTOR, reference, injection.getResource()); - } else if(bean instanceof IInterceptor) { - addError(CDIValidationMessages.INJECTED_INTERCEPTOR, CDIPreferences.INJECTED_DECORATOR_OR_INTERCEPTOR, reference, injection.getResource()); - } + /* * 5.4.1. Unproxyable bean types * - If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2011-07-12 17:24:11 UTC (rev 32863) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2011-07-12 17:24:37 UTC (rev 32864) @@ -126,8 +126,6 @@ public static String INTERCEPTOR_IS_ALTERNATIVE; public static String DECORATOR_IS_ALTERNATIVE; public static String MISSING_INTERCEPTOR_BINDING; - public static String INJECTED_DECORATOR; - public static String INJECTED_INTERCEPTOR; public static String ILLEGAL_SPECIALIZING_MANAGED_BEAN; public static String ILLEGAL_SPECIALIZING_SESSION_BEAN; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2011-07-12 17:24:11 UTC (rev 32863) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2011-07-12 17:24:37 UTC (rev 32864) @@ -105,8 +105,6 @@ INTERCEPTOR_IS_ALTERNATIVE=Interceptor is an alternative [JSR-299 �2.6.1] DECORATOR_IS_ALTERNATIVE=Decorator is an alternative [JSR-299 �2.6.1] MISSING_INTERCEPTOR_BINDING=Interceptor declared using @Interceptor must specify at least one interceptor binding [JSR-299 �9.2] -INJECTED_DECORATOR=Injection point resolves to a decorator [JSR-299 �5.1.4] -INJECTED_INTERCEPTOR=Injection point resolves to an interceptor [JSR-299 �5.1.4] ILLEGAL_SPECIALIZING_MANAGED_BEAN=Managed bean class annotated @Specializes must directly extend the bean class of another managed bean [JSR-299 �3.1.4] ILLEGAL_SPECIALIZING_SESSION_BEAN=Session bean class annotated @Specializes must directly extend the bean class of another session bean [JSR-299 �3.2.4]