svn commit: r939060 - in /tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet: ./ delegate/

[apetrelli]

Author: apetrelli
Date: Wed Apr 28 19:27:52 2010
New Revision: 939060

URL: http://svn.apache.org/viewvc?rev=939060&view=rev
Log:
TILESSB-31
Removed useless code. Moved around a pair of classes.

Added:
    
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/delegate/StateAwareParameterMap.java
      - copied, changed from r939057, 
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/StateAwareParameterMap.java
Removed:
    
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/NotAPortletEnvironmentException.java
    
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletApplicationScopeMap.java
    
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletInitParamMap.java
    
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletParamMap.java
    
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletParamValuesMap.java
    
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequestScopeMap.java
    
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletSessionScopeMap.java
    
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletUtil.java
    
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/StateAwareParameterMap.java
Modified:
    
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletApplicationContext.java
    
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/delegate/StateAwareRequestDelegate.java

Modified: 
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletApplicationContext.java?rev=939060&r1=939059&r2=939060&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletApplicationContext.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletApplicationContext.java
 Wed Apr 28 19:27:52 2010
@@ -29,6 +29,10 @@ import java.util.Set;
 import javax.portlet.PortletContext;
 
 import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.collection.ReadOnlyEnumerationMap;
+import org.apache.tiles.request.collection.ScopeMap;
+import org.apache.tiles.request.portlet.extractor.ApplicationScopeExtractor;
+import org.apache.tiles.request.portlet.extractor.InitParameterExtractor;
 
 /**
  * Portlet-based TilesApplicationContext implementation.
@@ -114,7 +118,8 @@ public class PortletApplicationContext i
     /** {...@inheritdoc} */
     public Map<String, Object> getApplicationScope() {
         if ((applicationScope == null) && (context != null)) {
-            applicationScope = new PortletApplicationScopeMap(context);
+            applicationScope = new ScopeMap(new ApplicationScopeExtractor(
+                    context));
         }
         return (applicationScope);
 
@@ -123,7 +128,8 @@ public class PortletApplicationContext i
     /** {...@inheritdoc} */
     public Map<String, String> getInitParams() {
         if ((initParam == null) && (context != null)) {
-            initParam = new PortletInitParamMap(context);
+            initParam = new ReadOnlyEnumerationMap<String>(
+                    new InitParameterExtractor(context));
         }
         return (initParam);
 

Copied: 
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/delegate/StateAwareParameterMap.java
 (from r939057, 
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/StateAwareParameterMap.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/delegate/StateAwareParameterMap.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/delegate/StateAwareParameterMap.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/StateAwareParameterMap.java&r1=939057&r2=939060&rev=939060&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/StateAwareParameterMap.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/delegate/StateAwareParameterMap.java
 Wed Apr 28 19:27:52 2010
@@ -1,4 +1,4 @@
-package org.apache.tiles.request.portlet;
+package org.apache.tiles.request.portlet.delegate;
 
 import java.util.Collection;
 import java.util.Map;

Modified: 
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/delegate/StateAwareRequestDelegate.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/delegate/StateAwareRequestDelegate.java?rev=939060&r1=939059&r2=939060&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/delegate/StateAwareRequestDelegate.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/delegate/StateAwareRequestDelegate.java
 Wed Apr 28 19:27:52 2010
@@ -6,7 +6,6 @@ import javax.portlet.PortletRequest;
 import javax.portlet.StateAwareResponse;
 
 import org.apache.tiles.request.collection.AddableParameterMap;
-import org.apache.tiles.request.portlet.StateAwareParameterMap;
 import org.apache.tiles.request.portlet.extractor.StateAwareParameterExtractor;
 
 public class StateAwareRequestDelegate implements RequestDelegate {