[google-guice] r1282 committed - Rebuild guice 2.0 API spec to include spring

google-guice Mon, 04 Oct 2010 20:04:57 -0700

Revision: 1282
Author: [email protected]
Date: Mon Oct  4 20:03:15 2010
Log: Rebuild guice 2.0 API spec to include spring
http://code.google.com/p/google-guice/source/detail?r=1282


Modified:
 /trunk/lib/build/guice-2.0.xml

=======================================
--- /trunk/lib/build/guice-2.0.xml      Mon Oct  4 19:50:47 2010
+++ /trunk/lib/build/guice-2.0.xml      Mon Oct  4 20:03:15 2010
@@ -29,9 +29,7 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<parameter name="message" type="java.lang.String">
-</parameter>
-<parameter name="arguments" type="java.lang.Object...">
+<parameter name="message" type="com.google.inject.spi.Message">
 </parameter>
 </method>
 <method name="addError"
@@ -44,7 +42,9 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<parameter name="t" type="java.lang.Throwable">
+<parameter name="message" type="java.lang.String">
+</parameter>
+<parameter name="arguments" type="java.lang.Object...">
 </parameter>
 </method>
 <method name="addError"
@@ -57,7 +57,7 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<parameter name="message" type="com.google.inject.spi.Message">
+<parameter name="t" type="java.lang.Throwable">
 </parameter>
 </method>
 <method name="bind"
@@ -170,27 +170,27 @@
 </method>
 <method name="configure"
  return="void"
- abstract="false"
+ abstract="true"
  native="false"
- synchronized="true"
+ synchronized="false"
  static="false"
- final="true"
+ final="false"
  deprecated="not deprecated"
- visibility="public"
+ visibility="protected"
 >
-<parameter name="builder" type="com.google.inject.Binder">
-</parameter>
 </method>
 <method name="configure"
  return="void"
- abstract="true"
+ abstract="false"
  native="false"
- synchronized="false"
+ synchronized="true"
  static="false"
- final="false"
+ final="true"
  deprecated="not deprecated"
- visibility="protected"
+ visibility="public"
 >
+<parameter name="builder" type="com.google.inject.Binder">
+</parameter>
 </method>
 <method name="convertToTypes"
  return="void"
@@ -228,7 +228,7 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<parameter name="type" type="java.lang.Class&lt;T&gt;">
+<parameter name="type" type="com.google.inject.TypeLiteral&lt;T&gt;">
 </parameter>
 </method>
 <method name="getMembersInjector"
@@ -241,7 +241,7 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<parameter name="type" type="com.google.inject.TypeLiteral&lt;T&gt;">
+<parameter name="type" type="java.lang.Class&lt;T&gt;">
 </parameter>
 </method>
 <method name="getProvider"
@@ -353,9 +353,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="message" type="java.lang.String">
-</parameter>
-<parameter name="arguments" type="java.lang.Object...">
+<parameter name="message" type="com.google.inject.spi.Message">
 </parameter>
 </method>
 <method name="addError"
@@ -368,7 +366,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="t" type="java.lang.Throwable">
+<parameter name="message" type="java.lang.String">
+</parameter>
+<parameter name="arguments" type="java.lang.Object...">
 </parameter>
 </method>
 <method name="addError"
@@ -381,7 +381,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="message" type="com.google.inject.spi.Message">
+<parameter name="t" type="java.lang.Throwable">
 </parameter>
 </method>
 <method name="bind"
@@ -717,6 +717,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 <class name="ConfigurationException"
  extends="java.lang.RuntimeException"
@@ -810,6 +812,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 <class name="Guice"
  extends="java.lang.Object"
@@ -842,7 +846,9 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="modules" type="java.lang.Iterable<? extendscom.google.inject.Module>">

+<parameter name="stage" type="com.google.inject.Stage">
+</parameter>
+<parameter name="modules" type="com.google.inject.Module...">
 </parameter>
 </method>
 <method name="createInjector"
