Skip to content
Browse files

WELD-748

* Update the message key to avoid any confusion
  • Loading branch information...
1 parent c6c398f commit 69d75c3fa8813988cdca5729868f12d5456197d3 @pmuir pmuir committed Nov 13, 2010
View
4 impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java
@@ -27,7 +27,7 @@
import static org.jboss.weld.logging.messages.BeanMessage.ONLY_ONE_SCOPE_ALLOWED;
import static org.jboss.weld.logging.messages.BeanMessage.PRODUCER_CAST_ERROR;
import static org.jboss.weld.logging.messages.BeanMessage.PRODUCER_METHOD_WITH_TYPE_VARIABLE_RETURN_TYPE_MUST_BE_DEPENDENT;
-import static org.jboss.weld.logging.messages.BeanMessage.PRODUCER_METHOD_WITH_WILDCARD_RETURN_TYPE_MUST_BE_DEPENDENT;
+import static org.jboss.weld.logging.messages.BeanMessage.PRODUCER_METHOD_CANNOT_HAVE_A_WILDCARD_RETURN_TYPE;
import static org.jboss.weld.logging.messages.BeanMessage.RETURN_TYPE_MUST_BE_CONCRETE;
import static org.jboss.weld.logging.messages.BeanMessage.USING_DEFAULT_SCOPE;
import static org.jboss.weld.logging.messages.BeanMessage.USING_SCOPE;
@@ -183,7 +183,7 @@ else if (getWeldAnnotated().isParameterizedType())
}
else if (type instanceof WildcardType)
{
- throw new DefinitionException(PRODUCER_METHOD_WITH_WILDCARD_RETURN_TYPE_MUST_BE_DEPENDENT, getWeldAnnotated());
+ throw new DefinitionException(PRODUCER_METHOD_CANNOT_HAVE_A_WILDCARD_RETURN_TYPE, getWeldAnnotated());
}
}
}
View
2 impl/src/main/java/org/jboss/weld/logging/messages/BeanMessage.java
@@ -133,7 +133,7 @@
@MessageId("000095") GENERIC_SESSION_BEAN_MUST_BE_DEPENDENT,
@MessageId("000096") PRODUCER_FIELD_ON_SESSION_BEAN_MUST_BE_STATIC,
@MessageId("000097") PRODUCER_METHOD_WITH_TYPE_VARIABLE_RETURN_TYPE_MUST_BE_DEPENDENT,
- @MessageId("000098") PRODUCER_METHOD_WITH_WILDCARD_RETURN_TYPE_MUST_BE_DEPENDENT,
+ @MessageId("000098") PRODUCER_METHOD_CANNOT_HAVE_A_WILDCARD_RETURN_TYPE,
@MessageId("000099") CANNOT_LOAD_CLASS,
@MessageId("001500") PROXY_DESERIALIZATION_FAILURE,
@MessageId("001501") BEAN_INSTANCE_NOT_SET_ON_PROXY,
View
2 impl/src/main/resources/org/jboss/weld/messages/bean_en.properties
@@ -96,7 +96,7 @@ INJECTED_FIELD_CANNOT_BE_PRODUCER=Injected field {0} cannot be annotated @Produc
GENERIC_SESSION_BEAN_MUST_BE_DEPENDENT=Session bean with generic class {0} must be @Depedent scope
PRODUCER_FIELD_ON_SESSION_BEAN_MUST_BE_STATIC=Producer fields on session beans must be static. Field {0} declared on {1}
PRODUCER_METHOD_WITH_TYPE_VARIABLE_RETURN_TYPE_MUST_BE_DEPENDENT=A producer method with a parameterized return type with a type variable must be declared @Dependent scoped. Method {0}
-PRODUCER_METHOD_WITH_WILDCARD_RETURN_TYPE_MUST_BE_DEPENDENT=A producer method cannot have a return type parameterized with wildcards. Method {0}
+PRODUCER_METHOD_CANNOT_HAVE_A_WILDCARD_RETURN_TYPE=A producer method cannot have a return type parameterized with wildcards. Method {0}
CANNOT_LOAD_CLASS=Cannot load class {0} during deserialization of proxy
PROXY_DESERIALIZATION_FAILURE=Failed to deserialize proxy object
BEAN_INSTANCE_NOT_SET_ON_PROXY=Method call requires a BeanInstance which has not been set for this proxy

0 comments on commit 69d75c3

Please sign in to comment.
Something went wrong with that request. Please try again.