Author: nbelaevski Date: 2009-07-01 08:45:49 -0400 (Wed, 01 Jul 2009) New Revision: 14757 Modified: branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/LegacyResourceHandlerImpl.java Log: LegacyResourceHandlerImpl refactored Modified: branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/LegacyResourceHandlerImpl.java =================================================================== --- branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/LegacyResourceHandlerImpl.java 2009-07-01 10:36:19 UTC (rev 14756) +++ branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/LegacyResourceHandlerImpl.java 2009-07-01 12:45:49 UTC (rev 14757) @@ -100,21 +100,21 @@ } } - public boolean isResourceRequest(FacesContext context) { - if (defaultHandler.isResourceRequest(context)) { - return true; - } else { - Boolean resourceRequest = BooleanRequestStateVariable.LEGACY_RESOURCE_REQUEST.get(context); - if (resourceRequest == null) { - String resourceName = getResourceKey(context); - //TODO handle exclusions - resourceRequest = resourceName != null ? Boolean.TRUE : Boolean.FALSE; - BooleanRequestStateVariable.LEGACY_RESOURCE_REQUEST.set(context, resourceRequest); - } - - return resourceRequest.booleanValue(); + protected boolean isThisHandlerResourceRequest(FacesContext context) { + Boolean resourceRequest = BooleanRequestStateVariable.LEGACY_RESOURCE_REQUEST.get(context); + if (resourceRequest == null) { + String resourceName = getResourceKey(context); + //TODO handle exclusions + resourceRequest = resourceName != null ? Boolean.TRUE : Boolean.FALSE; + BooleanRequestStateVariable.LEGACY_RESOURCE_REQUEST.set(context, resourceRequest); } + + return resourceRequest.booleanValue(); } + + public boolean isResourceRequest(FacesContext context) { + return isThisHandlerResourceRequest(context) || defaultHandler.isResourceRequest(context); + } private Date getIfModifiedSince(ExternalContext externalContext) { @@ -136,10 +136,7 @@ } public void handleResourceRequest(FacesContext context) throws IOException { - if (defaultHandler.isResourceRequest(context)) { - defaultHandler.handleResourceRequest(context); - } else { - + if (isThisHandlerResourceRequest(context)) { String resourceKey = getResourceKey(context); InternetResourceBuilder resourceBuilder = InternetResourceBuilder.getInstance(); @@ -203,6 +200,8 @@ //TODO context.getExternalContext().setResponseStatus(HttpServletResponse.SC_NOT_FOUND); } + } else { + defaultHandler.handleResourceRequest(context); } }