@@ -857,7 +863,7 @@
 >
 <parameter name="stage" type="com.google.inject.Stage">
 </parameter>
-<parameter name="modules" type="com.google.inject.Module...">

+<parameter name="modules" type="java.lang.Iterable<? extendscom.google.inject.Module>">

 </parameter>
 </method>
 <method name="createInjector"
@@ -870,8 +876,6 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="stage" type="com.google.inject.Stage">
-</parameter>

<parameter name="modules" type="java.lang.Iterable<? extendscom.google.inject.Module>">

 </parameter>
 </method>
@@ -884,6 +888,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 <class name="Inject"
  extends="java.lang.Object"
@@ -893,6 +899,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 <interface name="Injector"
  abstract="true"
@@ -911,7 +919,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="modules" type="java.lang.Iterable<? extendscom.google.inject.Module>">

+<parameter name="modules" type="com.google.inject.Module...">
 </parameter>
 </method>
 <method name="createChildInjector"
@@ -924,7 +932,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="modules" type="com.google.inject.Module...">

+<parameter name="modules" type="java.lang.Iterable<? extendscom.google.inject.Module>">

 </parameter>
 </method>
 <method name="findBindingsByType"
@@ -1095,8 +1103,6 @@
  deprecated="not deprecated"
  visibility="protected"
 >

-<parameter name="annotationType" type="java.lang.Class<? extendsjava.lang.annotation.Annotation>">

-</parameter>
 </constructor>
 <constructor name="Key"
  type="com.google.inject.Key"
@@ -1105,7 +1111,7 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<parameter name="annotation" type="java.lang.annotation.Annotation">

+<parameter name="annotationType" type="java.lang.Class<? extendsjava.lang.annotation.Annotation>">

 </parameter>
 </constructor>
 <constructor name="Key"
@@ -1115,6 +1121,8 @@
  deprecated="not deprecated"
  visibility="protected"
 >
+<parameter name="annotation" type="java.lang.annotation.Annotation">
+</parameter>
 </constructor>
 <method name="equals"
  return="boolean"
@@ -1139,7 +1147,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="type" type="java.lang.Class&lt;T&gt;">

+<parameter name="typeLiteral"type="com.google.inject.TypeLiteral<T>">

 </parameter>
 </method>
 <method name="get"
@@ -1152,7 +1160,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="type" type="java.lang.Class&lt;T&gt;">

+<parameter name="typeLiteral"type="com.google.inject.TypeLiteral<T>">

 </parameter>

<parameter name="annotationType" type="java.lang.Class<? extendsjava.lang.annotation.Annotation>">

 </parameter>
@@ -1167,13 +1175,13 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="type" type="java.lang.Class&lt;T&gt;">

+<parameter name="typeLiteral"type="com.google.inject.TypeLiteral<T>">

 </parameter>
 <parameter name="annotation" type="java.lang.annotation.Annotation">
 </parameter>
 </method>
 <method name="get"
- return="com.google.inject.Key&lt;?&gt;"
+ return="com.google.inject.Key&lt;T&gt;"
  abstract="false"
  native="false"
  synchronized="false"
@@ -1182,11 +1190,11 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="type" type="java.lang.reflect.Type">
+<parameter name="type" type="java.lang.Class&lt;T&gt;">
 </parameter>
 </method>
 <method name="get"
- return="com.google.inject.Key&lt;?&gt;"
+ return="com.google.inject.Key&lt;T&gt;"
  abstract="false"
  native="false"
  synchronized="false"
@@ -1195,13 +1203,13 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="type" type="java.lang.reflect.Type">
+<parameter name="type" type="java.lang.Class&lt;T&gt;">
 </parameter>

<parameter name="annotationType" type="java.lang.Class<? extendsjava.lang.annotation.Annotation>">

 </parameter>
 </method>
 <method name="get"
- return="com.google.inject.Key&lt;?&gt;"
+ return="com.google.inject.Key&lt;T&gt;"
  abstract="false"
  native="false"
  synchronized="false"
