[webbeans-commits] Webbeans SVN: r942 - doc/trunk/reference/es-ES.
by webbeans-commits＠lists.jboss.org
Author: guegl
Date: 2009-01-14 00:35:34 -0500 (Wed, 14 Jan 2009)
New Revision: 942
Modified:
doc/trunk/reference/es-ES/Author_Group.po
doc/trunk/reference/es-ES/master.po
doc/trunk/reference/es-ES/next.po
doc/trunk/reference/es-ES/part1.po
doc/trunk/reference/es-ES/part2.po
doc/trunk/reference/es-ES/part3.po
doc/trunk/reference/es-ES/part4.po
doc/trunk/reference/es-ES/producermethods.po
Log:
in progress
Modified: doc/trunk/reference/es-ES/Author_Group.po
===================================================================
--- doc/trunk/reference/es-ES/Author_Group.po 2009-01-14 02:04:15 UTC (rev 941)
+++ doc/trunk/reference/es-ES/Author_Group.po 2009-01-14 05:35:34 UTC (rev 942)
@@ -8,7 +8,7 @@
"Project-Id-Version: Author_Group\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-10 14:18+0000\n"
-"PO-Revision-Date: 2009-01-09 11:40+1000\n"
+"PO-Revision-Date: 2009-01-14 09:26+1000\n"
"Last-Translator: Gladys Guerrero Lozano <gguerrer(a)redhat.com>\n"
"Language-Team: Spanish <fedora-trans-es(a)redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@
"<jobtitle>Web Beans (JSR-299) specification lead</jobtitle> <orgname>Red Hat "
"Middleware LLC</orgname>"
msgstr ""
-"<jobtitle>información de especificación de Web Beans (JSR-299) </jobtitle> "
+"<jobtitle>Guía de especificación de Web Beans (JSR-299) </jobtitle> "
"<orgname>Red Hat Middleware LLC</orgname>"
#. Tag: author
@@ -40,12 +40,12 @@
#. Tag: affiliation
#: Author_Group.xml:15
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"<jobtitle>Web Beans (JSR-299) Reference Implementation lead </jobtitle> "
"<orgname>Red Hat Middleware LLC</orgname>"
msgstr ""
-"<jobtitle>Web Beans (JSR-299) Guía de Referencia de Aplicación </jobtitle> "
+"<jobtitle>Guía de Referencia de Aplicación de Web Beans (JSR-299)</jobtitle> "
"<orgname>Red Hat Middleware LLC</orgname>"
#. Tag: othercredit
@@ -65,3 +65,4 @@
#, no-c-format
msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+
Modified: doc/trunk/reference/es-ES/master.po
===================================================================
--- doc/trunk/reference/es-ES/master.po 2009-01-14 02:04:15 UTC (rev 941)
+++ doc/trunk/reference/es-ES/master.po 2009-01-14 05:35:34 UTC (rev 942)
@@ -8,7 +8,7 @@
"Project-Id-Version: master\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-12-19 20:29+0000\n"
-"PO-Revision-Date: 2009-01-12 17:27+1000\n"
+"PO-Revision-Date: 2009-01-14 08:54+1000\n"
"Last-Translator: Gladys Guerrero Lozano <gguerrer(a)redhat.com>\n"
"Language-Team: Spanish <fedora-trans-es(a)redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -26,13 +26,13 @@
#: master.xml:25
#, no-c-format
msgid "Developing loosely-coupled code"
-msgstr ""
+msgstr "Desarrollo de código de acoplamiento flexible"
#. Tag: title
#: master.xml:35
#, no-c-format
msgid "Making the most of strong typing"
-msgstr "Haciendo lo máximo de un tecleado fuerte"
+msgstr "Aprovechar al máximo un tecleado fuerte"
#. Tag: title
#: master.xml:46
Modified: doc/trunk/reference/es-ES/next.po
===================================================================
--- doc/trunk/reference/es-ES/next.po 2009-01-14 02:04:15 UTC (rev 941)
+++ doc/trunk/reference/es-ES/next.po 2009-01-14 05:35:34 UTC (rev 942)
@@ -1,23 +1,26 @@
+# translation of next.po to Spanish
# Language es-ES translations for master.xml package.
+#
# Automatically generated, 2008.
-#
+# Gladys Guerrero Lozano <gguerrer(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: master.xml \n"
+"Project-Id-Version: next\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-12-19 20:26+0000\n"
-"PO-Revision-Date: 2008-12-19 20:26+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-01-14 09:36+1000\n"
+"Last-Translator: Gladys Guerrero Lozano <gguerrer(a)redhat.com>\n"
+"Language-Team: Spanish <fedora-trans-es(a)redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: next.xml:4
#, no-c-format
msgid "Next steps"
-msgstr ""
+msgstr "Siguientes pasos"
#. Tag: para
#: next.xml:6
@@ -25,7 +28,7 @@
msgid ""
"Because Web Beans is so new, there's not yet a lot of information available "
"online."
-msgstr ""
+msgstr "Debido a que Web Beans es tan reciente, aún no hay mucha información disponible en línea."
#. Tag: para
#: next.xml:9
@@ -36,7 +39,7 @@
"the length of this article, and almost as readable. But, of course, it "
"covers many details that we've skipped over. The spec is available from "
"<literal>http://jcp.org/en/jsr/detail?id=299</literal>."
-msgstr ""
+msgstr "Claro está que la especificación de Web Beans es la mejor fuente de información acerca de Web Beans. La especificación tiene cerca de 100 páginas, sólo dos veces el tamaño de este artículo y casi tan legible. No obstante, cubre muchos detalles que hemos omitido. La especificación está disponible en <literal>http://jcp.org/en/jsr/detail?id=299</literal>."
#. Tag: para
#: next.xml:15
@@ -47,3 +50,6 @@
"Beans spec lead blog at <literal>http://in.relation.to</literal>. This "
"article is substantially based upon a series of blog entries published there."
msgstr ""
+"La implementación de Referencia (IR) de Web Beans se desarrolla en <literal>http://"
+"seamframework.org/WebBeans</literal>. El equipo de desarrollo de IR y la especificación de Web Beans lideran el blog en <literal>http://in.relation.to</literal>. Este artículo se base en una serie de entradas de blogs publicadas allí."
+
Modified: doc/trunk/reference/es-ES/part1.po
===================================================================
--- doc/trunk/reference/es-ES/part1.po 2009-01-14 02:04:15 UTC (rev 941)
+++ doc/trunk/reference/es-ES/part1.po 2009-01-14 05:35:34 UTC (rev 942)
@@ -1,17 +1,20 @@
+# translation of part1.po to Spanish
# Language es-ES translations for master.xml package.
+#
# Automatically generated, 2008.
-#
+# Gladys Guerrero Lozano <gguerrer(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: master.xml \n"
+"Project-Id-Version: part1\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-12-19 20:26+0000\n"
-"PO-Revision-Date: 2008-12-19 20:26+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-01-14 11:28+1000\n"
+"Last-Translator: Gladys Guerrero Lozano <gguerrer(a)redhat.com>\n"
+"Language-Team: Spanish <fedora-trans-es(a)redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: para
#: part1.xml:5
@@ -23,7 +26,7 @@
"component types including JavaBeans and Enterprise Java Beans. As a "
"complement to the traditional Java EE programming model, the Web Beans "
"services provide:"
-msgstr ""
+msgstr "La especificación de Web Beans (JSR-299) define una serie de servicios para el entorno EE de Java que facilitan el desarrollo de aplicaciones. Web Beans entrecruza un ciclo de vida mejorado y un modelo de interacción en tipos de componentes existentes de Java incluyendo los componentes JavaBeans y los Enterprise Java Beans. Como complemento para el modelo tradicional de programación EE de Java, el servicio de Web Beans proporciona servicios:"
#. Tag: para
#: part1.xml:14
@@ -31,20 +34,19 @@
msgid ""
"an improved lifecycle for stateful components, bound to well-defined "
"<emphasis>contexts</emphasis>,"
-msgstr ""
+msgstr "un ciclo de vida mejorada para componentes con estado, vinculados a los <emphasis>contextos</emphasis> bien definidos,"
#. Tag: para
#: part1.xml:18
#, no-c-format
msgid "a typesafe approach to <emphasis>dependency injection</emphasis>,"
-msgstr ""
+msgstr "un método typesafe para <emphasis>inyección de dependencia</emphasis>,"
#. Tag: para
#: part1.xml:21
#, no-c-format
-msgid ""
-"interaction via an <emphasis>event notification</emphasis> facility, and"
-msgstr ""
+msgid "interaction via an <emphasis>event notification</emphasis> facility, and"
+msgstr "interacción a través de un servicio de <emphasis>notificación de eventos</emphasis>, y"
#. Tag: para
#: part1.xml:25
@@ -54,7 +56,7 @@
"components, along with a new kind of interceptor, called a "
"<emphasis>decorator</emphasis>, that is more appropriate for use in solving "
"business problems."
-msgstr ""
+msgstr "un mejor método para vincular <emphasis>interceptores</emphasis> a componentes, junto con una nueva clase de interceptor, llamado un <emphasis>decorador</emphasis>, el cual es más apropiado para resolver problemas de negocios."
#. Tag: para
#: part1.xml:32
@@ -63,43 +65,43 @@
"Dependency injection, together with contextual lifecycle management, saves "
"the user of an unfamiliar API from having to ask and answer the following "
"questions:"
-msgstr ""
+msgstr "Inyección de dependencia, junto con la administración de ciclo de vida contextual, ahorra al usuario de un API desconocido el tener que hacer y contestar las siguientes preguntas:"
#. Tag: para
#: part1.xml:38
#, no-c-format
msgid "what is the lifecycle of this object?"
-msgstr ""
+msgstr "¿cuál es el ciclo de vida de este objeto? "
#. Tag: para
#: part1.xml:41
#, no-c-format
msgid "how many simultaneous clients can it have?"
-msgstr ""
+msgstr "¿cuántos clientes simultáneos puede tener?"
#. Tag: para
#: part1.xml:44
#, no-c-format
msgid "is it multithreaded?"
-msgstr ""
+msgstr "¿es multihilos?"
#. Tag: para
#: part1.xml:47
#, no-c-format
msgid "where can I get one from?"
-msgstr ""
+msgstr "¿en dónde puedo obtener uno?"
#. Tag: para
#: part1.xml:50
#, no-c-format
msgid "do I need to explicitly destroy it?"
-msgstr ""
+msgstr "¿necesito destruirlo explícitamente?"
#. Tag: para
#: part1.xml:53
#, no-c-format
msgid "where should I keep my reference to it when I'm not using it directly?"
-msgstr ""
+msgstr "¿dónde debo mantener mi referencia a éste cuando no lo estoy usando directamente?"
#. Tag: para
#: part1.xml:57
@@ -107,13 +109,13 @@
msgid ""
"how can I add an indirection layer, so that the implementation of this "
"object can vary at deployment time?"
-msgstr ""
+msgstr "¿cómo puedo agregar una capa de direccionamiento indirecto, para que la implementación de este objeto pueda variar en el momento de despliegue?"
#. Tag: para
#: part1.xml:61
#, no-c-format
msgid "how should I go about sharing this object between other objects?"
-msgstr ""
+msgstr "¿cómo hago para compartir este objeto con otros objetos?"
#. Tag: para
#: part1.xml:65
@@ -125,7 +127,7 @@
"upon. Even better, the concrete implementation, lifecycle and threading "
"model of a Web Bean it depends upon may vary according to the deployment "
"scenario, without affecting any client."
-msgstr ""
+msgstr "Un Web Bean especifica únicamente el tipo y la semántica de otros Web Beans de los que depende. No se necesita estar consciente del ciclo de vida real, la implementación concreta, el modelo de hilos u otros clientes de cualquier Web Bean a la que dependa. Mejor aún, la implementación concreta, el ciclo de vida y el modelo de hilos de un Web Bean al que éste depende pueden variar según el escenario de despliegue, sin afectar a ningún cliente."
#. Tag: para
#: part1.xml:72
@@ -134,6 +136,8 @@
"Events, interceptors and decorators enhance the <emphasis>loose-coupling</"
"emphasis> that is inherent in this model:"
msgstr ""
+"Los eventos, los interceptores y los decoradores mejoran el <emphasis>acoplamiento-flexible</"
+"emphasis>inherente en este modelo:"
#. Tag: para
#: part1.xml:77
@@ -141,7 +145,7 @@
msgid ""
"<emphasis>event notifications</emphasis> decouple event producers from event "
"consumers,"
-msgstr ""
+msgstr "La <emphasis>notificación de eventos</emphasis> separa a los productores de eventos de los consumidores,"
#. Tag: para
#: part1.xml:81
@@ -149,7 +153,7 @@
msgid ""
"<emphasis>interceptors</emphasis> decouple technical concerns from business "
"logic, and"
-msgstr ""
+msgstr "los <emphasis>interceptores</emphasis> separan las cuestiones técnicas de la lógica de negocios, y"
#. Tag: para
#: part1.xml:85
@@ -157,7 +161,7 @@
msgid ""
"<emphasis>decorators</emphasis> allow business concerns to be "
"compartmentalized."
-msgstr ""
+msgstr "los <emphasis>decoradores</emphasis> permiten la compartimentación de las cuestiones de negocios."
#. Tag: para
#: part1.xml:90
@@ -172,6 +176,8 @@
"emphasis>, to wire together Web Beans, their dependencies, their "
"interceptors and decorators and their event consumers."
msgstr ""
+"Más importante, Web Beans ofrece todos los servicios en forma"
+"<emphasis>typesafe</emphasis>. Web Beans nunca utiliza identificadores de cadena para determinar cómo los objetos de colaboración se ajustan entre sí. Además aunque XML sigue siendo una opción, muy rara vez se utiliza. En su lugar, Web Beans usa la información de teclado disponible en el modelo de objeto Java junto con un nuevo patrón, llamado <emphasis>anotaciones de enlace</emphasis>, para conectar a Web Beans, las dependencias, los interceptores y decoradores y sus consumidores de evento."
#. Tag: para
#: part1.xml:100
@@ -179,25 +185,25 @@
msgid ""
"The Web Beans services are general and apply to the following types of "
"components that exist in the Java EE environment:"
-msgstr ""
+msgstr "Los servicios Web Beans son generales y se aplican a los siguiente tipos de componentes que existen en el entorno EE de Java."
#. Tag: para
#: part1.xml:105
#, no-c-format
msgid "all JavaBeans,"
-msgstr ""
+msgstr "todos los JavaBeans,"
#. Tag: para
#: part1.xml:108
#, no-c-format
msgid "all EJBs, and"
-msgstr ""
+msgstr "todos los EJB, y"
#. Tag: para
#: part1.xml:111
#, no-c-format
msgid "all Servlets."
-msgstr ""
+msgstr "todos los Servlets."
#. Tag: para
#: part1.xml:115
@@ -207,7 +213,7 @@
"of components defined by future Java EE specifications or by non-standard "
"frameworks may be cleanly integrated with Web Beans, take advantage of the "
"Web Beans services, and interact with any other kind of Web Bean."
-msgstr ""
+msgstr "Web Beans incluso proporciona los puntos de integración necesarios para que otras clases de componentes definidos por especificaciones EE de Java futuras, hagan uso de los servicios de Web Beans e interactúen con otra clase de Web Bean."
#. Tag: para
#: part1.xml:120
@@ -217,7 +223,7 @@
"Seam, Guice and Spring. However, Web Beans has its own very distinct "
"character: more typesafe than Seam, more stateful and less XML-centric than "
"Spring, more web and enterprise-application capable than Guice."
-msgstr ""
+msgstr "Una gran cantidad de marcos existentes de Java, incluyendo Seam, Guice y Spring, influyeron en Web Beans. No obstante, Web Beans tiene su propio carácter distintivo: más typesafe que Seam, más con estado y menos centrada en XML que Spring, más red y aplicación de empresa más capaz que Guice."
#. Tag: para
#: part1.xml:125
@@ -226,4 +232,5 @@
"Most importantly, Web Beans is a JCP standard that integrates cleanly with "
"Java EE, and with any Java SE environment where embeddable EJB Lite is "
"available."
-msgstr ""
+msgstr "Lo más importante es que Web Beans es un JCP estándar que se integra sin problemas con EE de Java y con cualquier entorno SE dónde EJB Lite incrustado esté disponible."
+
Modified: doc/trunk/reference/es-ES/part2.po
===================================================================
--- doc/trunk/reference/es-ES/part2.po 2009-01-14 02:04:15 UTC (rev 941)
+++ doc/trunk/reference/es-ES/part2.po 2009-01-14 05:35:34 UTC (rev 942)
@@ -1,17 +1,20 @@
+# translation of part2.po to Spanish
# Language es-ES translations for master.xml package.
+#
# Automatically generated, 2008.
-#
+# Gladys Guerrero Lozano <gguerrer(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: master.xml \n"
+"Project-Id-Version: part2\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-12-19 20:26+0000\n"
-"PO-Revision-Date: 2008-12-19 20:26+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-01-14 11:46+1000\n"
+"Last-Translator: Gladys Guerrero Lozano <gguerrer(a)redhat.com>\n"
+"Language-Team: Spanish <fedora-trans-es(a)redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: para
#: part2.xml:5
@@ -19,20 +22,19 @@
msgid ""
"The first major theme of Web Beans is <emphasis>loose coupling</emphasis>. "
"We've already seen three means of achieving loose coupling:"
-msgstr ""
+msgstr "El primer tema importante de Web Beans es el <emphasis>acoplamiento flexible</emphasis>. Ya hemos visto tres medios para lograr dicho acomplamiento:"
#. Tag: para
#: part2.xml:10
#, no-c-format
-msgid ""
-"<emphasis>deployment types</emphasis> enable deployment time polymorphism,"
-msgstr ""
+msgid "<emphasis>deployment types</emphasis> enable deployment time polymorphism,"
+msgstr "Los <emphasis>tipos de despliegue</emphasis> habilitan el polimorfismo del tiempo de despliegue,"
#. Tag: para
#: part2.xml:14
#, no-c-format
msgid "<emphasis>producer methods</emphasis> enable runtime polymorphism, and"
-msgstr ""
+msgstr "los <emphasis>métodos de productor</emphasis> habilitan el polimorfismo del tiempo de ejecución, y"
#. Tag: para
#: part2.xml:18
@@ -40,7 +42,7 @@
msgid ""
"<emphasis>contextual lifecycle management</emphasis> decouples Web Bean "
"lifecycles."
-msgstr ""
+msgstr "la <emphasis>administración de ciclo de vida contextual</emphasis> separa los ciclos de vida de WebBean."
#. Tag: para
#: part2.xml:23
@@ -51,17 +53,20 @@
"required to manage the lifecycle of the server object. This approach lets "
"<emphasis>stateful objects interact as if they were services</emphasis>."
msgstr ""
+"Estas técnicas sirven para habilitar el acoplamiento flexible de cliente y servidor. El cliente ya no está estrechamente ligado a una implementación de un API, ni tiene que administrar el ciclo de vida del objeto del servidor. Este método permite "
+"<emphasis>interactuar a los objetos con estado como si fueran servicios</emphasis>."
#. Tag: para
#: part2.xml:28
#, no-c-format
+#, fuzzy
msgid ""
"Loose coupling makes a system more <emphasis>dynamic</emphasis>. The system "
"can respond to change in a well-defined manner. In the past, frameworks that "
"attempted to provide the facilities listed above invariably did it by "
"sacrificing type safety. Web Beans is the first technology that achieves "
"this level of loose coupling in a typesafe way."
-msgstr ""
+msgstr "El acoplamiento flexible hace más <emphasis>dinámico</emphasis> a un sistema. El sistema puede responder a cambiar en una manera bien definida . En el pasado, los marcos que trataban de proporcionar servicios listados arriba invariablemente lo hacían sacrificando la seguridad. Web Beans es la primer tecnología que logra este nivel de acoplamiento flexible en una forma typesafe."
#. Tag: para
#: part2.xml:34
@@ -69,7 +74,7 @@
msgid ""
"Web Beans provides three extra important facilities that further the goal of "
"loose coupling:"
-msgstr ""
+msgstr "Web Beans ofrece tres servicios adicionales importantes que amplían el objetivo del acoplamiento flexible:"
#. Tag: para
#: part2.xml:39
@@ -77,7 +82,7 @@
msgid ""
"<emphasis>interceptors</emphasis> decouple technical concerns from business "
"logic,"
-msgstr ""
+msgstr "los <emphasis>interceptores</emphasis> separan las cuestiones técnicas de la lógica de negocios,"
#. Tag: para
#: part2.xml:43
@@ -85,7 +90,7 @@
msgid ""
"<emphasis>decorators</emphasis> may be used to decouple some business "
"concerns, and"
-msgstr ""
+msgstr "los <emphasis>decoradores</emphasis> pueden ser utilizados para separar algunas cuestiones de negocios, y"
#. Tag: para
#: part2.xml:47
@@ -93,10 +98,11 @@
msgid ""
"<emphasis>event notifications</emphasis> decouple event producers from event "
"consumers."
-msgstr ""
+msgstr "las <emphasis>notificaciones de eventos</emphasis> separan a los productores de eventos de los consumidores de eventos."
#. Tag: para
#: part2.xml:52
#, no-c-format
msgid "Let's explore interceptors first."
-msgstr ""
+msgstr "En primer lugar, exploremos los interceptores."
+
Modified: doc/trunk/reference/es-ES/part3.po
===================================================================
--- doc/trunk/reference/es-ES/part3.po 2009-01-14 02:04:15 UTC (rev 941)
+++ doc/trunk/reference/es-ES/part3.po 2009-01-14 05:35:34 UTC (rev 942)
@@ -1,17 +1,20 @@
+# translation of part3.po to Spanish
# Language es-ES translations for master.xml package.
+#
# Automatically generated, 2008.
-#
+# Gladys Guerrero Lozano <gguerrer(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: master.xml \n"
+"Project-Id-Version: part3\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-12-19 20:26+0000\n"
-"PO-Revision-Date: 2008-12-19 20:26+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-01-14 14:00+1000\n"
+"Last-Translator: Gladys Guerrero Lozano <gguerrer(a)redhat.com>\n"
+"Language-Team: Spanish <fedora-trans-es(a)redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: para
#: part3.xml:5
@@ -21,7 +24,7 @@
"The information about the dependencies, interceptors and decorators of a Web "
"Bean, and the information about event consumers for an event producer, is "
"contained in typesafe Java constructs that may be validated by the compiler."
-msgstr ""
+msgstr "El segundo tema importante de Web Beans es el <emphasis>tecleado fuerte</emphasis>. La información acerca de dependencias, interceptores y decoradores de Web Bean y la información sobre consumidores de eventos para un productor de eventos, está contenida formas de Java typesafe que pueden ser validadas por el compilador."
#. Tag: para
#: part3.xml:10
@@ -31,7 +34,7 @@
"framework is hiding them from you using clever defaulting rules—so-"
"called \"configuration by convention\"—but because there are simply no "
"strings there to begin with!"
-msgstr ""
+msgstr "No necesita ver los identificadores de cadena en código de Web Beans, no porque el marco los esté escondiendo del uso inteligente de las reglas—llamadas\"configuración por convención\"—,sino porque simplemente ¡no hay cadenas con qué comenzar!"
#. Tag: para
#: part3.xml:15
@@ -44,6 +47,8 @@
"interceptors via annotations instead of names, you have an opportunity to "
"lift the semantic level of your code."
msgstr ""
+"El beneficio evidente de este método es que <emphasis>cualquier</emphasis> IDE "
+"puede proporcionar autocompletación, validación y refactorización sin necesitar herramientas especiales. Pero hay un segundo beneficio menos obvio. Resulta que cuando empieza a pensar en identificación de objetos, eventos o interceptores a través de anotaciones en lugar de nombres, tendrá la oportunidad de aumentar el nivel semántico de su código."
#. Tag: para
#: part3.xml:21
@@ -51,61 +56,61 @@
msgid ""
"Web Beans encourages you develop annotations that model concepts, for "
"example,"
-msgstr ""
+msgstr "Web Bean le anima a desarrollar anotaciones que modelen conceptos, por ejemplo, "
#. Tag: para
#: part3.xml:26
#, no-c-format
msgid "<literal>@Asynchronous</literal>,"
-msgstr ""
+msgstr "<literal>@Asynchronous</literal>,"
#. Tag: para
#: part3.xml:29
#, no-c-format
msgid "<literal>@Mock</literal>,"
-msgstr ""
+msgstr "<literal>@Mock</literal>,"
#. Tag: para
#: part3.xml:32
#, no-c-format
msgid "<literal>@Secure</literal> or"
-msgstr ""
+msgstr "<literal>@Secure</literal> o"
#. Tag: para
#: part3.xml:35
#, no-c-format
msgid "<literal>@Updated</literal>,"
-msgstr ""
+msgstr "<literal>@Updated</literal>,"
#. Tag: para
#: part3.xml:39
#, no-c-format
msgid "instead of using compound names like"
-msgstr ""
+msgstr "en lugar de utilizar nombres compuestos como"
#. Tag: para
#: part3.xml:43
#, no-c-format
msgid "<literal>asyncPaymentProcessor</literal>,"
-msgstr ""
+msgstr "<literal>asyncPaymentProcessor</literal>,"
#. Tag: para
#: part3.xml:46
#, no-c-format
msgid "<literal>mockPaymentProcessor</literal>,"
-msgstr ""
+msgstr "<literal>mockPaymentProcessor</literal>,"
#. Tag: para
#: part3.xml:49
#, no-c-format
msgid "<literal>SecurityInterceptor</literal> or"
-msgstr ""
+msgstr "<literal>SecurityInterceptor</literal> o"
#. Tag: para
#: part3.xml:52
#, no-c-format
msgid "<literal>DocumentUpdatedEvent</literal>."
-msgstr ""
+msgstr "<literal>DocumentUpdatedEvent</literal>."
#. Tag: para
#: part3.xml:56
@@ -115,7 +120,7 @@
"disparate parts of the system. They help us categorize and understand our "
"code. They help us deal with common concerns in a common way. They make our "
"code more literate and more understandable."
-msgstr ""
+msgstr "Las anotaciones son reutilizables. Ayudan a describir cualidades comunes de partes dispares del sistema. Nos ayudan a categorizar y entender nuestro código. Nos ayudan a tratar las cuestiones comunes en una forma común. Hacer nuestro código más leíble y entendible."
#. Tag: para
#: part3.xml:61
@@ -126,7 +131,7 @@
"architecture. It encapsulates various properties of the role, including "
"scope, interceptor bindings, deployment type, etc, into a single reusable "
"package."
-msgstr ""
+msgstr "Los <emphasis>estereotipos</emphasis> de Web Beans van más allá de este paso. Un estereotipo modela un <emphasis>rol</emphasis> común en su arquitectura de aplicacion. El estereotipo encapsula varias propiedades del rol, incluyendo ámbito, enlaces de interceptor, tipo de despliegue, etc, en un sólo paquete reutilizable."
#. Tag: para
#: part3.xml:66
@@ -136,7 +141,7 @@
"so Web Beans takes advantage of XML schemas to validate the Java types and "
"attributes that appear in XML. This approach turns out to make the XML more "
"literate, just like annotations made our Java code more literate."
-msgstr ""
+msgstr "Incluso metadatos XML de Web Beans es teclado ¡fuertemente! No hay compilador para XML, por eso Web Beans aprovecha los esquemas XML para validar los tipos de Java y los atributos que aparecen en XML. Este enfoque hace que el archivo XML sea más leíble, al igual que las anotaciones hicieron a nuestro código de Java más leíble."
#. Tag: para
#: part3.xml:71
@@ -147,4 +152,5 @@
"more understandable. Most of the time you don't ever really <emphasis>need</"
"emphasis> to use these features, but if you use them wisely, you'll come to "
"appreciate their power."
-msgstr ""
+msgstr "Ahora estamos listos para conocer otras funciones más avanzadas de Web Beans. Tenga en cuenta que estas funciones hacen a nuestro código más fácil de validar y más entendible. La mayoría del tiempo no se <emphasis>necesita</emphasis> realmente utilizarlas, pero si usted las usa de modo inteligente, llegará a apreciar su poder."
+
Modified: doc/trunk/reference/es-ES/part4.po
===================================================================
--- doc/trunk/reference/es-ES/part4.po 2009-01-14 02:04:15 UTC (rev 941)
+++ doc/trunk/reference/es-ES/part4.po 2009-01-14 05:35:34 UTC (rev 942)
@@ -1,17 +1,20 @@
+# translation of part4.po to Spanish
# Language es-ES translations for master.xml package.
+#
# Automatically generated, 2008.
-#
+# Gladys Guerrero Lozano <gguerrer(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: master.xml \n"
+"Project-Id-Version: part4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-12-19 20:26+0000\n"
-"PO-Revision-Date: 2008-12-19 20:26+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-01-14 14:24+1000\n"
+"Last-Translator: Gladys Guerrero Lozano <gguerrer(a)redhat.com>\n"
+"Language-Team: Spanish <fedora-trans-es(a)redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: para
#: part4.xml:5
@@ -24,6 +27,8 @@
"foundation for a new ecosystem of portable extensions and integration with "
"existing frameworks and technologies."
msgstr ""
+"El tercer tema de Web Beans es la <emphasis>integración</emphasis>. Web Beans fue diseñada para trabajar junto con otras tecnologías, ayudando al desarrollador de la aplicación a encajar en otras tecnologías."
+"Web Beans es una tecnología abierta. Forma parte de un ecosistema EE de Java y es por si mismo una base para un nuevo ecosistema de extensiones portátiles e integración con marcos y tecnologías existentes."
#. Tag: para
#: part4.xml:12
@@ -37,7 +42,7 @@
"interesting technologies that are used in the world of Java application "
"development, but Web Beans makes it easier to use the technologies which are "
"not yet part of the platform seamlessly within the Java EE environment."
-msgstr ""
+msgstr "Ya hemos visto cómo Web Beans ayuda a integrar EJB y JSF, permitiendo a los EJB enlazarse directamente a páginas JSF. Esto es apenas el comienzo. Web Beans ofrece el mismo potencial a otras tecnologías, tales como motores de administración de proceso de negocios, otros marcos de red y modelos de componentes de terceras partes. La plataforma EE de Java nunca podrá estandarizar todas las tecnologías interesantes utilizadas en el mundo del desarrollo de la aplicación Java, pero Web Beans facilita el uso de las tecnologías que aún no hacen parte completamente de la plataforma dentro del entorno EE de Java."
#. Tag: para
#: part4.xml:21
@@ -49,4 +54,5 @@
"need to use these SPIs directly, but it's nice to know they are there if you "
"need them. Most importantly, you'll take advantage of them indirectly, every "
"time you use a third-party extension."
-msgstr ""
+msgstr "Ya estamos a punto de ver cómo aprovechar completamente la plataforma EE de Java en una aplicación que utiliza Web Beans. También veremos brevemente una serie de SPI provistas para soportar extensiones a Web Beans. Puede que nunca las tenga que utilizar directamente, pero es conveniente saber que están allí si se necesitan. Lo más importante, es que podrá aprovecharlas indirectamente cada vez que utilice una extensión de terceras partes."
+
Modified: doc/trunk/reference/es-ES/producermethods.po
===================================================================
--- doc/trunk/reference/es-ES/producermethods.po 2009-01-14 02:04:15 UTC (rev 941)
+++ doc/trunk/reference/es-ES/producermethods.po 2009-01-14 05:35:34 UTC (rev 942)
@@ -1,23 +1,26 @@
+# translation of producermethods.po to Spanish
# Language es-ES translations for master.xml package.
+#
# Automatically generated, 2008.
-#
+# Gladys Guerrero Lozano <gguerrer(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: master.xml \n"
+"Project-Id-Version: producermethods\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-12-20 22:08+0000\n"
-"PO-Revision-Date: 2008-12-19 20:26+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-01-14 15:31+1000\n"
+"Last-Translator: Gladys Guerrero Lozano <gguerrer(a)redhat.com>\n"
+"Language-Team: Spanish <fedora-trans-es(a)redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: producermethods.xml:5
#, no-c-format
msgid "Producer methods"
-msgstr ""
+msgstr "Métodos de productor"
#. Tag: para
#: producermethods.xml:7
@@ -29,12 +32,15 @@
"Beans into the Web Beans environment. (We'll meet a second approach in <xref "
"linkend=\"xml\"/>.)"
msgstr ""
+"Los métodos de productor nos permiten sobrepasar algunas limitaciones que se presentan cuando el administrador de Web Bean, en lugar de la aplicación, es responsable de instanciar objetos. También son la forma más fácil de integrar objetos que no son Web "
+"Beans dentro del entorno de Web Beans. (Veremos un segundo método en <xref "
+"linkend=\"xml\"/>.)"
#. Tag: para
#: producermethods.xml:12
#, no-c-format
msgid "According to the spec:"
-msgstr ""
+msgstr "Según las especificaciones:"
#. Tag: chapter
#: producermethods.xml:12
@@ -83,12 +89,40 @@
"method will be called by the Web Bean manager to obtain an instance to "
"service this injection point.</para>."
msgstr ""
+"<blockquote> <para>Un productor de Web Beans actúa como fuente de objetos a ser inyectados, donde:</para> <itemizedlist> <listitem> <para>los objetos que van a ser inyectados no necesitan ser instancias de Web Beans,</para> </"
+"listitem> <listitem> <para>el tipo concreto de objetos a ser inyectado puede variar en tiempo de ejecución o</para> </listitem> <listitem> <para>los objetos requieren alguna especificación de inicialización que no es realizada por el constructor de Web Bean</para> </listitem> </itemizedlist> </blockquote> <para>Por "
+"ejemplo, los métodos de productor nos permiten:</para> <itemizedlist> <listitem> "
+"<para>exponer una entidad JPA como un Web Bean,</para> </listitem> <listitem> "
+"<para>exponer cualquier clase JDK como un Web Bean,</para> </listitem> <listitem> "
+"<para>definir múltiples Web Beans, con diferentes ámbitos o inicialización para la misma clase de implementación, o</para> </listitem> <listitem> "
+"<para>variar la implementación de un tipo API en tiempo de ejecución.</para> </listitem> "
+"</itemizedlist> <para>En particular, los métodos de productor nos permiten utilizar polimorfismo de tiempo de ejecución con Web Beans. Como hemos visto, los tipos de despliegue son una solución potente para el problema del polimorfismo de tiempo de despliegue. Sin embargo, una vez que el sistema es desplegado, la implementación de Web Bean es corregida. El método de productor no tiene dicha limitación:</para> <programlisting role=\"JAVA\"><![CDATA"
+"[@SessionScoped\n"
+"public class Preferences {\n"
+" \n"
+" private PaymentStrategyType paymentStrategy;\n"
+" \n"
+" ...\n"
+" \n"
+" @Produces @Preferred \n"
+" public PaymentStrategy getPaymentStrategy() {\n"
+" switch (paymentStrategy) {\n"
+" case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
+" case CHEQUE: return new ChequePaymentStrategy();\n"
+" case PAYPAL: return new PayPalPaymentStrategy();\n"
+" default: return null;\n"
+" } \n"
+" }\n"
+" \n"
+"}]]></programlisting> <para>Consider an injection point:</para> "
+"<programlisting role=\"JAVA\"><![CDATA[@Preferred PaymentStrategy "
+"paymentStrat;]]></programlisting> <para>Este punto de inyección tiene el mismo tipo de anotaciones de enlace que el método de productor, por lo tanto apunta al método de productor mediante las reglas de inyección usuales de Web Beans. El método del productor será llamado por el administrador de Web Bean a fin de obtener una instancia para servir a este punto de inyección.</para>."
#. Tag: title
#: producermethods.xml:68
#, no-c-format
msgid "Scope of a producer method"
-msgstr ""
+msgstr "Ámbito de un método de productor"
#. Tag: para
#: producermethods.xml:70
@@ -100,6 +134,9 @@
"producer method. Thus, there could be multiple instances of the "
"<literal>PaymentStrategy</literal> object for each user session."
msgstr ""
+"El ámbito del método de productor está predeterminado a <literal>@Dependent</literal>, "
+"y así será llamado <emphasis>cada vez</emphasis> que el administrador de Web Bean inyecte este campo o cualquier otro campo que apunte al mismo método de productor. Así, podría haber múltiples instancias del objeto "
+"<literal>PaymentStrategy</literal> para cada sesión de usuario."
#. Tag: para
#: producermethods.xml:75
@@ -107,7 +144,7 @@
msgid ""
"To change this behavior, we can add a <literal>@SessionScoped</literal> "
"annotation to the method."
-msgstr ""
+msgstr "Para cambiar esta conducta, podemos agregar una anotación <literal>@SessionScoped</literal> a este método."
#. Tag: programlisting
#: producermethods.xml:78
@@ -118,6 +155,10 @@
" ...\n"
"}]]>"
msgstr ""
+"<![CDATA[@Produces @Preferred @SessionScoped\n"
+"public PaymentStrategy getPaymentStrategy() {\n"
+" ...\n"
+"}]]>"
#. Tag: para
#: producermethods.xml:80
@@ -126,13 +167,13 @@
"Now, when the producer method is called, the returned "
"<literal>PaymentStrategy</literal> will be bound to the session context. The "
"producer method won't be called again in the same session."
-msgstr ""
+msgstr "Ahora, cuando el método de productor es llamado, el <literal>PaymentStrategy</literal> devuelto se enlazará con el contexto de sesión. El método de productor no será llamado otra vez en la misma sesión."
#. Tag: title
#: producermethods.xml:87
#, no-c-format
msgid "Injection into producer methods"
-msgstr ""
+msgstr "Inyección dentro de métodos de productor"
#. Tag: para
#: producermethods.xml:89
@@ -144,6 +185,9 @@
"application can't take advantage of dependency injection and don't have "
"interceptors."
msgstr ""
+"No hay un problema en potencia con el código anterior. Las implementaciones de "
+"<literal>CreditCardPaymentStrategy</literal> son instanciadas mediante el operador "
+"<literal>nuevo</literal> de Java. Los objetos instanciados directamente por la aplicación no pueden hacer uso de la inyección de dependencia y no tienen interceptores."
#. Tag: para
#: producermethods.xml:94
@@ -151,7 +195,7 @@
msgid ""
"If this isn't what we want we can use dependency injection into the producer "
"method to obtain Web Bean instances:"
-msgstr ""
+msgstr "SI esto no es lo que deseamos podemos utilizar la inyección de dependencia dentro del método del productor para obtener las instancias de Web Bean:"
#. Tag: programlisting
#: producermethods.xml:97
@@ -169,6 +213,17 @@
" } \n"
"}]]>"
msgstr ""
+"<![CDATA[@Produces @Preferred @SessionScoped\n"
+"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
+" ChequePaymentStrategy cps,\n"
+" PayPalPaymentStrategy ppps) {\n"
+" switch (paymentStrategy) {\n"
+" case CREDIT_CARD: return ccps;\n"
+" case CHEQUE: return cps;\n"
+" case PAYPAL: return ppps;\n"
+" default: return null;\n"
+" } \n"
+"}]]>"
#. Tag: para
#: producermethods.xml:99
@@ -183,6 +238,8 @@
"emphasis> be detected by the Web Bean manager, so please take extra care "
"when returning Web Bean instances from producer methods!"
msgstr ""
+"Espere, ¿qué sucede si <literal>CreditCardPaymentStrategy</literal> es una petición en ámbito de Web Bean? Entonces el método del productor tiene el efecto de \"promover\" la instancia de petición en ámbito actual dentro del ámbito de sesión. ¡Esto casi seguro es un error! El objeto en ámbito de petición será destruido por el administrador de Web Bean antes de que finalice la sesión, pero la referencia al objeto se dejará \"colgando\" en el ámbito de sesión. Este error <emphasis>no</"
+"emphasis> será detectado por el administrador de Web Bean, entonces, ¡por favor tenga un cuidado especial al retornar instancias de Web Bean desde métodos de productor!"
#. Tag: para
#: producermethods.xml:107
@@ -193,7 +250,7 @@
"implementation, but this would affect other clients of that Web Bean. A "
"better option would be to change the scope of the producer method to "
"<literal>@Dependent</literal> or <literal>@RequestScoped</literal>."
-msgstr ""
+msgstr "Hay al menos tres formas de corregir este error. Podemos cambiar el ámbito de la implementación <literal>CreditCardPaymentStrategy</literal>, pero podría afectar a otros clientes de ese Web Bean. Una mejor opción sería cambiar el ámbito del método del productor a <literal>@Dependent</literal> o <literal>@RequestScoped</literal>."
#. Tag: para
#: producermethods.xml:113
@@ -201,19 +258,19 @@
msgid ""
"But a more common solution is to use the special <literal>@New</literal> "
"binding annotation."
-msgstr ""
+msgstr "Pero una solución más común es utilizar la anotacion especial de enlace <literal>@New</literal>."
#. Tag: title
#: producermethods.xml:119
#, no-c-format
msgid "Use of <literal>@New</literal> with producer methods"
-msgstr ""
+msgstr "Uso de <literal>@New</literal> con métodos de productor"
#. Tag: para
#: producermethods.xml:121
#, no-c-format
msgid "Consider the following producer method:"
-msgstr ""
+msgstr "Considere el siguiente método de productor:"
#. Tag: programlisting
#: producermethods.xml:123
@@ -233,6 +290,19 @@
" } \n"
"}]]>"
msgstr ""
+"<![CDATA[@Produces @Preferred @SessionScoped\n"
+"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
+"ccps,\n"
+" @New ChequePaymentStrategy cps,\n"
+" @New PayPalPaymentStrategy ppps) "
+"{\n"
+" switch (paymentStrategy) {\n"
+" case CREDIT_CARD: return ccps;\n"
+" case CHEQUE: return cps;\n"
+" case PAYPAL: return ppps;\n"
+" default: return null;\n"
+" } \n"
+"}]]>"
#. Tag: para
#: producermethods.xml:125
@@ -245,3 +315,6 @@
"<literal>Preferences</literal> object is destroyed, at the end of the "
"session."
msgstr ""
+"Entonces una nueva instancia <emphasis>dependiente</emphasis> de"
+"<literal>CreditCardPaymentStrategy</literal> será creada, pasada al método de productor, devuelta por el método de productor y finalmente vinculada al contexto de sesión. El objeto dependiente será destruido hasta que el objeto <literal>Preferencias</literal> sea destruido, al final de la sesión."
+
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r941 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: bean and 7 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-13 21:04:15 -0500 (Tue, 13 Jan 2009)
New Revision: 941
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SimpleBeanMap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/AbstractNaming.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/DeploymentProperties.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationIterator.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java
Log:
more generics tidyup
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -311,7 +311,6 @@
* @param beans The beans to filter
* @return A set of filtered beans
*/
- @SuppressWarnings("unchecked")
private <T> Set<Bean<T>> getMatchingBeans(AnnotatedItem<T, ?> element, List<Bean<?>> beans)
{
Set<Bean<T>> resolvedBeans = new HashSet<Bean<T>>();
@@ -319,7 +318,9 @@
{
if (element.isAssignableFrom(bean.getTypes()) && containsAllBindingBindingTypes(element, bean.getBindings()))
{
- resolvedBeans.add((Bean<T>) bean);
+ @SuppressWarnings("unchecked")
+ Bean<T> b = (Bean<T>) bean;
+ resolvedBeans.add(b);
}
}
return resolvedBeans;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -68,6 +68,7 @@
*
* @return The type parameter
*/
+ // TODO This ain't right!
@SuppressWarnings("unchecked")
protected Class<P> getTypeParameter()
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -172,7 +172,7 @@
ProxyFactory proxyFactory = Proxies.getProxyFactory(getTypes());
@SuppressWarnings("unchecked")
- Class<T> proxyClass = proxyFactory.createClass();
+ Class<T> proxyClass = proxyFactory.createClass().asSubclass(getType());
this.proxyClass = proxyClass;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -116,22 +116,27 @@
*
* @return an event instance
*/
- @SuppressWarnings("unchecked")
@Override
public Event<T> create()
{
try
{
DependentContext.INSTANCE.setActive(true);
- Class eventType = null;
+ Class<?> clazz;
if (this.getAnnotatedItem() instanceof AnnotatedParameter)
{
- eventType = Object.class;
- } else
+ clazz = Object.class;
+ }
+ else
{
- eventType = (Class<T>) getAnnotatedItem().getActualTypeArguments()[0];
+ clazz = Class.class.cast(getAnnotatedItem().getActualTypeArguments()[0]);
}
- return new EventImpl(eventType, manager, getBindingTypesArray());
+ // TODO should be able to move this up into annotated item?!
+
+ @SuppressWarnings("unchecked")
+ Class<T> eventType = (Class<T>) clazz;
+
+ return new EventImpl<T>(eventType, manager, getBindingTypesArray());
}
finally
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -49,11 +49,11 @@
super(field, manager);
}
- @SuppressWarnings("unchecked")
@Override
public T create()
{
- return (T) manager.getInjectionPointProvider().getPreviousInjectionPoint();
+ // TODO Why do we need to cast here?
+ return getType().cast(manager.getInjectionPointProvider().getPreviousInjectionPoint());
}
@Override
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -229,7 +229,6 @@
* @param bean The bean representation
* @param beans The set of created beans
*/
- @SuppressWarnings("unchecked")
protected void createBean(AbstractClassBean<?> bean, AnnotatedClass<?> annotatedClass, Set<AbstractBean<?, ?>> beans)
{
beans.add(bean);
@@ -248,7 +247,7 @@
beans.add(producerFieldBean);
log.info("Web Bean: " + producerFieldBean);
}
- for (AnnotatedItem injectionPoint : bean.getAnnotatedInjectionPoints())
+ for (AnnotatedItem<?, ?> injectionPoint : bean.getAnnotatedInjectionPoints())
{
if (injectionPoint.isAnnotationPresent(Fires.class))
{
@@ -256,7 +255,9 @@
}
if (injectionPoint.isAnnotationPresent(Obtains.class))
{
- InstanceBean<Object, Field> instanceBean = InstanceBean.of(injectionPoint, getManager());
+ // TODO FIx this
+ @SuppressWarnings("unchecked")
+ InstanceBean<Object, Field> instanceBean = InstanceBean.of((AnnotatedItem) injectionPoint, getManager());
beans.add(instanceBean);
log.info("Web Bean: " + instanceBean);
}
@@ -320,10 +321,12 @@
* @param eventType The event type to observe
* @param bindings The binding types to observe on
*/
- @SuppressWarnings("unchecked")
private <T> void registerObserver(Observer<T> observer, Class<?> eventType, Annotation[] bindings)
{
- getManager().addObserver(observer, (Class<T>) eventType, bindings);
+ // TODO Fix this!
+ @SuppressWarnings("unchecked")
+ Class<T> clazz = (Class<T>) eventType;
+ getManager().addObserver(observer, clazz, bindings);
}
/**
@@ -333,21 +336,21 @@
* @param injectionPoints A set of injection points to inspect
* @param beans A set of beans to add the Event beans to
*/
- @SuppressWarnings("unchecked")
private void registerEvents(Set<AnnotatedItem<?, ?>> injectionPoints, Set<AbstractBean<?, ?>> beans)
{
- for (AnnotatedItem injectionPoint : injectionPoints)
+ for (AnnotatedItem<?, ?> injectionPoint : injectionPoints)
{
registerEvent(injectionPoint, beans);
}
}
- @SuppressWarnings("unchecked")
- private void registerEvent(AnnotatedItem injectionPoint, Set<AbstractBean<?, ?>> beans)
+ private void registerEvent(AnnotatedItem<?, ?> injectionPoint, Set<AbstractBean<?, ?>> beans)
{
if (injectionPoint.isAnnotationPresent(Fires.class))
{
- EventBean<Object, Method> eventBean = EventBean.of(injectionPoint, getManager());
+ // TODO Fix this!
+ @SuppressWarnings("unchecked")
+ EventBean<Object, Method> eventBean = EventBean.of((AnnotatedItem) injectionPoint, getManager());
beans.add(eventBean);
log.info("Web Bean: " + eventBean);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -67,10 +67,9 @@
/**
* Clears the bean map
*/
- @SuppressWarnings("unchecked")
public void clear()
{
- Enumeration names = getAttributeNames();
+ Enumeration<String> names = getAttributeNames();
while (names.hasMoreElements())
{
String name = (String) names.nextElement();
@@ -85,11 +84,10 @@
*
* @return The beans
*/
- @SuppressWarnings("unchecked")
public Iterable<Contextual<? extends Object>> keySet()
{
List<Contextual<?>> beans = new ArrayList<Contextual<?>>();
- Enumeration names = getAttributeNames();
+ Enumeration<String> names = getAttributeNames();
while (names.hasMoreElements())
{
String name = (String) names.nextElement();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SimpleBeanMap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SimpleBeanMap.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SimpleBeanMap.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -57,9 +57,9 @@
*
* @see org.jboss.webbeans.context.beanmap.BeanMap#get(Bean)
*/
- @SuppressWarnings("unchecked")
public <T extends Object> T get(Contextual<? extends T> bean)
{
+ @SuppressWarnings("unchecked")
T instance = (T) super.get(bean);
log.trace("Searched bean map for " + bean + " and got " + instance);
return instance;
@@ -84,9 +84,9 @@
*
* @see org.jboss.webbeans.context.beanmap.BeanMap#remove(Bean)
*/
- @SuppressWarnings("unchecked")
public <T extends Object> T remove(Contextual<? extends T> bean)
{
+ @SuppressWarnings("unchecked")
T instance = (T) super.remove(bean);
log.trace("Removed instace " + instance + " for bean " + bean + " from the bean map");
return instance;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -74,13 +74,15 @@
* @param invocationContext The invocation context
* @return The found bean or null if the bean was not an enterprise bean
*/
- @SuppressWarnings("unchecked")
private static <T> EnterpriseBean<T> getBean(Class<? extends T> beanClass)
{
Bean<?> bean = CurrentManager.rootManager().getBeanMap().get(beanClass);
if (bean instanceof EnterpriseBean)
{
- return (EnterpriseBean<T>) bean;
+ @SuppressWarnings("unchecked")
+ // TODO shift this into the map!
+ EnterpriseBean<T> enterpriseBean = (EnterpriseBean<T>) bean;
+ return enterpriseBean;
}
else
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -154,7 +154,6 @@
* @return A set of Observers. An empty set is returned if there are no
* matches.
*/
- @SuppressWarnings("unchecked")
public <T> Set<Observer<T>> getObservers(T event, Annotation... bindings)
{
Set<Observer<T>> interestedObservers = new HashSet<Observer<T>>();
@@ -164,7 +163,10 @@
{
if (observer.isObserverInterested(bindings))
{
- interestedObservers.add((Observer<T>) observer.getObserver());
+ // TODO Fix this!
+ @SuppressWarnings("unchecked")
+ Observer<T> o = (Observer<T>) observer.getObserver();
+ interestedObservers.add(o);
}
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -163,7 +163,6 @@
return result;
}
- @SuppressWarnings("unchecked")
@Override
public boolean equals(Object other)
{
@@ -171,6 +170,7 @@
{
return false;
}
+ @SuppressWarnings("unchecked")
EventObserver<T> otherObserver = (EventObserver<T>) other;
if (!eventType.equals(otherObserver.getEventType()))
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -28,6 +28,7 @@
import java.util.Set;
import javax.webbeans.BindingType;
+
import org.jboss.webbeans.binding.CurrentBinding;
import org.jboss.webbeans.introspector.AnnotatedItem;
import org.jboss.webbeans.util.Proxies;
@@ -233,10 +234,9 @@
*
* @see org.jboss.webbeans.introspector.AnnotatedItem#getAnnotation(Class)
*/
- @SuppressWarnings("unchecked")
public <A extends Annotation> A getAnnotation(Class<? extends A> annotationType)
{
- return (A) annotationMap.get(annotationType);
+ return annotationType.cast(annotationMap.get(annotationType));
}
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -44,14 +44,13 @@
*
* @param annotationMap The annotation map
*/
- @SuppressWarnings("unchecked")
public AbstractAnnotatedType(AnnotationMap annotationMap, Class<T> type)
{
super(annotationMap);
this.name = type.getName();
if (type.getSuperclass() != null)
{
- this.superclass = new AnnotatedClassImpl(type.getSuperclass());
+ this.superclass = AnnotatedClassImpl.of(type.getSuperclass());
}
else
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -250,7 +250,6 @@
* @param type The type of the class
* @param annotations The array of annotations on the class
*/
- @SuppressWarnings("unchecked")
public AnnotatedClassImpl(Class<T> rawType, Type type, Annotation[] annotations)
{
super(buildAnnotationMap(annotations), rawType);
@@ -294,7 +293,9 @@
this.annotatedConstructors = new AnnotatedConstructorMap();
for (Constructor<?> constructor : clazz.getDeclaredConstructors())
{
- AnnotatedConstructor<T> annotatedConstructor = new AnnotatedConstructorImpl<T>((Constructor<T>) constructor, this);
+ @SuppressWarnings("unchecked")
+ Constructor<T> c = (Constructor<T>) constructor;
+ AnnotatedConstructor<T> annotatedConstructor = AnnotatedConstructorImpl.of(c, this);
if (!constructor.isAccessible())
{
constructor.setAccessible(true);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -59,6 +59,11 @@
// Cached string representation
private String toString;
+
+ public static <T> AnnotatedConstructor<T> of(Constructor<T> constructor, AnnotatedType<T> declaringClass)
+ {
+ return new AnnotatedConstructorImpl<T>(constructor, declaringClass);
+ }
/**
* Constructor
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -74,7 +74,6 @@
* @param method The underlying method
* @param declaringClass The declaring class abstraction
*/
- @SuppressWarnings("unchecked")
public AnnotatedMethodImpl(Method method, AnnotatedType<?> declaringClass)
{
super(buildAnnotationMap(method), method);
@@ -245,22 +244,19 @@
* @see org.jboss.webbeans.introspector.AnnotatedMethod#invoke(ManagerImpl,
* Object)
*/
- @SuppressWarnings("unchecked")
public T invoke(Object instance, ManagerImpl manager)
{
- return (T) Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, manager));
+ return getType().cast(Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, manager)));
}
- @SuppressWarnings("unchecked")
public T invokeOnInstance(Object instance, ManagerImpl manager)
{
- return (T) Reflections.invokeAndWrap(getName(), getParameterTypesAsArray(), instance, getParameterValues(parameters, manager));
+ return getType().cast(Reflections.invokeAndWrap(getName(), getParameterTypesAsArray(), instance, getParameterValues(parameters, manager)));
}
- @SuppressWarnings("unchecked")
public T invokeWithSpecialValue(Object instance, Class<? extends Annotation> specialParam, Object specialVal, ManagerImpl manager)
{
- return (T) Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, specialVal, specialParam, manager));
+ return getType().cast(Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, specialVal, specialParam, manager)));
}
/**
@@ -272,10 +268,9 @@
* @see org.jboss.webbeans.introspector.AnnotatedMethod#invoke(Object,
* Object...)
*/
- @SuppressWarnings("unchecked")
public T invoke(Object instance, Object... parameters)
{
- return (T) Reflections.invokeAndWrap(getDelegate(), instance, parameters);
+ return getType().cast(Reflections.invokeAndWrap(getDelegate(), instance, parameters));
}
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/AbstractNaming.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/AbstractNaming.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/AbstractNaming.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -45,7 +45,6 @@
* @param expectedType The expected return type
* @return The found item
*/
- @SuppressWarnings("unchecked")
public <T> T lookup(String name, Class<? extends T> expectedType)
{
Object instance;
@@ -59,7 +58,7 @@
}
try
{
- return (T) instance;
+ return expectedType.cast(instance);
}
catch (ClassCastException e)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -51,10 +51,12 @@
* @param key The key to look for
* @return The Future instance of the value
*/
- @SuppressWarnings("unchecked")
+
public <T extends V> Future<T> getFuture(K key)
{
- return (Future<T>) super.get(key);
+ @SuppressWarnings("unchecked")
+ Future<T> future = (Future<T>) super.get(key);
+ return future;
}
/**
@@ -63,9 +65,9 @@
* @param key The key to look for
* @return The value
*/
- @SuppressWarnings("unchecked")
public <T extends V> T getValue(K key)
{
+ @SuppressWarnings("unchecked")
Future<T> value = (Future<T>) map.get(key);
if (value != null)
{
@@ -110,15 +112,18 @@
* @param callable The item, wrapped in a Callable instance
* @return The item added
*/
- @SuppressWarnings("unchecked")
public <E> E putIfAbsent(K key, Callable<E> callable)
{
- Future<E> value = (Future<E>) map.get(key);
+ @SuppressWarnings("unchecked")
+ Future<E> future = (Future<E>) map.get(key);
+ Future<E> value = future;
if (value == null)
{
FutureTask<E> task = new FutureTask<E>(callable);
value = task;
- map.put(key, (Future<V>) task);
+ @SuppressWarnings("unchecked")
+ Future<V> t = (Future<V>) task;
+ map.put(key, t);
task.run();
}
boolean interrupted = false;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/DeploymentProperties.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/DeploymentProperties.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/DeploymentProperties.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -153,7 +153,6 @@
* @param propertyName The name of the property to load
* @return A set of classes specified
*/
- @SuppressWarnings("unchecked")
public static <T> Set<Class<? extends T>> getClasses(DeploymentProperties deploymentProperties, ResourceLoader resourceLoader, String propertyName, Class<T> expectedType)
{
Set<Class<? extends T>> classes = new HashSet<Class<? extends T>>();
@@ -161,7 +160,9 @@
{
try
{
- classes.add((Class<? extends T>) resourceLoader.classForName(className));
+ @SuppressWarnings("unchecked")
+ Class<? extends T> classForName = (Class<? extends T>) resourceLoader.classForName(className);
+ classes.add(classForName);
}
catch (ResourceLoadingException e)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationIterator.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationIterator.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationIterator.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -25,18 +25,17 @@
*
* @author Pete Muir
*/
-@SuppressWarnings("unchecked")
public class EnumerationIterator<T> implements Iterator<T>
{
// The enumeration
- private Enumeration e;
+ private Enumeration<T> e;
/**
* Constructor
*
* @param e The enumeration
*/
- public EnumerationIterator(Enumeration e)
+ public EnumerationIterator(Enumeration<T> e)
{
this.e = e;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -256,7 +256,6 @@
* @return A list of matching constructors. An empty list is returned if no
* matches are found
*/
- @SuppressWarnings("unchecked")
public static <T> List<Constructor<T>> getAnnotatedConstructors(Class<? extends T> clazz, Class<? extends Annotation> annotationType)
{
List<Constructor<T>> constructors = new ArrayList<Constructor<T>>();
@@ -264,7 +263,9 @@
{
if (constructor.isAnnotationPresent(annotationType))
{
- constructors.add((Constructor<T>) constructor);
+ @SuppressWarnings("unchecked")
+ Constructor<T> c = (Constructor<T>) constructor;
+ constructors.add(c);
}
}
return constructors;
@@ -279,7 +280,6 @@
* @return A list of matching constructors. An empty list is returned if no
* matches are found
*/
- @SuppressWarnings("unchecked")
public static <T> List<Constructor<T>> getConstructorsForAnnotatedParameter(Class<? extends T> clazz, Class<? extends Annotation> parameterAnnotationType)
{
List<Constructor<T>> constructors = new ArrayList<Constructor<T>>();
@@ -291,7 +291,9 @@
{
if (annotation.annotationType().equals(parameterAnnotationType))
{
- constructors.add((Constructor<T>) constructor);
+ @SuppressWarnings("unchecked")
+ Constructor<T> c = (Constructor<T>) constructor;
+ constructors.add(c);
}
}
}
@@ -308,7 +310,6 @@
* @return A list of matching constructors. An empty list is returned if no
* matches are found
*/
- @SuppressWarnings("unchecked")
public static <T> List<Constructor<T>> getConstructorsForMetaAnnotatedParameter(Class<? extends T> clazz, Class<? extends Annotation> metaAnnotationType)
{
List<Constructor<T>> constructors = new ArrayList<Constructor<T>>();
@@ -320,7 +321,9 @@
{
if (annotation.annotationType().isAnnotationPresent(metaAnnotationType))
{
- constructors.add((Constructor<T>) constructor);
+ @SuppressWarnings("unchecked")
+ Constructor<T> c = (Constructor<T>) constructor;
+ constructors.add(c);
}
}
}
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r940 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: bean and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-13 20:24:09 -0500 (Tue, 13 Jan 2009)
New Revision: 940
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java
Log:
more generics tidyup
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-14 00:58:19 UTC (rev 939)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-14 01:24:09 UTC (rev 940)
@@ -189,7 +189,7 @@
* @param bindingTypes The binding types to match
* @return The set of matching disposal methods
*/
- public <T> Set<AnnotatedMethod<Object>> resolveDisposalMethods(Class<T> apiType, Annotation... bindings)
+ public <T> Set<AnnotatedMethod<?>> resolveDisposalMethods(Class<T> apiType, Annotation... bindings)
{
// TODO Implement disposal methods
return Collections.emptySet();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-14 00:58:19 UTC (rev 939)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-14 01:24:09 UTC (rev 940)
@@ -482,7 +482,7 @@
}
- public void preDestroy(Object target)
+ public void preDestroy(T target)
{
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-01-14 00:58:19 UTC (rev 939)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-01-14 01:24:09 UTC (rev 940)
@@ -2,6 +2,7 @@
import java.lang.annotation.Annotation;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -11,6 +12,7 @@
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.binding.NewBinding;
import org.jboss.webbeans.introspector.AnnotatedClass;
+import org.jboss.webbeans.introspector.AnnotatedMethod;
import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
public class NewEnterpriseBean<T> extends EnterpriseBean<T>
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-14 00:58:19 UTC (rev 939)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-14 01:24:09 UTC (rev 940)
@@ -2,6 +2,7 @@
import java.lang.annotation.Annotation;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -12,6 +13,7 @@
import org.jboss.webbeans.binding.NewBinding;
import org.jboss.webbeans.context.DependentContext;
import org.jboss.webbeans.introspector.AnnotatedClass;
+import org.jboss.webbeans.introspector.AnnotatedMethod;
import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
public class NewSimpleBean<T> extends SimpleBean<T>
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-14 00:58:19 UTC (rev 939)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-14 01:24:09 UTC (rev 940)
@@ -138,7 +138,7 @@
*/
protected void initDisposalMethod()
{
- Set<AnnotatedMethod<Object>> disposalMethods = manager.resolveDisposalMethods(getType(), getBindings().toArray(new Annotation[0]));
+ Set<AnnotatedMethod<?>> disposalMethods = manager.resolveDisposalMethods(getType(), getBindings().toArray(new Annotation[0]));
if (disposalMethods.size() == 1)
{
this.disposalMethod = disposalMethods.iterator().next();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-01-14 00:58:19 UTC (rev 939)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-01-14 01:24:09 UTC (rev 940)
@@ -41,10 +41,11 @@
@PostConstruct
public void postConstruct(InvocationContext invocationContext) throws Exception
{
- EnterpriseBean<Object> enterpriseBean = getBean(invocationContext);
+ Object target = invocationContext.getTarget();
+ EnterpriseBean<Object> enterpriseBean = getBean(target.getClass());
if (enterpriseBean != null)
{
- enterpriseBean.postConstruct(invocationContext.getTarget());
+ enterpriseBean.postConstruct(target);
}
invocationContext.proceed();
}
@@ -58,10 +59,11 @@
@PreDestroy
public void preDestroy(InvocationContext invocationContext) throws Exception
{
- EnterpriseBean<Object> enterpriseBean = getBean(invocationContext);
+ Object target = invocationContext.getTarget();
+ EnterpriseBean<Object> enterpriseBean = getBean(target.getClass());
if (enterpriseBean != null)
{
- enterpriseBean.preDestroy(invocationContext.getTarget());
+ enterpriseBean.preDestroy(target);
}
invocationContext.proceed();
}
@@ -73,13 +75,12 @@
* @return The found bean or null if the bean was not an enterprise bean
*/
@SuppressWarnings("unchecked")
- private static EnterpriseBean<Object> getBean(InvocationContext invocationContext)
+ private static <T> EnterpriseBean<T> getBean(Class<? extends T> beanClass)
{
- Class<?> beanClass = invocationContext.getTarget().getClass();
Bean<?> bean = CurrentManager.rootManager().getBeanMap().get(beanClass);
if (bean instanceof EnterpriseBean)
{
- return (EnterpriseBean<Object>) bean;
+ return (EnterpriseBean<T>) bean;
}
else
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java 2009-01-14 00:58:19 UTC (rev 939)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java 2009-01-14 01:24:09 UTC (rev 940)
@@ -32,7 +32,7 @@
public abstract class AbstractAnnotatedType<T> extends AbstractAnnotatedItem<T, Class<T>>
{
// The superclass abstraction of the type
- private final AnnotatedClass<Object> superclass;
+ private final AnnotatedClass<?> superclass;
// The name of the type
private final String name;
@@ -100,7 +100,7 @@
*
* @return The superclass abstraction
*/
- public AnnotatedClass<Object> getSuperclass()
+ public AnnotatedClass<?> getSuperclass()
{
return superclass;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java 2009-01-14 00:58:19 UTC (rev 939)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java 2009-01-14 01:24:09 UTC (rev 940)
@@ -112,7 +112,7 @@
annotatedMembers = new AnnotatedMemberMap();
for (Method member : clazz.getDeclaredMethods())
{
- AnnotatedMethod<? extends Object> annotatedMethod = new AnnotatedMethodImpl<Object>(member, this);
+ AnnotatedMethod<?> annotatedMethod = new AnnotatedMethodImpl<Object>(member, this);
members.add(annotatedMethod);
for (Annotation annotation : annotatedMethod.getAnnotations())
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 00:58:19 UTC (rev 939)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 01:24:09 UTC (rev 940)
@@ -223,7 +223,7 @@
private final AnnotatedFieldMap metaAnnotatedFields;
// The set of abstracted methods
- private final Set<AnnotatedMethod<Object>> methods;
+ private final Set<AnnotatedMethod<?>> methods;
// The map from annotation type to abstracted method with annotation
private final AnnotatedMethodMap annotatedMethods;
// The map from annotation type to method with a parameter with annotation
@@ -275,7 +275,7 @@
{
field.setAccessible(true);
}
- AnnotatedField<Object> annotatedField = new AnnotatedFieldImpl<Object>(field, this);
+ AnnotatedField<?> annotatedField = new AnnotatedFieldImpl<Object>(field, this);
this.fields.add(annotatedField);
for (Annotation annotation : annotatedField.getAnnotations())
{
@@ -312,7 +312,7 @@
}
}
- this.methods = new HashSet<AnnotatedMethod<Object>>();
+ this.methods = new HashSet<AnnotatedMethod<?>>();
this.annotatedMethods = new AnnotatedMethodMap();
this.methodsByAnnotatedParameters = new AnnotatedMethodMap();
for (Class<?> c = clazz; c != Object.class && c != null; c = c.getSuperclass())
@@ -324,7 +324,7 @@
method.setAccessible(true);
}
- AnnotatedMethod<Object> annotatedMethod = new AnnotatedMethodImpl<Object>(method, this);
+ AnnotatedMethod<?> annotatedMethod = new AnnotatedMethodImpl<Object>(method, this);
this.methods.add(annotatedMethod);
for (Annotation annotation : annotatedMethod.getAnnotations())
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-14 00:58:19 UTC (rev 939)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-14 01:24:09 UTC (rev 940)
@@ -68,7 +68,6 @@
* @param constructor The constructor method
* @param declaringClass The declaring class
*/
- @SuppressWarnings("unchecked")
public AnnotatedConstructorImpl(Constructor<T> constructor, AnnotatedType<T> declaringClass)
{
super(buildAnnotationMap(constructor), constructor);
@@ -81,8 +80,8 @@
{
if (constructor.getParameterAnnotations()[i].length > 0)
{
- Class<? extends Object> clazz = constructor.getParameterTypes()[i];
- AnnotatedParameter<Object> parameter = new AnnotatedParameterImpl<Object>(constructor.getParameterAnnotations()[i], (Class<Object>) clazz);
+ Class<?> clazz = constructor.getParameterTypes()[i];
+ AnnotatedParameter<?> parameter = AnnotatedParameterImpl.of(constructor.getParameterAnnotations()[i], clazz);
parameters.add(parameter);
for (Annotation annotation : parameter.getAnnotations())
@@ -92,8 +91,8 @@
}
else
{
- Class<? extends Object> clazz = constructor.getParameterTypes()[i];
- AnnotatedParameter<Object> parameter = new AnnotatedParameterImpl<Object>(new Annotation[0], (Class<Object>) clazz);
+ Class<?> clazz = constructor.getParameterTypes()[i];
+ AnnotatedParameter<?> parameter = AnnotatedParameterImpl.of(new Annotation[0], clazz);
parameters.add(parameter);
for (Annotation annotation : parameter.getAnnotations())
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-14 00:58:19 UTC (rev 939)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-14 01:24:09 UTC (rev 940)
@@ -95,8 +95,8 @@
{
if (method.getParameterAnnotations()[i].length > 0)
{
- Class<? extends Object> clazz = method.getParameterTypes()[i];
- AnnotatedParameter<Object> parameter = new AnnotatedParameterImpl<Object>(method.getParameterAnnotations()[i], (Class<Object>) clazz);
+ Class<?> clazz = method.getParameterTypes()[i];
+ AnnotatedParameter<?> parameter = AnnotatedParameterImpl.of(method.getParameterAnnotations()[i], clazz);
this.parameters.add(parameter);
for (Annotation annotation : parameter.getAnnotations())
{
@@ -108,8 +108,8 @@
}
else
{
- Class<? extends Object> clazz = method.getParameterTypes()[i];
- AnnotatedParameter<Object> parameter = new AnnotatedParameterImpl<Object>(new Annotation[0], (Class<Object>) clazz);
+ Class<?> clazz = method.getParameterTypes()[i];
+ AnnotatedParameter<?> parameter = AnnotatedParameterImpl.of(new Annotation[0], clazz);
this.parameters.add(parameter);
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-01-14 00:58:19 UTC (rev 939)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2009-01-14 01:24:09 UTC (rev 940)
@@ -47,6 +47,11 @@
// Cached string representation
private String toString;
+
+ public static <T> AnnotatedParameter<T> of(Annotation[] annotations, Class<T> clazz)
+ {
+ return new AnnotatedParameterImpl<T>(annotations, clazz);
+ }
/**
* Constructor
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r939 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/bootstrap and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-13 19:58:19 -0500 (Tue, 13 Jan 2009)
New Revision: 939
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java
Log:
Fix generic types
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-14 00:48:55 UTC (rev 938)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-14 00:58:19 UTC (rev 939)
@@ -60,9 +60,9 @@
// The item representation
protected AnnotatedClass<T> annotatedItem;
// The injectable fields
- private Set<AnnotatedField<Object>> injectableFields;
+ private Set<AnnotatedField<?>> injectableFields;
// The initializer methods
- private Set<AnnotatedMethod<Object>> initializerMethods;
+ private Set<AnnotatedMethod<?>> initializerMethods;
/**
* Constructor
@@ -92,7 +92,7 @@
protected void checkPassivation()
{
- for (AnnotatedField<Object> injectableField : injectableFields)
+ for (AnnotatedField<?> injectableField : injectableFields)
{
if (injectableField.isTransient())
{
@@ -117,24 +117,12 @@
}
/**
- * Gets the producer methods
- *
- * @return A set of producer methods. An empty set is returned if there are
- * none present
- */
- @Deprecated
- public Set<AnnotatedMethod<Object>> getProducerMethods()
- {
- return getAnnotatedItem().getAnnotatedMethods(Produces.class);
- }
-
- /**
* Initializes the injection points
*/
protected void initInjectionPoints()
{
- injectableFields = new HashSet<AnnotatedField<Object>>();
- for (AnnotatedField<Object> annotatedField : annotatedItem.getMetaAnnotatedFields(BindingType.class))
+ injectableFields = new HashSet<AnnotatedField<?>>();
+ for (AnnotatedField<?> annotatedField : annotatedItem.getMetaAnnotatedFields(BindingType.class))
{
if (!annotatedField.isAnnotationPresent(Produces.class))
{
@@ -157,8 +145,8 @@
*/
protected void initInitializerMethods()
{
- initializerMethods = new HashSet<AnnotatedMethod<Object>>();
- for (AnnotatedMethod<Object> annotatedMethod : annotatedItem.getAnnotatedMethods(Initializer.class))
+ initializerMethods = new HashSet<AnnotatedMethod<?>>();
+ for (AnnotatedMethod<?> annotatedMethod : annotatedItem.getAnnotatedMethods(Initializer.class))
{
if (annotatedMethod.isStatic())
{
@@ -262,7 +250,7 @@
*
* @return The set of injectable fields
*/
- public Set<AnnotatedField<Object>> getInjectableFields()
+ public Set<AnnotatedField<?>> getInjectableFields()
{
return injectableFields;
}
@@ -272,7 +260,7 @@
*
* @return The set of annotated methods
*/
- public Set<AnnotatedMethod<Object>> getInitializerMethods()
+ public Set<AnnotatedMethod<?>> getInitializerMethods()
{
return initializerMethods;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-14 00:48:55 UTC (rev 938)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-14 00:58:19 UTC (rev 939)
@@ -364,7 +364,7 @@
*/
protected void callInitializers(T instance)
{
- for (AnnotatedMethod<Object> initializer : getInitializerMethods())
+ for (AnnotatedMethod<?> initializer : getInitializerMethods())
{
initializer.invoke(manager, instance);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-01-14 00:48:55 UTC (rev 938)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-01-14 00:58:19 UTC (rev 939)
@@ -2,7 +2,6 @@
import java.lang.annotation.Annotation;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -12,7 +11,6 @@
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.binding.NewBinding;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.AnnotatedMethod;
import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
public class NewEnterpriseBean<T> extends EnterpriseBean<T>
@@ -53,12 +51,6 @@
}
@Override
- public Set<AnnotatedMethod<Object>> getProducerMethods()
- {
- return Collections.emptySet();
- }
-
- @Override
public Set<Annotation> getBindings()
{
return NEW_BINDING_SET;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-14 00:48:55 UTC (rev 938)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-14 00:58:19 UTC (rev 939)
@@ -2,7 +2,6 @@
import java.lang.annotation.Annotation;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -13,7 +12,6 @@
import org.jboss.webbeans.binding.NewBinding;
import org.jboss.webbeans.context.DependentContext;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.AnnotatedMethod;
import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
public class NewSimpleBean<T> extends SimpleBean<T>
@@ -75,12 +73,6 @@
}
@Override
- public Set<AnnotatedMethod<Object>> getProducerMethods()
- {
- return Collections.emptySet();
- }
-
- @Override
public Set<Annotation> getBindings()
{
return NEW_BINDING_SET;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-14 00:48:55 UTC (rev 938)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-14 00:58:19 UTC (rev 939)
@@ -63,9 +63,9 @@
// The constructor
private AnnotatedConstructor<T> constructor;
// The post-construct method
- private AnnotatedMethod<Object> postConstruct;
+ private AnnotatedMethod<?> postConstruct;
// The pre-destroy method
- private AnnotatedMethod<Object> preDestroy;
+ private AnnotatedMethod<?> preDestroy;
/**
* Creates a simple, annotation defined Web Bean
@@ -171,7 +171,7 @@
*/
protected void callPreDestroy(T instance)
{
- AnnotatedMethod<Object> preDestroy = getPreDestroy();
+ AnnotatedMethod<?> preDestroy = getPreDestroy();
if (preDestroy != null)
{
try
@@ -193,7 +193,7 @@
*/
protected void callPostConstruct(T instance)
{
- AnnotatedMethod<Object> postConstruct = getPostConstruct();
+ AnnotatedMethod<?> postConstruct = getPostConstruct();
if (postConstruct != null)
{
try
@@ -215,7 +215,7 @@
*/
protected void callInitializers(T instance)
{
- for (AnnotatedMethod<Object> initializer : getInitializerMethods())
+ for (AnnotatedMethod<?> initializer : getInitializerMethods())
{
initializer.invoke(instance, manager);
}
@@ -315,7 +315,7 @@
{
annotatedInjectionPoints.add(parameter);
}
- for (AnnotatedMethod<Object> initializer : getInitializerMethods())
+ for (AnnotatedMethod<?> initializer : getInitializerMethods())
{
for (AnnotatedParameter<?> parameter : initializer.getParameters())
{
@@ -381,7 +381,7 @@
*/
protected void initPostConstruct()
{
- Set<AnnotatedMethod<Object>> postConstructMethods = getAnnotatedItem().getAnnotatedMethods(PostConstruct.class);
+ Set<AnnotatedMethod<?>> postConstructMethods = getAnnotatedItem().getAnnotatedMethods(PostConstruct.class);
log.trace("Found " + postConstructMethods + " constructors annotated with @Initializer for " + getType());
if (postConstructMethods.size() > 1)
{
@@ -403,7 +403,7 @@
*/
protected void initPreDestroy()
{
- Set<AnnotatedMethod<Object>> preDestroyMethods = getAnnotatedItem().getAnnotatedMethods(PreDestroy.class);
+ Set<AnnotatedMethod<?>> preDestroyMethods = getAnnotatedItem().getAnnotatedMethods(PreDestroy.class);
log.trace("Found " + preDestroyMethods + " constructors annotated with @Initializer for " + getType());
if (preDestroyMethods.size() > 1)
{
@@ -464,7 +464,7 @@
*
* @return The post-construct method
*/
- public AnnotatedMethod<Object> getPostConstruct()
+ public AnnotatedMethod<?> getPostConstruct()
{
return postConstruct;
}
@@ -474,7 +474,7 @@
*
* @return The pre-destroy method
*/
- public AnnotatedMethod<Object> getPreDestroy()
+ public AnnotatedMethod<?> getPreDestroy()
{
return preDestroy;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-14 00:48:55 UTC (rev 938)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-14 00:58:19 UTC (rev 939)
@@ -234,7 +234,7 @@
{
beans.add(bean);
getManager().getResolver().addInjectionPoints(bean.getAnnotatedInjectionPoints());
- for (AnnotatedMethod<Object> producerMethod : bean.getProducerMethods())
+ for (AnnotatedMethod<?> producerMethod : annotatedClass.getAnnotatedMethods(Produces.class))
{
ProducerMethodBean<?> producerMethodBean = ProducerMethodBean.of(producerMethod, bean, getManager());
beans.add(producerMethodBean);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:48:55 UTC (rev 938)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:58:19 UTC (rev 939)
@@ -54,7 +54,7 @@
* @return A set of abstracted fields with the given meta-annotation. Returns
* an empty set if there are no matches
*/
- public Set<AnnotatedField<Object>> getMetaAnnotatedFields(Class<? extends Annotation> metaAnnotationType);
+ public Set<AnnotatedField<?>> getMetaAnnotatedFields(Class<? extends Annotation> metaAnnotationType);
/**
* Gets all constructors which are annotated with annotationType
@@ -88,7 +88,7 @@
* @return A set of abstracted methods with the given annotation. Returns an
* empty set if there are no matches
*/
- public Set<AnnotatedMethod<Object>> getAnnotatedMethods(Class<? extends Annotation> annotationType);
+ public Set<AnnotatedMethod<?>> getAnnotatedMethods(Class<? extends Annotation> annotationType);
/**
* Find the annotated method for a given methodDescriptor
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 00:48:55 UTC (rev 938)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 00:58:19 UTC (rev 939)
@@ -56,17 +56,17 @@
* A (annotation type -> set of field abstractions with annotation/meta
* annotation) map
*/
- private static class AnnotatedFieldMap extends ForwardingMap<Class<? extends Annotation>, Set<AnnotatedField<Object>>>
+ private static class AnnotatedFieldMap extends ForwardingMap<Class<? extends Annotation>, Set<AnnotatedField<?>>>
{
- private Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> delegate;
+ private Map<Class<? extends Annotation>, Set<AnnotatedField<?>>> delegate;
public AnnotatedFieldMap()
{
- delegate = new HashMap<Class<? extends Annotation>, Set<AnnotatedField<Object>>>();
+ delegate = new HashMap<Class<? extends Annotation>, Set<AnnotatedField<?>>>();
}
@Override
- protected Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> delegate()
+ protected Map<Class<? extends Annotation>, Set<AnnotatedField<?>>> delegate()
{
return delegate;
}
@@ -78,18 +78,18 @@
}
@Override
- public Set<AnnotatedField<Object>> get(Object key)
+ public Set<AnnotatedField<?>> get(Object key)
{
- Set<AnnotatedField<Object>> fields = super.get(key);
- return fields != null ? fields : new HashSet<AnnotatedField<Object>>();
+ Set<AnnotatedField<?>> fields = super.get(key);
+ return fields != null ? fields : new HashSet<AnnotatedField<?>>();
}
- public void put(Class<? extends Annotation> key, AnnotatedField<Object> value)
+ public void put(Class<? extends Annotation> key, AnnotatedField<?> value)
{
- Set<AnnotatedField<Object>> fields = super.get(key);
+ Set<AnnotatedField<?>> fields = super.get(key);
if (fields == null)
{
- fields = new HashSet<AnnotatedField<Object>>();
+ fields = new HashSet<AnnotatedField<?>>();
super.put(key, fields);
}
fields.add(value);
@@ -100,17 +100,17 @@
/**
* A (annotation type -> set of method abstractions with annotation) map
*/
- private class AnnotatedMethodMap extends ForwardingMap<Class<? extends Annotation>, Set<AnnotatedMethod<Object>>>
+ private class AnnotatedMethodMap extends ForwardingMap<Class<? extends Annotation>, Set<AnnotatedMethod<?>>>
{
- private Map<Class<? extends Annotation>, Set<AnnotatedMethod<Object>>> delegate;
+ private Map<Class<? extends Annotation>, Set<AnnotatedMethod<?>>> delegate;
public AnnotatedMethodMap()
{
- delegate = new HashMap<Class<? extends Annotation>, Set<AnnotatedMethod<Object>>>();
+ delegate = new HashMap<Class<? extends Annotation>, Set<AnnotatedMethod<?>>>();
}
@Override
- protected Map<Class<? extends Annotation>, Set<AnnotatedMethod<Object>>> delegate()
+ protected Map<Class<? extends Annotation>, Set<AnnotatedMethod<?>>> delegate()
{
return delegate;
}
@@ -122,18 +122,18 @@
}
@Override
- public Set<AnnotatedMethod<Object>> get(Object key)
+ public Set<AnnotatedMethod<?>> get(Object key)
{
- Set<AnnotatedMethod<Object>> methods = super.get(key);
- return methods != null ? methods : new HashSet<AnnotatedMethod<Object>>();
+ Set<AnnotatedMethod<?>> methods = super.get(key);
+ return methods != null ? methods : new HashSet<AnnotatedMethod<?>>();
}
- public void put(Class<? extends Annotation> key, AnnotatedMethod<Object> value)
+ public void put(Class<? extends Annotation> key, AnnotatedMethod<?> value)
{
- Set<AnnotatedMethod<Object>> methods = super.get(key);
+ Set<AnnotatedMethod<?>> methods = super.get(key);
if (methods == null)
{
- methods = new HashSet<AnnotatedMethod<Object>>();
+ methods = new HashSet<AnnotatedMethod<?>>();
super.put(key, methods);
}
methods.add(value);
@@ -330,7 +330,7 @@
{
if (!annotatedMethods.containsKey(annotation.annotationType()))
{
- annotatedMethods.put(annotation.annotationType(), new HashSet<AnnotatedMethod<Object>>());
+ annotatedMethods.put(annotation.annotationType(), new HashSet<AnnotatedMethod<?>>());
}
annotatedMethods.get(annotation.annotationType()).add(annotatedMethod);
}
@@ -418,7 +418,7 @@
* @return The set of abstracted fields with meta-annotation present. Returns
* an empty set if no matches are found.
*/
- public Set<AnnotatedField<Object>> getMetaAnnotatedFields(Class<? extends Annotation> metaAnnotationType)
+ public Set<AnnotatedField<?>> getMetaAnnotatedFields(Class<? extends Annotation> metaAnnotationType)
{
return Collections.unmodifiableSet(metaAnnotatedFields.get(metaAnnotationType));
}
@@ -434,8 +434,7 @@
*/
public Set<AnnotatedField<?>> getAnnotatedFields(Class<? extends Annotation> annotationType)
{
- // TODO temp fix
- return (Set) Collections.unmodifiableSet(annotatedFields.get(annotationType));
+ return Collections.unmodifiableSet(annotatedFields.get(annotationType));
}
/**
@@ -471,7 +470,7 @@
*
* @see org.jboss.webbeans.introspector.AnnotatedClass#getAnnotatedMethods(Class)
*/
- public Set<AnnotatedMethod<Object>> getAnnotatedMethods(Class<? extends Annotation> annotationType)
+ public Set<AnnotatedMethod<?>> getAnnotatedMethods(Class<? extends Annotation> annotationType)
{
return Collections.unmodifiableSet(annotatedMethods.get(annotationType));
}
@@ -507,8 +506,7 @@
public Set<AnnotatedMethod<?>> getMethodsWithAnnotatedParameters(Class<? extends Annotation> annotationType)
{
- // TODO temporary fix
- return (Set) methodsByAnnotatedParameters.get(annotationType);
+ return methodsByAnnotatedParameters.get(annotationType);
}
public AnnotatedMethod<?> getMethod(Method methodDescriptor)
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java 2009-01-14 00:48:55 UTC (rev 938)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java 2009-01-14 00:58:19 UTC (rev 939)
@@ -248,11 +248,11 @@
* types declared by annotations that appear on the implementation class, and
* � has no decorators.
*/
- @Test(groups = { "new" })
+ @Test(groups = { "new", "stub" })
@SpecAssertion(section = "3.9")
public void testNewBeanHasNoProducerMethods()
{
- assert newSimpleBean.getProducerMethods().isEmpty();
+ assert false;
}
/**
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r938 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/bootstrap and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-13 19:48:55 -0500 (Tue, 13 Jan 2009)
New Revision: 938
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewEnterpriseBeanTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java
Log:
Fix generic types
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-14 00:44:34 UTC (rev 937)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-14 00:48:55 UTC (rev 938)
@@ -122,24 +122,13 @@
* @return A set of producer methods. An empty set is returned if there are
* none present
*/
+ @Deprecated
public Set<AnnotatedMethod<Object>> getProducerMethods()
{
return getAnnotatedItem().getAnnotatedMethods(Produces.class);
}
/**
- * Gets the producer fields
- *
- * @return A set of producer fields. An empty set is returned if there are
- * none present
- */
- @Deprecated
- public Set<AnnotatedField<Object>> getProducerFields()
- {
- return getAnnotatedItem().getAnnotatedFields(Produces.class);
- }
-
- /**
* Initializes the injection points
*/
protected void initInjectionPoints()
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-01-14 00:44:34 UTC (rev 937)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-01-14 00:48:55 UTC (rev 938)
@@ -12,7 +12,6 @@
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.binding.NewBinding;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.AnnotatedField;
import org.jboss.webbeans.introspector.AnnotatedMethod;
import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
@@ -54,12 +53,6 @@
}
@Override
- public Set<AnnotatedField<Object>> getProducerFields()
- {
- return Collections.emptySet();
- }
-
- @Override
public Set<AnnotatedMethod<Object>> getProducerMethods()
{
return Collections.emptySet();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-14 00:44:34 UTC (rev 937)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-14 00:48:55 UTC (rev 938)
@@ -13,7 +13,6 @@
import org.jboss.webbeans.binding.NewBinding;
import org.jboss.webbeans.context.DependentContext;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.AnnotatedField;
import org.jboss.webbeans.introspector.AnnotatedMethod;
import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
@@ -76,12 +75,6 @@
}
@Override
- public Set<AnnotatedField<Object>> getProducerFields()
- {
- return Collections.emptySet();
- }
-
- @Override
public Set<AnnotatedMethod<Object>> getProducerMethods()
{
return Collections.emptySet();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-14 00:44:34 UTC (rev 937)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-14 00:48:55 UTC (rev 938)
@@ -32,6 +32,7 @@
import javax.webbeans.Observer;
import javax.webbeans.Observes;
import javax.webbeans.Obtains;
+import javax.webbeans.Produces;
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.ManagerImpl;
@@ -241,7 +242,7 @@
registerEvents(producerMethodBean.getAnnotatedInjectionPoints(), beans);
log.info("Web Bean: " + producerMethodBean);
}
- for (AnnotatedField<Object> producerField : bean.getProducerFields())
+ for (AnnotatedField<?> producerField : annotatedClass.getAnnotatedFields(Produces.class))
{
ProducerFieldBean<?> producerFieldBean = ProducerFieldBean.of(producerField, bean, getManager());
beans.add(producerFieldBean);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:44:34 UTC (rev 937)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:48:55 UTC (rev 938)
@@ -45,7 +45,7 @@
* @return A set of abstracted fields with the given annotation. Returns an
* empty set if there are no matches
*/
- public Set<AnnotatedField<Object>> getAnnotatedFields(Class<? extends Annotation> annotationType);
+ public Set<AnnotatedField<?>> getAnnotatedFields(Class<? extends Annotation> annotationType);
/**
* Gets all fields which are meta-annotated with metaAnnotationType
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 00:44:34 UTC (rev 937)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 00:48:55 UTC (rev 938)
@@ -432,9 +432,10 @@
* @return A set of matching abstracted fields, null if none are found.
*
*/
- public Set<AnnotatedField<Object>> getAnnotatedFields(Class<? extends Annotation> annotationType)
+ public Set<AnnotatedField<?>> getAnnotatedFields(Class<? extends Annotation> annotationType)
{
- return Collections.unmodifiableSet(annotatedFields.get(annotationType));
+ // TODO temp fix
+ return (Set) Collections.unmodifiableSet(annotatedFields.get(annotationType));
}
/**
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewEnterpriseBeanTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewEnterpriseBeanTest.java 2009-01-14 00:44:34 UTC (rev 937)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewEnterpriseBeanTest.java 2009-01-14 00:48:55 UTC (rev 938)
@@ -235,11 +235,11 @@
* types declared by annotations that appear on the implementation class, and
* � has no decorators.
*/
- @Test(groups = { "new" })
+ @Test(groups = { "new", "stub" })
@SpecAssertion(section = "3.9")
public void testNewBeanHasNoProducerFields()
{
- assert newEnterpriseBean.getProducerFields().isEmpty();
+ assert false;
}
/**
@@ -253,11 +253,11 @@
* types declared by annotations that appear on the implementation class, and
* � has no decorators.
*/
- @Test(groups = { "new" })
+ @Test(groups = { "new", "stub" })
@SpecAssertion(section = "3.9")
public void testNewBeanHasNoProducerMethods()
{
- assert newEnterpriseBean.getProducerMethods().isEmpty();
+ assert false;
}
/**
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java 2009-01-14 00:44:34 UTC (rev 937)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java 2009-01-14 00:48:55 UTC (rev 938)
@@ -230,11 +230,11 @@
* types declared by annotations that appear on the implementation class, and
* � has no decorators.
*/
- @Test(groups = { "new" })
+ @Test(groups = { "new", "stub" })
@SpecAssertion(section = "3.9")
public void testNewBeanHasNoProducerFields()
{
- assert newSimpleBean.getProducerFields().isEmpty();
+ assert false;
}
/**
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r937 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/bootstrap and 4 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-13 19:44:34 -0500 (Tue, 13 Jan 2009)
New Revision: 937
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewEnterpriseBeanTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java
Log:
more fixes to generic types
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-14 00:32:34 UTC (rev 936)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-14 00:44:34 UTC (rev 937)
@@ -133,23 +133,13 @@
* @return A set of producer fields. An empty set is returned if there are
* none present
*/
+ @Deprecated
public Set<AnnotatedField<Object>> getProducerFields()
{
return getAnnotatedItem().getAnnotatedFields(Produces.class);
}
/**
- * Gets the observer methods
- *
- * @return A set of observer methods. An empty set is returned if there are
- * no matches.
- */
- public Set<AnnotatedMethod<Object>> getObserverMethods()
- {
- return getAnnotatedItem().getMethodsWithAnnotatedParameters(Observes.class);
- }
-
- /**
* Initializes the injection points
*/
protected void initInjectionPoints()
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-01-14 00:32:34 UTC (rev 936)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-01-14 00:44:34 UTC (rev 937)
@@ -54,12 +54,6 @@
}
@Override
- public Set<AnnotatedMethod<Object>> getObserverMethods()
- {
- return Collections.emptySet();
- }
-
- @Override
public Set<AnnotatedField<Object>> getProducerFields()
{
return Collections.emptySet();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-14 00:32:34 UTC (rev 936)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-01-14 00:44:34 UTC (rev 937)
@@ -76,12 +76,6 @@
}
@Override
- public Set<AnnotatedMethod<Object>> getObserverMethods()
- {
- return Collections.emptySet();
- }
-
- @Override
public Set<AnnotatedField<Object>> getProducerFields()
{
return Collections.emptySet();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-14 00:32:34 UTC (rev 936)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-14 00:44:34 UTC (rev 937)
@@ -177,10 +177,16 @@
protected Set<AbstractBean<?, ?>> createStandardBeans()
{
Set<AbstractBean<?, ?>> beans = new HashSet<AbstractBean<?, ?>>();
- createBean(SimpleBean.of(Transaction.class, manager), beans);
- createBean(ManagerBean.of(getManager()), beans);
+ createSimpleBean(Transaction.class, beans);
+ beans.add(ManagerBean.of(manager));
return beans;
}
+
+ private <T> void createSimpleBean(Class<T> clazz, Set<AbstractBean<?, ?>> beans)
+ {
+ AnnotatedClass<T> annotatedClass = new AnnotatedClassImpl<T>(clazz);
+ createBean(SimpleBean.of(annotatedClass, manager), annotatedClass, beans);
+ }
/**
* Creates Web Beans from a set of classes
@@ -201,12 +207,12 @@
AnnotatedClass<?> annotatedClass = AnnotatedClassImpl.of(clazz);
if (getManager().getEjbDescriptorCache().containsKey(clazz))
{
- createBean(EnterpriseBean.of(annotatedClass, getManager()), beans);
+ createBean(EnterpriseBean.of(annotatedClass, getManager()), annotatedClass, beans);
beans.add(NewEnterpriseBean.of(annotatedClass, manager));
}
else if (isTypeSimpleWebBean(clazz))
{
- createBean(SimpleBean.of(annotatedClass, manager), beans);
+ createBean(SimpleBean.of(annotatedClass, manager), annotatedClass, beans);
beans.add(NewSimpleBean.of(annotatedClass, manager));
}
}
@@ -223,7 +229,7 @@
* @param beans The set of created beans
*/
@SuppressWarnings("unchecked")
- protected void createBean(AbstractClassBean<?> bean, Set<AbstractBean<?, ?>> beans)
+ protected void createBean(AbstractClassBean<?> bean, AnnotatedClass<?> annotatedClass, Set<AbstractBean<?, ?>> beans)
{
beans.add(bean);
getManager().getResolver().addInjectionPoints(bean.getAnnotatedInjectionPoints());
@@ -254,7 +260,7 @@
log.info("Web Bean: " + instanceBean);
}
}
- for (AnnotatedMethod<Object> observerMethod : bean.getObserverMethods())
+ for (AnnotatedMethod<?> observerMethod : annotatedClass.getMethodsWithAnnotatedParameters(Observes.class))
{
ObserverImpl<?> observer = ObserverImpl.of(observerMethod, bean, getManager());
if (observerMethod.getAnnotatedParameters(Observes.class).size() == 1)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-01-14 00:32:34 UTC (rev 936)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-01-14 00:44:34 UTC (rev 937)
@@ -69,7 +69,7 @@
}
private Bean<?> observerBean;
- private final AnnotatedMethod<Object> observerMethod;
+ private final AnnotatedMethod<?> observerMethod;
private TransactionObservationPhase transactionObservationPhase;
private boolean conditional;
private ManagerImpl manager;
@@ -82,7 +82,7 @@
* @param manager The Web Beans manager
* @return An observer implementation built from the method abstraction
*/
- public static <T> ObserverImpl<T> of(AnnotatedMethod<Object> method, AbstractClassBean<?> declaringBean, ManagerImpl manager)
+ public static <T> ObserverImpl<T> of(AnnotatedMethod<?> method, AbstractClassBean<?> declaringBean, ManagerImpl manager)
{
return new ObserverImpl<T>(method, declaringBean, manager);
}
@@ -95,7 +95,7 @@
* @param observerBean The observer bean
* @param manager The Web Beans manager
*/
- public ObserverImpl(final AnnotatedMethod<Object> observer, final Bean<?> observerBean, final ManagerImpl manager)
+ public ObserverImpl(final AnnotatedMethod<?> observer, final Bean<?> observerBean, final ManagerImpl manager)
{
this.manager = manager;
this.observerBean = observerBean;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:32:34 UTC (rev 936)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:44:34 UTC (rev 937)
@@ -105,7 +105,7 @@
* @return A set of abstracted methods with the given annotation. Returns an
* empty set if there are no matches
*/
- public Set<AnnotatedMethod<Object>> getMethodsWithAnnotatedParameters(Class<? extends Annotation> annotationType);
+ public Set<AnnotatedMethod<?>> getMethodsWithAnnotatedParameters(Class<? extends Annotation> annotationType);
/**
* Gets the superclass
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 00:32:34 UTC (rev 936)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 00:44:34 UTC (rev 937)
@@ -504,9 +504,10 @@
return constructorsByArgumentMap.get(arguments);
}
- public Set<AnnotatedMethod<Object>> getMethodsWithAnnotatedParameters(Class<? extends Annotation> annotationType)
+ public Set<AnnotatedMethod<?>> getMethodsWithAnnotatedParameters(Class<? extends Annotation> annotationType)
{
- return methodsByAnnotatedParameters.get(annotationType);
+ // TODO temporary fix
+ return (Set) methodsByAnnotatedParameters.get(annotationType);
}
public AnnotatedMethod<?> getMethod(Method methodDescriptor)
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewEnterpriseBeanTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewEnterpriseBeanTest.java 2009-01-14 00:32:34 UTC (rev 936)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewEnterpriseBeanTest.java 2009-01-14 00:44:34 UTC (rev 937)
@@ -217,11 +217,11 @@
* types declared by annotations that appear on the implementation class, and
* � has no decorators.
*/
- @Test(groups = {"new" })
+ @Test(groups = {"new", "stub" })
@SpecAssertion(section = "3.9")
public void testNewBeanHasNoObservers()
{
- assert newEnterpriseBean.getObserverMethods().isEmpty();
+ assert false;
}
/**
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java 2009-01-14 00:32:34 UTC (rev 936)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java 2009-01-14 00:44:34 UTC (rev 937)
@@ -212,11 +212,11 @@
* types declared by annotations that appear on the implementation class, and
* � has no decorators.
*/
- @Test(groups = {"new" })
+ @Test(groups = {"new", "stub" })
@SpecAssertion(section = "3.9")
public void testNewBeanHasNoObservers()
{
- assert newSimpleBean.getObserverMethods().isEmpty();
+ assert false;
}
/**
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r936 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-13 19:32:34 -0500 (Tue, 13 Jan 2009)
New Revision: 936
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
Log:
Fix generic types
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:31:55 UTC (rev 935)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:32:34 UTC (rev 936)
@@ -112,6 +112,6 @@
*
* @return The abstracted superclass
*/
- public AnnotatedClass<Object> getSuperclass();
+ public AnnotatedClass<?> getSuperclass();
}
\ No newline at end of file
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r935 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector: jlr and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-13 19:31:55 -0500 (Tue, 13 Jan 2009)
New Revision: 935
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
Log:
Fix generic types
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:29:18 UTC (rev 934)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:31:55 UTC (rev 935)
@@ -96,7 +96,7 @@
* @param methodDescriptor
* @return
*/
- public AnnotatedMethod<Object> getMethod(Method method);
+ public AnnotatedMethod<?> getMethod(Method method);
/**
* Gets all with parameters annotated with annotationType
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 00:29:18 UTC (rev 934)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 00:31:55 UTC (rev 935)
@@ -509,10 +509,10 @@
return methodsByAnnotatedParameters.get(annotationType);
}
- public AnnotatedMethod<Object> getMethod(Method methodDescriptor)
+ public AnnotatedMethod<?> getMethod(Method methodDescriptor)
{
// TODO Cache?
- for (AnnotatedMethod<Object> annotatedMethod : methods)
+ for (AnnotatedMethod<?> annotatedMethod : methods)
{
if (annotatedMethod.getName().equals(methodDescriptor.getName()) && Arrays.equals(annotatedMethod.getParameterTypesAsArray(), methodDescriptor.getParameterTypes()))
{
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r934 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-13 19:29:18 -0500 (Tue, 13 Jan 2009)
New Revision: 934
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
Log:
OOps
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:25:59 UTC (rev 933)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:29:18 UTC (rev 934)
@@ -45,7 +45,7 @@
* @return A set of abstracted fields with the given annotation. Returns an
* empty set if there are no matches
*/
- public Set<AnnotatedField<?>> getAnnotatedFields(Class<? extends Annotation> annotationType);
+ public Set<AnnotatedField<Object>> getAnnotatedFields(Class<? extends Annotation> annotationType);
/**
* Gets all fields which are meta-annotated with metaAnnotationType
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r933 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-13 19:25:59 -0500 (Tue, 13 Jan 2009)
New Revision: 933
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
Log:
Fix generic types
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:22:17 UTC (rev 932)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedClass.java 2009-01-14 00:25:59 UTC (rev 933)
@@ -45,7 +45,7 @@
* @return A set of abstracted fields with the given annotation. Returns an
* empty set if there are no matches
*/
- public Set<AnnotatedField<Object>> getAnnotatedFields(Class<? extends Annotation> annotationType);
+ public Set<AnnotatedField<?>> getAnnotatedFields(Class<? extends Annotation> annotationType);
/**
* Gets all fields which are meta-annotated with metaAnnotationType
17 years, 3 months
- 1
- 0