tiles-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r936438 - in /tiles/sandbox/trunk/tiles-request: tiles-request-api/src/main/java/org/apache/tiles/request/collection/ tiles-request-api/src/main/java/org/apache/tiles/request/collection/extractor/ tiles-request-servlet/src/main/java/org/apa...
Date Wed, 21 Apr 2010 18:51:12 GMT
Author: apetrelli
Date: Wed Apr 21 18:51:11 2010
New Revision: 936438

URL: http://svn.apache.org/viewvc?rev=936438&view=rev
Log:
TILESSB-31
Renamed a pair of interfaces.

Added:
    tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/extractor/EnumeratedValuesExtractor.java
      - copied, changed from r935400, tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/extractor/HeaderExtractor.java
    tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java
      - copied, changed from r935400, tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ServletHeaderExtractor.java
Removed:
    tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/extractor/HeaderExtractor.java
    tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ServletHeaderExtractor.java
Modified:
    tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/AddableParameterMap.java
    tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/HeaderValuesMap.java
    tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java

Modified: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/AddableParameterMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/AddableParameterMap.java?rev=936438&r1=936437&r2=936438&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/AddableParameterMap.java
(original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/AddableParameterMap.java
Wed Apr 21 18:51:11 2010
@@ -25,7 +25,7 @@ import java.util.Enumeration;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.tiles.request.collection.extractor.HeaderExtractor;
+import org.apache.tiles.request.collection.extractor.EnumeratedValuesExtractor;
 
 /**
  * <p>Private implementation of <code>Map</code> for servlet request
@@ -36,7 +36,7 @@ import org.apache.tiles.request.collecti
 
 public class AddableParameterMap extends ParameterMap {
 
-    private HeaderExtractor request;
+    private EnumeratedValuesExtractor request;
 
     /**
      * Constructor.
@@ -45,7 +45,7 @@ public class AddableParameterMap extends
      * @param response The response object to use.
      * @since 2.2.0
      */
-    public AddableParameterMap(HeaderExtractor request) {
+    public AddableParameterMap(EnumeratedValuesExtractor request) {
         super(request);
         this.request = request;
     }
@@ -59,7 +59,7 @@ public class AddableParameterMap extends
     /** {@inheritDoc} */
     @Override
     public boolean equals(Object o) {
-        HeaderExtractor otherRequest = ((AddableParameterMap) o).request;
+        EnumeratedValuesExtractor otherRequest = ((AddableParameterMap) o).request;
         boolean retValue = true;
         synchronized (request) {
             for (Enumeration<String> attribs = request.getKeys(); attribs

Modified: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/HeaderValuesMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/HeaderValuesMap.java?rev=936438&r1=936437&r2=936438&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/HeaderValuesMap.java
(original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/HeaderValuesMap.java
Wed Apr 21 18:51:11 2010
@@ -31,7 +31,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.tiles.request.collection.extractor.HeaderExtractor;
+import org.apache.tiles.request.collection.extractor.EnumeratedValuesExtractor;
 import org.apache.tiles.request.util.MapEntry;
 
 
@@ -44,14 +44,14 @@ import org.apache.tiles.request.util.Map
 
 public class HeaderValuesMap implements Map<String, String[]> {
 
-    private HeaderExtractor request;
+    private EnumeratedValuesExtractor request;
 
     /**
      * Constructor.
      *
      * @param request The request object to use.
      */
-    public HeaderValuesMap(HeaderExtractor request) {
+    public HeaderValuesMap(EnumeratedValuesExtractor request) {
         this.request = request;
     }
 
@@ -94,7 +94,7 @@ public class HeaderValuesMap implements 
     /** {@inheritDoc} */
     @Override
     public boolean equals(Object o) {
-        HeaderExtractor otherRequest = ((HeaderValuesMap) o).request;
+        EnumeratedValuesExtractor otherRequest = ((HeaderValuesMap) o).request;
         boolean retValue = true;
         for (Enumeration<String> attribs = request.getKeys(); attribs
                 .hasMoreElements()

Copied: tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/extractor/EnumeratedValuesExtractor.java
(from r935400, tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/extractor/HeaderExtractor.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/extractor/EnumeratedValuesExtractor.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/extractor/EnumeratedValuesExtractor.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/extractor/HeaderExtractor.java&r1=935400&r2=936438&rev=936438&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/extractor/HeaderExtractor.java
(original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/collection/extractor/EnumeratedValuesExtractor.java
Wed Apr 21 18:51:11 2010
@@ -2,7 +2,7 @@ package org.apache.tiles.request.collect
 
 import java.util.Enumeration;
 
-public interface HeaderExtractor extends HasAddableKeys<String> {
+public interface EnumeratedValuesExtractor extends HasAddableKeys<String> {
 
     Enumeration<String> getValues(String key);
 }

Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java?rev=936438&r1=936437&r2=936438&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
(original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
Wed Apr 21 18:51:11 2010
@@ -40,7 +40,7 @@ import org.apache.tiles.request.collecti
 import org.apache.tiles.request.collection.ScopeMap;
 import org.apache.tiles.request.servlet.extractor.ParameterExtractor;
 import org.apache.tiles.request.servlet.extractor.RequestScopeExtractor;
-import org.apache.tiles.request.servlet.extractor.ServletHeaderExtractor;
+import org.apache.tiles.request.servlet.extractor.HeaderExtractor;
 import org.apache.tiles.request.servlet.extractor.SessionScopeExtractor;
 
 /**
@@ -131,7 +131,7 @@ public class ServletRequest extends Abst
     public Map<String, String> getHeader() {
 
         if ((header == null) && (request != null)) {
-            header = new AddableParameterMap(new ServletHeaderExtractor(request, response));
+            header = new AddableParameterMap(new HeaderExtractor(request, response));
         }
         return (header);
 
@@ -142,7 +142,7 @@ public class ServletRequest extends Abst
     public Map<String, String[]> getHeaderValues() {
 
         if ((headerValues == null) && (request != null)) {
-            headerValues = new HeaderValuesMap(new ServletHeaderExtractor(request, response));
+            headerValues = new HeaderValuesMap(new HeaderExtractor(request, response));
         }
         return (headerValues);
 

Copied: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java
(from r935400, tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ServletHeaderExtractor.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ServletHeaderExtractor.java&r1=935400&r2=936438&rev=936438&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ServletHeaderExtractor.java
(original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java
Wed Apr 21 18:51:11 2010
@@ -5,15 +5,15 @@ import java.util.Enumeration;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.tiles.request.collection.extractor.HeaderExtractor;
+import org.apache.tiles.request.collection.extractor.EnumeratedValuesExtractor;
 
-public class ServletHeaderExtractor implements HeaderExtractor {
+public class HeaderExtractor implements EnumeratedValuesExtractor {
 
     private HttpServletRequest request;
 
     private HttpServletResponse response;
 
-    public ServletHeaderExtractor(HttpServletRequest request,
+    public HeaderExtractor(HttpServletRequest request,
             HttpServletResponse response) {
         this.request = request;
         this.response = response;



Mime
View raw message