@@ -1210,13 +1218,13 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="type" type="java.lang.reflect.Type">
+<parameter name="type" type="java.lang.Class&lt;T&gt;">
 </parameter>
 <parameter name="annotation" type="java.lang.annotation.Annotation">
 </parameter>
 </method>
 <method name="get"
- return="com.google.inject.Key&lt;T&gt;"
+ return="com.google.inject.Key&lt;?&gt;"
  abstract="false"
  native="false"
  synchronized="false"
@@ -1225,11 +1233,11 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="typeLiteral"type="com.google.inject.TypeLiteral<T>">

+<parameter name="type" type="java.lang.reflect.Type">
 </parameter>
 </method>
 <method name="get"
- return="com.google.inject.Key&lt;T&gt;"
+ return="com.google.inject.Key&lt;?&gt;"
  abstract="false"
  native="false"
  synchronized="false"
@@ -1238,13 +1246,13 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="typeLiteral"type="com.google.inject.TypeLiteral<T>">

+<parameter name="type" type="java.lang.reflect.Type">
 </parameter>

<parameter name="annotationType" type="java.lang.Class<? extendsjava.lang.annotation.Annotation>">

 </parameter>
 </method>
 <method name="get"
- return="com.google.inject.Key&lt;T&gt;"
+ return="com.google.inject.Key&lt;?&gt;"
  abstract="false"
  native="false"
  synchronized="false"
@@ -1253,7 +1261,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="typeLiteral"type="com.google.inject.TypeLiteral<T>">

+<parameter name="type" type="java.lang.reflect.Type">
 </parameter>
 <parameter name="annotation" type="java.lang.annotation.Annotation">
 </parameter>
@@ -1429,7 +1437,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="type" type="java.lang.Class&lt;?&gt;">
+<parameter name="type" type="com.google.inject.TypeLiteral&lt;?&gt;">
 </parameter>
 </method>
 <method name="expose"
@@ -1442,7 +1450,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="type" type="com.google.inject.TypeLiteral&lt;?&gt;">
+<parameter name="type" type="java.lang.Class&lt;?&gt;">
 </parameter>
 </method>
 <method name="skipSources"
@@ -1500,9 +1508,7 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<parameter name="message" type="java.lang.String">
-</parameter>
-<parameter name="arguments" type="java.lang.Object...">
+<parameter name="message" type="com.google.inject.spi.Message">
 </parameter>
 </method>
 <method name="addError"
@@ -1515,7 +1521,9 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<parameter name="t" type="java.lang.Throwable">
+<parameter name="message" type="java.lang.String">
+</parameter>
+<parameter name="arguments" type="java.lang.Object...">
 </parameter>
 </method>
 <method name="addError"
@@ -1528,7 +1536,7 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<parameter name="message" type="com.google.inject.spi.Message">
+<parameter name="t" type="java.lang.Throwable">
 </parameter>
 </method>
 <method name="bind"
@@ -1641,27 +1649,27 @@
 </method>
 <method name="configure"
  return="void"
- abstract="false"
+ abstract="true"
  native="false"
- synchronized="true"
+ synchronized="false"
  static="false"
- final="true"
+ final="false"
  deprecated="not deprecated"
- visibility="public"
+ visibility="protected"
 >
-<parameter name="binder" type="com.google.inject.Binder">
-</parameter>
 </method>
 <method name="configure"
  return="void"
- abstract="true"
+ abstract="false"
  native="false"
- synchronized="false"
+ synchronized="true"
  static="false"
- final="false"
+ final="true"
  deprecated="not deprecated"
- visibility="protected"
+ visibility="public"
 >
+<parameter name="binder" type="com.google.inject.Binder">
+</parameter>
 </method>
 <method name="convertToTypes"
  return="void"
@@ -1712,7 +1720,7 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<parameter name="type" type="java.lang.Class&lt;?&gt;">
+<parameter name="type" type="com.google.inject.TypeLiteral&lt;?&gt;">
 </parameter>
 </method>
 <method name="expose"
