incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r619366 - in /incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request: SlingRequestDispatcher.java SlingRequestPathInfo.java
Date Thu, 07 Feb 2008 11:32:56 GMT
Author: fmeschbe
Date: Thu Feb  7 03:32:47 2008
New Revision: 619366

URL: http://svn.apache.org/viewvc?rev=619366&view=rev
Log:
SLING-234 use new getter methods on RequestDispatcherOptions

Modified:
    incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java
    incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestPathInfo.java

Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java?rev=619366&r1=619365&r2=619366&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java
(original)
+++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java
Thu Feb  7 03:32:47 2008
@@ -109,7 +109,7 @@
             info = info.merge(options);
 
             // ensure overwritten resource type
-            String rtOverwrite = options.get(RequestDispatcherOptions.OPT_FORCE_RESOURCE_TYPE);
+            String rtOverwrite = options.getForceResourceType();
             if (rtOverwrite != null
                 && !rtOverwrite.equals(resource.getResourceType())) {
                 resource = new ResourceWrapper(resource, rtOverwrite);

Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestPathInfo.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestPathInfo.java?rev=619366&r1=619365&r2=619366&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestPathInfo.java
(original)
+++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestPathInfo.java
Thu Feb  7 03:32:47 2008
@@ -146,7 +146,7 @@
             boolean needCreate = false;
 
             // replacement selectors
-            String selectors = options.get(RequestDispatcherOptions.OPT_REPLACE_SELECTORS);
+            String selectors = options.getReplaceSelectors();
             if (selectors != null) {
                 needCreate = true;
             } else {
@@ -154,7 +154,7 @@
             }
 
             // additional selectors
-            String selectorsAdd = options.get(RequestDispatcherOptions.OPT_ADD_SELECTORS);
+            String selectorsAdd = options.getAddSelectors();
             if (selectorsAdd != null) {
                 if (selectors != null) {
                     selectors += "." + selectorsAdd;
@@ -165,7 +165,7 @@
             }
 
             // suffix replacement
-            String suffix = options.get(RequestDispatcherOptions.REPLACE_SUFFIX);
+            String suffix = options.getReplaceSuffix();
             if (suffix != null) {
                 needCreate = true;
             } else {



Mime
View raw message