[waffle-scm] [514] trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar: WAFFLE-52 - renamed static method on the *Reference classes to prevent name collision with the request/session method defined on Registrar (note: these static methods are meant to be statically included for use in the Registrar to improve readability of component registration

Tue, 18 Dec 2007 22:29:07 -0800

Title: [waffle-scm] [514] trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar: WAFFLE-52 - renamed static method on the *Reference classes to prevent name collision with the request/session method defined on Registrar (note: these static methods are meant to be statically included for use in the Registrar to improve readability of component registration

Diff

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/HttpSessionAttributeReference.java (513 => 514)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/HttpSessionAttributeReference.java	2007-12-19 06:18:16 UTC (rev 513)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/HttpSessionAttributeReference.java	2007-12-19 06:28:59 UTC (rev 514)
@@ -20,7 +20,7 @@
      * This method can be statically imported into an Application's Registrar allowing
      * for a more fluent interface to define components and their dependencies
      */
-    public static HttpSessionAttributeReference session(Object key) {
+    public static HttpSessionAttributeReference sessionAttribute(Object key) {
         return new HttpSessionAttributeReference(key);
     }
 }

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/RequestAttributeReference.java (513 => 514)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/RequestAttributeReference.java	2007-12-19 06:18:16 UTC (rev 513)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/RequestAttributeReference.java	2007-12-19 06:28:59 UTC (rev 514)
@@ -20,7 +20,7 @@
      * This method can be statically imported into an Application's Registrar allowing
      * for a more fluent interface to define components and their dependencies
      */
-    public static RequestAttributeReference request(String key) {
+    public static RequestAttributeReference requestAttribute(String key) {
         return new RequestAttributeReference(key);
     }

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/RequestParameterReference.java (513 => 514)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/RequestParameterReference.java	2007-12-19 06:18:16 UTC (rev 513)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/RequestParameterReference.java	2007-12-19 06:28:59 UTC (rev 514)
@@ -20,7 +20,7 @@
      * This method can be statically imported into an Application's Registrar allowing
      * for a more fluent interface to define components and their dependencies
      */
-    public static RequestAttributeReference parameter(String key) {
+    public static RequestAttributeReference requestParameter(String key) {
         return new RequestAttributeReference(key);
     }
 }

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/ServletContextAttributeReference.java (513 => 514)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/ServletContextAttributeReference.java	2007-12-19 06:18:16 UTC (rev 513)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/ServletContextAttributeReference.java	2007-12-19 06:28:59 UTC (rev 514)
@@ -20,7 +20,7 @@
      * This method can be statically imported into an Application's Registrar allowing
      * for a more fluent interface to define components and their dependencies
      */
-    public static ServletContextAttributeReference servletContext(String key) {
+    public static ServletContextAttributeReference servletContextAttribute(String key) {
         return new ServletContextAttributeReference(key);
     }
 }

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/HttpSessionAttributeReferenceTest.java (513 => 514)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/HttpSessionAttributeReferenceTest.java	2007-12-19 06:18:16 UTC (rev 513)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/HttpSessionAttributeReferenceTest.java	2007-12-19 06:28:59 UTC (rev 514)
@@ -7,7 +7,7 @@
 
     @Test
     public void canConstructInstanceFromSessionMethod() {
-        Reference reference = HttpSessionAttributeReference.session("foo");
+        Reference reference = HttpSessionAttributeReference.sessionAttribute("foo");
         Assert.assertEquals("foo", reference.getKey());
     }
 }

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestAttributeReferenceTest.java (513 => 514)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestAttributeReferenceTest.java	2007-12-19 06:18:16 UTC (rev 513)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestAttributeReferenceTest.java	2007-12-19 06:28:59 UTC (rev 514)
@@ -7,7 +7,7 @@
 
     @Test
     public void canConstructInstanceFromRequestMethod() {
-        Reference reference = RequestAttributeReference.request("foo");
+        Reference reference = RequestAttributeReference.requestAttribute("foo");
         Assert.assertEquals("foo", reference.getKey());
     }
 }

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestParameterReferenceTest.java (513 => 514)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestParameterReferenceTest.java	2007-12-19 06:18:16 UTC (rev 513)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestParameterReferenceTest.java	2007-12-19 06:28:59 UTC (rev 514)
@@ -7,7 +7,7 @@
 
     @Test
     public void canConstructInstanceFromParameterMethod() {
-        Reference reference = RequestParameterReference.parameter("foo");
+        Reference reference = RequestParameterReference.requestParameter("foo");
         Assert.assertEquals("foo", reference.getKey());
     }
 }

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ServletContextAttributeReferenceTest.java (513 => 514)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ServletContextAttributeReferenceTest.java	2007-12-19 06:18:16 UTC (rev 513)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ServletContextAttributeReferenceTest.java	2007-12-19 06:28:59 UTC (rev 514)
@@ -7,7 +7,7 @@
 
     @Test
     public void canConstructInstanceFromParameterMethod() {
-        Reference reference = ServletContextAttributeReference.servletContext("foo");
+        Reference reference = ServletContextAttributeReference.servletContextAttribute("foo");
         Assert.assertEquals("foo", reference.getKey());
     }
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to