@@ -1725,7 +1733,7 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<parameter name="type" type="com.google.inject.TypeLiteral&lt;?&gt;">
+<parameter name="type" type="java.lang.Class&lt;?&gt;">
 </parameter>
 </method>
 <method name="getMembersInjector"
@@ -1738,7 +1746,7 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<parameter name="type" type="java.lang.Class&lt;T&gt;">
+<parameter name="type" type="com.google.inject.TypeLiteral&lt;T&gt;">
 </parameter>
 </method>
 <method name="getMembersInjector"
@@ -1751,7 +1759,7 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<parameter name="type" type="com.google.inject.TypeLiteral&lt;T&gt;">
+<parameter name="type" type="java.lang.Class&lt;T&gt;">
 </parameter>
 </method>
 <method name="getProvider"
@@ -1854,6 +1862,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 <interface name="Provider"
  abstract="true"
@@ -1882,6 +1892,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 <class name="ProvisionException"
  extends="java.lang.RuntimeException"
@@ -1910,8 +1922,6 @@
 >
 <parameter name="message" type="java.lang.String">
 </parameter>
-<parameter name="cause" type="java.lang.Throwable">
-</parameter>
 </constructor>
 <constructor name="ProvisionException"
  type="com.google.inject.ProvisionException"
@@ -1922,6 +1932,8 @@
 >
 <parameter name="message" type="java.lang.String">
 </parameter>
+<parameter name="cause" type="java.lang.Throwable">
+</parameter>
 </constructor>
 <method name="getErrorMessages"
  return="java.util.Collection&lt;com.google.inject.spi.Message&gt;"
@@ -1977,6 +1989,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 <class name="Scopes"
  extends="java.lang.Object"
@@ -2015,6 +2029,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 <class name="Stage"
  extends="java.lang.Enum"
@@ -2079,7 +2095,7 @@
 </parameter>
 </method>
 <method name="get"
- return="com.google.inject.TypeLiteral&lt;?&gt;"
+ return="com.google.inject.TypeLiteral&lt;T&gt;"
  abstract="false"
  native="false"
  synchronized="false"
@@ -2088,11 +2104,11 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="type" type="java.lang.reflect.Type">
+<parameter name="type" type="java.lang.Class&lt;T&gt;">
 </parameter>
 </method>
 <method name="get"
- return="com.google.inject.TypeLiteral&lt;T&gt;"
+ return="com.google.inject.TypeLiteral&lt;?&gt;"
  abstract="false"
  native="false"
  synchronized="false"
@@ -2101,7 +2117,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="type" type="java.lang.Class&lt;T&gt;">
+<parameter name="type" type="java.lang.reflect.Type">
 </parameter>
 </method>
 <method name="getExceptionTypes"
@@ -2225,6 +2241,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 <class name="AssistedInject"
  extends="java.lang.Object"
@@ -2234,6 +2252,8 @@
  deprecated="deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 <class name="FactoryProvider"
  extends="java.lang.Object"
@@ -2279,9 +2299,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="factoryType" type="java.lang.Class&lt;F&gt;">

+<parameter name="factoryType"type="com.google.inject.TypeLiteral<F>">

 </parameter>
-<parameter name="implementationType" type="java.lang.Class&lt;?&gt;">

+<parameter name="implementationType"type="com.google.inject.TypeLiteral<?>">

 </parameter>
 </method>
 <method name="newFactory"
@@ -2294,9 +2314,9 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="factoryType"type="com.google.inject.TypeLiteral<F>">

+<parameter name="factoryType" type="java.lang.Class&lt;F&gt;">
 </parameter>

-<parameter name="implementationType"type="com.google.inject.TypeLiteral<?>">

+<parameter name="implementationType" type="java.lang.Class&lt;?&gt;">
 </parameter>
 </method>
 </class>
