[google-guice] r1294 committed - flip the order of the type parameters in ProviderWithExtensionVisitor ...

Sat, 16 Oct 2010 18:37:17 -0700 

Revision: 1294
Author: sberlin
Date: Sat Oct 16 18:31:25 2010
Log: flip the order of the type parameters in ProviderWithExtensionVisitor to match the order in the BindingTargetVisitor. 
http://code.google.com/p/google-guice/source/detail?r=1294

Modified:
/trunk/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java /trunk/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java /trunk/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java /trunk/extensions/servlet/src/com/google/inject/servlet/FilterDefinition.java /trunk/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java 
 /trunk/src/com/google/inject/spi/ProviderWithExtensionVisitor.java
 /trunk/test/com/google/inject/spi/SpiBindingsTest.java

=======================================
--- /trunk/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java Sat Oct 16 18:28:06 2010 +++ /trunk/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java Sat Oct 16 18:31:25 2010 
@@ -303,7 +303,7 @@
   }

   @SuppressWarnings("unchecked")
- public <V, T> V acceptExtensionVisitor(BindingTargetVisitor<T, V> visitor, + public <T, V> V acceptExtensionVisitor(BindingTargetVisitor<T, V> visitor, 
       ProviderInstanceBinding<? extends T> binding) {
     if (visitor instanceof AssistedInjectTargetVisitor) {
return ((AssistedInjectTargetVisitor<T, V>)visitor).visit((AssistedInjectBinding<T>)this); 
=======================================
--- /trunk/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java Sun Sep 19 17:42:24 2010 +++ /trunk/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java Sat Oct 16 18:31:25 2010 
@@ -394,7 +394,7 @@
         }

         @SuppressWarnings("unchecked")
- public <R, B> R acceptExtensionVisitor(BindingTargetVisitor<B, R> visitor, + public <B, R> R acceptExtensionVisitor(BindingTargetVisitor<B, R> visitor, 
             ProviderInstanceBinding<? extends B> binding) {
           if (visitor instanceof MultibindingsTargetVisitor) {
return ((MultibindingsTargetVisitor<Map<K, V>, R>)visitor).visit(this); 
=======================================
--- /trunk/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java Sun Sep 19 17:42:24 2010 +++ /trunk/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java Sat Oct 16 18:31:25 2010 
@@ -328,7 +328,7 @@
     }

     @SuppressWarnings("unchecked")
-    public <V, B> V acceptExtensionVisitor(
+    public <B, V> V acceptExtensionVisitor(
         BindingTargetVisitor<B, V> visitor,
         ProviderInstanceBinding<? extends B> binding) {
       if(visitor instanceof MultibindingsTargetVisitor) {
=======================================
--- /trunk/extensions/servlet/src/com/google/inject/servlet/FilterDefinition.java Sun Aug 22 11:48:23 2010 +++ /trunk/extensions/servlet/src/com/google/inject/servlet/FilterDefinition.java Sat Oct 16 18:31:25 2010 
@@ -67,7 +67,7 @@
     return this;
   }
- public <V, B> V acceptExtensionVisitor(BindingTargetVisitor<B, V> visitor, + public <B, V> V acceptExtensionVisitor(BindingTargetVisitor<B, V> visitor, 
       ProviderInstanceBinding<? extends B> binding) {
     if(visitor instanceof ServletModuleTargetVisitor) {
       if(filterInstance != null) {
=======================================
--- /trunk/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java Sun Aug 22 11:48:23 2010 +++ /trunk/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java Sat Oct 16 18:31:25 2010 
@@ -71,7 +71,7 @@
     return this;
   }
- public <V, B> V acceptExtensionVisitor(BindingTargetVisitor<B, V> visitor, + public <B, V> V acceptExtensionVisitor(BindingTargetVisitor<B, V> visitor, 
       ProviderInstanceBinding<? extends B> binding) {
     if(visitor instanceof ServletModuleTargetVisitor) {
       if(servletInstance != null) {
=======================================
--- /trunk/src/com/google/inject/spi/ProviderWithExtensionVisitor.java Mon Oct 4 20:41:40 2010 +++ /trunk/src/com/google/inject/spi/ProviderWithExtensionVisitor.java Sat Oct 16 18:31:25 2010 
@@ -55,6 +55,6 @@
* relate to the type of the provider. In practice, the 'B' type will always 
    * be a supertype of 'T'.
    */
-  <V, B> V acceptExtensionVisitor(BindingTargetVisitor<B, V> visitor,
+  <B, V> V acceptExtensionVisitor(BindingTargetVisitor<B, V> visitor,
       ProviderInstanceBinding<? extends B> binding);
 }
=======================================
--- /trunk/test/com/google/inject/spi/SpiBindingsTest.java Sun Aug 22 11:12:59 2010 +++ /trunk/test/com/google/inject/spi/SpiBindingsTest.java Sat Oct 16 18:31:25 2010 
@@ -353,7 +353,7 @@
     final Injector injector = Guice.createInjector(new AbstractModule() {
       protected void configure() {
bind(String.class).toProvider(new ProviderWithExtensionVisitor<String>() { - public <V, B> V acceptExtensionVisitor(BindingTargetVisitor<B, V> visitor, + public <B, V> V acceptExtensionVisitor(BindingTargetVisitor<B, V> visitor, 
               ProviderInstanceBinding<? extends B> binding) {
             assertSame(this, binding.getProviderInstance());
             // We can't always check for FailingSpiTargetVisitor,

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

Reply via email to