[prettyfaces] r472 committed - Started to remove some references to PrettyContext from PrettyFacesWra...

[prett...@googlecode.com]

Revision: 472
Author: chkalt
Date: Wed Dec 8 23:29:52 2010
Log: Started to remove some references to PrettyContext from
PrettyFacesWrappedResponse
http://code.google.com/p/prettyfaces/source/detail?r=472

Modified:

/prettyfaces/trunk/core/src/main/java/com/ocpsoft/pretty/faces/servlet/PrettyFacesWrappedResponse.java

=======================================
---
/prettyfaces/trunk/core/src/main/java/com/ocpsoft/pretty/faces/servlet/PrettyFacesWrappedResponse.java
Thu May 13 09:52:33 2010
+++
/prettyfaces/trunk/core/src/main/java/com/ocpsoft/pretty/faces/servlet/PrettyFacesWrappedResponse.java
Wed Dec 8 23:29:52 2010
@@ -43,9 +43,12 @@
{
private final RewriteEngine rewriteEngine = new RewriteEngine();

+ private final PrettyConfig prettyConfig;
+
public PrettyFacesWrappedResponse(final HttpServletResponse response,
final PrettyConfig config)
{
super(response);
+ this.prettyConfig = config;
}

@Override
@@ -95,7 +98,7 @@
}

List<UrlMapping> matches = new ArrayList<UrlMapping>();
- for (UrlMapping m : prettyContext.getConfig().getMappings())
+ for (UrlMapping m : prettyConfig.getMappings())
{
if (!"".equals(m.getViewId()) &&
strippedUrl.startsWith(m.getViewId()))
{
@@ -175,7 +178,7 @@

try
{
- for (RewriteRule c :
context.getConfig().getGlobalRewriteRules())
+ for (RewriteRule c : prettyConfig.getGlobalRewriteRules())
{
strippedUrl = rewriteEngine.processOutbound(c, strippedUrl);
}