@@ -2424,7 +2444,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="java.lang.String">
+<parameter name="value" type="E">
 </parameter>
 </method>
 <method name="to"
@@ -2437,7 +2457,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="int">
+<parameter name="value" type="boolean">
 </parameter>
 </method>
 <method name="to"
@@ -2450,7 +2470,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="long">
+<parameter name="value" type="char">
 </parameter>
 </method>
 <method name="to"
@@ -2463,7 +2483,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="boolean">
+<parameter name="value" type="double">
 </parameter>
 </method>
 <method name="to"
@@ -2476,7 +2496,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="double">
+<parameter name="value" type="float">
 </parameter>
 </method>
 <method name="to"
@@ -2489,7 +2509,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="float">
+<parameter name="value" type="int">
 </parameter>
 </method>
 <method name="to"
@@ -2502,7 +2522,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="short">
+<parameter name="value" type="java.lang.Class&lt;?&gt;">
 </parameter>
 </method>
 <method name="to"
@@ -2515,7 +2535,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="char">
+<parameter name="value" type="java.lang.String">
 </parameter>
 </method>
 <method name="to"
@@ -2528,7 +2548,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="java.lang.Class&lt;?&gt;">
+<parameter name="value" type="long">
 </parameter>
 </method>
 <method name="to"
@@ -2541,7 +2561,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="E">
+<parameter name="value" type="short">
 </parameter>
 </method>
 </interface>
@@ -2564,7 +2584,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="implementation" type="java.lang.Class&lt;? extends T&gt;">

+<parameter name="targetKey" type="com.google.inject.Key<? extendsT>">

 </parameter>
 </method>
 <method name="to"
@@ -2590,7 +2610,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="targetKey" type="com.google.inject.Key<? extendsT>">

+<parameter name="implementation" type="java.lang.Class&lt;? extends T&gt;">
 </parameter>
 </method>
 <method name="toInstance"
@@ -2616,7 +2636,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="provider" type="com.google.inject.Provider<? extendsT>">+<parameter name="providerKey" type="com.google.inject.Key<? extendscom.google.inject.Provider<? extends T>>">

 </parameter>
 </method>
 <method name="toProvider"
@@ -2629,7 +2649,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="providerType" type="java.lang.Class<? extendscom.google.inject.Provider<? extends T>>">+<parameter name="provider" type="com.google.inject.Provider<? extendsT>">

 </parameter>
 </method>
 <method name="toProvider"
@@ -2642,7 +2662,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="providerKey" type="com.google.inject.Key<? extendscom.google.inject.Provider<? extends T>>">+<parameter name="providerType" type="java.lang.Class<? extendscom.google.inject.Provider<? extends T>>">

 </parameter>
 </method>
 </interface>
@@ -2674,7 +2694,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="scopeAnnotation" type="java.lang.Class<? extendsjava.lang.annotation.Annotation>">

+<parameter name="scope" type="com.google.inject.Scope">
 </parameter>
 </method>
 <method name="in"
@@ -2687,7 +2707,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="scope" type="com.google.inject.Scope">

+<parameter name="scopeAnnotation" type="java.lang.Class<? extendsjava.lang.annotation.Annotation>">

 </parameter>
 </method>
 </interface>
@@ -3003,9 +3023,11 @@
 >
 <parameter name="binder" type="com.google.inject.Binder">
 </parameter>
-<parameter name="keyType" type="java.lang.Class&lt;K&gt;">
+<parameter name="keyType" type="com.google.inject.TypeLiteral&lt;K&gt;">
 </parameter>
-<parameter name="valueType" type="java.lang.Class&lt;V&gt;">
+<parameter name="valueType" type="com.google.inject.TypeLiteral&lt;V&gt;">
+</parameter>

+<parameter name="annotationType" type="java.lang.Class<? extendsjava.lang.annotation.Annotation>">

 </parameter>
 </method>
 <method name="newMapBinder"
