Author: scabanovich
Date: 2010-07-21 04:30:32 -0400 (Wed, 21 Jul 2010)
New Revision: 23619
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-6636
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
08:26:58 UTC (rev 23618)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-07-21
08:30:32 UTC (rev 23619)
@@ -1651,7 +1651,14 @@
}
}
if (!typeWasFound) {
- addError(CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION,
CDIPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION, typedDeclaration, bean.getResource());
+ String message = bean instanceof IClassBean
+ ? CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_BEAN_CLASS
+ : bean instanceof IProducerField
+ ? CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_PRODUCER_FIELD
+ : bean instanceof IProducerMethod
+ ? CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_PRODUCER_METHOD
+ : CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION;
+ addError(message, CDIPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION,
typedDeclaration, 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
08:26:58 UTC (rev 23618)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2010-07-21
08:30:32 UTC (rev 23619)
@@ -30,6 +30,9 @@
public static String UNSATISFIED_INJECTION_POINTS;
public static String AMBIGUOUS_INJECTION_POINTS;
public static String ILLEGAL_TYPE_IN_TYPED_DECLARATION;
+ public static String ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_BEAN_CLASS;
+ public static String ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_PRODUCER_METHOD;
+ public static String ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_PRODUCER_FIELD;
public static String PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD;
public static String PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE;
public static String PRODUCER_FIELD_TYPE_HAS_WILDCARD;
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
08:26:58 UTC (rev 23618)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-07-21
08:30:32 UTC (rev 23619)
@@ -9,6 +9,9 @@
UNSATISFIED_INJECTION_POINTS=No bean is eligible for injection to the injection point
AMBIGUOUS_INJECTION_POINTS=Multiple beans are eligible for injection to the injection
point
ILLEGAL_TYPE_IN_TYPED_DECLARATION=Bean class or producer method or field specifies a
@Typed annotation, and the value member specifies a class which does not correspond to a
type in the unrestricted set of bean types of a bean
+ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_BEAN_CLASS=Bean class specifies a @Typed annotation,
and the value member specifies a class which does not correspond to a type in the
unrestricted set of bean types of a bean
+ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_PRODUCER_METHOD=Producer method specifies a @Typed
annotation, and the value member specifies a class which does not correspond to a type in
the unrestricted set of bean types of a bean
+ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_PRODUCER_FIELD=Producer field specifies a @Typed
annotation, and the value member specifies a class which does not correspond to a type in
the unrestricted set of bean types of a bean
PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD=Producer method return type contains a wildcard
type parameter
PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE=Producer method return type is a type variable
PRODUCER_FIELD_TYPE_HAS_WILDCARD=Producer field type contains a wildcard type parameter