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/09/05 21:08:25 UTC
svn commit: r1807411 - in
/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces:
push/WebsocketComponentRenderer.java view/facelets/compiler/UILeaf.java
view/facelets/component/UIRepeat.java
Author: tandraschko
Date: Tue Sep 5 21:08:25 2017
New Revision: 1807411
URL: http://svn.apache.org/viewvc?rev=1807411&view=rev
Log:
cosmetics + removed duplicate SharedStringBuilder impl
Modified:
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/push/WebsocketComponentRenderer.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/push/WebsocketComponentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/push/WebsocketComponentRenderer.java?rev=1807411&r1=1807410&r2=1807411&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/push/WebsocketComponentRenderer.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/push/WebsocketComponentRenderer.java Tue Sep 5 21:08:25 2017
@@ -80,6 +80,7 @@ public class WebsocketComponentRenderer
return HtmlBufferResponseWriterWrapper.getInstance(context.getResponseWriter());
}
+ @Override
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException
{
ResponseWriter writer = facesContext.getResponseWriter();
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java?rev=1807411&r1=1807410&r2=1807411&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java Tue Sep 5 21:08:25 2017
@@ -51,8 +51,8 @@ import org.apache.myfaces.view.facelets.
class UILeaf extends UIComponent implements UntargetableComponent, Map<String, Object>
{
//-------------- START TAKEN FROM UIComponentBase ----------------
- private static final String _STRING_BUILDER_KEY
- = "javax.faces.component.UIComponentBase.SHARED_STRING_BUILDER";
+ private static final String STRING_BUILDER_KEY
+ = UILeaf.class.getName() + ".SHARED_STRING_BUILDER";
private String _clientId = null;
@@ -116,7 +116,7 @@ class UILeaf extends UIComponent impleme
String containerClientId = namingContainer.getContainerClientId(context);
if (containerClientId != null)
{
- StringBuilder sb = SharedStringBuilder.get(context, _STRING_BUILDER_KEY);
+ StringBuilder sb = SharedStringBuilder.get(context, STRING_BUILDER_KEY);
_clientId = sb.append(containerClientId).append(
context.getNamingContainerSeparatorChar()).append(id).toString();
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java?rev=1807411&r1=1807410&r2=1807411&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java Tue Sep 5 21:08:25 2017
@@ -58,6 +58,7 @@ import javax.faces.render.Renderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
import org.apache.myfaces.cdi.model.DataModelBuilderProxy;
+import org.apache.myfaces.shared.renderkit.html.util.SharedStringBuilder;
import org.apache.myfaces.util.ExternalSpecifications;
/**
@@ -70,6 +71,9 @@ public class UIRepeat extends UIComponen
public static final String COMPONENT_FAMILY = "facelets";
+ private static final String STRING_BUILDER_KEY
+ = UIRepeat.class.getName() + ".SHARED_STRING_BUILDER";
+
//private static final String SKIP_ITERATION_HINT = "javax.faces.visit.SKIP_ITERATION";
private final static DataModel<?> EMPTY_MODEL = new ListDataModel<Object>(Collections.emptyList());
@@ -101,7 +105,6 @@ public class UIRepeat extends UIComponen
private int _index = -1;
- private transient StringBuilder _clientIdBuffer;
private transient Object _origValue;
private transient Object _origVarStatus;
@@ -116,6 +119,7 @@ public class UIRepeat extends UIComponen
setRendererType("facelets.ui.Repeat");
}
+ @Override
public String getFamily()
{
return COMPONENT_FAMILY;
@@ -319,8 +323,8 @@ public class UIRepeat extends UIComponen
return clientId;
}
- StringBuilder bld = _getBuffer(); //SharedStringBuilder(context);
- return bld.append(clientId).append(context.getNamingContainerSeparatorChar()).append(index).toString();
+ StringBuilder sb = SharedStringBuilder.get(context, STRING_BUILDER_KEY);
+ return sb.append(clientId).append(context.getNamingContainerSeparatorChar()).append(index).toString();
}
private RepeatStatus _getRepeatStatus()
@@ -349,18 +353,6 @@ public class UIRepeat extends UIComponen
_origVarStatus = getFacesContext().getExternalContext().getRequestMap().get(varStatus);
}
}
-
- private StringBuilder _getBuffer()
- {
- if (_clientIdBuffer == null)
- {
- _clientIdBuffer = new StringBuilder();
- }
-
- _clientIdBuffer.setLength(0);
-
- return _clientIdBuffer;
- }
private boolean _isIndexAvailable()
{
@@ -1506,11 +1498,13 @@ public class UIRepeat extends UIComponen
_target.setPhaseId(phaseId);
}
+ @Override
public boolean isAppropriateListener(FacesListener listener)
{
return _target.isAppropriateListener(listener);
}
+ @Override
public void processListener(FacesListener listener)
{
UIRepeat owner = (UIRepeat) getComponent();