[weld-commits] Weld SVN: r6911 - in core/trunk/impl/src/main: java/org/jboss/weld/logging/messages and 2 other directories.

Author: pete.muir(a)jboss.org Date: 2010-08-05 09:36:10 -0400 (Thu, 05 Aug 2010) New Revision: 6911 Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/UtilMessage.java core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java core/trunk/impl/src/main/resources/org/jboss/weld/messages/event_en.properties core/trunk/impl/src/main/resources/org/jboss/weld/messages/util_en.properties Log: WELD-565 Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2010-08-05 13:18:07 UTC (rev 6910) +++ core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2010-08-05 13:36:10 UTC (rev 6911) @@ -266,7 +266,7 @@ @Override public String toString() { - return id; + return observerMethod.toString(); } public String getId() Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/UtilMessage.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/UtilMessage.java 2010-08-05 13:18:07 UTC (rev 6910) +++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/UtilMessage.java 2010-08-05 13:36:10 UTC (rev 6911) @@ -45,7 +45,6 @@ @MessageId("000806") TOO_MANY_PRE_DESTROY_METHODS, @MessageId("000807") INITIALIZER_CANNOT_BE_PRODUCER, @MessageId("000808") INITIALIZER_CANNOT_BE_DISPOSAL_METHOD, - @MessageId("000809") INITIALIZER_CANNOT_BE_OBSERVER, @MessageId("000810") QUALIFIER_ON_FINAL_FIELD, @MessageId("000811") TOO_MANY_INITIALIZERS, @MessageId("000812") AMBIGUOUS_CONSTRUCTOR, Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2010-08-05 13:18:07 UTC (rev 6910) +++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2010-08-05 13:36:10 UTC (rev 6911) @@ -25,10 +25,10 @@ import static org.jboss.weld.logging.messages.BeanMessage.FOUND_ONE_PRE_DESTROY_METHOD; import static org.jboss.weld.logging.messages.BeanMessage.FOUND_POST_CONSTRUCT_METHODS; import static org.jboss.weld.logging.messages.BeanMessage.FOUND_PRE_DESTROY_METHODS; +import static org.jboss.weld.logging.messages.EventMessage.INVALID_INITIALIZER; import static org.jboss.weld.logging.messages.UtilMessage.AMBIGUOUS_CONSTRUCTOR; import static org.jboss.weld.logging.messages.UtilMessage.ANNOTATION_NOT_QUALIFIER; import static org.jboss.weld.logging.messages.UtilMessage.INITIALIZER_CANNOT_BE_DISPOSAL_METHOD; -import static org.jboss.weld.logging.messages.UtilMessage.INITIALIZER_CANNOT_BE_OBSERVER; import static org.jboss.weld.logging.messages.UtilMessage.INITIALIZER_CANNOT_BE_PRODUCER; import static org.jboss.weld.logging.messages.UtilMessage.INITIALIZER_METHOD_IS_GENERIC; import static org.jboss.weld.logging.messages.UtilMessage.INVALID_QUANTITY_INJECTABLE_FIELDS_AND_INITIALIZER_METHODS; @@ -408,7 +408,7 @@ } else if (method.getWeldParameters(Observes.class).size() > 0) { - throw new DefinitionException(INITIALIZER_CANNOT_BE_OBSERVER, method, type); + throw new DefinitionException(INVALID_INITIALIZER, method); } else if (method.isGeneric()) { Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/event_en.properties =================================================================== --- core/trunk/impl/src/main/resources/org/jboss/weld/messages/event_en.properties 2010-08-05 13:18:07 UTC (rev 6910) +++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/event_en.properties 2010-08-05 13:36:10 UTC (rev 6911) @@ -2,8 +2,8 @@ ASYNC_TX_FIRE=Sending event {0} asynchronously to transactional observer {1} ASYNC_OBSERVER_FAILURE=Failure while notifying an observer of event {0} PROXY_REQUIRED=Proxy required -INVALID_SCOPED_CONDITIONAL_OBSERVER={0} is invalid because it is a conditional observer method and is declared by a @Dependent scoped bean -MULTIPLE_EVENT_PARAMETERS={0} is invalid because it contains more than one event parameter annotated @Observes -INVALID_DISPOSES_PARAMETER={0} cannot have any parameters annotated with @Disposes -INVALID_PRODUCER={0} cannot be annotated with @Produces -INVALID_INITIALIZER={0} cannot be annotated with @Initializer +INVALID_SCOPED_CONDITIONAL_OBSERVER=Conditional observer method [{0}] cannot be declared by a @Dependent scoped bean +MULTIPLE_EVENT_PARAMETERS=Observer method [{0}] cannot have more than one event parameter annotated @Observes +INVALID_DISPOSES_PARAMETER=Observer method [{0}] cannot have a parameter annotated with @Disposes +INVALID_PRODUCER=Observer method [{0}] cannot be annotated with @Produces +INVALID_INITIALIZER=Observer method [{0}] cannot be annotated with @Inject; observer methods are automatically injection points Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/util_en.properties =================================================================== --- core/trunk/impl/src/main/resources/org/jboss/weld/messages/util_en.properties 2010-08-05 13:18:07 UTC (rev 6910) +++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/util_en.properties 2010-08-05 13:36:10 UTC (rev 6911) @@ -7,7 +7,6 @@ TOO_MANY_PRE_DESTROY_METHODS=Cannot have more than one pre destroy method annotated @PreDestroy for {0} INITIALIZER_CANNOT_BE_PRODUCER=Initializer method {0} cannot be annotated @Produces on {1} INITIALIZER_CANNOT_BE_DISPOSAL_METHOD=Initializer method {0} cannot have parameters annotated @Disposes on {1} -INITIALIZER_CANNOT_BE_OBSERVER=Initializer method {0} cannot be annotated @Observes on {1} QUALIFIER_ON_FINAL_FIELD=Cannot place qualifiers on final fields: {0} TOO_MANY_INITIALIZERS=Cannot have more than one constructor annotated with @Initializer for {0} AMBIGUOUS_CONSTRUCTOR=Cannot determine constructor to use for {0}. Possible constructors {1}