Author: scabanovich Date: 2010-07-21 03:58:33 -0400 (Wed, 21 Jul 2010) New Revision: 23616 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/CDIValidationMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties Log: https://jira.jboss.org/browse/JBIDE-6633 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-07-21 07:41:53 UTC (rev 23615) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-07-21 07:58:33 UTC (rev 23616) @@ -1664,8 +1664,15 @@ // - bean class or producer method or field specifies multiple scope type annotations // if (scopes.size() > 1) { + String message = bean instanceof IClassBean + ? CDIValidationMessages.MULTIPLE_SCOPE_TYPE_ANNOTATIONS_IN_BEAN_CLASS + : bean instanceof IProducerField + ? CDIValidationMessages.MULTIPLE_SCOPE_TYPE_ANNOTATIONS_IN_PRODUCER_FIELD + : bean instanceof IProducerMethod + ? CDIValidationMessages.MULTIPLE_SCOPE_TYPE_ANNOTATIONS_IN_PRODUCER_METHOD + : CDIValidationMessages.MULTIPLE_SCOPE_TYPE_ANNOTATIONS; for (IScopeDeclaration scope : scopes) { - addError(CDIValidationMessages.MULTIPLE_SCOPE_TYPE_ANNOTATIONS, CDIPreferences.MULTIPLE_SCOPE_TYPE_ANNOTATIONS, scope, bean.getResource()); + addError(message, CDIPreferences.MULTIPLE_SCOPE_TYPE_ANNOTATIONS, scope, bean.getResource()); } } 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 2010-07-21 07:41:53 UTC (rev 23615) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2010-07-21 07:58:33 UTC (rev 23616) @@ -46,6 +46,9 @@ public static String MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE; public static String MULTIPLE_SCOPE_TYPE_ANNOTATIONS; + public static String MULTIPLE_SCOPE_TYPE_ANNOTATIONS_IN_BEAN_CLASS; + public static String MULTIPLE_SCOPE_TYPE_ANNOTATIONS_IN_PRODUCER_METHOD; + public static String MULTIPLE_SCOPE_TYPE_ANNOTATIONS_IN_PRODUCER_FIELD; public static String MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE; public static String STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE; public static String ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD; 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 2010-07-21 07:41:53 UTC (rev 23615) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-07-21 07:58:33 UTC (rev 23616) @@ -25,6 +25,9 @@ MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE=Qualifier annotation type should be annotated with @Retention(RUNTIME) MULTIPLE_SCOPE_TYPE_ANNOTATIONS=Bean class or producer method or field specifies multiple scope type annotations +MULTIPLE_SCOPE_TYPE_ANNOTATIONS_IN_BEAN_CLASS=Bean class specifies multiple scope type annotations +MULTIPLE_SCOPE_TYPE_ANNOTATIONS_IN_PRODUCER_METHOD=Producer method specifies multiple scope type annotations +MULTIPLE_SCOPE_TYPE_ANNOTATIONS_IN_PRODUCER_FIELD=Producer field specifies multiple scope type annotations MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE=Bean does not explicitly declare a scope when there is no default scope STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE=Stereotype declares more than one scope ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD=Managed bean with a public field declares any scope other than @Dependent