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/16 00:06:37 UTC
svn commit: r1542428 - in /myfaces/core/trunk:
impl/src/main/java/org/apache/myfaces/application/
impl/src/main/java/org/apache/myfaces/component/visit/
impl/src/main/java/org/apache/myfaces/renderkit/html/
impl/src/main/java/org/apache/myfaces/view/fa...
Author: lu4242
Date: Fri Nov 15 23:06:36 2013
New Revision: 1542428
URL: http://svn.apache.org/r1542428
Log:
MYFACES-3822 General cleanup and remove unused web config params
Added:
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/SubKeyMap.java
- copied, changed from r1539924, myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java
Removed:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/impl/SubKeyMap.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/component/visit/PartialVisitContext.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.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/view/facelets/compiler/UILeaf.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/impl/DefaultViewScopeHandler.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGridRendererTest.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonPropertyUtils.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/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/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/HtmlResponseWriterImpl.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/util/HTMLEncoder.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/BaseResourceHandlerSupport.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoaderUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ValueExpressionFilterInputStream.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java
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=1542428&r1=1542427&r2=1542428&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 Fri Nov 15 23:06:36 2013
@@ -52,8 +52,6 @@ import org.apache.myfaces.application.vi
import org.apache.myfaces.shared.application.DefaultViewHandlerSupport;
import org.apache.myfaces.shared.application.InvalidViewIdException;
import org.apache.myfaces.shared.application.ViewHandlerSupport;
-import org.apache.myfaces.shared.config.MyfacesConfig;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.view.facelets.StateWriter;
/**
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/component/visit/PartialVisitContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/component/visit/PartialVisitContext.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/component/visit/PartialVisitContext.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/component/visit/PartialVisitContext.java Fri Nov 15 23:06:36 2013
@@ -31,7 +31,6 @@ import java.util.Set;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
-import javax.faces.component.UINamingContainer;
import javax.faces.component.visit.VisitCallback;
import javax.faces.component.visit.VisitContext;
import javax.faces.component.visit.VisitHint;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java Fri Nov 15 23:06:36 2013
@@ -28,7 +28,6 @@ import javax.faces.FacesException;
import javax.faces.component.ActionSource;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
-import javax.faces.component.UINamingContainer;
import javax.faces.component.behavior.AjaxBehavior;
import javax.faces.component.behavior.ClientBehavior;
import javax.faces.component.behavior.ClientBehaviorContext;
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=1542428&r1=1542427&r2=1542428&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 Fri Nov 15 23:06:36 2013
@@ -21,15 +21,10 @@ package org.apache.myfaces.renderkit.htm
import java.io.IOException;
import javax.faces.component.UIComponent;
-import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared.config.MyfacesConfig;
-import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.shared.renderkit.html.HtmlFormRendererBase;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
/**
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=1542428&r1=1542427&r2=1542428&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 Fri Nov 15 23:06:36 2013
@@ -41,7 +41,6 @@ import org.apache.myfaces.shared.renderk
import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
/**
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java Fri Nov 15 23:06:36 2013
@@ -31,7 +31,6 @@ import javax.el.ValueExpression;
import javax.faces.FacesException;
import javax.faces.component.ContextCallback;
import javax.faces.component.UIComponent;
-import javax.faces.component.UINamingContainer;
import javax.faces.component.UIViewRoot;
import javax.faces.component.UniqueIdVendor;
import javax.faces.component.visit.VisitCallback;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java Fri Nov 15 23:06:36 2013
@@ -37,7 +37,6 @@ import javax.faces.component.EditableVal
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
-import javax.faces.component.UINamingContainer;
import javax.faces.component.visit.VisitCallback;
import javax.faces.component.visit.VisitContext;
import javax.faces.component.visit.VisitHint;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java Fri Nov 15 23:06:36 2013
@@ -25,7 +25,6 @@ import java.util.List;
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
-import javax.faces.component.UINamingContainer;
import javax.faces.context.FacesContext;
import javax.faces.view.AttachedObjectTarget;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java Fri Nov 15 23:06:36 2013
@@ -29,7 +29,6 @@ import java.util.Map;
import javax.faces.FacesException;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
-import javax.faces.component.UINamingContainer;
import javax.faces.component.UIPanel;
import javax.faces.component.UIViewRoot;
import javax.faces.component.UniqueIdVendor;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/impl/DefaultViewScopeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/impl/DefaultViewScopeHandler.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/impl/DefaultViewScopeHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/impl/DefaultViewScopeHandler.java Fri Nov 15 23:06:36 2013
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.shared.util.SubKeyMap;
import org.apache.myfaces.spi.ViewScopeProvider;
/**
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGridRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGridRendererTest.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGridRendererTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGridRendererTest.java Fri Nov 15 23:06:36 2013
@@ -107,10 +107,10 @@ public class HtmlGridRendererTest extend
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertEquals("<table><tbody>"+LINE_SEPARATOR+
- "<tr><td>col1Text</td></tr>" + LINE_SEPARATOR +
- "<tr><td>col2Text</td></tr>" + LINE_SEPARATOR +
- "</tbody>"+LINE_SEPARATOR+"</table>", output);
+ assertEquals("<table><tbody>"+
+ "<tr><td>col1Text</td></tr>"+
+ "<tr><td>col2Text</td></tr>"+
+ "</tbody>"+"</table>", output);
}
public void testHtmlPropertyPassTru() throws Exception
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java Fri Nov 15 23:06:36 2013
@@ -150,53 +150,6 @@ public class HtmlLinkRendererTest extend
}
}
- public void testJSNotAllowedHtmlPropertyPassTru() throws Exception
- {
- HtmlRenderedAttr[] attrs = {
- //_AccesskeyProperty
- new HtmlRenderedAttr("accesskey"),
- //_UniversalProperties
- new HtmlRenderedAttr("dir"),
- new HtmlRenderedAttr("lang"),
- new HtmlRenderedAttr("title"),
- //_FocusBlurProperties
- new HtmlRenderedAttr("onfocus"),
- new HtmlRenderedAttr("onblur"),
- //_EventProperties
- new HtmlRenderedAttr("onclick"),
- new HtmlRenderedAttr("ondblclick"),
- new HtmlRenderedAttr("onkeydown"),
- new HtmlRenderedAttr("onkeypress"),
- new HtmlRenderedAttr("onkeyup"),
- new HtmlRenderedAttr("onmousedown"),
- new HtmlRenderedAttr("onmousemove"),
- new HtmlRenderedAttr("onmouseout"),
- new HtmlRenderedAttr("onmouseover"),
- new HtmlRenderedAttr("onmouseup"),
- //_StyleProperties
- new HtmlRenderedAttr("style"),
- new HtmlRenderedAttr("styleClass", "styleClass", "class=\"styleClass\""),
- //_TabindexProperty
- new HtmlRenderedAttr("tabindex")
- };
-
-
- commandLink.setValue("outputdata");
-
- MockServletContext servletContext = new MockServletContext();
- servletContext.addInitParameter("org.apache.myfaces.ALLOW_JAVASCRIPT", "false");
- MockExternalContext mockExtCtx = new MockExternalContext(servletContext,
- new MockHttpServletRequest(), new MockHttpServletResponse());
- MyfacesConfig config = MyfacesConfig.getCurrentInstance(mockExtCtx);
- facesContext.setExternalContext(mockExtCtx);
-
- HtmlCheckAttributesUtil.checkRenderedAttributes(
- commandLink, facesContext, writer, attrs);
- if(HtmlCheckAttributesUtil.hasFailedAttrRender(attrs)) {
- fail(HtmlCheckAttributesUtil.constructErrorMessage(attrs, writer.getWriter().toString()));
- }
- }
-
public void testOutputLink() throws Exception
{
HtmlRenderedAttr[] attrs = {
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java Fri Nov 15 23:06:36 2013
@@ -129,7 +129,7 @@ public class DefaultViewHandlerSupport i
throw new InvalidViewIdException();
}
}
- else if (viewId != null && mapping.getUrlPattern().startsWith(viewId))
+ else if (mapping.getUrlPattern().startsWith(viewId))
{
throw new InvalidViewIdException(viewId);
}
@@ -164,7 +164,7 @@ public class DefaultViewHandlerSupport i
// considered invalid, because jsp vdl will use RequestDispatcher and cause
// a loop that ends in a exception. Note in portlet mode the view
// could be encoded as a query param, so the viewId could be valid.
- if (viewId != null && viewId.equals(mapping.getPrefix()) &&
+ if (viewId.equals(mapping.getPrefix()) &&
!ExternalContextUtils.isPortlet(context.getExternalContext()))
{
throw new InvalidViewIdException();
@@ -173,7 +173,7 @@ public class DefaultViewHandlerSupport i
return (checkResourceExists(context,viewId) ? viewId : null);
}
}
- else if (viewId != null && mapping.getUrlPattern().startsWith(viewId))
+ else if (mapping.getUrlPattern().startsWith(viewId))
{
throw new InvalidViewIdException(viewId);
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java Fri Nov 15 23:06:36 2013
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.shared.config;
-import java.util.logging.Logger;
import javax.faces.context.ExternalContext;
import javax.servlet.ServletContext;
@@ -45,9 +44,6 @@ import org.apache.myfaces.shared.util.We
*/
public class MyfacesConfig
{
- //private static final Log log = LogFactory.getLog(MyfacesConfig.class);
- private static final Logger log = Logger.getLogger(MyfacesConfig.class.getName());
-
private static final String APPLICATION_MAP_PARAM_NAME = MyfacesConfig.class.getName();
/**
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/FlashImpl.java Fri Nov 15 23:06:36 2013
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.shared.context.flash;
+import org.apache.myfaces.shared.util.SubKeyMap;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.shared.util.ExternalContextUtils;
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java Fri Nov 15 23:06:36 2013
@@ -48,7 +48,6 @@ import javax.faces.component.NamingConta
import javax.faces.component.UIComponent;
import javax.faces.component.UIForm;
import javax.faces.component.UIInput;
-import javax.faces.component.UINamingContainer;
import javax.faces.component.UIOutput;
import javax.faces.component.UISelectMany;
import javax.faces.component.UISelectOne;
@@ -974,7 +973,7 @@ public final class RendererUtils
//To be compatible with jsf ri, and according to issue 69
//[ Permit the passing of a null value to SelectItem.setValue() ]
//If submittedValue == "" then convert to null.
- if ((submittedValue != null) && (submittedValue instanceof String)
+ if ((submittedValue != null)
&& ("".equals(submittedValue)))
{
//Replace "" by null value
@@ -1191,28 +1190,6 @@ public final class RendererUtils
dest.setValidator(src.getValidator());
}
- /**
- * @deprecated Logic corrected and encapsulated better in org.apache.myfaces.renderkit.ServerSideStateCacheImpl
- */
- @Deprecated
- public static Integer getViewSequence(FacesContext facescontext)
- {
- Map map = facescontext.getExternalContext().getRequestMap();
- Integer sequence = (Integer) map.get(SEQUENCE_PARAM);
- if (sequence == null)
- {
- sequence = new Integer(1);
- map.put(SEQUENCE_PARAM, sequence);
-
- synchronized (facescontext.getExternalContext().getSession(true))
- {
- facescontext.getExternalContext().getSessionMap()
- .put(RendererUtils.SEQUENCE_PARAM, sequence);
- }
- }
- return sequence;
- }
-
public static UIComponent findComponent(UIComponent headerComp, Class clazz)
{
if (clazz.isAssignableFrom(headerComp.getClass()))
@@ -1430,7 +1407,7 @@ public final class RendererUtils
}
}
- return content.toString();
+ return content != null ? content.toString() : null;
}
/**
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonPropertyUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonPropertyUtils.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonPropertyUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonPropertyUtils.java Fri Nov 15 23:06:36 2013
@@ -43,7 +43,7 @@ public final class CommonPropertyUtils
return component.getId() != null && !component.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX);
}
- public static final void renderUniversalProperties(ResponseWriter writer,
+ public static void renderUniversalProperties(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -69,7 +69,7 @@ public final class CommonPropertyUtils
}
}
- public static final void renderUniversalPropertiesWithoutTitle(ResponseWriter writer,
+ public static void renderUniversalPropertiesWithoutTitle(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -90,7 +90,7 @@ public final class CommonPropertyUtils
}
}
- public static final void renderStyleProperties(ResponseWriter writer,
+ public static void renderStyleProperties(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -106,7 +106,7 @@ public final class CommonPropertyUtils
}
}
- public static final void renderEventProperties(ResponseWriter writer,
+ public static void renderEventProperties(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -118,7 +118,7 @@ public final class CommonPropertyUtils
renderEventPropertiesWithoutOnclick(writer, commonPropertiesMarked, component);
}
- public static final void renderEventPropertiesWithoutOnclick(ResponseWriter writer,
+ public static void renderEventPropertiesWithoutOnclick(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -170,7 +170,7 @@ public final class CommonPropertyUtils
}
- public static final void renderChangeSelectEventProperties(ResponseWriter writer,
+ public static void renderChangeSelectEventProperties(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -186,7 +186,7 @@ public final class CommonPropertyUtils
}
}
- public static final void renderFocusBlurEventProperties(ResponseWriter writer,
+ public static void renderFocusBlurEventProperties(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -202,7 +202,7 @@ public final class CommonPropertyUtils
}
}
- public static final void renderFieldEventPropertiesWithoutOnchangeAndOnselect(ResponseWriter writer,
+ public static void renderFieldEventPropertiesWithoutOnchangeAndOnselect(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component) throws IOException
{
if ((commonPropertiesMarked & CommonPropertyConstants.ONFOCUS_PROP) != 0)
@@ -217,7 +217,7 @@ public final class CommonPropertyUtils
}
}
- public static final void renderFieldEventPropertiesWithoutOnchange(ResponseWriter writer,
+ public static void renderFieldEventPropertiesWithoutOnchange(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component) throws IOException
{
if ((commonPropertiesMarked & CommonPropertyConstants.ONFOCUS_PROP) != 0)
@@ -237,7 +237,7 @@ public final class CommonPropertyUtils
}
}
- public static final void renderChangeEventProperty(ResponseWriter writer,
+ public static void renderChangeEventProperty(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component) throws IOException
{
if ((commonPropertiesMarked & CommonPropertyConstants.ONCHANGE_PROP) != 0)
@@ -279,7 +279,7 @@ public final class CommonPropertyUtils
}
}
- public static final void renderInputProperties(ResponseWriter writer,
+ public static void renderInputProperties(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -315,7 +315,7 @@ public final class CommonPropertyUtils
}
}
- public static final void renderAnchorProperties(ResponseWriter writer,
+ public static void renderAnchorProperties(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -362,7 +362,7 @@ public final class CommonPropertyUtils
}
}
- public static final void renderCommonPassthroughPropertiesWithoutEvents(ResponseWriter writer,
+ public static void renderCommonPassthroughPropertiesWithoutEvents(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -370,7 +370,7 @@ public final class CommonPropertyUtils
renderUniversalProperties(writer, commonPropertiesMarked, component);
}
- public static final void renderCommonPassthroughProperties(ResponseWriter writer,
+ public static void renderCommonPassthroughProperties(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -380,7 +380,7 @@ public final class CommonPropertyUtils
}
//Methods
- public static final void renderCommonFieldEventProperties(ResponseWriter writer,
+ public static void renderCommonFieldEventProperties(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -388,7 +388,7 @@ public final class CommonPropertyUtils
renderFocusBlurEventProperties(writer, commonPropertiesMarked, component);
}
- public static final void renderCommonFieldPassthroughPropertiesWithoutDisabled(ResponseWriter writer,
+ public static void renderCommonFieldPassthroughPropertiesWithoutDisabled(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -397,7 +397,7 @@ public final class CommonPropertyUtils
renderCommonFieldEventProperties(writer, commonPropertiesMarked, component);
}
- public static final void renderCommonFieldPassthroughPropertiesWithoutDisabledAndEvents(ResponseWriter writer,
+ public static void renderCommonFieldPassthroughPropertiesWithoutDisabledAndEvents(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -405,7 +405,7 @@ public final class CommonPropertyUtils
renderAccesskeyTabindexProperties(writer, commonPropertiesMarked, component);
}
- public static final void renderInputPassthroughPropertiesWithoutDisabled(ResponseWriter writer,
+ public static void renderInputPassthroughPropertiesWithoutDisabled(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -413,7 +413,7 @@ public final class CommonPropertyUtils
renderCommonFieldPassthroughPropertiesWithoutDisabled(writer, commonPropertiesMarked, component);
}
- public static final void renderInputPassthroughPropertiesWithoutDisabledAndEvents(ResponseWriter writer,
+ public static void renderInputPassthroughPropertiesWithoutDisabledAndEvents(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -421,7 +421,7 @@ public final class CommonPropertyUtils
renderCommonFieldPassthroughPropertiesWithoutDisabledAndEvents(writer, commonPropertiesMarked, component);
}
- public static final void renderAnchorPassthroughProperties(ResponseWriter writer,
+ public static void renderAnchorPassthroughProperties(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -430,7 +430,7 @@ public final class CommonPropertyUtils
renderFocusBlurEventProperties(writer, commonPropertiesMarked, component);
}
- public static final void renderAnchorPassthroughPropertiesWithoutEvents(ResponseWriter writer,
+ public static void renderAnchorPassthroughPropertiesWithoutEvents(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -439,7 +439,7 @@ public final class CommonPropertyUtils
renderUniversalProperties(writer, commonPropertiesMarked, component);
}
- public static final void renderAnchorPassthroughPropertiesWithoutStyleAndEvents(ResponseWriter writer,
+ public static void renderAnchorPassthroughPropertiesWithoutStyleAndEvents(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -447,7 +447,7 @@ public final class CommonPropertyUtils
renderUniversalProperties(writer, commonPropertiesMarked, component);
}
- public static final void renderAnchorPassthroughPropertiesWithoutStyle(ResponseWriter writer,
+ public static void renderAnchorPassthroughPropertiesWithoutStyle(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -457,7 +457,7 @@ public final class CommonPropertyUtils
renderFocusBlurEventProperties(writer, commonPropertiesMarked, component);
}
- public static final void renderAnchorPassthroughPropertiesWithoutOnclickAndStyle(ResponseWriter writer,
+ public static void renderAnchorPassthroughPropertiesWithoutOnclickAndStyle(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -467,7 +467,7 @@ public final class CommonPropertyUtils
renderFocusBlurEventProperties(writer, commonPropertiesMarked, component);
}
- public static final void renderButtonPassthroughPropertiesWithoutDisabledAndEvents(ResponseWriter writer,
+ public static void renderButtonPassthroughPropertiesWithoutDisabledAndEvents(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -477,7 +477,7 @@ public final class CommonPropertyUtils
renderAltAlignProperties(writer, commonPropertiesMarked, component);
}
- public static final void renderLabelProperties(ResponseWriter writer,
+ public static void renderLabelProperties(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -490,7 +490,7 @@ public final class CommonPropertyUtils
}
- public static final void renderLabelPassthroughProperties(ResponseWriter writer,
+ public static void renderLabelPassthroughProperties(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -498,7 +498,7 @@ public final class CommonPropertyUtils
renderCommonPassthroughProperties(writer, commonPropertiesMarked, component);
}
- public static final void renderLabelPassthroughPropertiesWithoutEvents(ResponseWriter writer,
+ public static void renderLabelPassthroughPropertiesWithoutEvents(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
@@ -510,14 +510,14 @@ public final class CommonPropertyUtils
renderCommonPassthroughPropertiesWithoutEvents(writer, commonPropertiesMarked, component);
}
- public static final void renderSelectPassthroughPropertiesWithoutDisabled(ResponseWriter writer,
+ public static void renderSelectPassthroughPropertiesWithoutDisabled(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
renderCommonFieldPassthroughPropertiesWithoutDisabled(writer, commonPropertiesMarked, component);
}
- public static final void renderSelectPassthroughPropertiesWithoutDisabledAndEvents(ResponseWriter writer,
+ public static void renderSelectPassthroughPropertiesWithoutDisabledAndEvents(ResponseWriter writer,
long commonPropertiesMarked, UIComponent component)
throws IOException
{
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=1542428&r1=1542427&r2=1542428&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 Fri Nov 15 23:06:36 2013
@@ -30,11 +30,9 @@ import javax.faces.component.UIParameter
import javax.faces.component.ValueHolder;
import javax.faces.component.behavior.ClientBehavior;
import javax.faces.component.behavior.ClientBehaviorContext;
-import javax.faces.component.behavior.ClientBehaviorHint;
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.component.html.HtmlCommandButton;
import javax.faces.component.html.HtmlCommandLink;
-import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.event.ActionEvent;
@@ -174,8 +172,6 @@ public class HtmlButtonRendererBase
writer.writeAttribute(HTML.ID_ATTR, clientId, org.apache.myfaces.shared.renderkit.JSFAttr.ID_ATTR);
writer.writeAttribute(HTML.NAME_ATTR, clientId, JSFAttr.ID_ATTR);
- ExternalContext externalContext = facesContext.getExternalContext();
-
String image = RendererUtils.getIconSrc(facesContext, uiComponent, JSFAttr.IMAGE_ATTR);
if (image != null)
{
@@ -327,22 +323,6 @@ public class HtmlButtonRendererBase
}*/
}
- private boolean hasSubmittingBehavior(Map<String, List<ClientBehavior>> clientBehaviors, String eventName)
- {
- List<ClientBehavior> eventBehaviors = clientBehaviors.get(eventName);
- if (eventBehaviors != null && !eventBehaviors.isEmpty())
- {
- for (ClientBehavior behavior : eventBehaviors)
- {
- if (behavior.getHints().contains(ClientBehaviorHint.SUBMITTING))
- {
- return true;
- }
- }
- }
- return false;
- }
-
protected String buildBehaviorizedOnClick(UIComponent uiComponent, Map<String, List<ClientBehavior>> behaviors,
FacesContext facesContext, ResponseWriter writer,
FormInfo nestedFormInfo, List<UIParameter> validParams)
@@ -419,7 +399,7 @@ public class HtmlButtonRendererBase
}
else
{
- StringBuilder params = addChildParameters(facesContext, component, nestingForm, validParams);
+ StringBuilder params = addChildParameters(facesContext, nestingForm, validParams);
String target = getTarget(component);
@@ -445,7 +425,7 @@ public class HtmlButtonRendererBase
return onClick.toString();
}
- private StringBuilder addChildParameters(FacesContext context, UIComponent component,
+ private StringBuilder addChildParameters(FacesContext context,
UIComponent nestingForm, List<UIParameter> validParams)
{
//add child parameters
@@ -585,7 +565,7 @@ public class HtmlButtonRendererBase
if (validParams != null && !validParams.isEmpty() )
{
StringBuilder params = addChildParameters(
- facesContext, uiComponent, nestedFormInfo.getForm(), validParams);
+ facesContext, nestedFormInfo.getForm(), validParams);
String target = getTarget(uiComponent);
@@ -690,15 +670,6 @@ public class HtmlButtonRendererBase
uiComponent, HTML.READONLY_ATTR, false);
}
- private String getImage(UIComponent uiComponent)
- {
- if (uiComponent instanceof HtmlCommandButton)
- {
- return ((HtmlCommandButton)uiComponent).getImage();
- }
- return (String)uiComponent.getAttributes().get(JSFAttr.IMAGE_ATTR);
- }
-
private String getType(UIComponent uiComponent)
{
if (uiComponent instanceof HtmlCommandButton)
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=1542428&r1=1542427&r2=1542428&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 Fri Nov 15 23:06:36 2013
@@ -26,7 +26,6 @@ import java.util.Set;
import java.util.logging.Logger;
import javax.faces.component.UIComponent;
-import javax.faces.component.UINamingContainer;
import javax.faces.component.UISelectBoolean;
import javax.faces.component.UISelectMany;
import javax.faces.component.UISelectOne;
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=1542428&r1=1542427&r2=1542428&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 Fri Nov 15 23:06:36 2013
@@ -313,15 +313,6 @@ public class HtmlFormRendererBase
}
}
- private String getAcceptCharset(UIComponent uiComponent)
- {
- if (uiComponent instanceof HtmlForm)
- {
- return ((HtmlForm)uiComponent).getAcceptcharset();
- }
- return (String)uiComponent.getAttributes().get(JSFAttr.ACCEPTCHARSET_ATTR);
- }
-
/**
* Called before the state and any elements are added to the form tag in the
* encodeBegin method
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=1542428&r1=1542427&r2=1542428&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 Fri Nov 15 23:06:36 2013
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
-import javax.faces.component.UINamingContainer;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
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=1542428&r1=1542427&r2=1542428&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 Fri Nov 15 23:06:36 2013
@@ -1120,27 +1120,6 @@ public abstract class HtmlLinkRendererBa
writer.flush();
}
}
-
-
- private void renderLinkParameter(String name,
- Object value,
- StringBuilder onClick,
- String jsForm,
- UIComponent nestingForm)
- {
- if (name == null)
- {
- throw new IllegalArgumentException("Unnamed parameter value not allowed within command link.");
- }
- onClick.append(jsForm);
- onClick.append(".elements['").append(name).append("']");
- //UIParameter is no ValueHolder, so no conversion possible
- String strParamValue = value != null ? org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder.encode(
- value.toString(), false, false) : "";
- onClick.append(".value='").append(strParamValue).append("';");
-
- addHiddenCommandParameter(FacesContext.getCurrentInstance(), nestingForm, name);
- }
private static void addParameterToHref(String name,
Object value,
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=1542428&r1=1542427&r2=1542428&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 Fri Nov 15 23:06:36 2013
@@ -26,7 +26,6 @@ import java.util.logging.Logger;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
-import javax.faces.component.UINamingContainer;
import javax.faces.component.UISelectOne;
import javax.faces.component.behavior.ClientBehavior;
import javax.faces.component.behavior.ClientBehaviorHolder;
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=1542428&r1=1542427&r2=1542428&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 Fri Nov 15 23:06:36 2013
@@ -37,7 +37,6 @@ import javax.faces.FacesException;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
-import javax.faces.component.UINamingContainer;
import javax.faces.component.UIOutcomeTarget;
import javax.faces.component.UIOutput;
import javax.faces.component.UIParameter;
@@ -196,7 +195,7 @@ public final class HtmlRendererUtils
{
if (obj instanceof String)
{
- return new Boolean((String) obj);
+ return Boolean.valueOf((String) obj);
}
if (!(obj instanceof Boolean))
{
@@ -829,7 +828,7 @@ public final class HtmlRendererUtils
* @return
* @throws IOException
*/
- public static final boolean renderHTMLStringPreserveEmptyAttribute(ResponseWriter writer,
+ public static boolean renderHTMLStringPreserveEmptyAttribute(ResponseWriter writer,
String componentProperty, String htmlAttrName, String value)
throws IOException
{
@@ -848,7 +847,7 @@ public final class HtmlRendererUtils
* @param value
* @return
*/
- private static final boolean isDefaultStringPreserveEmptyAttributeValue(String value)
+ private static boolean isDefaultStringPreserveEmptyAttributeValue(String value)
{
if (value == null)
{
@@ -871,7 +870,7 @@ public final class HtmlRendererUtils
* @return
* @throws IOException
*/
- public static final boolean renderHTMLStringAttribute(ResponseWriter writer,
+ public static boolean renderHTMLStringAttribute(ResponseWriter writer,
UIComponent component, String componentProperty, String htmlAttrName)
throws IOException
{
@@ -895,7 +894,7 @@ public final class HtmlRendererUtils
* @return
* @throws IOException
*/
- public static final boolean renderHTMLStringAttribute(ResponseWriter writer,
+ public static boolean renderHTMLStringAttribute(ResponseWriter writer,
String componentProperty, String htmlAttrName, String value)
throws IOException
{
@@ -913,7 +912,7 @@ public final class HtmlRendererUtils
* @param value
* @return
*/
- private static final boolean isDefaultStringAttributeValue(String value)
+ private static boolean isDefaultStringAttributeValue(String value)
{
if (value == null)
{
@@ -1808,17 +1807,6 @@ public final class HtmlRendererUtils
* @since 4.0.0
*/
private static boolean getClientBehaviorScript(FacesContext facesContext,
- UIComponent uiComponent, String eventName,
- Map<String, List<ClientBehavior>> clientBehaviors,
- ScriptContext target,
- Collection<ClientBehaviorContext.Parameter> params)
- {
- return getClientBehaviorScript(facesContext, uiComponent,
- uiComponent.getClientId(facesContext), eventName,
- clientBehaviors, target, params);
- }
-
- private static boolean getClientBehaviorScript(FacesContext facesContext,
UIComponent uiComponent, String targetClientId, String eventName,
Map<String, List<ClientBehavior>> clientBehaviors,
ScriptContext target,
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java Fri Nov 15 23:06:36 2013
@@ -440,7 +440,7 @@ public class HtmlResponseWriterImpl
// same here. After all, it is resposibility of the one who set the passthrough
// attribute to do the proper encoding in cases when a URI is provided. However,
// that does not means the attribute should not be encoded as other attributes.
- encodeAndWriteAttribute(key, value, key);
+ encodeAndWriteAttribute(key, value);
}
}
@@ -852,7 +852,7 @@ public class HtmlResponseWriterImpl
}
}
- private void encodeAndWriteAttribute(String name, Object value, String componentPropertyName) throws IOException
+ private void encodeAndWriteAttribute(String name, Object value) throws IOException
{
String strValue = (value==null)?"":value.toString();
_currentWriter.write(' ');
@@ -881,10 +881,10 @@ public class HtmlResponseWriterImpl
return;
}
- encodeAndWriteURIAttribute(name, value, componentPropertyName);
+ encodeAndWriteURIAttribute(name, value);
}
- private void encodeAndWriteURIAttribute(String name, Object value, String componentPropertyName) throws IOException
+ private void encodeAndWriteURIAttribute(String name, Object value) throws IOException
{
String strValue = value.toString();
_currentWriter.write(' ');
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Fri Nov 15 23:06:36 2013
@@ -335,7 +335,7 @@ public class HtmlTableRendererBase exten
bodyrows = new Integer[bodyrowsString.length];
for(int i = 0; i < bodyrowsString.length; i++)
{
- bodyrows[i] = new Integer(bodyrowsString[i]);
+ bodyrows[i] = Integer.valueOf(bodyrowsString[i]);
}
}
@@ -1128,7 +1128,7 @@ public class HtmlTableRendererBase exten
// Only render colspan if is > 0
if (totalColumns > 0)
{
- writer.writeAttribute(HTML.COLSPAN_ATTR, new Integer(totalColumns), null);
+ writer.writeAttribute(HTML.COLSPAN_ATTR, Integer.valueOf(totalColumns), null);
}
if (styleClass != null)
{
@@ -1298,7 +1298,7 @@ public class HtmlTableRendererBase exten
writer.startElement(determineHeaderCellTag(facesContext, uiComponent.getParent()), null); // uiComponent);
if (colspan > 1)
{
- writer.writeAttribute(HTML.COLSPAN_ATTR, new Integer(colspan), null);
+ writer.writeAttribute(HTML.COLSPAN_ATTR, Integer.valueOf(colspan), null);
}
if (headerStyleClass != null)
{
@@ -1353,7 +1353,7 @@ public class HtmlTableRendererBase exten
writer.startElement(HTML.TD_ELEM, null); // uiComponent);
if (colspan > 1)
{
- writer.writeAttribute(HTML.COLSPAN_ATTR, new Integer(colspan), null);
+ writer.writeAttribute(HTML.COLSPAN_ATTR, Integer.valueOf(colspan), null);
}
if (footerStyleClass != null)
{
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java Fri Nov 15 23:06:36 2013
@@ -1162,7 +1162,7 @@ public abstract class HTMLEncoder
throws IOException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream(10);
- StringBuilder builder = new StringBuilder();
+
try
{
OutputStreamWriter writer = new OutputStreamWriter(baos,characterEncoding);
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/BaseResourceHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/BaseResourceHandlerSupport.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/BaseResourceHandlerSupport.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/BaseResourceHandlerSupport.java Fri Nov 15 23:06:36 2013
@@ -51,6 +51,10 @@ public class BaseResourceHandlerSupport
private static final String CACHED_SERVLET_MAPPING =
BaseResourceHandlerSupport.class.getName() + ".CACHED_SERVLET_MAPPING";
+ private static final ResourceLoader[] EMPTY_RESOURCE_LOADERS = new ResourceLoader[]{};
+ private static final ContractResourceLoader[] EMPTY_CONTRACT_RESOURCE_LOADERS =
+ new ContractResourceLoader[]{};
+
private Long _startupTime;
private Long _maxTimeExpires;
@@ -62,17 +66,17 @@ public class BaseResourceHandlerSupport
public ResourceLoader[] getResourceLoaders()
{
- return null;
+ return EMPTY_RESOURCE_LOADERS;
}
public ContractResourceLoader[] getContractResourceLoaders()
{
- return null;
+ return EMPTY_CONTRACT_RESOURCE_LOADERS;
}
public ResourceLoader[] getViewResourceLoaders()
{
- return null;
+ return EMPTY_RESOURCE_LOADERS;
}
public String calculateResourceBasePath(FacesContext facesContext)
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java Fri Nov 15 23:06:36 2013
@@ -101,7 +101,7 @@ public abstract class ResourceLoader
_versionComparator = versionComparator;
}
- public class VersionComparator implements Comparator<String>
+ public static class VersionComparator implements Comparator<String>
{
public int compare(String s1, String s2)
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoaderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoaderUtils.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoaderUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoaderUtils.java Fri Nov 15 23:06:36 2013
@@ -72,7 +72,7 @@ public class ResourceLoaderUtils
{
return null;
}
- return new Long(date.getTime());
+ return Long.valueOf(date.getTime());
}
//Taken from trinidad URLUtils
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ValueExpressionFilterInputStream.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ValueExpressionFilterInputStream.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ValueExpressionFilterInputStream.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ValueExpressionFilterInputStream.java Fri Nov 15 23:06:36 2013
@@ -42,7 +42,6 @@ public class ValueExpressionFilterInputS
private String libraryName;
private String resourceName;
private String contractName;
- private Resource resource;
public ValueExpressionFilterInputStream(InputStream in, String libraryName, String resourceName)
{
@@ -57,7 +56,6 @@ public class ValueExpressionFilterInputS
{
super();
delegate = new DynamicPushbackInputStream(in,300);
- this.resource = resource;
this.libraryName = resource.getLibraryName();
this.resourceName = resource.getResourceName();
this.contractName = (resource instanceof ContractResource) ?
Copied: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/SubKeyMap.java (from r1539924, myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/SubKeyMap.java?p2=myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/SubKeyMap.java&p1=myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java&r1=1539924&r2=1542428&rev=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/SubKeyMap.java Fri Nov 15 23:06:36 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.context.flash;
+package org.apache.myfaces.shared.util;
import java.util.AbstractMap;
import java.util.AbstractSet;
@@ -41,7 +41,7 @@ import java.util.Set;
* "flaw" is actually relied on by PageFlowScopeMap (since it provides
* a handy way to clear out all descendents), so don't "fix" it!
*/
-final class SubKeyMap<V> extends AbstractMap<String, V>
+public final class SubKeyMap<V> extends AbstractMap<String, V>
{
public SubKeyMap(Map<String, Object> base, String prefix)
{
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java?rev=1542428&r1=1542427&r2=1542428&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java Fri Nov 15 23:06:36 2013
@@ -264,7 +264,6 @@ public abstract class JspViewDeclaration
if (MyfacesConfig.getCurrentInstance(context.getExternalContext()).isMyfacesImplAvailable())
{
// In MyFaces the viewState key is already encoded is server side state saving is being used
- StateManager stateManager = context.getApplication().getStateManager();
return !context.getApplication().getStateManager().isSavingStateInClient(context);
}
else