@@ -3043,8 +3065,6 @@
 </parameter>
 <parameter name="valueType" type="java.lang.Class&lt;V&gt;">
 </parameter>
-<parameter name="annotation" type="java.lang.annotation.Annotation">
-</parameter>
 </method>
 <method name="newMapBinder"
  return="com.google.inject.multibindings.MapBinder&lt;K, V&gt;"
@@ -3058,9 +3078,9 @@
 >
 <parameter name="binder" type="com.google.inject.Binder">
 </parameter>
-<parameter name="keyType" type="com.google.inject.TypeLiteral&lt;K&gt;">
+<parameter name="keyType" type="java.lang.Class&lt;K&gt;">
 </parameter>
-<parameter name="valueType" type="com.google.inject.TypeLiteral&lt;V&gt;">
+<parameter name="valueType" type="java.lang.Class&lt;V&gt;">
 </parameter>

<parameter name="annotationType" type="java.lang.Class<? extendsjava.lang.annotation.Annotation>">

 </parameter>
@@ -3081,7 +3101,7 @@
 </parameter>
 <parameter name="valueType" type="java.lang.Class&lt;V&gt;">
 </parameter>

-<parameter name="annotationType" type="java.lang.Class<? extendsjava.lang.annotation.Annotation>">

+<parameter name="annotation" type="java.lang.annotation.Annotation">
 </parameter>
 </method>
 </class>
@@ -3131,7 +3151,9 @@
 >
 <parameter name="binder" type="com.google.inject.Binder">
 </parameter>
-<parameter name="type" type="java.lang.Class&lt;T&gt;">
+<parameter name="type" type="com.google.inject.TypeLiteral&lt;T&gt;">
+</parameter>

+<parameter name="annotationType" type="java.lang.Class<? extendsjava.lang.annotation.Annotation>">

 </parameter>
 </method>
 <method name="newSetBinder"
@@ -3165,8 +3187,6 @@
 </parameter>
 <parameter name="type" type="java.lang.Class&lt;T&gt;">
 </parameter>
-<parameter name="annotation" type="java.lang.annotation.Annotation">
-</parameter>
 </method>
 <method name="newSetBinder"
  return="com.google.inject.multibindings.Multibinder&lt;T&gt;"
@@ -3180,7 +3200,7 @@
 >
 <parameter name="binder" type="com.google.inject.Binder">
 </parameter>
-<parameter name="type" type="com.google.inject.TypeLiteral&lt;T&gt;">
+<parameter name="type" type="java.lang.Class&lt;T&gt;">
 </parameter>

<parameter name="annotationType" type="java.lang.Class<? extendsjava.lang.annotation.Annotation>">

 </parameter>
@@ -3199,7 +3219,7 @@
 </parameter>
 <parameter name="type" type="java.lang.Class&lt;T&gt;">
 </parameter>

-<parameter name="annotationType" type="java.lang.Class<? extendsjava.lang.annotation.Annotation>">

+<parameter name="annotation" type="java.lang.annotation.Annotation">
 </parameter>
 </method>
 </class>
@@ -3214,6 +3234,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 <class name="Names"
  extends="java.lang.Object"
@@ -3396,6 +3418,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 <class name="RequestScoped"
  extends="java.lang.Object"
@@ -3405,6 +3429,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 <class name="ServletModule"
  extends="com.google.inject.AbstractModule"
@@ -3522,7 +3548,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="filterKey" type="java.lang.Class&lt;? extends Filter&gt;">

+<parameter name="filterKey" type="com.google.inject.Key<? extendsFilter>">

 </parameter>
 </method>
 <method name="through"
@@ -3535,7 +3561,9 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="filterKey" type="com.google.inject.Key<? extendsFilter>">+<parameter name="dummyFilterClass" type="com.google.inject.Key<?extends Filter>">

+</parameter>

+<parameter name="contextParams" type="java.util.Map<java.lang.String,java.lang.String>">

 </parameter>
 </method>
 <method name="through"
