Author: jmitchell Date: Wed Jan 26 14:31:30 2005 New Revision: 126553 URL: http://svn.apache.org/viewcvs?view=rev&rev=126553 Log: mostly non-functional changes with 1 exception. ShaleApplicationFilter specifies a private field that is never used anywhere, so I dropped it. My best guess is that it is now passed in on init, but did not in a previous life. If this is wrong, and I am misunderstanding something, please let me know and I'll put it back. Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/component/Token.java struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleConstants.java struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleViewHandler.java struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractViewController.java
Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/component/Token.java Url: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/component/Token.java?view=diff&rev=126553&p1=struts/shale/trunk/core-library/src/java/org/apache/shale/component/Token.java&r1=126552&p2=struts/shale/trunk/core-library/src/java/org/apache/shale/component/Token.java&r2=126553 ============================================================================== --- struts/shale/trunk/core-library/src/java/org/apache/shale/component/Token.java (original) +++ struts/shale/trunk/core-library/src/java/org/apache/shale/component/Token.java Wed Jan 26 14:31:30 2005 @@ -16,10 +16,10 @@ package org.apache.shale.component; -import java.util.Locale; import javax.faces.application.FacesMessage; import javax.faces.component.UIInput; import javax.faces.context.FacesContext; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shale.faces.ShaleConstants; Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java Url: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java?view=diff&rev=126553&p1=struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java&r1=126552&p2=struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java&r2=126553 ============================================================================== --- struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java (original) +++ struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java Wed Jan 26 14:31:30 2005 @@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.shale.ViewControllerMapper; import org.apache.shale.util.Messages; -import org.apache.shale.view.DefaultViewControllerMapper; + /** * <p>[EMAIL PROTECTED] ShaleApplicationFilter} is a <code>Filter</code> implementation @@ -156,12 +156,6 @@ /** - * <p>Filter configuration object for this <code>Filter</code>.</p> - */ - private FilterConfig config = null; - - - /** * <p>The <code>ServletContext</code> instance for our web application.</p> */ private ServletContext context = null; @@ -196,7 +190,6 @@ } phaseListener = null; context = null; - config = null; catalog = null; } @@ -246,7 +239,6 @@ log.info(messages.getMessage("filter.initializing")); - this.config = config; context = config.getServletContext(); phaseListener = new ShalePhaseListener(); getLifecycle().addPhaseListener(phaseListener); Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleConstants.java Url: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleConstants.java?view=diff&rev=126553&p1=struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleConstants.java&r1=126552&p2=struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleConstants.java&r2=126553 ============================================================================== --- struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleConstants.java (original) +++ struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleConstants.java Wed Jan 26 14:31:30 2005 @@ -16,10 +16,6 @@ package org.apache.shale.faces; -import org.apache.shale.ViewController; -import org.apache.shale.ViewControllerMapper; -import org.apache.shale.util.TokenProcessor; - /** * <p>[EMAIL PROTECTED] ShaleConstants} are manifest constants defining global identifiers shared across * the internal implementation of the controller. These constants Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleViewHandler.java Url: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleViewHandler.java?view=diff&rev=126553&p1=struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleViewHandler.java&r1=126552&p2=struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleViewHandler.java&r2=126553 ============================================================================== --- struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleViewHandler.java (original) +++ struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleViewHandler.java Wed Jan 26 14:31:30 2005 @@ -208,12 +208,12 @@ } // Map our view identifier to a corresponding managed bean name - ViewControllerMapper mapper = getViewControllerMapper(context); - if (mapper == null) { + ViewControllerMapper viewControllerMapper = getViewControllerMapper(context); + if (viewControllerMapper == null) { log.warn(messages.getMessage("view.noViewControllerMapper")); return; } - String viewName = mapper.mapViewId(viewId); + String viewName = viewControllerMapper.mapViewId(viewId); // Retrieve an existing instance, or one created and configured by // the managed bean facility Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractViewController.java Url: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractViewController.java?view=diff&rev=126553&p1=struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractViewController.java&r1=126552&p2=struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractViewController.java&r2=126553 ============================================================================== --- struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractViewController.java (original) +++ struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractViewController.java Wed Jan 26 14:31:30 2005 @@ -87,6 +87,7 @@ * <p>The default implementation does nothing.</p> */ public void init() { + // do nothing } @@ -94,6 +95,7 @@ * <p>The default implementation does nothing.</p> */ public void preprocess() { + // do nothing } @@ -101,6 +103,7 @@ * <p>The default implementation does nothing.</p> */ public void prerender() { + // do nothing } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
