svn commit: r656337 - in /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets: BasicGadgetSpecFactory.java BasicMessageBundleFactory.java DefaultGuiceModule.java GadgetSpecFetcher.java MessageBundleFetcher.java

[etnu]

Author: etnu
Date: Wed May 14 10:31:58 2008
New Revision: 656337

URL: http://svn.apache.org/viewvc?rev=656337&view=rev
Log:
Removed GadgetSpecFetcher and MessageBundleFetcher annotations and fixed 
bindings to resolve exceptions being thrown after Louis' factory change 
(r655969). The annotations are being removed because they are no longer 
necessary, as GadgetSpecFactory and MessageBundleFactory provide adequate means 
for binding. The fetcher factories will be removed (or at least renamed and 
altered) in a follow up patch, but this solves the immediate problem.


Removed:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFetcher.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFetcher.java
Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java?rev=656337&r1=656336&r2=656337&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java
 Wed May 14 10:31:58 2008
@@ -56,8 +56,7 @@
   }
 
   @Inject
-  public BasicGadgetSpecFactory(
-      @GadgetSpecFetcher HttpFetcher specFetcher) {
+  public BasicGadgetSpecFactory(HttpFetcher specFetcher) {
     this.specFetcher = specFetcher;
   }
 }

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java?rev=656337&r1=656336&r2=656337&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
 Wed May 14 10:31:58 2008
@@ -57,8 +57,7 @@
   }
 
   @Inject
-  public BasicMessageBundleFactory(
-      @MessageBundleFetcher HttpFetcher bundleFetcher) {
+  public BasicMessageBundleFactory(HttpFetcher bundleFetcher) {
     this.bundleFetcher = bundleFetcher;
   }
 }

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java?rev=656337&r1=656336&r2=656337&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
 Wed May 14 10:31:58 2008
@@ -60,15 +60,9 @@
     bind(OAuthFetcherFactory.class);
     bind(ContentFetcherFactory.class);
 
-    bind(HttpFetcher.class)
-        .annotatedWith(GadgetSpecFetcher.class)
-        .toProvider(ContentFetcherFactory.class);
     bind(GadgetSpecFactory.class)
         .to(BasicGadgetSpecFactory.class);
 
-    bind(HttpFetcher.class)
-        .annotatedWith(MessageBundleFetcher.class)
-        .toProvider(ContentFetcherFactory.class);
     bind(MessageBundleFactory.class)
         .to(BasicMessageBundleFactory.class);