You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2006/02/08 22:40:51 UTC
svn commit: r376085 [2/2] - in /myfaces:
commons/trunk/src/main/java/org/apache/myfaces/config/
commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/
tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/
tomahawk/trunk...
Added: myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java
URL: http://svn.apache.org/viewcvs/myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java?rev=376085&view=auto
==============================================================================
--- myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java (added)
+++ myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java Wed Feb 8 13:40:47 2006
@@ -0,0 +1,1105 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.renderkit.html.util;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
+
+import javax.faces.FacesException;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * This is a utility class to render link to resources used by custom components.
+ * Mostly used to avoid having to include [script src="..."][/script]
+ * in the head of the pages before using a component.
+ * <p>
+ * When used together with the ExtensionsFilter, this class can allow components
+ * in the body of a page to emit script and stylesheet references into the page
+ * head section. The relevant methods on this object simply queue the changes,
+ * and when the page is complete the ExtensionsFilter calls back into this
+ * class to allow it to insert the commands into the buffered response.
+ * <p>
+ * This class also works with the ExtensionsFilter to allow components to
+ * emit references to javascript/css/etc which are bundled in the component's
+ * jar file. Special URLs are generated which the ExtensionsFilter will later
+ * handle by retrieving the specified resource from the classpath.
+ * <p>
+ * The special URL format is:
+ * <pre>
+ * {contextPath}/faces/myFacesExtensionResource/
+ * {resourceLoaderName}/{cacheKey}/{resourceURI}
+ * </pre>
+ * Where:
+ * <ul>
+ * <li> {contextPath} is the context path of the current webapp
+ * <li> {resourceLoaderName} is the fully-qualified name of a class which
+ * implements the ResourceLoader interface. When a browser app sends a request
+ * for the specified resource, an instance of the specified ResourceLoader class
+ * will be created and passed the resourceURI part of the URL for resolving to the
+ * actual resource to be served back. The standard MyFaces ResourceLoader
+ * implementation only serves resources for files stored beneath path
+ * org/apache/myfaces/custom in the classpath but non-myfaces code can provide their
+ * own ResourceLoader implementations.
+ * </ul>
+ *
+ * @author Sylvain Vieujot (latest modification by $Author: mmarinschek $)
+ * @version $Revision: 371739 373827 $ $Date: 2006-01-31 14:50:35 +0000 (Tue, 31 Jan 2006) $
+ */
+public class DefaultAddResource implements AddResource
+{
+ private static final String PATH_SEPARATOR = "/";
+
+ protected static final Log log = LogFactory.getLog(DefaultAddResource.class);
+
+ private static final String RESOURCE_VIRTUAL_PATH = "/faces/myFacesExtensionResource";
+
+ private static final String HEADER_BEGIN_INFO_REQUEST_ATTRIBUTE_NAME = AddResource.class
+ .getName()
+ + ".HEADER_BEGIN_INFO";
+
+ private static final String BODY_END_INFO_REQUEST_ATTRIBUTE_NAME = AddResource.class.getName()
+ + ".BODY_END_INFO";
+
+ private static final String BODY_ONLOAD_INFO_REQUEST_ATTRIBUTE_NAME = AddResource.class
+ .getName()
+ + ".BODY_ONLOAD_INFO";
+
+ private static final String RESOURCES_CACHE_KEY = AddResource.class.getName() + ".CACHE_KEY";
+
+ protected final String _contextPath;
+
+ private StringBuffer originalResponse;
+ protected boolean parserCalled = false;
+ protected int headerInsertPosition = -1;
+ protected int bodyInsertPosition = -1;
+ protected int beforeBodyPosition = -1;
+ protected int afterBodyContentInsertPosition = -1;
+ protected int beforeBodyEndPosition = -1;
+
+ protected DefaultAddResource(String contextPath)
+ {
+ _contextPath = contextPath;
+ }
+
+ // Methods to add resources
+
+ /**
+ * Insert a [script src="url"] entry at the current location in the response.
+ * The resource is expected to be in the classpath, at the same location as the
+ * specified component + "/resource".
+ * <p>
+ * Example: when customComponent is class example.Widget, and
+ * resourceName is script.js, the resource will be retrieved from
+ * "example/Widget/resource/script.js" in the classpath.
+ */
+ public void addJavaScriptHere(FacesContext context, Class myfacesCustomComponent,
+ String resourceName) throws IOException
+ {
+ addJavaScriptHere(context, new MyFacesResourceHandler(myfacesCustomComponent, resourceName));
+ }
+
+ /**
+ * Insert a [script src="url"] entry at the current location in the response.
+ *
+ * @param uri is the location of the desired resource, relative to the base
+ * directory of the webapp (ie its contextPath).
+ */
+ public void addJavaScriptHere(FacesContext context, String uri) throws IOException
+ {
+ ResponseWriter writer = context.getResponseWriter();
+
+ writer.startElement(HTML.SCRIPT_ELEM, null);
+ writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
+ String src = context.getExternalContext().encodeResourceURL(getResourceUri(context, uri));
+ writer.writeURIAttribute(HTML.SRC_ATTR, src, null);
+ writer.endElement(HTML.SCRIPT_ELEM);
+ }
+
+ /**
+ * Insert a [script src="url"] entry at the current location in the response.
+ *
+ * @param context
+ *
+ * @param resourceHandler is an object which specifies exactly how to build the url
+ * that is emitted into the script tag. Code which needs to generate URLs in ways
+ * that this class does not support by default can implement a custom ResourceHandler.
+ *
+ * @throws IOException
+ */
+ public void addJavaScriptHere(FacesContext context, ResourceHandler resourceHandler)
+ throws IOException
+ {
+ validateResourceHandler(resourceHandler);
+
+ ResponseWriter writer = context.getResponseWriter();
+
+ writer.startElement(HTML.SCRIPT_ELEM, null);
+ writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
+ String src = context.getExternalContext().encodeResourceURL(
+ getResourceUri(context, resourceHandler));
+ writer.writeURIAttribute(HTML.SRC_ATTR, src, null);
+ writer.endElement(HTML.SCRIPT_ELEM);
+ }
+
+ public void addResourceHere(FacesContext context, ResourceHandler resourceHandler)
+ throws IOException
+ {
+ validateResourceHandler(resourceHandler);
+
+ String path = getResourceUri(context, resourceHandler);
+ ResponseWriter writer = context.getResponseWriter();
+ writer.write(context.getExternalContext().encodeResourceURL(path));
+ }
+
+ /**
+ * Verify that the resource handler is acceptable. Null is not
+ * valid, and the getResourceLoaderClass method must return a
+ * Class object whose instances implements the ResourceLoader
+ * interface.
+ *
+ * @param resourceHandler
+ */
+ protected void validateResourceHandler(ResourceHandler resourceHandler)
+ {
+ if (resourceHandler == null)
+ {
+ throw new IllegalArgumentException("ResourceHandler is null");
+ }
+ validateResourceLoader(resourceHandler.getResourceLoaderClass());
+ }
+
+ /**
+ * Given a Class object, verify that the instances of that class
+ * implement the ResourceLoader interface.
+ *
+ * @param resourceloader
+ */
+ protected void validateResourceLoader(Class resourceloader)
+ {
+ if (!ResourceLoader.class.isAssignableFrom(resourceloader))
+ {
+ throw new FacesException("Class " + resourceloader.getName() + " must implement "
+ + ResourceLoader.class.getName());
+ }
+ }
+
+ /**
+ * Adds the given Javascript resource to the document header at the specified
+ * document positioy by supplying a resourcehandler instance.
+ * <p>
+ * Use this method to have full control about building the reference url
+ * to identify the resource and to customize how the resource is
+ * written to the response. In most cases, however, one of the convenience
+ * methods on this class can be used without requiring a custom ResourceHandler
+ * to be provided.
+ * <p>
+ * If the script has already been referenced, it's added only once.
+ * <p>
+ * Note that this method <i>queues</i> the javascript for insertion, and that
+ * the script is inserted into the buffered response by the ExtensionsFilter
+ * after the page is complete.
+ */
+ public void addJavaScriptAtPosition(FacesContext context, ResourcePosition position,
+ ResourceHandler resourceHandler)
+ {
+ addJavaScriptAtPosition(context, position, resourceHandler, false);
+ }
+
+ /**
+ * Insert a [script src="url"] entry into the document header at the
+ * specified document position. If the script has already been
+ * referenced, it's added only once.
+ * <p>
+ * The resource is expected to be in the classpath, at the same location as the
+ * specified component + "/resource".
+ * <p>
+ * Example: when customComponent is class example.Widget, and
+ * resourceName is script.js, the resource will be retrieved from
+ * "example/Widget/resource/script.js" in the classpath.
+ */
+ public void addJavaScriptAtPosition(FacesContext context, ResourcePosition position,
+ Class myfacesCustomComponent, String resourceName)
+ {
+ addJavaScriptAtPosition(context, position, new MyFacesResourceHandler(
+ myfacesCustomComponent, resourceName));
+ }
+
+ /**
+ * Insert a [script src="url"] entry into the document header at the
+ * specified document position. If the script has already been
+ * referenced, it's added only once.
+ *
+ * @param defer specifies whether the html attribute "defer" is set on the
+ * generated script tag. If this is true then the browser will continue
+ * processing the html page without waiting for the specified script to
+ * load and be run.
+ */
+ public void addJavaScriptAtPosition(FacesContext context, ResourcePosition position,
+ Class myfacesCustomComponent, String resourceName, boolean defer)
+ {
+ addJavaScriptAtPosition(context, position, new MyFacesResourceHandler(
+ myfacesCustomComponent, resourceName), defer);
+ }
+
+ /**
+ * Insert a [script src="url"] entry into the document header at the
+ * specified document position. If the script has already been
+ * referenced, it's added only once.
+ *
+ * @param uri is the location of the desired resource, relative to the base
+ * directory of the webapp (ie its contextPath).
+ */
+ public void addJavaScriptAtPosition(FacesContext context, ResourcePosition position, String uri)
+ {
+ addJavaScriptAtPosition(context, position, uri, false);
+ }
+
+ /**
+ * Adds the given Javascript resource at the specified document position.
+ * If the script has already been referenced, it's added only once.
+ */
+ public void addJavaScriptAtPosition(FacesContext context, ResourcePosition position, String uri,
+ boolean defer)
+ {
+ addPositionedInfo(context, position, getScriptInstance(context, uri, defer));
+ }
+
+ public void addJavaScriptToBodyTag(FacesContext context, String javascriptEventName,
+ String addedJavaScript)
+ {
+ AttributeInfo info = new AttributeInfo();
+ info.setAttributeName(javascriptEventName);
+ info.setAttributeValue(addedJavaScript);
+
+ addPositionedInfo(context, BODY_ONLOAD, info);
+ }
+
+ /**
+ * Adds the given Javascript resource at the specified document position.
+ * If the script has already been referenced, it's added only once.
+ */
+ public void addJavaScriptAtPosition(FacesContext context, ResourcePosition position,
+ ResourceHandler resourceHandler, boolean defer)
+ {
+ validateResourceHandler(resourceHandler);
+ addPositionedInfo(context, position, getScriptInstance(context, resourceHandler, defer));
+ }
+
+ /**
+ * Adds the given Style Sheet at the specified document position.
+ * If the style sheet has already been referenced, it's added only once.
+ */
+ public void addStyleSheet(FacesContext context, ResourcePosition position,
+ Class myfacesCustomComponent, String resourceName)
+ {
+ addStyleSheet(context, position, new MyFacesResourceHandler(myfacesCustomComponent,
+ resourceName));
+ }
+
+ /**
+ * Adds the given Style Sheet at the specified document position.
+ * If the style sheet has already been referenced, it's added only once.
+ */
+ public void addStyleSheet(FacesContext context, ResourcePosition position, String uri)
+ {
+ addPositionedInfo(context, position, getStyleInstance(context, uri));
+ }
+
+ /**
+ * Adds the given Style Sheet at the specified document position.
+ * If the style sheet has already been referenced, it's added only once.
+ */
+ public void addStyleSheet(FacesContext context, ResourcePosition position,
+ ResourceHandler resourceHandler)
+ {
+ validateResourceHandler(resourceHandler);
+ addPositionedInfo(context, position, getStyleInstance(context, resourceHandler));
+ }
+
+ /**
+ * Adds the given Inline Style at the specified document position.
+ */
+ public void addInlineStyleAtPosition(FacesContext context, ResourcePosition position, String inlineStyle)
+ {
+ addPositionedInfo(context, position, getInlineStyleInstance(inlineStyle));
+ }
+
+ /**
+ * Adds the given Inline Script at the specified document position.
+ */
+ public void addInlineScriptAtPosition(FacesContext context, ResourcePosition position,
+ String inlineScript)
+ {
+ addPositionedInfo(context, position, getInlineScriptInstance(inlineScript));
+ }
+
+ public String getResourceUri(FacesContext context, Class myfacesCustomComponent,
+ String resource, boolean withContextPath)
+ {
+ return getResourceUri(context,
+ new MyFacesResourceHandler(myfacesCustomComponent, resource), withContextPath);
+ }
+
+ public String getResourceUri(FacesContext context, Class myfacesCustomComponent, String resource)
+ {
+ return getResourceUri(context, new MyFacesResourceHandler(myfacesCustomComponent, resource));
+ }
+
+ /**
+ * Get the Path used to retrieve an resource.
+ */
+ public String getResourceUri(FacesContext context, ResourceHandler resourceHandler)
+ {
+ String uri = resourceHandler.getResourceUri(context);
+ if (uri == null)
+ {
+ return getResourceUri(context, resourceHandler.getResourceLoaderClass(), true);
+ }
+ return getResourceUri(context, resourceHandler.getResourceLoaderClass(), true) + uri;
+ }
+
+ /**
+ * Get the Path used to retrieve an resource.
+ */
+ public String getResourceUri(FacesContext context, ResourceHandler resourceHandler,
+ boolean withContextPath)
+ {
+ String uri = resourceHandler.getResourceUri(context);
+ if (uri == null)
+ {
+ return getResourceUri(context, resourceHandler.getResourceLoaderClass(),
+ withContextPath);
+ }
+ return getResourceUri(context, resourceHandler.getResourceLoaderClass(), withContextPath)
+ + uri;
+ }
+
+ /**
+ * Get the Path used to retrieve an resource.
+ */
+ public String getResourceUri(FacesContext context, String uri)
+ {
+ return getResourceUri(context, uri, true);
+ }
+
+ /**
+ * Get the Path used to retrieve an resource.
+ */
+ public String getResourceUri(FacesContext context, String uri, boolean withContextPath)
+ {
+ if (withContextPath)
+ {
+ return context.getApplication().getViewHandler().getResourceURL(context, uri);
+ }
+ return uri;
+ }
+
+ /**
+ * Get the Path used to retrieve an resource.
+ */
+ protected String getResourceUri(FacesContext context, Class resourceLoader,
+ boolean withContextPath)
+ {
+ StringBuffer sb = new StringBuffer(200);
+ sb.append(RESOURCE_VIRTUAL_PATH);
+ sb.append(PATH_SEPARATOR);
+ sb.append(resourceLoader.getName());
+ sb.append(PATH_SEPARATOR);
+ sb.append(getCacheKey(context));
+ sb.append(PATH_SEPARATOR);
+ return getResourceUri(context, sb.toString(), withContextPath);
+ }
+
+ /**
+ * Return a value used in the {cacheKey} part of a generated URL for a
+ * resource reference.
+ * <p>
+ * Caching in browsers normally works by having files served to them
+ * include last-modified and expiry-time http headers. Until the expiry
+ * time is reached, a browser will silently use its cached version. After
+ * the expiry time, it will send a "get if modified since {time}" message,
+ * where {time} is the last-modified header from the version it has cached.
+ * <p>
+ * Unfortunately this scheme only works well for resources represented as
+ * plain files on disk, where the webserver can easily and efficiently see
+ * the last-modified time of the resource file. When that query has to be
+ * processed by a servlet that doesn't scale well, even when it is possible
+ * to determine the resource's last-modified date from servlet code.
+ * <p>
+ * Fortunately, for the AddResource class a static resource is only ever
+ * accessed because a URL was embedded by this class in a dynamic page.
+ * This makes it possible to implement caching by instead marking every
+ * resource served with a very long expiry time, but forcing the URL that
+ * points to the resource to change whenever the old cached version becomes
+ * invalid; the browser effectively thinks it is fetching a different
+ * resource that it hasn't seen before. This is implemented by embedding
+ * a "cache key" in the generated URL.
+ * <p>
+ * Rather than using the actual modification date of a resource as the
+ * cache key, we simply use the webapp deployment time. This means that all
+ * data cached by browsers will become invalid after a webapp deploy (all
+ * the urls to the resources change). It also means that changes that occur
+ * to a resource <i>without</i> a webapp redeploy will not be seen by browsers.
+ */
+ protected long getCacheKey(FacesContext context)
+ {
+ // cache key is hold in application scope so it is recreated on redeploying the webapp.
+ Map applicationMap = context.getExternalContext().getApplicationMap();
+ Long cacheKey = (Long) applicationMap.get(RESOURCES_CACHE_KEY);
+ if (cacheKey == null)
+ {
+ cacheKey = new Long(System.currentTimeMillis() / 100000);
+ applicationMap.put(RESOURCES_CACHE_KEY, cacheKey);
+ }
+ return cacheKey.longValue();
+ }
+
+ public boolean isResourceUri(HttpServletRequest request)
+ {
+ String path;
+ if (_contextPath != null)
+ {
+ path = _contextPath + RESOURCE_VIRTUAL_PATH;
+ }
+ else
+ {
+ path = RESOURCE_VIRTUAL_PATH;
+ }
+ return request.getRequestURI().startsWith(path);
+ }
+
+ private Class getClass(String className) throws ClassNotFoundException
+ {
+ Class clazz = Thread.currentThread().getContextClassLoader().loadClass(className);
+ validateResourceLoader(clazz);
+ return clazz;
+ }
+
+ public void serveResource(ServletContext context, HttpServletRequest request,
+ HttpServletResponse response) throws IOException
+ {
+ String pathInfo = request.getPathInfo();
+ String uri = request.getContextPath() + request.getServletPath()
+ + (pathInfo == null ? "" : pathInfo);
+ String classNameStartsAfter = RESOURCE_VIRTUAL_PATH + '/';
+
+ int posStartClassName = uri.indexOf(classNameStartsAfter) + classNameStartsAfter.length();
+ int posEndClassName = uri.indexOf(PATH_SEPARATOR, posStartClassName);
+ String className = uri.substring(posStartClassName, posEndClassName);
+ int posEndCacheKey = uri.indexOf(PATH_SEPARATOR, posEndClassName + 1);
+ String resourceUri = null;
+ if (posEndCacheKey + 1 < uri.length())
+ {
+ resourceUri = uri.substring(posEndCacheKey + 1);
+ }
+ try
+ {
+ Class resourceLoader = getClass(className);
+ validateResourceLoader(resourceLoader);
+ ((ResourceLoader) resourceLoader.newInstance()).serveResource(context, request,
+ response, resourceUri);
+ response.flushBuffer();
+ }
+ catch (ClassNotFoundException e)
+ {
+ log.error("Could not find class for name: " + className, e);
+ response.sendError(HttpServletResponse.SC_NOT_FOUND,
+ "Could not find resourceloader class for name: " + className);
+ }
+ catch (InstantiationException e)
+ {
+ log.error("Could not instantiate class for name: " + className, e);
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ "Could not instantiate resourceloader class for name: " + className);
+ }
+ catch (IllegalAccessException e)
+ {
+ log.error("Could not access class for name: " + className, e);
+ response.sendError(HttpServletResponse.SC_FORBIDDEN,
+ "Could not access resourceloader class for name: " + className);
+ }
+ catch (Throwable e)
+ {
+ log.error("Error while serving resource: " +resourceUri+", message : "+ e.getMessage(), e);
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ // Positioned stuffs
+
+ protected Set getHeaderBeginInfos(HttpServletRequest request)
+ {
+ Set set = (Set) request.getAttribute(HEADER_BEGIN_INFO_REQUEST_ATTRIBUTE_NAME);
+ if (set == null)
+ {
+ set = new LinkedHashSet();
+ request.setAttribute(HEADER_BEGIN_INFO_REQUEST_ATTRIBUTE_NAME, set);
+ }
+ return set;
+ }
+
+ protected Set getBodyEndInfos(HttpServletRequest request)
+ {
+ Set set = (Set) request.getAttribute(BODY_END_INFO_REQUEST_ATTRIBUTE_NAME);
+ if (set == null)
+ {
+ set = new LinkedHashSet();
+ request.setAttribute(BODY_END_INFO_REQUEST_ATTRIBUTE_NAME, set);
+ }
+ return set;
+ }
+
+ protected Set getBodyOnloadInfos(HttpServletRequest request)
+ {
+ Set set = (Set) request.getAttribute(BODY_ONLOAD_INFO_REQUEST_ATTRIBUTE_NAME);
+ if (set == null)
+ {
+ set = new LinkedHashSet();
+ request.setAttribute(BODY_ONLOAD_INFO_REQUEST_ATTRIBUTE_NAME, set);
+ }
+ return set;
+ }
+
+ private void addPositionedInfo(FacesContext context, ResourcePosition position, PositionedInfo info)
+ {
+ if (HEADER_BEGIN.equals(position))
+ {
+ //todo: fix this to work in PortletRequest as well
+ HttpServletRequest request = (HttpServletRequest) context.getExternalContext()
+ .getRequest();
+ Set set = getHeaderBeginInfos(request);
+ set.add(info);
+ }
+ else if (BODY_END.equals(position))
+ {
+ //todo: fix this to work in PortletRequest as well
+ HttpServletRequest request = (HttpServletRequest) context.getExternalContext()
+ .getRequest();
+ Set set = getBodyEndInfos(request);
+ set.add(info);
+
+ }
+ else if (BODY_ONLOAD.equals(position))
+ {
+ //todo: fix this to work in PortletRequest as well
+ HttpServletRequest request = (HttpServletRequest) context.getExternalContext()
+ .getRequest();
+ Set set = getBodyOnloadInfos(request);
+ set.add(info);
+ }
+ }
+
+ public boolean hasHeaderBeginInfos(HttpServletRequest request)
+ {
+ return request.getAttribute(HEADER_BEGIN_INFO_REQUEST_ATTRIBUTE_NAME) != null;
+ }
+
+ /**
+ * Parses the response to mark the positions where code will be inserted
+ */
+ public void parseResponse(HttpServletRequest request, String bufferedResponse,
+ HttpServletResponse response)
+ {
+
+ originalResponse = new StringBuffer(bufferedResponse);
+
+ ParseCallbackListener l = new ParseCallbackListener();
+ ReducedHTMLParser.parse(originalResponse, l);
+
+ headerInsertPosition = l.getHeaderInsertPosition();
+ bodyInsertPosition = l.getBodyInsertPosition();
+ beforeBodyPosition = l.getBeforeBodyPosition();
+ afterBodyContentInsertPosition = l.getAfterBodyContentInsertPosition();
+ beforeBodyEndPosition = l.getAfterBodyEndPosition()-7; // 7, which is the length of </body>
+
+ parserCalled = true;
+ }
+
+ /**
+ * Writes the javascript code necessary for myfaces in every page, just befode the closing </body> tag
+ */
+ public void writeMyFacesJavascriptBeforeBodyEnd(HttpServletRequest request,
+ HttpServletResponse response) throws IOException
+ {
+ if (!parserCalled)
+ {
+ throw new IOException("Method parseResponse has to be called first");
+ }
+
+ if (beforeBodyEndPosition >= 0)
+ {
+ String myFacesJavascript = (String) request.getAttribute("org.apache.myfaces.myFacesJavascript");
+ if(myFacesJavascript != null)
+ {
+ originalResponse.insert(beforeBodyEndPosition, myFacesJavascript);
+ }
+ else
+ {
+ log.warn("MyFaces special javascript could not be retrieved from request-map.");
+ }
+ }
+ }
+
+ /**
+ * Add the resources to the <head> of the page.
+ * If the head tag is missing, but the <body> tag is present, the head tag is added.
+ * If both are missing, no resource is added.
+ *
+ * The ordering is such that the user header CSS & JS override the MyFaces' ones.
+ */
+ public void writeWithFullHeader(HttpServletRequest request,
+ HttpServletResponse response) throws IOException
+ {
+ if (!parserCalled)
+ {
+ throw new IOException("Method parseResponse has to be called first");
+ }
+
+ boolean addHeaderTags = false;
+
+ if (headerInsertPosition == -1)
+ {
+ if (beforeBodyPosition != -1)
+ {
+ // The input html has a body start tag, but no head tags. We therefore
+ // need to insert head start/end tags for our content to live in.
+ addHeaderTags = true;
+ headerInsertPosition = beforeBodyPosition;
+ }
+ else
+ {
+ // neither head nor body tags in the input
+ log.warn("Response has no <head> or <body> tag:\n" + originalResponse);
+ }
+ }
+
+ ResponseWriter writer = new HtmlResponseWriterImpl(response.getWriter(), HtmlRendererUtils
+ .selectContentType(request.getHeader("accept")), null);
+
+ if (afterBodyContentInsertPosition >= 0)
+ {
+ // insert all the items that want to go immediately after the <body> tag.
+ HtmlBufferResponseWriterWrapper writerWrapper = HtmlBufferResponseWriterWrapper
+ .getInstance(writer);
+
+ for (Iterator i = getBodyEndInfos(request).iterator(); i.hasNext();)
+ {
+ writerWrapper.write("\n");
+
+ PositionedInfo positionedInfo = (PositionedInfo) i.next();
+
+ if (!(positionedInfo instanceof WritablePositionedInfo))
+ throw new IllegalStateException("positionedInfo of type : "
+ + positionedInfo.getClass().getName());
+ ((WritablePositionedInfo) positionedInfo).writePositionedInfo(response,
+ writerWrapper);
+ }
+
+ originalResponse.insert(headerInsertPosition, writerWrapper.toString());
+ }
+
+ if (bodyInsertPosition > 0)
+ {
+ StringBuffer buf = new StringBuffer();
+ Set bodyInfos = getBodyOnloadInfos(request);
+ if (bodyInfos.size() > 0)
+ {
+ int i = 0;
+ for (Iterator it = getBodyOnloadInfos(request).iterator(); it.hasNext();)
+ {
+ AttributeInfo positionedInfo = (AttributeInfo) it.next();
+ if (i == 0)
+ {
+ buf.append(positionedInfo.getAttributeName());
+ buf.append("=\"");
+ }
+ buf.append(positionedInfo.getAttributeValue());
+
+ i++;
+ }
+
+ buf.append("\"");
+ originalResponse.insert(bodyInsertPosition - 1, " " + buf.toString());
+ }
+ }
+
+ if (headerInsertPosition >= 0)
+ {
+ HtmlBufferResponseWriterWrapper writerWrapper = HtmlBufferResponseWriterWrapper
+ .getInstance(writer);
+
+ if (addHeaderTags)
+ writerWrapper.write("<head>");
+
+ for (Iterator i = getHeaderBeginInfos(request).iterator(); i.hasNext();)
+ {
+ writerWrapper.write("\n");
+
+ PositionedInfo positionedInfo = (PositionedInfo) i.next();
+
+ if (!(positionedInfo instanceof WritablePositionedInfo))
+ throw new IllegalStateException("positionedInfo of type : "
+ + positionedInfo.getClass().getName());
+ ((WritablePositionedInfo) positionedInfo).writePositionedInfo(response,
+ writerWrapper);
+ }
+
+ if (addHeaderTags)
+ writerWrapper.write("</head>");
+
+ originalResponse.insert(headerInsertPosition, writerWrapper.toString());
+
+ }
+
+ }
+
+ /**
+ * Writes the response
+ */
+ public void writeResponse(HttpServletRequest request,
+ HttpServletResponse response) throws IOException
+ {
+ ResponseWriter writer = new HtmlResponseWriterImpl(response.getWriter(), HtmlRendererUtils
+ .selectContentType(request.getHeader("accept")), null);
+ writer.write(originalResponse.toString());
+ }
+
+ private PositionedInfo getStyleInstance(FacesContext context, ResourceHandler resourceHandler)
+ {
+ return new StylePositionedInfo(getResourceUri(context, resourceHandler));
+ }
+
+ private PositionedInfo getScriptInstance(FacesContext context, ResourceHandler resourceHandler,
+ boolean defer)
+ {
+ return new ScriptPositionedInfo(getResourceUri(context, resourceHandler), defer);
+ }
+
+ private PositionedInfo getStyleInstance(FacesContext context, String uri)
+ {
+ return new StylePositionedInfo(getResourceUri(context, uri));
+ }
+
+ protected PositionedInfo getScriptInstance(FacesContext context, String uri, boolean defer)
+ {
+ return new ScriptPositionedInfo(getResourceUri(context, uri), defer);
+ }
+
+ private PositionedInfo getInlineScriptInstance(String inlineScript)
+ {
+ return new InlineScriptPositionedInfo(inlineScript);
+ }
+
+ private PositionedInfo getInlineStyleInstance(String inlineStyle)
+ {
+ return new InlineStylePositionedInfo(inlineStyle);
+ }
+
+ protected interface PositionedInfo
+ {
+ }
+
+ protected static class AttributeInfo implements PositionedInfo
+ {
+ private String _attributeName;
+ private String _attributeValue;
+
+ public String getAttributeName()
+ {
+ return _attributeName;
+ }
+
+ public void setAttributeName(String attributeName)
+ {
+ _attributeName = attributeName;
+ }
+
+ public String getAttributeValue()
+ {
+ return _attributeValue;
+ }
+
+ public void setAttributeValue(String attributeValue)
+ {
+ _attributeValue = attributeValue;
+ }
+ }
+
+ protected interface WritablePositionedInfo extends PositionedInfo
+ {
+ public abstract void writePositionedInfo(HttpServletResponse response, ResponseWriter writer)
+ throws IOException;
+ }
+
+ private abstract class AbstractResourceUri
+ {
+ protected final String _resourceUri;
+
+ protected AbstractResourceUri(String resourceUri)
+ {
+ _resourceUri = resourceUri;
+ }
+
+ public int hashCode()
+ {
+ return _resourceUri.hashCode();
+ }
+
+ public boolean equals(Object obj)
+ {
+ if (obj == null)
+ {
+ return false;
+ }
+ if (obj == this)
+ {
+ return true;
+ }
+ if (obj instanceof AbstractResourceUri)
+ {
+ AbstractResourceUri other = (AbstractResourceUri) obj;
+ return _resourceUri.equals(other._resourceUri);
+ }
+ return false;
+ }
+
+ protected String getResourceUri()
+ {
+ return _resourceUri;
+ }
+ }
+
+ private class StylePositionedInfo extends AbstractResourceUri implements WritablePositionedInfo
+ {
+ protected StylePositionedInfo(String resourceUri)
+ {
+ super(resourceUri);
+ }
+
+ public void writePositionedInfo(HttpServletResponse response, ResponseWriter writer)
+ throws IOException
+ {
+ writer.startElement(HTML.LINK_ELEM, null);
+ writer.writeAttribute(HTML.REL_ATTR, HTML.STYLESHEET_VALUE, null);
+ writer.writeAttribute(HTML.HREF_ATTR, response.encodeURL(this.getResourceUri()), null);
+ writer.writeAttribute(HTML.TYPE_ATTR, HTML.STYLE_TYPE_TEXT_CSS, null);
+ writer.endElement(HTML.LINK_ELEM);
+ }
+ }
+
+ private class ScriptPositionedInfo extends AbstractResourceUri implements
+ WritablePositionedInfo
+ {
+ protected final boolean _defer;
+
+ public ScriptPositionedInfo(String resourceUri, boolean defer)
+ {
+ super(resourceUri);
+ _defer = defer;
+ }
+
+ public int hashCode()
+ {
+ return new HashCodeBuilder().append(this.getResourceUri()).append(_defer).toHashCode();
+ }
+
+ public boolean equals(Object obj)
+ {
+ if (super.equals(obj))
+ {
+ if (obj instanceof ScriptPositionedInfo)
+ {
+ ScriptPositionedInfo other = (ScriptPositionedInfo) obj;
+ return new EqualsBuilder().append(_defer, other._defer).isEquals();
+ }
+ }
+ return false;
+ }
+
+ public void writePositionedInfo(HttpServletResponse response, ResponseWriter writer)
+ throws IOException
+ {
+ writer.startElement(HTML.SCRIPT_ELEM, null);
+ writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
+ writer.writeAttribute(HTML.SRC_ATTR, response.encodeURL(this.getResourceUri()), null);
+
+ if (_defer)
+ {
+ writer.writeAttribute(HTML.SCRIPT_ELEM_DEFER_ATTR, "true", null);
+ }
+ writer.endElement(HTML.SCRIPT_ELEM);
+ }
+ }
+
+ private abstract class InlinePositionedInfo implements WritablePositionedInfo
+ {
+ private final String _inlineValue;
+
+ protected InlinePositionedInfo(String inlineValue)
+ {
+ _inlineValue = inlineValue;
+ }
+
+ public String getInlineValue()
+ {
+ return _inlineValue;
+ }
+
+ public int hashCode()
+ {
+ return new HashCodeBuilder().append(_inlineValue).toHashCode();
+ }
+
+ public boolean equals(Object obj)
+ {
+ if (obj == null)
+ {
+ return false;
+ }
+ if (obj == this)
+ {
+ return true;
+ }
+ if (obj instanceof InlinePositionedInfo)
+ {
+ InlinePositionedInfo other = (InlinePositionedInfo) obj;
+ return new EqualsBuilder().append(_inlineValue, other._inlineValue).isEquals();
+ }
+ return false;
+ }
+ }
+
+ private class InlineScriptPositionedInfo extends InlinePositionedInfo
+ {
+ protected InlineScriptPositionedInfo(String inlineScript)
+ {
+ super(inlineScript);
+ }
+
+ public void writePositionedInfo(HttpServletResponse response, ResponseWriter writer)
+ throws IOException
+ {
+ writer.startElement(HTML.SCRIPT_ELEM, null);
+ writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
+ writer.writeText(getInlineValue(), null);
+ writer.endElement(HTML.SCRIPT_ELEM);
+ }
+ }
+
+ private class InlineStylePositionedInfo extends InlinePositionedInfo
+ {
+ protected InlineStylePositionedInfo(String inlineStyle)
+ {
+ super(inlineStyle);
+ }
+
+ public void writePositionedInfo(HttpServletResponse response, ResponseWriter writer)
+ throws IOException
+ {
+ writer.startElement(HTML.STYLE_ELEM, null);
+ writer.writeAttribute(HTML.REL_ATTR, HTML.STYLESHEET_VALUE, null);
+ writer.writeAttribute(HTML.TYPE_ATTR, HTML.STYLE_TYPE_TEXT_CSS, null);
+ writer.writeText(getInlineValue(), null);
+ writer.endElement(HTML.STYLE_ELEM);
+ }
+ }
+
+ protected static class ParseCallbackListener implements CallbackListener
+ {
+ private int headerInsertPosition = -1;
+ private int bodyInsertPosition = -1;
+ private int beforeBodyPosition = -1;
+ private int afterBodyContentInsertPosition = -1;
+ private int afterBodyEndPosition = -1;
+
+ public ParseCallbackListener() {}
+
+ public void openedStartTag(int charIndex, int tagIdentifier)
+ {
+ if (tagIdentifier == ReducedHTMLParser.BODY_TAG)
+ {
+ beforeBodyPosition = charIndex;
+ }
+ }
+
+ public void closedStartTag(int charIndex, int tagIdentifier)
+ {
+ if (tagIdentifier == ReducedHTMLParser.HEAD_TAG)
+ {
+ headerInsertPosition = charIndex;
+ }
+ else if (tagIdentifier == ReducedHTMLParser.BODY_TAG)
+ {
+ bodyInsertPosition = charIndex;
+ }
+ }
+
+ public void openedEndTag(int charIndex, int tagIdentifier)
+ {
+ if (tagIdentifier == ReducedHTMLParser.BODY_TAG)
+ {
+ afterBodyContentInsertPosition = charIndex;
+ }
+ }
+
+ public void closedEndTag(int charIndex, int tagIdentifier)
+ {
+ if (tagIdentifier == ReducedHTMLParser.BODY_TAG)
+ {
+ afterBodyEndPosition = charIndex;
+ }
+ }
+
+ public void attribute(int charIndex, int tagIdentifier, String key, String value)
+ {
+ }
+
+ public int getHeaderInsertPosition()
+ {
+ return headerInsertPosition;
+ }
+
+ public int getBodyInsertPosition()
+ {
+ return bodyInsertPosition;
+ }
+
+ public int getBeforeBodyPosition()
+ {
+ return beforeBodyPosition;
+ }
+
+ public int getAfterBodyContentInsertPosition()
+ {
+ return afterBodyContentInsertPosition;
+ }
+
+ public int getAfterBodyEndPosition() {
+ return afterBodyEndPosition;
+ }
+ }
+}
Added: myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ResourcePosition.java
URL: http://svn.apache.org/viewcvs/myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ResourcePosition.java?rev=376085&view=auto
==============================================================================
--- myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ResourcePosition.java (added)
+++ myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ResourcePosition.java Wed Feb 8 13:40:47 2006
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.renderkit.html.util;
+
+public class ResourcePosition
+{
+
+ private final int _pos;
+
+ protected ResourcePosition(int pos)
+ {
+ _pos = pos;
+ }
+
+ public boolean equals(Object obj)
+ {
+ if (obj == null)
+ {
+ return false;
+ }
+ if (obj == this)
+ {
+ return true;
+ }
+ if (obj instanceof ResourcePosition)
+ {
+ return ((ResourcePosition) obj)._pos == _pos;
+ }
+ return false;
+ }
+
+ public int hashCode()
+ {
+ return _pos;
+ }
+}
\ No newline at end of file
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java Wed Feb 8 13:40:47 2006
@@ -17,6 +17,7 @@
import org.apache.commons.fileupload.FileUpload;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.renderkit.html.util.HtmlBufferResponseWriterWrapper;
import org.apache.myfaces.renderkit.html.util.DummyFormUtils;
import org.apache.myfaces.renderkit.html.util.JavascriptUtils;
@@ -126,13 +127,6 @@
HttpServletResponse httpResponse = (HttpServletResponse) response;
HttpServletRequest httpRequest = (HttpServletRequest) request;
- // Serve resources
- AddResource addResource = AddResource.getInstance(httpRequest);
- if( addResource.isResourceUri( httpRequest ) ){
- addResource.serveResource(_servletContext, httpRequest, httpResponse);
- return;
- }
-
HttpServletRequest extendedRequest = httpRequest;
// For multipart/form-data requests
@@ -142,13 +136,22 @@
ExtensionsResponseWrapper extendedResponse = new ExtensionsResponseWrapper((HttpServletResponse) response);
+ FacesContext facesContext = getFacesContext(extendedRequest, extendedResponse);
+
+ // Serve resources
+ AddResource addResource = AddResourceFactory.getInstance(facesContext);
+ if( addResource.isResourceUri( httpRequest ) ){
+ addResource.serveResource(_servletContext, httpRequest, httpResponse);
+ return;
+ }
+
+
// Standard request
chain.doFilter(extendedRequest, extendedResponse);
extendedResponse.finishResponse();
// write the javascript stuff for myfaces and headerInfo, if needed
- FacesContext facesContext = getFacesContext(extendedRequest, extendedResponse);
renderCodeBeforeBodyEnd(facesContext);
HttpServletResponse servletResponse = (HttpServletResponse)response;
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java Wed Feb 8 13:40:47 2006
@@ -47,6 +47,7 @@
import org.apache.myfaces.renderkit.html.HTML;
import org.apache.myfaces.renderkit.html.HtmlRenderer;
import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.renderkit.html.util.HtmlBufferResponseWriterWrapper;
import org.apache.myfaces.util.MessageUtils;
@@ -284,7 +285,7 @@
{
return;
}
- AddResource addresource = AddResource.getInstance(facesContext);
+ AddResource addresource = AddResourceFactory.getInstance(facesContext);
// Add the javascript and CSS pages
String styleLocation = HtmlRendererUtils.getStyleLocation(component);
@@ -338,7 +339,7 @@
throw new IllegalStateException("Week may only start with sunday or monday.");
StringBuffer script = new StringBuffer();
- setStringVariable(script,popupCalendarVariable +".initData.imgDir",(JavascriptUtils.encodeString(AddResource.getInstance(facesContext)
+ setStringVariable(script,popupCalendarVariable +".initData.imgDir",(JavascriptUtils.encodeString(AddResourceFactory.getInstance(facesContext)
.getResourceUri(facesContext, HtmlCalendarRenderer.class, "DB/"))));
defineStringArray(script, popupCalendarVariable +".initData.monthName", mapMonths(symbols));
defineStringArray(script, popupCalendarVariable +".initData.dayName", weekDays);
@@ -466,7 +467,7 @@
} else {
// render the image
writer.startElement(HTML.IMG_ELEM, uiComponent);
- AddResource addResource = AddResource.getInstance(facesContext);
+ AddResource addResource = AddResourceFactory.getInstance(facesContext);
String imgUrl = (String) uiComponent.getAttributes().get("popupButtonImageUrl");
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java Wed Feb 8 13:40:47 2006
@@ -37,6 +37,7 @@
import org.apache.myfaces.renderkit.html.HTML;
import org.apache.myfaces.renderkit.html.HtmlRenderer;
import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.renderkit.html.util.HTMLEncoder;
import org.apache.myfaces.renderkit.html.util.JavascriptUtils;
@@ -236,7 +237,7 @@
formId = tmpComponent.getClientId(context);
}
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
addResource.addStyleSheet(context, AddResource.HEADER_BEGIN, InputHtmlRenderer.class, "kupustyles.css");
addResource.addStyleSheet(context, AddResource.HEADER_BEGIN, InputHtmlRenderer.class, "kupudrawerstyles.css");
addResource.addStyleSheet(context, AddResource.HEADER_BEGIN, InputHtmlRenderer.class, "myFaces.css");
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/inputTextHelp/HtmlTextHelpRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/inputTextHelp/HtmlTextHelpRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/inputTextHelp/HtmlTextHelpRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/inputTextHelp/HtmlTextHelpRenderer.java Wed Feb 8 13:40:47 2006
@@ -24,6 +24,7 @@
import javax.faces.convert.ConverterException;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.renderkit.RendererUtils;
import org.apache.myfaces.renderkit.JSFAttr;
import org.apache.myfaces.renderkit.html.HTML;
@@ -171,7 +172,7 @@
return;
}
- AddResource.getInstance(facesContext).addJavaScriptAtPosition(
+ AddResourceFactory.getInstance(facesContext).addJavaScriptAtPosition(
facesContext, AddResource.HEADER_BEGIN, HtmlTextHelpRenderer.class, "inputTextHelp.js");
facesContext.getExternalContext().getRequestMap().put(JAVASCRIPT_ENCODED, Boolean.TRUE);
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java Wed Feb 8 13:40:47 2006
@@ -6,6 +6,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.renderkit.RendererUtils;
import org.apache.myfaces.renderkit.html.HtmlRenderer;
@@ -38,7 +39,7 @@
String expressionValue = jsValueChangeListener.getExpressionValue();
String property = jsValueChangeListener.getProperty();
- AddResource.getInstance(facesContext).addJavaScriptAtPosition(
+ AddResourceFactory.getInstance(facesContext).addJavaScriptAtPosition(
facesContext, AddResource.HEADER_BEGIN, JsValueChangeListenerRenderer.class,
"JSListener.js");
@@ -126,7 +127,7 @@
if (!propName.equals("onchange") && value != null)
{
- AddResource.getInstance(context).
+ AddResourceFactory.getInstance(context).
addJavaScriptToBodyTag(context,jsValueChangeListener.getBodyTagEvent(), value);
}
else if(value != null)
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java Wed Feb 8 13:40:47 2006
@@ -43,6 +43,7 @@
import org.apache.myfaces.renderkit.html.HTML;
import org.apache.myfaces.renderkit.html.HtmlFormRendererBase;
import org.apache.myfaces.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.renderkit.html.util.DummyFormUtils;
import org.apache.myfaces.renderkit.html.util.JavascriptUtils;
@@ -433,7 +434,7 @@
String imageLocation = (String) menu.getAttributes().get(JSFAttr.IMAGE_LOCATION);
String styleLocation = (String) menu.getAttributes().get(JSFAttr.STYLE_LOCATION);
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
if(javascriptLocation != null)
{
@@ -492,7 +493,7 @@
log.debug("Unknown theme name '" + themeName + "' specified.");
}
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
if ((imageLocation != null) || (themeLocation != null))
{
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java Wed Feb 8 13:40:47 2006
@@ -16,6 +16,7 @@
package org.apache.myfaces.custom.popup;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.renderkit.RendererUtils;
import org.apache.myfaces.renderkit.html.HtmlRenderer;
import org.apache.myfaces.renderkit.html.HTML;
@@ -113,7 +114,7 @@
Integer displayAtDistanceX, Integer displayAtDistanceY, UIComponent uiComponent)
throws IOException
{
- AddResource.getInstance(context).addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, HtmlPopupRenderer.class, "JSPopup.js");
+ AddResourceFactory.getInstance(context).addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, HtmlPopupRenderer.class, "JSPopup.js");
String popupId = JavascriptUtils.getValidJavascriptName(clientId+"Popup",false);
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java Wed Feb 8 13:40:47 2006
@@ -23,6 +23,7 @@
import org.apache.myfaces.renderkit.html.HtmlRenderer;
import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.custom.navigation.HtmlCommandNavigation;
import javax.faces.component.UIComponent;
@@ -47,7 +48,7 @@
ResponseWriter writer = facesContext.getResponseWriter();
- AddResource.getInstance(facesContext).addJavaScriptAtPosition(facesContext, AddResource.HEADER_BEGIN,
+ AddResourceFactory.getInstance(facesContext).addJavaScriptAtPosition(facesContext, AddResource.HEADER_BEGIN,
HtmlSwapImage.class, "swapimage.js");
String url;
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java Wed Feb 8 13:40:47 2006
@@ -30,6 +30,7 @@
import org.apache.myfaces.component.UserRoleUtils;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.renderkit.RendererUtils;
import org.apache.myfaces.renderkit.html.HTML;
import org.apache.myfaces.renderkit.html.HtmlRenderer;
@@ -83,7 +84,7 @@
tabbedPane.setBgcolor(DEFAULT_BG_COLOR);
}
- AddResource addResource = AddResource.getInstance(facesContext);
+ AddResource addResource = AddResourceFactory.getInstance(facesContext);
addResource.addStyleSheet(facesContext,AddResource.HEADER_BEGIN,
HtmlTabbedPaneRenderer.class, "defaultStyles.css");
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java Wed Feb 8 13:40:47 2006
@@ -16,6 +16,7 @@
package org.apache.myfaces.custom.tree.renderkit.html;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.custom.tree.HtmlTree;
import org.apache.myfaces.custom.tree.HtmlTreeColumn;
import org.apache.myfaces.custom.tree.HtmlTreeImageCommandLink;
@@ -354,7 +355,7 @@
public String getDefaultImagePath(FacesContext context, String relativePathInResourceFolder)
{
- AddResource instance = AddResource.getInstance(context);
+ AddResource instance = AddResourceFactory.getInstance(context);
return instance.getResourceUri(context, HtmlTree.class, relativePathInResourceFolder, false);
}
@@ -567,7 +568,7 @@
protected String getImageUrl(FacesContext context, String userValue, String resourceValue)
{
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
if(userValue != null)
{
return addResource.getResourceUri(context, userValue, false);
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java Wed Feb 8 13:40:47 2006
@@ -18,6 +18,7 @@
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
import org.apache.myfaces.renderkit.html.HTML;
import org.apache.myfaces.renderkit.JSFAttr;
@@ -594,7 +595,7 @@
{
// render javascript function for client-side toggle (it won't be used if user has opted for server-side toggle)
String javascriptLocation = (String)component.getAttributes().get(JSFAttr.JAVASCRIPT_LOCATION);
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
if (javascriptLocation == null)
{
addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, HtmlTreeRenderer.class, "javascript/tree.js");
@@ -620,7 +621,7 @@
private String getImageSrc(FacesContext context, UIComponent component, String imageName, boolean withContextPath)
{
String imageLocation = (String)component.getAttributes().get(JSFAttr.IMAGE_LOCATION);
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
if (imageLocation == null)
{
return addResource.getResourceUri(context, HtmlTreeRenderer.class,
Modified: myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java (original)
+++ myfaces/tomahawk/trunk/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java Wed Feb 8 13:40:47 2006
@@ -42,13 +42,13 @@
{
public void testGetInstance()
{
- AddResource instance1 = AddResource.getInstance("/test1");
+ AddResource instance1 = AddResourceFactory.getInstance("/test1", null);
assertNotNull(instance1);
- AddResource instance2 = AddResource.getInstance("/test2");
+ AddResource instance2 = AddResourceFactory.getInstance("/test2", null);
assertNotSame(instance1, instance2);
- AddResource instance1a = AddResource.getInstance("/test1");
+ AddResource instance1a = AddResourceFactory.getInstance("/test1", null);
assertSame(instance1, instance1a);
}
@@ -172,7 +172,7 @@
mockState.setup();
// now start the test
- AddResource instance1 = AddResource.getInstance("/test");
+ AddResource instance1 = AddResourceFactory.getInstance("/test", null);
instance1.addJavaScriptHere(mockState._facesContext, "/scripts/script1");
// verify that our mock objects got the expected callbacks
@@ -203,7 +203,7 @@
String originalResponse =
"<html><head></head><body></body></html>";
- AddResource ar = AddResource.getInstance("/test");
+ AddResource ar = AddResourceFactory.getInstance("/test", null);
ar.parseResponse(mockState._servletRequest,originalResponse,mockState._servletResponse);
ar.writeWithFullHeader(mockState._servletRequest,mockState._servletResponse);
ar.writeResponse(mockState._servletRequest,mockState._servletResponse);
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java Wed Feb 8 13:40:47 2006
@@ -16,6 +16,7 @@
package org.apache.myfaces.custom.accordion;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.custom.tabbedpane.HtmlPanelTab;
import org.apache.myfaces.renderkit.JSFAttr;
import org.apache.myfaces.renderkit.RendererUtils;
@@ -238,7 +239,7 @@
{
// AddResource takes care to add only one reference to the same script
String javascriptLocation = (String)component.getAttributes().get(JSFAttr.JAVASCRIPT_LOCATION);
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
if(javascriptLocation != null)
{
// add user defined javascripts
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/autoupdatedatatable/AutoUpdateDataTableRenderer.java Wed Feb 8 13:40:47 2006
@@ -16,6 +16,7 @@
package org.apache.myfaces.custom.autoupdatedatatable;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
import org.apache.myfaces.custom.prototype.PrototypeResourceLoader;
import org.apache.myfaces.renderkit.JSFAttr;
@@ -68,7 +69,7 @@
String javascriptLocation = (String) component.getAttributes().get(
JSFAttr.JAVASCRIPT_LOCATION);
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
if(javascriptLocation != null)
{
addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, javascriptLocation + "/prototype.js");
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoUtils.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoUtils.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dojo/DojoUtils.java Wed Feb 8 13:40:47 2006
@@ -27,6 +27,7 @@
import org.apache.myfaces.renderkit.html.HTML;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
/**
* Utils class for the dojo infrastructure
@@ -54,7 +55,7 @@
public static final void addMainInclude(FacesContext context, String javascriptLocation, DojoConfig config)
{
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
/*
* var djConfig = {
isDebug: false
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/effect/EffectRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/effect/EffectRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/effect/EffectRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/effect/EffectRenderer.java Wed Feb 8 13:40:47 2006
@@ -30,6 +30,7 @@
import org.apache.myfaces.renderkit.html.HtmlRenderer;
import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
/**
* Fade field only currently the renderer is implemented and the tag, because we
@@ -62,7 +63,7 @@
// render javascript function for client-side toggle (it won't be used
// if user has opted for server-side toggle)
String javascriptLocation = (String) component.getAttributes().get(JSFAttr.JAVASCRIPT_LOCATION);
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
if (javascriptLocation != null)
{
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/graphicimagedynamic/GraphicImageDynamicRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/graphicimagedynamic/GraphicImageDynamicRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/graphicimagedynamic/GraphicImageDynamicRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/graphicimagedynamic/GraphicImageDynamicRenderer.java Wed Feb 8 13:40:47 2006
@@ -28,6 +28,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.component.html.util.ParameterResourceHandler;
import org.apache.myfaces.renderkit.html.util.ResourceLoader;
import org.apache.myfaces.renderkit.RendererUtils;
@@ -162,7 +163,7 @@
}
params.put(RENDERER_PARAM, imageRendererClass.getName());
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
String url = addResource.getResourceUri(context, new ParameterResourceHandler(this
.getClass(), params));
writer.writeAttribute(HTML.SRC_ATTR, url, null);
@@ -325,4 +326,4 @@
String lifecycleId = context.getInitParameter(FacesServlet.LIFECYCLE_ID_ATTR);
return lifecycleId != null ? lifecycleId : LifecycleFactory.DEFAULT_LIFECYCLE;
}
-}
\ No newline at end of file
+}
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlInputTextAjaxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlInputTextAjaxRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlInputTextAjaxRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlInputTextAjaxRenderer.java Wed Feb 8 13:40:47 2006
@@ -23,6 +23,7 @@
import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
import org.apache.myfaces.custom.ajax.util.AjaxRendererUtils;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -55,7 +56,7 @@
{
HtmlInputTextAjax comp = (HtmlInputTextAjax) component;
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
AjaxRendererUtils.addPrototypeScript(context, component, addResource);
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectBooleanCheckboxAjaxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectBooleanCheckboxAjaxRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectBooleanCheckboxAjaxRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectBooleanCheckboxAjaxRenderer.java Wed Feb 8 13:40:47 2006
@@ -25,6 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
import org.apache.myfaces.custom.ajax.util.AjaxRendererUtils;
import org.apache.myfaces.renderkit.RendererUtils;
@@ -58,7 +59,7 @@
HtmlSelectBooleanCheckboxAjax selectBooleanCheckbox = (HtmlSelectBooleanCheckboxAjax) component;
// Add prototype script to header
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
AjaxRendererUtils.addPrototypeScript(context, component, addResource);
// write required javascript
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectManyCheckboxAjaxRenderer.java Wed Feb 8 13:40:47 2006
@@ -12,6 +12,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
import org.apache.myfaces.custom.ajax.util.AjaxRendererUtils;
import org.apache.myfaces.renderkit.RendererUtils;
@@ -45,7 +46,7 @@
HtmlSelectManyCheckboxAjax selectManyCheckbox = (HtmlSelectManyCheckboxAjax) component;
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
AjaxRendererUtils.addPrototypeScript(context, component, addResource);
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectOneRadioAjaxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectOneRadioAjaxRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectOneRadioAjaxRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputAjax/HtmlSelectOneRadioAjaxRenderer.java Wed Feb 8 13:40:47 2006
@@ -22,6 +22,7 @@
import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
import org.apache.myfaces.custom.ajax.util.AjaxRendererUtils;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -58,7 +59,7 @@
HtmlSelectOneRadioAjax selectManyCheckbox = (HtmlSelectOneRadioAjax) component;
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
AjaxRendererUtils.addPrototypeScript(context, component, addResource);
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java Wed Feb 8 13:40:47 2006
@@ -18,6 +18,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.custom.ajax.api.AjaxPhaseListener;
import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
import org.apache.myfaces.custom.prototype.PrototypeResourceLoader;
@@ -65,7 +66,7 @@
String javascriptLocation = (String)component.getAttributes().get(JSFAttr.JAVASCRIPT_LOCATION);
String styleLocation = (String)component.getAttributes().get(JSFAttr.STYLE_LOCATION);
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
if(javascriptLocation != null)
{
addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, javascriptLocation + "/prototype.js");
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java Wed Feb 8 13:40:47 2006
@@ -33,6 +33,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.renderkit.JSFAttr;
import org.apache.myfaces.renderkit.RendererUtils;
import org.apache.myfaces.renderkit.html.HTML;
@@ -187,7 +188,7 @@
UIComponent uiComponent)
{
// AddResource takes care to add only one reference to the same script
- AddResource addResource = AddResource.getInstance(facesContext);
+ AddResource addResource = AddResourceFactory.getInstance(facesContext);
addResource.addJavaScriptAtPosition(facesContext, AddResource.HEADER_BEGIN,
HtmlPicklistRenderer.class, "picklist.js");
}
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java Wed Feb 8 13:40:47 2006
@@ -31,6 +31,7 @@
import javax.faces.render.Renderer;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.custom.schedule.HtmlSchedule;
import org.apache.myfaces.custom.schedule.util.ScheduleEntryComparator;
import org.apache.myfaces.custom.schedule.util.ScheduleUtil;
@@ -95,7 +96,7 @@
//add needed CSS and Javascript files to the header
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
addResource.addStyleSheet(context, AddResource.HEADER_BEGIN, HtmlSchedule.class, css);
addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,
HtmlSchedule.class, "javascript/alphaAPI.js");
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/PlannerRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/PlannerRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/PlannerRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/PlannerRenderer.java Wed Feb 8 13:40:47 2006
@@ -33,6 +33,7 @@
import javax.faces.render.Renderer;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.custom.schedule.HtmlPlanner;
import org.apache.myfaces.custom.schedule.model.Day;
import org.apache.myfaces.custom.schedule.model.PlannerEntity;
@@ -83,7 +84,7 @@
//add needed CSS and Javascript files to the header
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
addResource.addStyleSheet(context, AddResource.HEADER_BEGIN, HtmlPlanner.class, css);
addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,
HtmlPlanner.class, "javascript/alphaAPI.js");
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/suggest/InputSuggestRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/suggest/InputSuggestRenderer.java?rev=376085&r1=376084&r2=376085&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/suggest/InputSuggestRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/suggest/InputSuggestRenderer.java Wed Feb 8 13:40:47 2006
@@ -30,6 +30,7 @@
import org.apache.myfaces.component.html.ext.HtmlInputHidden;
import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.renderkit.JSFAttr;
import org.apache.myfaces.renderkit.html.HTML;
import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
@@ -274,7 +275,7 @@
{
ResponseWriter out = context.getResponseWriter();
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
String styleLocation = (String) component.getAttributes().get(JSFAttr.
STYLE_LOCATION);
if (styleLocation == null)
@@ -300,7 +301,7 @@
{
ResponseWriter out = context.getResponseWriter();
- AddResource addResource = AddResource.getInstance(context);
+ AddResource addResource = AddResourceFactory.getInstance(context);
String javascriptLocation = (String) component.getAttributes().get(
JSFAttr.JAVASCRIPT_LOCATION);
if (javascriptLocation == null)