You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/03/09 23:49:42 UTC
svn commit: r1080046 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces:
application/ResourceHandlerImpl.java
el/unified/resolver/ManagedBeanResolver.java
view/facelets/FaceletViewHandler.java
Author: struberg
Date: Wed Mar 9 22:49:42 2011
New Revision: 1080046
URL: http://svn.apache.org/viewvc?rev=1080046&view=rev
Log:
MYFACES-3063 remove unused private functions
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java?rev=1080046&r1=1080045&r2=1080046&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java Wed Mar 9 22:49:42 2011
@@ -459,35 +459,6 @@ public class ResourceHandlerImpl extends
}
return localePrefix;
}
-
- private static ResourceBundle getBundle(FacesContext facesContext, Locale locale, String bundleName)
- {
- try
- {
- // First we try the JSF implementation class loader
- return ResourceBundle.getBundle(bundleName, locale, ResourceHandlerImpl.class.getClassLoader());
- }
- catch (MissingResourceException ignore1)
- {
- try
- {
- // Next we try the JSF API class loader
- return ResourceBundle.getBundle(bundleName, locale, ResourceHandler.class.getClassLoader());
- }
- catch (MissingResourceException ignore2)
- {
- try
- {
- // Last resort is the context class loader
- return ResourceBundle.getBundle(bundleName, locale, ClassUtils.getContextClassLoader());
- }
- catch (MissingResourceException damned)
- {
- return null;
- }
- }
- }
- }
protected boolean isResourceIdentifierExcluded(FacesContext context,
String resourceIdentifier)
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java?rev=1080046&r1=1080045&r2=1080046&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java Wed Mar 9 22:49:42 2011
@@ -49,7 +49,6 @@ import org.apache.myfaces.config.element
*/
public class ManagedBeanResolver extends ELResolver
{
- //private static final Log log = LogFactory.getLog(ManagedBeanResolver.class);
private static final Logger log = Logger.getLogger(ManagedBeanResolver.class.getName());
private static final String BEANS_UNDER_CONSTRUCTION =
"org.apache.myfaces.el.unified.resolver.managedbean.beansUnderConstruction";
@@ -372,13 +371,6 @@ public class ManagedBeanResolver extends
return (FacesContext)context.getContext(FacesContext.class);
}
- private static ExternalContext externalContext(final ELContext context)
- {
- final FacesContext facesContext = facesContext(context);
-
- return facesContext != null ? facesContext.getExternalContext() : null;
- }
-
@Override
public Class<?> getType(final ELContext context, final Object base, final Object property)
throws NullPointerException, PropertyNotFoundException, ELException
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java?rev=1080046&r1=1080045&r2=1080046&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java Wed Mar 9 22:49:42 2011
@@ -39,8 +39,8 @@ import javax.faces.context.ExternalConte
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.render.RenderKit;
-import javax.faces.view.facelets.ResourceResolver;
-import javax.faces.view.facelets.TagDecorator;
+import javax.faces.view.facelets.ResourceResolver;
+import javax.faces.view.facelets.TagDecorator;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
@@ -871,36 +871,6 @@ public class FaceletViewHandler extends
return this.parent.getResourceURL(context, path);
}
- /**
- * Try to guess if this is a postback request. In JSF 1.2, this method is not needed, since ResponseStateManager can
- * identify postbacks. We use a simple heuristic: for HttpServletRequests, "POST" and "PUT" are postbacks. For
- * anything that isn't an HttpServletRequest, just guess that if there's a request parameter, it's probably a
- * postback.
- */
- static private boolean isPostback11(FacesContext context)
- {
- Object reqObject = context.getExternalContext().getRequest();
- if (reqObject instanceof HttpServletRequest)
- {
- HttpServletRequest request = (HttpServletRequest) reqObject;
-
- String method = request.getMethod();
-
- // Is this a POST or PUT request?
- if ("POST".equals(method) || "PUT".equals(method))
- {
- return true;
- }
-
- return false;
- }
- else
- {
- Map<String, String> paramMap = context.getExternalContext().getRequestParameterMap();
- return !paramMap.isEmpty();
- }
- }
-
protected static class NullWriter extends Writer
{