You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2013/11/14 00:56:49 UTC
svn commit: r1541762 [1/2] - in /myfaces/core/trunk:
api/src/main/java/javax/faces/webapp/
impl/src/main/java/org/apache/myfaces/application/
impl/src/main/java/org/apache/myfaces/renderkit/html/
shared/src/main/java/org/apache/myfaces/shared/renderkit...
Author: lu4242
Date: Wed Nov 13 23:56:47 2013
New Revision: 1541762
URL: http://svn.apache.org/r1541762
Log:
MYFACES-3822 General cleanup and remove unused web config params
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/webapp/PreJsf2ExceptionHandlerFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlInputFileRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlOutcomeTargetButtonRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSelectableRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/PreJsf2ExceptionHandlerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/PreJsf2ExceptionHandlerFactory.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/PreJsf2ExceptionHandlerFactory.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/PreJsf2ExceptionHandlerFactory.java Wed Nov 13 23:56:47 2013
@@ -18,8 +18,6 @@
*/
package javax.faces.webapp;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.Collections;
import java.util.LinkedList;
import java.util.Queue;
@@ -33,7 +31,6 @@ import javax.faces.component.UIComponent
import javax.faces.component.UpdateModelException;
import javax.faces.context.ExceptionHandler;
import javax.faces.context.ExceptionHandlerFactory;
-import javax.faces.context.FacesContext;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.ExceptionQueuedEvent;
import javax.faces.event.ExceptionQueuedEventContext;
@@ -87,7 +84,10 @@ public class PreJsf2ExceptionHandlerFact
* <li>handleException(FacesContext fc, Exception ex)</li>
* </ul>
* Furthermore, the init parameter only works when using the PreJsf2ExceptionHandlerFactory.
+ *
+ * @deprecated
*/
+ @Deprecated
@JSFWebConfigParam(since="1.2.4",desc="Deprecated: use JSF 2.0 ExceptionHandler", deprecated=true)
private static final String ERROR_HANDLER_PARAMETER = "org.apache.myfaces.ERROR_HANDLER";
@@ -173,11 +173,6 @@ public class PreJsf2ExceptionHandlerFact
handled = new LinkedList<ExceptionQueuedEvent>();
}
- // check the org.apache.myfaces.ERROR_HANDLER init param
- // for backwards compatibility to myfaces-1.2's error handling
- String errorHandlerClass = FacesContext.getCurrentInstance()
- .getExternalContext().getInitParameter(ERROR_HANDLER_PARAMETER);
-
FacesException toThrow = null;
do
@@ -193,101 +188,52 @@ public class PreJsf2ExceptionHandlerFact
// and call getException() on the returned result
Throwable exception = context.getException();
-
- if (errorHandlerClass != null)
- {
- // myfaces-1.2's error handler
- try
- {
- Class<?> clazz = Class.forName(errorHandlerClass);
- Object errorHandler = clazz.newInstance();
+ // spec described behaviour of PreJsf2ExceptionHandler
- Method m = clazz.getMethod("handleException",
- new Class[] { FacesContext.class, Exception.class });
- m.invoke(errorHandler, new Object[] { context.getContext(), exception });
- }
- catch (ClassNotFoundException ex)
- {
- throw new FacesException("Error-Handler : " + errorHandlerClass
- + " was not found. Fix your web.xml-parameter : "
- + ERROR_HANDLER_PARAMETER, ex);
- }
- catch (IllegalAccessException ex)
- {
- throw new FacesException("Constructor of error-Handler : " + errorHandlerClass
- + " is not accessible. Error-Handler is specified in web.xml-parameter : "
- + ERROR_HANDLER_PARAMETER, ex);
- }
- catch (InstantiationException ex)
- {
- throw new FacesException("Error-Handler : " + errorHandlerClass
- + " could not be instantiated. Error-Handler is specified in web.xml-parameter : "
- + ERROR_HANDLER_PARAMETER, ex);
- }
- catch (NoSuchMethodException ex)
- {
- throw new FacesException("Error-Handler : " + errorHandlerClass
- + " does not have a method with name : handleException and parameters : "
- + "javax.faces.context.FacesContext, java.lang.Exception. Error-Handler is"
- + "specified in web.xml-parameter : " + ERROR_HANDLER_PARAMETER, ex);
- }
- catch (InvocationTargetException ex)
+ // UpdateModelException needs special treatment here
+ if (exception instanceof UpdateModelException)
+ {
+ FacesMessage message = ((UpdateModelException) exception).getFacesMessage();
+ // Log a SEVERE message to the log
+ log.log(Level.SEVERE, message.getSummary(), exception.getCause());
+ // queue the FacesMessage on the FacesContext
+ UIComponent component = context.getComponent();
+ String clientId = null;
+ if (component != null)
{
- throw new FacesException("Excecution of method handleException in Error-Handler : "
- + errorHandlerClass
- + " caused an exception. Error-Handler is specified in web.xml-parameter : "
- + ERROR_HANDLER_PARAMETER, ex);
+ clientId = component.getClientId(context.getContext());
}
+ context.getContext().addMessage(clientId, message);
+ }
+ else if (!shouldSkip(exception) && !context.inBeforePhase() && !context.inAfterPhase())
+ {
+ // set handledAndThrown so that getHandledExceptionQueuedEvent() returns this event
+ handledAndThrown = event;
+
+ // Re-wrap toThrow in a ServletException or
+ // (PortletException, if in a portlet environment)
+ // and throw it
+ // FIXME: The spec says to NOT use a FacesException
+ // to propagate the exception, but I see
+ // no other way as ServletException is not a RuntimeException
+ toThrow = wrap(getRethrownException(exception));
+ break;
}
else
{
- // spec described behaviour of PreJsf2ExceptionHandler
-
- // UpdateModelException needs special treatment here
- if (exception instanceof UpdateModelException)
- {
- FacesMessage message = ((UpdateModelException) exception).getFacesMessage();
- // Log a SEVERE message to the log
- log.log(Level.SEVERE, message.getSummary(), exception.getCause());
- // queue the FacesMessage on the FacesContext
- UIComponent component = context.getComponent();
- String clientId = null;
- if (component != null)
- {
- clientId = component.getClientId(context.getContext());
- }
- context.getContext().addMessage(clientId, message);
- }
- else if (!shouldSkip(exception) && !context.inBeforePhase() && !context.inAfterPhase())
- {
- // set handledAndThrown so that getHandledExceptionQueuedEvent() returns this event
- handledAndThrown = event;
-
- // Re-wrap toThrow in a ServletException or
- // (PortletException, if in a portlet environment)
- // and throw it
- // FIXME: The spec says to NOT use a FacesException
- // to propagate the exception, but I see
- // no other way as ServletException is not a RuntimeException
- toThrow = wrap(getRethrownException(exception));
- break;
- }
- else
- {
- // Testing mojarra it logs a message and the exception
- // however, this behaviour is not mentioned in the spec
- log.log(Level.SEVERE, exception.getClass().getName() + " occured while processing " +
- (context.inBeforePhase() ? "beforePhase() of " :
- (context.inAfterPhase() ? "afterPhase() of " : "")) +
- "phase " + context.getPhaseId() + ": " +
- "UIComponent-ClientId=" +
- (context.getComponent() != null ?
- context.getComponent().getClientId(context.getContext()) : "") + ", " +
- "Message=" + exception.getMessage());
-
- log.log(Level.SEVERE, exception.getMessage(), exception);
- }
+ // Testing mojarra it logs a message and the exception
+ // however, this behaviour is not mentioned in the spec
+ log.log(Level.SEVERE, exception.getClass().getName() + " occured while processing " +
+ (context.inBeforePhase() ? "beforePhase() of " :
+ (context.inAfterPhase() ? "afterPhase() of " : "")) +
+ "phase " + context.getPhaseId() + ": " +
+ "UIComponent-ClientId=" +
+ (context.getComponent() != null ?
+ context.getComponent().getClientId(context.getContext()) : "") + ", " +
+ "Message=" + exception.getMessage());
+
+ log.log(Level.SEVERE, exception.getMessage(), exception);
}
}
catch (Throwable t)
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java Wed Nov 13 23:56:47 2013
@@ -369,12 +369,7 @@ public class ViewHandlerImpl extends Vie
isWriteStateAfterRenderViewRequired(context))
{
// Only write state marker if javascript view state is disabled
- ExternalContext extContext = context.getExternalContext();
- if (!(JavascriptUtils.isJavascriptAllowed(extContext) &&
- MyfacesConfig.getCurrentInstance(extContext).isViewStateJavascript()))
- {
- context.getResponseWriter().write(FORM_STATE_MARKER);
- }
+ context.getResponseWriter().write(FORM_STATE_MARKER);
}
else
{
@@ -384,12 +379,7 @@ public class ViewHandlerImpl extends Vie
else
{
// Only write state marker if javascript view state is disabled
- ExternalContext extContext = context.getExternalContext();
- if (!(JavascriptUtils.isJavascriptAllowed(extContext) &&
- MyfacesConfig.getCurrentInstance(extContext).isViewStateJavascript()))
- {
- context.getResponseWriter().write(FORM_STATE_MARKER);
- }
+ context.getResponseWriter().write(FORM_STATE_MARKER);
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java Wed Nov 13 23:56:47 2013
@@ -52,21 +52,6 @@ public class HtmlFormRenderer
protected void afterFormElementsEnd(FacesContext facesContext, UIComponent component) throws IOException
{
super.afterFormElementsEnd(facesContext, component);
-
- ResponseWriter writer = facesContext.getResponseWriter();
- ExternalContext extContext = facesContext.getExternalContext();
-
- // If javascript viewstate is enabled write empty hidden input in forms
- if (JavascriptUtils.isJavascriptAllowed(extContext)
- && MyfacesConfig.getCurrentInstance(extContext).isViewStateJavascript())
- {
- writer.startElement(HTML.INPUT_ELEM, null);
- writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_HIDDEN, null);
- writer.writeAttribute(HTML.NAME_ATTR, HtmlResponseStateManager.VIEW_STATE_PARAM, null);
- writer.writeAttribute(HTML.ID_ATTR, HtmlResponseStateManager.VIEW_STATE_PARAM, null);
- writer.writeAttribute(HTML.VALUE_ATTR, "", null);
- writer.endElement(HTML.INPUT_ELEM);
- }
}
@Override
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java Wed Nov 13 23:56:47 2013
@@ -98,8 +98,7 @@ public class HtmlLabelRenderer extends H
encodeBefore(facesContext, writer, uiComponent);
writer.startElement(HTML.LABEL_ELEM, uiComponent);
- if (uiComponent instanceof ClientBehaviorHolder
- && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (uiComponent instanceof ClientBehaviorHolder)
{
if (!behaviors.isEmpty())
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java Wed Nov 13 23:56:47 2013
@@ -20,7 +20,6 @@ package org.apache.myfaces.renderkit.htm
import java.io.IOException;
import java.util.Map;
-import java.util.logging.Level;
import java.util.logging.Logger;
import javax.faces.context.ExternalContext;
@@ -38,10 +37,7 @@ import org.apache.myfaces.renderkit.Myfa
import org.apache.myfaces.renderkit.StateTokenProcessor;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.shared.renderkit.html.HTML;
-import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.util.StateUtils;
-import org.apache.myfaces.shared.util.WebConfigParamUtils;
/**
* @author Manfred Geiler (latest modification by $Author$)
@@ -51,9 +47,6 @@ public class HtmlResponseStateManager ex
{
private static final Logger log = Logger.getLogger(HtmlResponseStateManager.class.getName());
- private static final int STATE_PARAM = 0;
- private static final int VIEWID_PARAM = 1;
-
public static final String STANDARD_STATE_SAVING_PARAM = "javax.faces.ViewState";
private static final String VIEW_STATE_COUNTER = "oam.partial.VIEW_STATE_COUNTER";
@@ -70,13 +63,14 @@ public class HtmlResponseStateManager ex
* requires this property set to true in order to work correctly, so if you set this param to false, please
* remember to add an entry into your faces-config.xml setting up JspStateManagerImpl as the state manager to use.
* </p>
+ * @deprecated
*/
- @JSFWebConfigParam(since="2.0.6", expectedValues="true, false", defaultValue="true", group="state")
+ @Deprecated
+ @JSFWebConfigParam(since="2.0.6", expectedValues="true, false", defaultValue="true", group="state",
+ deprecated=true)
public static final String INIT_PARAM_HANDLE_STATE_CACHING_MECHANICS
= "org.apache.myfaces.HANDLE_STATE_CACHING_MECHANICS";
- private Boolean _handleStateCachingMechanics;
-
private StateCacheFactory _stateCacheFactory;
private StateTokenProcessor _stateTokenProcessor;
@@ -87,17 +81,7 @@ public class HtmlResponseStateManager ex
_stateTokenProcessor = new DefaultStateTokenProcessor();
}
- protected boolean isHandlingStateCachingMechanics(FacesContext facesContext)
- {
- if (_handleStateCachingMechanics == null)
- {
- _handleStateCachingMechanics
- = WebConfigParamUtils.getBooleanInitParameter(facesContext.getExternalContext(),
- INIT_PARAM_HANDLE_STATE_CACHING_MECHANICS, true);
- }
- return _handleStateCachingMechanics.booleanValue();
- }
-
+ @Override
public void writeState(FacesContext facesContext, Object state) throws IOException
{
ResponseWriter responseWriter = facesContext.getResponseWriter();
@@ -107,43 +91,7 @@ public class HtmlResponseStateManager ex
if (!facesContext.getViewRoot().isTransient())
{
// Only if the view is not transient needs to be saved
- if (isHandlingStateCachingMechanics(facesContext))
- {
- savedStateObject = getStateCache(facesContext).encodeSerializedState(facesContext, state);
- }
- else
- {
- Object token = null;
- Object[] savedState = new Object[2];
- token = state;
-
- if (log.isLoggable(Level.FINEST))
- {
- log.finest("Writing state in client");
- }
-
-
- if (token != null)
- {
- savedState[STATE_PARAM] = token;
- }
- else
- {
- if (log.isLoggable(Level.FINEST))
- {
- log.finest("No component states to be saved in client response!");
- }
- }
-
- savedState[VIEWID_PARAM] = facesContext.getViewRoot().getViewId();
-
- if (log.isLoggable(Level.FINEST))
- {
- log.finest("Writing view state and renderKit fields");
- }
-
- savedStateObject = savedState;
- }
+ savedStateObject = getStateCache(facesContext).encodeSerializedState(facesContext, state);
}
// write the view state field
@@ -175,14 +123,7 @@ public class HtmlResponseStateManager ex
{
if (!facesContext.getViewRoot().isTransient())
{
- if (isHandlingStateCachingMechanics(facesContext))
- {
- getStateCache(facesContext).saveSerializedView(facesContext, state);
- }
- else
- {
- //This is done outside
- }
+ getStateCache(facesContext).saveSerializedView(facesContext, state);
}
}
@@ -192,29 +133,21 @@ public class HtmlResponseStateManager ex
String serializedState = _stateTokenProcessor.encode(facesContext, savedState);
ExternalContext extContext = facesContext.getExternalContext();
MyfacesConfig myfacesConfig = MyfacesConfig.getCurrentInstance(extContext);
- // Write Javascript viewstate if enabled and if javascript is allowed,
- // otherwise write hidden input
- if (JavascriptUtils.isJavascriptAllowed(extContext) && myfacesConfig.isViewStateJavascript())
- {
- HtmlRendererUtils.renderViewStateJavascript(facesContext, STANDARD_STATE_SAVING_PARAM, serializedState);
- }
- else
- {
- responseWriter.startElement(HTML.INPUT_ELEM, null);
- responseWriter.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_HIDDEN, null);
- responseWriter.writeAttribute(HTML.NAME_ATTR, STANDARD_STATE_SAVING_PARAM, null);
- if (myfacesConfig.isRenderViewStateId())
- {
- // responseWriter.writeAttribute(HTML.ID_ATTR, STANDARD_STATE_SAVING_PARAM, null);
- // JSF 2.2 if javax.faces.ViewState is used as the id, in portlet
- // case it will be duplicate ids and that not xml friendly.
- responseWriter.writeAttribute(HTML.ID_ATTR,
- HtmlResponseStateManager.generateUpdateViewStateId(
- facesContext), null);
- }
- responseWriter.writeAttribute(HTML.VALUE_ATTR, serializedState, null);
- responseWriter.endElement(HTML.INPUT_ELEM);
+
+ responseWriter.startElement(HTML.INPUT_ELEM, null);
+ responseWriter.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_HIDDEN, null);
+ responseWriter.writeAttribute(HTML.NAME_ATTR, STANDARD_STATE_SAVING_PARAM, null);
+ if (myfacesConfig.isRenderViewStateId())
+ {
+ // responseWriter.writeAttribute(HTML.ID_ATTR, STANDARD_STATE_SAVING_PARAM, null);
+ // JSF 2.2 if javax.faces.ViewState is used as the id, in portlet
+ // case it will be duplicate ids and that not xml friendly.
+ responseWriter.writeAttribute(HTML.ID_ATTR,
+ HtmlResponseStateManager.generateUpdateViewStateId(
+ facesContext), null);
}
+ responseWriter.writeAttribute(HTML.VALUE_ATTR, serializedState, null);
+ responseWriter.endElement(HTML.INPUT_ELEM);
}
private void writeRenderKitIdField(FacesContext facesContext, ResponseWriter responseWriter) throws IOException
@@ -240,45 +173,9 @@ public class HtmlResponseStateManager ex
return null;
}
- if (isHandlingStateCachingMechanics(facesContext))
- {
- return getStateCache(facesContext).restoreSerializedView(facesContext, viewId, savedState);
- }
- else
- {
- return ((Object[])savedState)[STATE_PARAM];
- }
+ return getStateCache(facesContext).restoreSerializedView(facesContext, viewId, savedState);
}
- /* There methods are no longer required
- @Override
- public Object getTreeStructureToRestore(FacesContext facesContext, String viewId)
- {
- // Although this method won't be called anymore,
- // it has been kept for backward compatibility.
- Object[] savedState = getSavedState(facesContext);
- if (savedState == null)
- {
- return null;
- }
-
- return savedState[TREE_PARAM];
- }
-
- @Override
- public Object getComponentStateToRestore(FacesContext facesContext)
- {
- // Although this method won't be called anymore,
- // it has been kept for backward compatibility.
- Object[] savedState = getSavedState(facesContext);
- if (savedState == null)
- {
- return null;
- }
-
- return savedState[STATE_PARAM];
- }*/
-
/**
* Reconstructs the state from the "javax.faces.ViewState" request parameter.
*
@@ -298,38 +195,7 @@ public class HtmlResponseStateManager ex
Object savedStateObject = _stateTokenProcessor.decode(facesContext, (String)encodedState);
- if (isHandlingStateCachingMechanics(facesContext))
- {
- return savedStateObject;
- }
- else
- {
- Object[] savedState = (Object[]) savedStateObject;
-
- if (savedState == null)
- {
- if (log.isLoggable(Level.FINEST))
- {
- log.finest("No saved state");
- }
- return null;
- }
-
- String restoredViewId = (String)savedState[VIEWID_PARAM];
-
- if (restoredViewId == null)
- {
- // no saved state or state of different viewId
- if (log.isLoggable(Level.FINEST))
- {
- log.finest("No saved state or state of a different viewId: " + restoredViewId);
- }
-
- return null;
- }
-
- return savedState;
- }
+ return savedStateObject;
}
/**
@@ -359,25 +225,8 @@ public class HtmlResponseStateManager ex
return null;
}
- Object state = null;
- if (isHandlingStateCachingMechanics(facesContext))
- {
- state = getStateCache(facesContext).saveSerializedView(facesContext, baseState);
- }
- else
- {
- //state = baseState;
- Object[] savedState = new Object[2];
-
- if (state != null)
- {
- savedState[STATE_PARAM] = baseState;
- }
+ Object state = getStateCache(facesContext).saveSerializedView(facesContext, baseState);
- savedState[VIEWID_PARAM] = facesContext.getViewRoot().getViewId();
-
- state = savedState;
- }
return _stateTokenProcessor.encode(facesContext, state);
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java Wed Nov 13 23:56:47 2013
@@ -31,7 +31,6 @@ import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
/**
@@ -61,8 +60,7 @@ public class HtmlBodyRendererBase extend
ResponseWriter writer = facesContext.getResponseWriter();
Map<String, List<ClientBehavior>> behaviors = null;
- if (component instanceof ClientBehaviorHolder &&
- JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (component instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) component).getClientBehaviors();
if (!behaviors.isEmpty())
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java Wed Nov 13 23:56:47 2013
@@ -155,9 +155,7 @@ public class HtmlButtonRendererBase
List<UIParameter> validParams = HtmlRendererUtils.getValidUIParameterChildren(
facesContext, childrenList, false, false);
- boolean javascriptAllowed = JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext());
-
- if (formInfo != null && javascriptAllowed
+ if (formInfo != null
&& (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isAutoScroll() ||
(validParams != null && !validParams.isEmpty() )))
{
@@ -202,8 +200,7 @@ public class HtmlButtonRendererBase
}
}
- if (javascriptAllowed &&
- (HtmlRendererUtils.hasClientBehavior(ClientBehaviorEvents.CLICK, behaviors, facesContext) ||
+ if ((HtmlRendererUtils.hasClientBehavior(ClientBehaviorEvents.CLICK, behaviors, facesContext) ||
HtmlRendererUtils.hasClientBehavior(ClientBehaviorEvents.ACTION, behaviors, facesContext)))
{
if (!reset && !button)
@@ -236,7 +233,7 @@ public class HtmlButtonRendererBase
facesContext, uiComponent, ClientBehaviorEvents.DBLCLICK, null, behaviors,
(String) attributes.get(HTML.ONDBLCLICK_ATTR), "");
}
- else if (javascriptAllowed)
+ else
{
//fallback into the pre 2.0 code to keep backwards compatibility with libraries which rely on internals
if (!reset && !button)
@@ -426,20 +423,10 @@ public class HtmlButtonRendererBase
String target = getTarget(component);
- if (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isRenderFormSubmitScriptInline())
- {
- onClick.append("return ").
- append(HtmlRendererUtils.SUBMIT_FORM_FN_NAME).append("('").
- append(formName).append("','").
- append(component.getClientId(facesContext)).append("'");
- }
- else
- {
- onClick.append("return ").
- append(HtmlRendererUtils.SUBMIT_FORM_FN_NAME_JSF2).append("('").
- append(formName).append("','").
- append(component.getClientId(facesContext)).append("'");
- }
+ onClick.append("return ").
+ append(HtmlRendererUtils.SUBMIT_FORM_FN_NAME_JSF2).append("('").
+ append(formName).append("','").
+ append(component.getClientId(facesContext)).append("'");
if (params.length() > 2 || target != null)
{
@@ -602,21 +589,10 @@ public class HtmlButtonRendererBase
String target = getTarget(uiComponent);
- if (MyfacesConfig.getCurrentInstance(
- facesContext.getExternalContext()).isRenderFormSubmitScriptInline())
- {
- onClick.append("return ").
- append(HtmlRendererUtils.SUBMIT_FORM_FN_NAME).append("('").
- append(formName).append("','").
- append(uiComponent.getClientId(facesContext)).append("'");
- }
- else
- {
- onClick.append("return ").
- append(HtmlRendererUtils.SUBMIT_FORM_FN_NAME_JSF2).append("('").
- append(formName).append("','").
- append(uiComponent.getClientId(facesContext)).append("'");
- }
+ onClick.append("return ").
+ append(HtmlRendererUtils.SUBMIT_FORM_FN_NAME_JSF2).append("('").
+ append(formName).append("','").
+ append(uiComponent.getClientId(facesContext)).append("'");
if (params.length() > 2 || target != null)
{
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java Wed Nov 13 23:56:47 2013
@@ -42,7 +42,6 @@ import javax.faces.model.SelectItem;
import javax.faces.model.SelectItemGroup;
import org.apache.myfaces.shared.renderkit.JSFAttr;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
/**
@@ -372,8 +371,7 @@ public class HtmlCheckboxRendererBase ex
Map<String, List<ClientBehavior>> behaviors = null;
if (uiComponent instanceof UISelectBoolean)
{
- if (uiComponent instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (uiComponent instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) uiComponent).getClientBehaviors();
@@ -419,8 +417,7 @@ public class HtmlCheckboxRendererBase ex
}
else
{
- if (uiComponent instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (uiComponent instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) uiComponent).getClientBehaviors();
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java Wed Nov 13 23:56:47 2013
@@ -35,7 +35,6 @@ import javax.faces.context.ResponseWrite
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.shared.renderkit.JSFAttr;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
/**
@@ -94,8 +93,7 @@ public class HtmlFormRendererBase
encodedActionURL,
null);
- if (htmlForm instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (htmlForm instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) htmlForm).getClientBehaviors();
if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java Wed Nov 13 23:56:47 2013
@@ -35,7 +35,6 @@ import javax.faces.context.ResponseWrite
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.RendererUtils;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
import org.apache.myfaces.shared.util.ArrayUtils;
import org.apache.myfaces.shared.util.StringUtils;
@@ -122,8 +121,7 @@ public class HtmlGridRendererBase
writer.startElement(HTML.TABLE_ELEM, component);
- if (component instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (component instanceof ClientBehaviorHolder)
{
if (!behaviors.isEmpty())
{
@@ -211,7 +209,6 @@ public class HtmlGridRendererBase
return;
}
- HtmlRendererUtils.writePrettyLineSeparator(context);
writer.startElement(
header ? org.apache.myfaces.shared.renderkit.html.HTML.THEAD_ELEM : HTML.TFOOT_ELEM, null);
// component);
@@ -240,11 +237,9 @@ public class HtmlGridRendererBase
writer.writeAttribute(HTML.COLSPAN_ATTR, Integer.toString(columns), null);
- HtmlRendererUtils.writePrettyLineSeparator(context);
//RendererUtils.renderChild(context, facet);
facet.encodeAll(context);
- HtmlRendererUtils.writePrettyLineSeparator(context);
writer.endElement(header ? HTML.TH_ELEM : HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
writer.endElement(header ? HTML.THEAD_ELEM : HTML.TFOOT_ELEM);
@@ -330,7 +325,6 @@ public class HtmlGridRendererBase
{
//do we have to close the last row?
writer.endElement(HTML.TR_ELEM);
- HtmlRendererUtils.writePrettyLineSeparator(context);
}
// is the current row listed in the bodyrows attribute
@@ -340,10 +334,8 @@ public class HtmlGridRendererBase
if(bodyrowsCount != 0)
{
writer.endElement(HTML.TBODY_ELEM);
- HtmlRendererUtils.writePrettyLineSeparator(context);
}
writer.startElement(HTML.TBODY_ELEM, null); // component);
- HtmlRendererUtils.writePrettyLineSeparator(context);
bodyrowsCount++;
}
@@ -402,13 +394,11 @@ public class HtmlGridRendererBase
}
}
writer.endElement(HTML.TR_ELEM);
- HtmlRendererUtils.writePrettyLineSeparator(context);
// close any preopened TBODY element first
if(bodyrowsCount != 0)
{
writer.endElement(HTML.TBODY_ELEM);
- HtmlRendererUtils.writePrettyLineSeparator(context);
}
}
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java Wed Nov 13 23:56:47 2013
@@ -34,7 +34,6 @@ import javax.faces.context.ResponseWrite
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.RendererUtils;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
@@ -78,8 +77,7 @@ public class HtmlImageRendererBase
writer.startElement(HTML.IMG_ELEM, uiComponent);
- if (uiComponent instanceof ClientBehaviorHolder
- && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext())
+ if (uiComponent instanceof ClientBehaviorHolder
&& !behaviors.isEmpty())
{
HtmlRendererUtils.writeIdAndName(writer, uiComponent, facesContext);
@@ -117,8 +115,7 @@ public class HtmlImageRendererBase
}
}
- if (uiComponent instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (uiComponent instanceof ClientBehaviorHolder)
{
if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
{
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlInputFileRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlInputFileRendererBase.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlInputFileRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlInputFileRendererBase.java Wed Nov 13 23:56:47 2013
@@ -42,7 +42,6 @@ import javax.faces.component.html.HtmlFo
import javax.faces.component.html.HtmlInputText;
import org.apache.myfaces.shared.renderkit.html.util.FormInfo;
import org.apache.myfaces.shared.renderkit.html.util.HttpPartWrapper;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.util._ComponentUtils;
/**
@@ -174,8 +173,7 @@ public class HtmlInputFileRendererBase e
renderValue(facesContext, component, writer);
Map<String, List<ClientBehavior>> behaviors = null;
- if (component instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (component instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) component).getClientBehaviors();
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java Wed Nov 13 23:56:47 2013
@@ -81,35 +81,9 @@ public final class HtmlJavaScriptUtils
private static void renderFormSubmitScriptIfNecessary(
FacesContext facesContext) throws IOException
{
- final ExternalContext externalContext = facesContext
- .getExternalContext();
- final MyfacesConfig currentInstance = MyfacesConfig
- .getCurrentInstance(externalContext);
ResponseWriter writer = facesContext.getResponseWriter();
-
- if (currentInstance.isRenderFormSubmitScriptInline())
- {
- writer.startElement(HTML.SCRIPT_ELEM, null);
- writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
-
- boolean autoScroll = currentInstance.isAutoScroll();
-
- ScriptContext context = new ScriptContext(
- currentInstance.isPrettyHtml());
- context.prettyLine();
- context.increaseIndent();
-
- prepareScript(facesContext, context, autoScroll);
-
- writer.writeText(context.toString(), null);
-
- writer.endElement(HTML.SCRIPT_ELEM);
- }
- else
- {
- ResourceUtils
- .renderMyfacesJSInlineIfNecessary(facesContext, writer);
- }
+ ResourceUtils
+ .renderMyfacesJSInlineIfNecessary(facesContext, writer);
}
private static void renderConfigOptionsIfNecessary(FacesContext facesContext)
@@ -118,7 +92,7 @@ public final class HtmlJavaScriptUtils
ResponseWriter writer = facesContext.getResponseWriter();
MyfacesConfig config = MyfacesConfig.getCurrentInstance(facesContext
.getExternalContext());
- ScriptContext script = new ScriptContext(config.isPrettyHtml());
+ ScriptContext script = new ScriptContext();
boolean autoScroll = config.isAutoScroll();
boolean autoSave = JavascriptUtils.isSaveFormSubmitLinkIE(facesContext
.getExternalContext());
@@ -398,15 +372,7 @@ public final class HtmlJavaScriptUtils
scriptContext.append("if(typeof window." + AUTO_SCROLL_FUNCTION
+ "!='undefined')");
scriptContext.append("{");
- if (MyfacesConfig.getCurrentInstance(context.getExternalContext())
- .isRenderFormSubmitScriptInline())
- {
- scriptContext.append(SET_HIDDEN_INPUT_FN_NAME);
- }
- else
- {
- scriptContext.append(SET_HIDDEN_INPUT_FN_NAME_JSF2);
- }
+ scriptContext.append(SET_HIDDEN_INPUT_FN_NAME_JSF2);
scriptContext.append("(").append(formNameStr).append(",")
.append(paramName).append(",").append(value).append(");");
scriptContext.append("}");
@@ -415,9 +381,7 @@ public final class HtmlJavaScriptUtils
public static String getAutoScrollFunction(FacesContext facesContext)
{
- ScriptContext script = new ScriptContext(MyfacesConfig
- .getCurrentInstance(facesContext.getExternalContext())
- .isPrettyHtml());
+ ScriptContext script = new ScriptContext();
script.prettyLineIncreaseIndent();
@@ -506,12 +470,10 @@ public final class HtmlJavaScriptUtils
public static void renderAutoScrollHiddenInput(FacesContext facesContext,
ResponseWriter writer) throws IOException
{
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
writer.startElement(HTML.INPUT_ELEM, null);
writer.writeAttribute(HTML.TYPE_ATTR, "hidden", null);
writer.writeAttribute(HTML.NAME_ATTR, AUTO_SCROLL_PARAM, null);
writer.endElement(HTML.INPUT_ELEM);
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
}
/**
@@ -520,13 +482,11 @@ public final class HtmlJavaScriptUtils
public static void renderAutoScrollFunction(FacesContext facesContext,
ResponseWriter writer) throws IOException
{
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
writer.startElement(HTML.SCRIPT_ELEM, null);
writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR,
HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
writer.writeText(getAutoScrollFunction(facesContext), null);
writer.endElement(HTML.SCRIPT_ELEM);
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
}
public static void appendClearHiddenCommandFormParamsFunctionCall(
@@ -724,40 +684,4 @@ public final class HtmlJavaScriptUtils
return out.toString();
}
}
-
- public static void renderViewStateJavascript(FacesContext facesContext,
- String hiddenId, String serializedState) throws IOException
- {
- ResponseWriter writer = facesContext.getResponseWriter();
-
- writer.startElement(HTML.SCRIPT_ELEM, null);
- writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
-
- final ExternalContext externalContext = facesContext
- .getExternalContext();
- final MyfacesConfig currentInstance = MyfacesConfig
- .getCurrentInstance(externalContext);
-
- ScriptContext context = new ScriptContext(
- currentInstance.isPrettyHtml());
- context.prettyLine();
- context.increaseIndent();
-
- context.append("function setViewState() {\n");
- context.append("\tvar state = '");
- context.append(serializedState);
- context.append("';\n");
- context.append("\tfor (var i = 0; i < document.forms.length; i++) {\n");
- context.append("\t\tdocument.forms[i]['" + hiddenId
- + "'].value = state;\n");
- context.append("\t}\n");
- context.append("}\n");
- context.append("setViewState();\n");
-
- context.decreaseIndent();
-
- writer.writeText(context.toString(), null);
-
- writer.endElement(HTML.SCRIPT_ELEM);
- }
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Wed Nov 13 23:56:47 2013
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.RandomAccess;
-import javax.faces.application.ViewHandler;
import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
import javax.faces.component.UIOutcomeTarget;
@@ -48,7 +47,6 @@ import org.apache.myfaces.shared.renderk
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.RendererUtils;
import org.apache.myfaces.shared.renderkit.html.util.FormInfo;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
import org.apache.myfaces.shared.util._ComponentUtils;
@@ -235,8 +233,7 @@ public abstract class HtmlLinkRendererBa
if (HtmlRendererUtils.isDisabled(component) || formInfo == null)
{
writer.startElement(HTML.SPAN_ELEM, component);
- if (component instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (component instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) component).getClientBehaviors();
if (!behaviors.isEmpty())
@@ -304,104 +301,87 @@ public abstract class HtmlLinkRendererBa
else
{
//String[] anchorAttrsToRender;
- if (JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (component instanceof ClientBehaviorHolder)
{
- if (component instanceof ClientBehaviorHolder)
+ behaviors = ((ClientBehaviorHolder) component).getClientBehaviors();
+ renderBehaviorizedJavaScriptAnchorStart(
+ facesContext, writer, component, clientId, behaviors, formInfo);
+ if (!behaviors.isEmpty())
{
- behaviors = ((ClientBehaviorHolder) component).getClientBehaviors();
- renderBehaviorizedJavaScriptAnchorStart(
- facesContext, writer, component, clientId, behaviors, formInfo);
- if (!behaviors.isEmpty())
- {
- HtmlRendererUtils.writeIdAndName(writer, component, facesContext);
- }
- else
- {
- // If onclick is not null, both onclick and server side script are rendered
- // using jsf.util.chain(...) js function. We need to check that case and force
- // id/name rendering. It is possible to do something else in that case and
- // do not render the script using jsf.util.chain, but for now it is ok.
- String commandOnclick;
- if (component instanceof HtmlCommandLink)
- {
- commandOnclick = ((HtmlCommandLink)component).getOnclick();
- }
- else
- {
- commandOnclick = (String)component.getAttributes().get(HTML.ONCLICK_ATTR);
- }
-
- if (commandOnclick != null)
- {
- HtmlRendererUtils.writeIdAndName(writer, component, facesContext);
- }
- else
- {
- HtmlRendererUtils.writeIdIfNecessary(writer, component, facesContext);
- }
- }
- long commonPropertiesMarked = 0L;
- if (isCommonPropertiesOptimizationEnabled(facesContext))
- {
- commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(component);
- }
- if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ HtmlRendererUtils.writeIdAndName(writer, component, facesContext);
+ }
+ else
+ {
+ // If onclick is not null, both onclick and server side script are rendered
+ // using jsf.util.chain(...) js function. We need to check that case and force
+ // id/name rendering. It is possible to do something else in that case and
+ // do not render the script using jsf.util.chain, but for now it is ok.
+ String commandOnclick;
+ if (component instanceof HtmlCommandLink)
{
- CommonPropertyUtils.renderEventPropertiesWithoutOnclick(writer,
- commonPropertiesMarked, component);
- CommonPropertyUtils.renderFocusBlurEventProperties(writer,
- commonPropertiesMarked, component);
+ commandOnclick = ((HtmlCommandLink)component).getOnclick();
}
else
{
- HtmlRendererUtils.renderBehaviorizedEventHandlersWithoutOnclick(
- facesContext, writer, component, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
- facesContext, writer, component, behaviors);
+ commandOnclick = (String)component.getAttributes().get(HTML.ONCLICK_ATTR);
}
- if (isCommonPropertiesOptimizationEnabled(facesContext))
+
+ if (commandOnclick != null)
{
- CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutStyleAndEvents(writer,
- commonPropertiesMarked, component);
+ HtmlRendererUtils.writeIdAndName(writer, component, facesContext);
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, component,
- HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE_AND_EVENTS);
+ HtmlRendererUtils.writeIdIfNecessary(writer, component, facesContext);
}
}
+ long commonPropertiesMarked = 0L;
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(component);
+ }
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderEventPropertiesWithoutOnclick(writer,
+ commonPropertiesMarked, component);
+ CommonPropertyUtils.renderFocusBlurEventProperties(writer,
+ commonPropertiesMarked, component);
+ }
else
{
- renderJavaScriptAnchorStart(facesContext, writer, component, clientId, formInfo);
- HtmlRendererUtils.writeIdIfNecessary(writer, component, facesContext);
- if (isCommonPropertiesOptimizationEnabled(facesContext))
- {
- CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutOnclickAndStyle(writer,
- CommonPropertyUtils.getCommonPropertiesMarked(component), component);
- }
- else
- {
- HtmlRendererUtils.renderHTMLAttributes(writer, component,
- HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE);
- }
+ HtmlRendererUtils.renderBehaviorizedEventHandlersWithoutOnclick(
+ facesContext, writer, component, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, component, behaviors);
+ }
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutStyleAndEvents(writer,
+ commonPropertiesMarked, component);
+ }
+ else
+ {
+ HtmlRendererUtils.renderHTMLAttributes(writer, component,
+ HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE_AND_EVENTS);
}
}
else
{
- renderNonJavaScriptAnchorStart(facesContext, writer, component, clientId, formInfo);
+ renderJavaScriptAnchorStart(facesContext, writer, component, clientId, formInfo);
HtmlRendererUtils.writeIdIfNecessary(writer, component, facesContext);
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
- CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutStyle(writer,
+ CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutOnclickAndStyle(writer,
CommonPropertyUtils.getCommonPropertiesMarked(component), component);
}
else
{
HtmlRendererUtils.renderHTMLAttributes(writer, component,
- HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE);
+ HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE);
}
}
+
//HtmlRendererUtils.renderHTMLAttributes(writer, component,
// anchorAttrsToRender);
HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_ATTR, HTML.STYLE_ATTR,
@@ -469,20 +449,10 @@ public abstract class HtmlLinkRendererBa
String target = getTarget(component);
- if (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isRenderFormSubmitScriptInline())
- {
- onClick.append("return ").
- append(HtmlRendererUtils.SUBMIT_FORM_FN_NAME).append("('").
- append(formName).append("','").
- append(clientId).append("'");
- }
- else
- {
- onClick.append("return ").
- append(HtmlRendererUtils.SUBMIT_FORM_FN_NAME_JSF2).append("('").
- append(formName).append("','").
- append(clientId).append("'");
- }
+ onClick.append("return ").
+ append(HtmlRendererUtils.SUBMIT_FORM_FN_NAME_JSF2).append("('").
+ append(formName).append("','").
+ append(clientId).append("'");
if (params.length() > 2 || target != null)
{
@@ -629,21 +599,10 @@ public abstract class HtmlLinkRendererBa
String target = getTarget(component);
- if (MyfacesConfig.getCurrentInstance(
- facesContext.getExternalContext()).isRenderFormSubmitScriptInline())
- {
- onClick.append("return ").
- append(HtmlRendererUtils.SUBMIT_FORM_FN_NAME).append("('").
- append(formName).append("','").
- append(clientId).append("'");
- }
- else
- {
- onClick.append("return ").
- append(HtmlRendererUtils.SUBMIT_FORM_FN_NAME_JSF2).append("('").
- append(formName).append("','").
- append(clientId).append("'");
- }
+ onClick.append("return ").
+ append(HtmlRendererUtils.SUBMIT_FORM_FN_NAME_JSF2).append("('").
+ append(formName).append("','").
+ append(clientId).append("'");
if (params.length() > 2 || target != null)
{
@@ -779,60 +738,6 @@ public abstract class HtmlLinkRendererBa
}
}
-
- protected void renderNonJavaScriptAnchorStart(FacesContext facesContext,
- ResponseWriter writer,
- UIComponent component,
- String clientId,
- FormInfo formInfo)
- throws IOException
- {
- ViewHandler viewHandler = facesContext.getApplication().getViewHandler();
- String viewId = facesContext.getViewRoot().getViewId();
- String path = viewHandler.getActionURL(facesContext, viewId);
-
- boolean strictXhtmlLinks
- = MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isStrictXhtmlLinks();
-
- StringBuilder hrefBuf = new StringBuilder(path);
-
- //add clientId parameter for decode
-
- if (path.indexOf('?') == -1)
- {
- hrefBuf.append('?');
- }
- else
- {
- if (strictXhtmlLinks)
- {
- hrefBuf.append("&");
- }
- else
- {
- hrefBuf.append('&');
- }
- }
- String hiddenFieldName = HtmlRendererUtils.getHiddenCommandLinkFieldName(
- formInfo, facesContext);
- hrefBuf.append(hiddenFieldName);
- hrefBuf.append('=');
- hrefBuf.append(clientId);
-
- if (getChildCount(component) > 0)
- {
- addChildParametersToHref(facesContext, component, hrefBuf,
- false, //not the first url parameter
- writer.getCharacterEncoding());
- }
-
- String href = facesContext.getExternalContext().encodeActionURL(hrefBuf.toString());
- writer.startElement(HTML.ANCHOR_ELEM, component);
- writer.writeURIAttribute(HTML.HREF_ATTR,
- facesContext.getExternalContext().encodeActionURL(href),
- null);
- }
-
private void addChildParametersToHref(FacesContext facesContext,
UIComponent linkComponent,
StringBuilder hrefBuf,
@@ -873,8 +778,7 @@ public abstract class HtmlLinkRendererBa
if (HtmlRendererUtils.isDisabled(output))
{
writer.startElement(HTML.SPAN_ELEM, output);
- if (output instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (output instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) output).getClientBehaviors();
if (!behaviors.isEmpty())
@@ -986,8 +890,7 @@ public abstract class HtmlLinkRendererBa
//write anchor
writer.startElement(HTML.ANCHOR_ELEM, output);
writer.writeURIAttribute(HTML.HREF_ATTR, href, null);
- if (output instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (output instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) output).getClientBehaviors();
if (!behaviors.isEmpty())
@@ -1071,8 +974,7 @@ public abstract class HtmlLinkRendererBa
//to just put this flag on FacesContext attribute map
facesContext.getAttributes().put(END_LINK_OUTCOME_AS_SPAN, Boolean.TRUE);
writer.startElement(HTML.SPAN_ELEM, output);
- if (output instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (output instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) output).getClientBehaviors();
if (!behaviors.isEmpty())
@@ -1149,8 +1051,7 @@ public abstract class HtmlLinkRendererBa
//write anchor
writer.startElement(HTML.ANCHOR_ELEM, output);
writer.writeURIAttribute(HTML.HREF_ATTR, targetHref, null);
- if (output instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (output instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) output).getClientBehaviors();
if (!behaviors.isEmpty())
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java Wed Nov 13 23:56:47 2013
@@ -36,7 +36,6 @@ import javax.faces.context.ResponseWrite
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.RendererUtils;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
/**
* @author Manfred Geiler (latest modification by $Author$)
@@ -179,8 +178,7 @@ public abstract class HtmlMessageRendere
throws IOException
{
Map<String, List<ClientBehavior>> behaviors = null;
- if (message instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (message instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) message).getClientBehaviors();
}
@@ -236,8 +234,7 @@ public abstract class HtmlMessageRendere
boolean span = false;
Map<String, List<ClientBehavior>> behaviors = null;
- if (message instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed
- (facesContext.getExternalContext()))
+ if (message instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) message).getClientBehaviors();
// If there is a behavior registered, force wrapSpan
@@ -259,8 +256,7 @@ public abstract class HtmlMessageRendere
{
HtmlRendererUtils.writeIdIfNecessary(writer, message, facesContext);
}
- if (message instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (message instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) message).getClientBehaviors();
if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlOutcomeTargetButtonRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlOutcomeTargetButtonRendererBase.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlOutcomeTargetButtonRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlOutcomeTargetButtonRendererBase.java Wed Nov 13 23:56:47 2013
@@ -34,7 +34,6 @@ import javax.faces.context.ResponseWrite
import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.RendererUtils;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
/**
@@ -136,25 +135,17 @@ public class HtmlOutcomeTargetButtonRend
{
long commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(uiComponent);
- if (JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (behaviors != null && !behaviors.isEmpty() && uiComponent instanceof ClientBehaviorHolder)
{
- if (behaviors != null && !behaviors.isEmpty() && uiComponent instanceof ClientBehaviorHolder)
- {
- HtmlRendererUtils.renderBehaviorizedEventHandlersWithoutOnclick(
- facesContext, writer, uiComponent, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
- facesContext, writer, uiComponent, behaviors);
- }
- else
- {
- CommonPropertyUtils.renderEventPropertiesWithoutOnclick(
- writer, commonPropertiesMarked, uiComponent);
- CommonPropertyUtils.renderFocusBlurEventProperties(writer, commonPropertiesMarked, uiComponent);
- }
+ HtmlRendererUtils.renderBehaviorizedEventHandlersWithoutOnclick(
+ facesContext, writer, uiComponent, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, uiComponent, behaviors);
}
else
{
- CommonPropertyUtils.renderEventPropertiesWithoutOnclick(writer, commonPropertiesMarked, uiComponent);
+ CommonPropertyUtils.renderEventPropertiesWithoutOnclick(
+ writer, commonPropertiesMarked, uiComponent);
CommonPropertyUtils.renderFocusBlurEventProperties(writer, commonPropertiesMarked, uiComponent);
}
@@ -168,8 +159,7 @@ public class HtmlOutcomeTargetButtonRend
}
else
{
- if (uiComponent instanceof ClientBehaviorHolder
- && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (uiComponent instanceof ClientBehaviorHolder)
{
HtmlRendererUtils.renderBehaviorizedEventHandlersWithoutOnclick(
facesContext, writer, uiComponent, behaviors);
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java Wed Nov 13 23:56:47 2013
@@ -40,7 +40,6 @@ import javax.faces.model.SelectItemGroup
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.RendererUtils;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
/**
@@ -357,8 +356,7 @@ public class HtmlRadioRendererBase
}
Map<String, List<ClientBehavior>> behaviors = null;
- if (uiComponent instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (uiComponent instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) uiComponent).getClientBehaviors();
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Wed Nov 13 23:56:47 2013
@@ -61,13 +61,11 @@ import javax.faces.model.SelectItemGroup
import org.apache.myfaces.shared.component.DisplayValueOnlyCapable;
import org.apache.myfaces.shared.component.EscapeCapable;
-import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.RendererUtils;
import org.apache.myfaces.shared.renderkit.html.util.FormInfo;
import org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.renderkit.html.util.OutcomeTargetUtils;
/**
@@ -358,7 +356,6 @@ public final class HtmlRendererUtils
ResponseWriter writer = facesContext.getResponseWriter();
writer.startElement(HTML.SELECT_ELEM, uiComponent);
if (uiComponent instanceof ClientBehaviorHolder
- && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext())
&& !((ClientBehaviorHolder) uiComponent).getClientBehaviors().isEmpty())
{
writer.writeAttribute(HTML.ID_ATTR, uiComponent.getClientId(facesContext), null);
@@ -393,9 +390,7 @@ public final class HtmlRendererUtils
writer.writeAttribute(HTML.SIZE_ATTR, Integer.toString(size), null);
}
Map<String, List<ClientBehavior>> behaviors = null;
- if (uiComponent instanceof ClientBehaviorHolder
- && JavascriptUtils.isJavascriptAllowed(facesContext
- .getExternalContext()))
+ if (uiComponent instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) uiComponent)
.getClientBehaviors();
@@ -659,26 +654,6 @@ public final class HtmlRendererUtils
}
}
- public static void writePrettyLineSeparator(FacesContext facesContext)
- throws IOException
- {
- if (org.apache.myfaces.shared.config.MyfacesConfig.getCurrentInstance(
- facesContext.getExternalContext()).isPrettyHtml())
- {
- facesContext.getResponseWriter().write(LINE_SEPARATOR);
- }
- }
-
- public static void writePrettyIndent(FacesContext facesContext)
- throws IOException
- {
- if (org.apache.myfaces.shared.config.MyfacesConfig.getCurrentInstance(
- facesContext.getExternalContext()).isPrettyHtml())
- {
- facesContext.getResponseWriter().write('\t');
- }
- }
-
/**
* @return true, if the attribute was written
* @throws java.io.IOException
@@ -1159,7 +1134,6 @@ public final class HtmlRendererUtils
captionStyle = (String) component.getAttributes()
.get(org.apache.myfaces.shared.renderkit.JSFAttr.CAPTION_STYLE_ATTR);
}
- HtmlRendererUtils.writePrettyLineSeparator(context);
writer.startElement(HTML.CAPTION_ELEM, null); // component);
if (captionClass != null)
{
@@ -1855,10 +1829,7 @@ public final class HtmlRendererUtils
target.append(STR_EMPTY);
return false;
}
- ExternalContext externalContext = facesContext.getExternalContext();
- boolean renderClientBehavior = JavascriptUtils
- .isJavascriptAllowed(externalContext)
- && clientBehaviors != null && clientBehaviors.size() > 0;
+ boolean renderClientBehavior = clientBehaviors != null && clientBehaviors.size() > 0;
if (!renderClientBehavior)
{
target.append(STR_EMPTY);
@@ -1946,13 +1917,6 @@ public final class HtmlRendererUtils
Map<String, List<ClientBehavior>> clientBehaviors,
String userEventCode, String serverEventCode)
{
- ExternalContext externalContext = facesContext.getExternalContext();
- boolean renderCode = JavascriptUtils
- .isJavascriptAllowed(externalContext);
- if (!renderCode)
- {
- return STR_EMPTY;
- }
List<String> finalParams = new ArrayList<String>(3);
if (userEventCode != null && !userEventCode.trim().equals(STR_EMPTY))
{
@@ -1960,10 +1924,8 @@ public final class HtmlRendererUtils
// be a string attribute of jsf.util.chain
finalParams.add('\'' + escapeJavaScriptForChain(userEventCode) + '\'');
}
- final MyfacesConfig currentInstance = MyfacesConfig
- .getCurrentInstance(externalContext);
ScriptContext behaviorCode = new ScriptContext();
- ScriptContext retVal = new ScriptContext(currentInstance.isPrettyHtml());
+ ScriptContext retVal = new ScriptContext();
getClientBehaviorScript(facesContext, uiComponent, targetClientId,
eventName, clientBehaviors, behaviorCode, params);
if (behaviorCode != null
@@ -2035,22 +1997,14 @@ public final class HtmlRendererUtils
String userEventCode, String serverEventCode)
{
ExternalContext externalContext = facesContext.getExternalContext();
- boolean renderCode = JavascriptUtils
- .isJavascriptAllowed(externalContext);
- if (!renderCode)
- {
- return STR_EMPTY;
- }
List<String> finalParams = new ArrayList<String>(3);
if (userEventCode != null && !userEventCode.trim().equals(STR_EMPTY))
{
finalParams.add('\'' + escapeJavaScriptForChain(userEventCode) + '\'');
}
- final MyfacesConfig currentInstance = MyfacesConfig
- .getCurrentInstance(externalContext);
ScriptContext behaviorCode = new ScriptContext();
- ScriptContext retVal = new ScriptContext(currentInstance.isPrettyHtml());
+ ScriptContext retVal = new ScriptContext();
boolean submitting1 = getClientBehaviorScript(facesContext,
uiComponent, targetClientId, eventName1, clientBehaviors,
behaviorCode, params);
@@ -2791,12 +2745,6 @@ public final class HtmlRendererUtils
}
}
- public static void renderViewStateJavascript(FacesContext facesContext,
- String hiddenId, String serializedState) throws IOException
- {
- HtmlJavaScriptUtils.renderViewStateJavascript(facesContext, hiddenId, serializedState);
- }
-
/**
* Returns the value of the hideNoSelectionOption attribute of the given UIComponent
* @param component
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java?rev=1541762&r1=1541761&r2=1541762&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java Wed Nov 13 23:56:47 2013
@@ -20,7 +20,6 @@ package org.apache.myfaces.shared.render
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.RendererUtils;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
import javax.faces.component.UIComponent;
@@ -81,8 +80,7 @@ public class HtmlSecretRendererBase
writer.startElement(HTML.INPUT_ELEM, uiComponent);
writer.writeAttribute(HTML.TYPE_ATTR, org.apache.myfaces.shared.renderkit.html.HTML.INPUT_TYPE_PASSWORD, null);
- if (uiComponent instanceof ClientBehaviorHolder
- && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext())
+ if (uiComponent instanceof ClientBehaviorHolder
&& !((ClientBehaviorHolder) uiComponent).getClientBehaviors().isEmpty())
{
writer.writeAttribute(HTML.ID_ATTR,
@@ -112,8 +110,7 @@ public class HtmlSecretRendererBase
}
Map<String, List<ClientBehavior>> behaviors = null;
- if (uiComponent instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
- facesContext.getExternalContext()))
+ if (uiComponent instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) uiComponent).getClientBehaviors();