You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2017/10/24 07:13:17 UTC
svn commit: r1813142 - in
/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces:
renderkit/html/ view/facelets/impl/ view/facelets/tag/ui/
Author: tandraschko
Date: Tue Oct 24 07:13:17 2017
New Revision: 1813142
URL: http://svn.apache.org/viewvc?rev=1813142&view=rev
Log:
cosmetics
Modified:
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java?rev=1813142&r1=1813141&r2=1813142&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java Tue Oct 24 07:13:17 2017
@@ -74,8 +74,8 @@ public class HtmlAjaxBehaviorRenderer ex
private static final String AJAX_SB = "oam.renderkit.AJAX_SB";
private static final String AJAX_PARAM_SB = "oam.renderkit.AJAX_PARAM_SB";
- public void decode(FacesContext context, UIComponent component,
- ClientBehavior behavior)
+ @Override
+ public void decode(FacesContext context, UIComponent component, ClientBehavior behavior)
{
assertBehavior(behavior);
AjaxBehavior ajaxBehavior = (AjaxBehavior) behavior;
@@ -87,9 +87,8 @@ public class HtmlAjaxBehaviorRenderer ex
dispatchBehaviorEvent(component, ajaxBehavior);
}
-
- public String getScript(ClientBehaviorContext behaviorContext,
- ClientBehavior behavior)
+ @Override
+ public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior behavior)
{
assertBehavior(behavior);
AjaxBehavior ajaxBehavior = (AjaxBehavior) behavior;
@@ -102,8 +101,7 @@ public class HtmlAjaxBehaviorRenderer ex
return makeAjax(behaviorContext, ajaxBehavior).toString();
}
-
- private final void dispatchBehaviorEvent(UIComponent component, AjaxBehavior ajaxBehavior)
+ private void dispatchBehaviorEvent(UIComponent component, AjaxBehavior ajaxBehavior)
{
AjaxBehaviorEvent event = new AjaxBehaviorEvent(component, ajaxBehavior);
@@ -116,9 +114,8 @@ public class HtmlAjaxBehaviorRenderer ex
{
isImmediate = isComponentImmediate(component);
}
- PhaseId phaseId = isImmediate ?
- PhaseId.APPLY_REQUEST_VALUES :
- PhaseId.INVOKE_APPLICATION;
+
+ PhaseId phaseId = isImmediate ? PhaseId.APPLY_REQUEST_VALUES : PhaseId.INVOKE_APPLICATION;
event.setPhaseId(phaseId);
@@ -126,7 +123,7 @@ public class HtmlAjaxBehaviorRenderer ex
}
- private final boolean isComponentImmediate(UIComponent component)
+ private boolean isComponentImmediate(UIComponent component)
{
boolean isImmediate = false;
if (component instanceof EditableValueHolder)
@@ -149,7 +146,7 @@ public class HtmlAjaxBehaviorRenderer ex
* @param behavior the behavior
* @return a fully working javascript with calls into jsf.js
*/
- private final StringBuilder makeAjax(ClientBehaviorContext context, AjaxBehavior behavior)
+ private StringBuilder makeAjax(ClientBehaviorContext context, AjaxBehavior behavior)
{
StringBuilder retVal = SharedStringBuilder.get(context.getFacesContext(), AJAX_SB, 60);
StringBuilder paramBuffer = SharedStringBuilder.get(context.getFacesContext(), AJAX_PARAM_SB, 20);
@@ -278,7 +275,7 @@ public class HtmlAjaxBehaviorRenderer ex
Collection<ClientBehaviorContext.Parameter> params = context.getParameters();
int paramSize = (params != null) ? params.size() : 0;
- List<String> parameterList = new ArrayList<String>(paramSize + 2);
+ List<String> parameterList = new ArrayList<>(paramSize + 2);
if (executes != null)
{
parameterList.add(executes);
@@ -405,7 +402,7 @@ public class HtmlAjaxBehaviorRenderer ex
return retVal;
}
- private final String mapToString(ClientBehaviorContext context, StringBuilder retVal,
+ private String mapToString(ClientBehaviorContext context, StringBuilder retVal,
String target, Collection<String> dataHolder)
{
//Clear buffer
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java?rev=1813142&r1=1813141&r2=1813142&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java Tue Oct 24 07:13:17 2017
@@ -39,16 +39,19 @@ public class HtmlCompositeComponentRende
//private static final Log log = LogFactory.getLog(HtmlCompositeComponentRenderer.class);
private static final Logger log = Logger.getLogger(HtmlCompositeComponentRenderer.class.getName());
+ @Override
public boolean getRendersChildren()
{
return true;
}
+ @Override
public void encodeBegin(FacesContext context, UIComponent component)
throws IOException
{
}
+ @Override
public void encodeChildren(FacesContext context, UIComponent component)
throws IOException
{
@@ -66,6 +69,7 @@ public class HtmlCompositeComponentRende
compositeFacet.encodeAll(context);
}
+ @Override
public void encodeEnd(FacesContext context, UIComponent component)
throws IOException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java?rev=1813142&r1=1813141&r2=1813142&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java Tue Oct 24 07:13:17 2017
@@ -34,17 +34,19 @@ import org.apache.myfaces.shared.renderk
@JSFRenderer(renderKitId = "HTML_BASIC", family = "javax.faces.Output", type = "javax.faces.CompositeFacet")
public class HtmlCompositeFacetRenderer extends HtmlRenderer
{
-
+ @Override
public boolean getRendersChildren()
{
return true;
}
+ @Override
public void encodeBegin(FacesContext context, UIComponent component)
throws IOException
{
}
+ @Override
public void encodeChildren(FacesContext context, UIComponent component)
throws IOException
{
@@ -81,6 +83,7 @@ public class HtmlCompositeFacetRenderer
}
}
+ @Override
public void encodeEnd(FacesContext context, UIComponent component)
throws IOException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java?rev=1813142&r1=1813141&r2=1813142&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java Tue Oct 24 07:13:17 2017
@@ -179,7 +179,7 @@ public class HtmlFormatRenderer extends
UIParameter param = validParams.get(i);
if (argsList == null)
{
- argsList = new ArrayList<Object>();
+ argsList = new ArrayList<>();
}
argsList.add(param.getValue());
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java?rev=1813142&r1=1813141&r2=1813142&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java Tue Oct 24 07:13:17 2017
@@ -165,6 +165,7 @@ public class HtmlRenderKitImpl extends R
}
}
+ @Override
public void addRenderer(String componentFamily, String rendererType, String rendererClass)
{
if (componentFamily == null)
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java?rev=1813142&r1=1813141&r2=1813142&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java Tue Oct 24 07:13:17 2017
@@ -58,11 +58,11 @@ import org.apache.myfaces.view.facelets.
@ListenerFor(systemEventClass = PostAddToViewEvent.class)
public class HtmlScriptRenderer extends Renderer implements ComponentSystemEventListener
{
- //private static final Log log = LogFactory.getLog(HtmlScriptRenderer.class);
private static final Logger log = Logger.getLogger(HtmlScriptRenderer.class.getName());
private static final String IS_BUILDING_INITIAL_STATE = "javax.faces.IS_BUILDING_INITIAL_STATE";
+ @Override
public void processEvent(ComponentSystemEvent event)
{
if (event instanceof PostAddToViewEvent)
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java?rev=1813142&r1=1813141&r2=1813142&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java Tue Oct 24 07:13:17 2017
@@ -65,8 +65,6 @@ import org.apache.myfaces.view.facelets.
*/
final class DefaultFacelet extends AbstractFacelet
{
-
- //private static final Logger log = Logger.getLogger("facelets.facelet");
private static final Logger log = Logger.getLogger(DefaultFacelet.class.getName());
private final static String APPLIED_KEY = "org.apache.myfaces.view.facelets.APPLIED";
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java?rev=1813142&r1=1813141&r2=1813142&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java Tue Oct 24 07:13:17 2017
@@ -50,8 +50,6 @@ import org.apache.myfaces.view.facelets.
@JSFFaceletTag(name="ui:composition")
public final class CompositionHandler extends TagHandler implements TemplateClient
{
-
- //private static final Logger log = Logger.getLogger("facelets.tag.ui.composition");
private static final Logger log = Logger.getLogger(CompositionHandler.class.getName());
public final static String NAME = "composition";