[google-guice] r1208 committed - update parameter names to reflect what they are.

Sun, 22 Aug 2010 16:08:46 -0700 

Revision: 1208
Author: sberlin
Date: Sun Aug 22 16:08:21 2010
Log: update parameter names to reflect what they are.
http://code.google.com/p/google-guice/source/detail?r=1208

Modified:
/trunk/extensions/servlet/src/com/google/inject/servlet/FiltersModuleBuilder.java 
 /trunk/extensions/servlet/src/com/google/inject/servlet/ServletModule.java
/trunk/extensions/servlet/src/com/google/inject/servlet/ServletsModuleBuilder.java 

=======================================
--- /trunk/extensions/servlet/src/com/google/inject/servlet/FiltersModuleBuilder.java Sun Aug 22 11:48:23 2010 +++ /trunk/extensions/servlet/src/com/google/inject/servlet/FiltersModuleBuilder.java Sun Aug 22 16:08:21 2010 
@@ -91,32 +91,32 @@
     }

     public void through(Class<? extends Filter> filterKey,
-        Map<String, String> contextParams) {
+        Map<String, String> initParams) {
// Careful you don't accidentally make this method recursive, thank you IntelliJ IDEA! 
-      through(Key.get(filterKey), contextParams);
+      through(Key.get(filterKey), initParams);
     }

     public void through(Key<? extends Filter> filterKey,
-        Map<String, String> contextParams) {
-      through(filterKey, contextParams, null);
+        Map<String, String> initParams) {
+      through(filterKey, initParams, null);
     }

     private void through(Key<? extends Filter> filterKey,
-        Map<String, String> contextParams,
+        Map<String, String> initParams,
         Filter filterInstance) {
       for (String pattern : uriPatterns) {
         filterDefinitions.add(
new FilterDefinition(pattern, filterKey, UriPatternType.get(uriPatternType, pattern), 
-                contextParams, filterInstance));
+                initParams, filterInstance));
       }
     }

     public void through(Filter filter,
-        Map<String, String> contextParams) {
+        Map<String, String> initParams) {
Key<Filter> filterKey = Key.get(Filter.class, UniqueAnnotations.create()); filterInstanceEntries.add(new FilterInstanceBindingEntry(filterKey, filter)); 
-      through(filterKey, contextParams, filter);
+      through(filterKey, initParams, filter);
     }
   }
 }
=======================================
--- /trunk/extensions/servlet/src/com/google/inject/servlet/ServletModule.java Sat Jul 3 08:51:31 2010 +++ /trunk/extensions/servlet/src/com/google/inject/servlet/ServletModule.java Sun Aug 22 16:08:21 2010 
@@ -273,9 +273,9 @@
     void through(Class<? extends Filter> filterKey);
     void through(Key<? extends Filter> filterKey);
     void through(Filter filter);
- void through(Class<? extends Filter> dummyFilterClass, Map<String, String> contextParams); - void through(Key<? extends Filter> dummyFilterClass, Map<String, String> contextParams); 
-    void through(Filter filter, Map<String, String> contextParams);
+ void through(Class<? extends Filter> filterKey, Map<String, String> initParams); + void through(Key<? extends Filter> filterKey, Map<String, String> initParams); 
+    void through(Filter filter, Map<String, String> initParams);
   }

   /**
@@ -287,8 +287,8 @@
     void with(Class<? extends HttpServlet> servletKey);
     void with(Key<? extends HttpServlet> servletKey);
     void with(HttpServlet servlet);
- void with(Class<? extends HttpServlet> servletKey, Map<String, String> contextParams); - void with(Key<? extends HttpServlet> servletKey, Map<String, String> contextParams); 
-    void with(HttpServlet servlet, Map<String, String> contextParams);
+ void with(Class<? extends HttpServlet> servletKey, Map<String, String> initParams); + void with(Key<? extends HttpServlet> servletKey, Map<String, String> initParams); 
+    void with(HttpServlet servlet, Map<String, String> initParams);
   }
 }
=======================================
--- /trunk/extensions/servlet/src/com/google/inject/servlet/ServletsModuleBuilder.java Sun Aug 22 11:48:23 2010 +++ /trunk/extensions/servlet/src/com/google/inject/servlet/ServletsModuleBuilder.java Sun Aug 22 16:08:21 2010 
@@ -101,30 +101,30 @@
     }

     public void with(Class<? extends HttpServlet> servletKey,
-        Map<String, String> contextParams) {
-      with(Key.get(servletKey), contextParams);
+        Map<String, String> initParams) {
+      with(Key.get(servletKey), initParams);
     }

     public void with(Key<? extends HttpServlet> servletKey,
-        Map<String, String> contextParams) {
-      with(servletKey, contextParams, null);
+        Map<String, String> initParams) {
+      with(servletKey, initParams, null);
     }

     private void with(Key<? extends HttpServlet> servletKey,
-        Map<String, String> contextParams,
+        Map<String, String> initParams,
         HttpServlet servletInstance) {
       for (String pattern : uriPatterns) {
         servletDefinitions.add(
new ServletDefinition(pattern, servletKey, UriPatternType.get(uriPatternType, pattern), 
-                contextParams, servletInstance));
+                initParams, servletInstance));
       }
     }

     public void with(HttpServlet servlet,
-        Map<String, String> contextParams) {
+        Map<String, String> initParams) {
Key<HttpServlet> servletKey = Key.get(HttpServlet.class, UniqueAnnotations.create()); servletInstanceEntries.add(new ServletInstanceBindingEntry(servletKey, servlet)); 
-      with(servletKey, contextParams, servlet);
+      with(servletKey, initParams, servlet);
     }
   }
 }

--
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.

Reply via email to