@@ -3548,9 +3576,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="dummyFilterClass" type="java.lang.Class<? extendsFilter>">

-</parameter>

-<parameter name="contextParams" type="java.util.Map<java.lang.String,java.lang.String>">

+<parameter name="filterKey" type="java.lang.Class&lt;? extends Filter&gt;">
 </parameter>
 </method>
 <method name="through"
@@ -3563,7 +3589,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="dummyFilterClass" type="com.google.inject.Key<?extends Filter>">+<parameter name="dummyFilterClass" type="java.lang.Class<? extendsFilter>">

 </parameter>

<parameter name="contextParams" type="java.util.Map<java.lang.String,java.lang.String>">

 </parameter>
@@ -3586,7 +3612,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="servletKey" type="java.lang.Class<? extendsHttpServlet>">+<parameter name="servletKey" type="com.google.inject.Key<? extendsHttpServlet>">

 </parameter>
 </method>
 <method name="with"
@@ -3601,6 +3627,8 @@
 >

<parameter name="servletKey" type="com.google.inject.Key<? extendsHttpServlet>">

 </parameter>

+<parameter name="contextParams" type="java.util.Map<java.lang.String,java.lang.String>">

+</parameter>
 </method>
 <method name="with"
  return="void"
@@ -3614,8 +3642,6 @@
 >

<parameter name="servletKey" type="java.lang.Class<? extendsHttpServlet>">

 </parameter>

-<parameter name="contextParams" type="java.util.Map<java.lang.String,java.lang.String>">

-</parameter>
 </method>
 <method name="with"
  return="void"
@@ -3627,7 +3653,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="servletKey" type="com.google.inject.Key<? extendsHttpServlet>">+<parameter name="servletKey" type="java.lang.Class<? extendsHttpServlet>">

 </parameter>

<parameter name="contextParams" type="java.util.Map<java.lang.String,java.lang.String>">

 </parameter>
@@ -3670,6 +3696,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.lang.annotation.Annotation">
+</implements>
 </class>
 </package>
 <package name="com.google.inject.spi"
@@ -3747,7 +3775,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="binding" type="com.google.inject.spi.InstanceBinding<?extends T>">+<parameter name="binding"type="com.google.inject.spi.ConstructorBinding<? extends T>">

 </parameter>
 </method>
 <method name="visit"
@@ -3760,7 +3788,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="binding"type="com.google.inject.spi.ProviderInstanceBinding<? extends T>">+<parameter name="binding"type="com.google.inject.spi.ConvertedConstantBinding<? extends T>">

 </parameter>
 </method>
 <method name="visit"
@@ -3773,7 +3801,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="binding"type="com.google.inject.spi.ProviderKeyBinding<? extends T>">+<parameter name="binding" type="com.google.inject.spi.ExposedBinding<?extends T>">

 </parameter>
 </method>
 <method name="visit"
@@ -3786,7 +3814,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="binding"type="com.google.inject.spi.LinkedKeyBinding<? extends T>">+<parameter name="binding" type="com.google.inject.spi.InstanceBinding<?extends T>">

 </parameter>
 </method>
 <method name="visit"
@@ -3799,7 +3827,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="binding" type="com.google.inject.spi.ExposedBinding<?extends T>">+<parameter name="binding"type="com.google.inject.spi.LinkedKeyBinding<? extends T>">

 </parameter>
 </method>
 <method name="visit"
@@ -3812,7 +3840,7 @@
  deprecated="not deprecated"
  visibility="public"
 >

-<parameter name="binding"type="com.google.inject.spi.UntargettedBinding<? extends T>">+<parameter name="binding" type="com.google.inject.spi.ProviderBinding<?extends T>">

 </parameter>
 </method>
 <method name="visit"
***The diff for this file has been truncated for email.***

--
You received this message because you are subscribed to the Google Groups 
"google-guice-dev" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/google-guice-dev?hl=en.

[google-guice] r1282 committed - Rebuild guice 2.0 API spec to include spring

Reply via email to