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 15:38:07 UTC
svn commit: r1541918 - in /myfaces/core/trunk:
api/src/main/java/javax/faces/component/
api/src/main/java/javax/faces/convert/ api/src/main/java/javax/faces/event/
api/src/main/java/javax/faces/validator/
api/src/main/java/javax/faces/webapp/ impl/src/...
Author: lu4242
Date: Thu Nov 14 14:38:06 2013
New Revision: 1541918
URL: http://svn.apache.org/r1541918
Log:
MYFACES-3822 General cleanup and remove unused web config params
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentUtils.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_LabeledFacesMessage.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/_LabeledFacesMessage.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionActionListener.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionValueChangeListener.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/RegexValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/RequiredValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/_LabeledFacesMessage.java
myfaces/core/trunk/api/src/main/java/javax/faces/webapp/PreJsf2ExceptionHandlerFactory.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/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/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.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/HtmlJavaScriptUtils.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
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java Thu Nov 14 14:38:06 2013
@@ -488,7 +488,7 @@ public abstract class UIComponent
honorCurrentComponentAttributes = _getHonorCurrentComponentAttributes(context);
}
- if (honorCurrentComponentAttributes == Boolean.TRUE)
+ if (Boolean.TRUE.equals(honorCurrentComponentAttributes))
{
return (UIComponent) context.getAttributes().get(UIComponent.CURRENT_COMPONENT);
}
@@ -538,7 +538,7 @@ public abstract class UIComponent
honorCurrentComponentAttributes = _getHonorCurrentComponentAttributes(context);
}
- if (honorCurrentComponentAttributes == Boolean.TRUE)
+ if (Boolean.TRUE.equals(honorCurrentComponentAttributes))
{
return (UIComponent) context.getAttributes().get(UIComponent.CURRENT_COMPOSITE_COMPONENT);
}
@@ -1141,7 +1141,7 @@ public abstract class UIComponent
_honorCurrentComponentAttributes = _getHonorCurrentComponentAttributes(context);
}
- if (_honorCurrentComponentAttributes == Boolean.TRUE)
+ if (Boolean.TRUE.equals(_honorCurrentComponentAttributes))
{
// Pop the current UIComponent from the FacesContext attributes map so that the previous
// UIComponent, if any, becomes the current component.
@@ -1183,29 +1183,26 @@ public abstract class UIComponent
}
oldCurrent = (UIComponent) contextAttributes.put(UIComponent.CURRENT_COMPONENT, newCurrent);
- if (oldCurrent != null && oldCurrent._isCompositeComponent())
+ if (oldCurrent != null && oldCurrent._isCompositeComponent() && newCurrent != null)
{
// Recalculate the current composite component
- if (newCurrent != null)
+ if (newCurrent._isCompositeComponent())
{
- if (newCurrent._isCompositeComponent())
- {
- contextAttributes.put(UIComponent.CURRENT_COMPOSITE_COMPONENT, newCurrent);
- }
- else
+ contextAttributes.put(UIComponent.CURRENT_COMPOSITE_COMPONENT, newCurrent);
+ }
+ else
+ {
+ UIComponent previousCompositeComponent = null;
+ for (int i = componentStack.size()-1; i >= 0; i--)
{
- UIComponent previousCompositeComponent = null;
- for (int i = componentStack.size()-1; i >= 0; i--)
+ UIComponent component = componentStack.get(i);
+ if (component._isCompositeComponent())
{
- UIComponent component = componentStack.get(i);
- if (component._isCompositeComponent())
- {
- previousCompositeComponent = component;
- break;
- }
+ previousCompositeComponent = component;
+ break;
}
- contextAttributes.put(UIComponent.CURRENT_COMPOSITE_COMPONENT, previousCompositeComponent);
}
+ contextAttributes.put(UIComponent.CURRENT_COMPOSITE_COMPONENT, previousCompositeComponent);
}
}
}
@@ -1266,7 +1263,7 @@ public abstract class UIComponent
_honorCurrentComponentAttributes = _getHonorCurrentComponentAttributes(context);
}
- if (_honorCurrentComponentAttributes == Boolean.TRUE)
+ if (Boolean.TRUE.equals(_honorCurrentComponentAttributes))
{
UIComponent currentComponent = (UIComponent) contextAttributes.get(UIComponent.CURRENT_COMPONENT);
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java Thu Nov 14 14:38:06 2013
@@ -59,8 +59,6 @@ import java.util.logging.Logger;
/**
- * TODO: IMPLEMENT HERE - Delta state saving support
- *
* Standard implementation of the UIComponent base class; all standard JSF components extend this class.
* <p>
* <i>Disclaimer</i>: The official definition for the behaviour of this class is the JSF 1.1 specification but for legal
@@ -202,7 +200,7 @@ public abstract class UIComponentBase ex
_updateInView(this, false);
}
}
- _parent = parent;
+ _parent = null;
}
else
{
@@ -654,12 +652,12 @@ public abstract class UIComponentBase ex
@Override
public void encodeEnd(FacesContext context) throws IOException
{
+ if (context == null)
+ {
+ throw new NullPointerException("context");
+ }
try
{
- if (context == null)
- {
- throw new NullPointerException("context");
- }
setCachedFacesContext(context);
if (isRendered())
{
@@ -717,7 +715,7 @@ public abstract class UIComponentBase ex
return null;
}
- char separatorChar = UINamingContainer.getSeparatorChar(getFacesContext());
+ char separatorChar = getFacesContext().getNamingContainerSeparatorChar();
UIComponent findBase;
if (expr.charAt(0) == separatorChar)
{
@@ -959,7 +957,7 @@ public abstract class UIComponentBase ex
{
StringBuilder bld = _getSharedStringBuilder(context);
_clientId = bld.append(containerClientId).append(
- UINamingContainer.getSeparatorChar(context)).append(id).toString();
+ context.getNamingContainerSeparatorChar()).append(id).toString();
}
else
{
@@ -1149,13 +1147,6 @@ public abstract class UIComponentBase ex
return null;
}
- public boolean initialStateMarked()
- {
- // TODO: IMPLEMENT HERE
- // FIXME: Nofity EG, this method should be in the specification
- return super.initialStateMarked();
- }
-
/**
* <code>invokeOnComponent</code> must be implemented in <code>UIComponentBase</code> too...
*/
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java Thu Nov 14 14:38:06 2013
@@ -271,7 +271,7 @@ public class UIData extends UIComponentB
}
};
- private class EditableValueHolderState
+ private static class EditableValueHolderState
{
private final Object _value;
private final boolean _localValueSet;
@@ -358,7 +358,7 @@ public class UIData extends UIComponentB
{
// Check if the clientId for the component, which we
// are looking for, has a rowIndex attached
- char separator = UINamingContainer.getSeparatorChar(context);
+ char separator = context.getNamingContainerSeparatorChar();
String subId = clientId.substring(baseClientId.length() + 1);
//If the char next to baseClientId is the separator one and
//the subId matches the regular expression
@@ -1061,13 +1061,11 @@ public class UIData extends UIComponentB
@Override
public void markInitialState()
{
- if (isRowStatePreserved())
+ if (isRowStatePreserved() &&
+ getFacesContext().getAttributes().containsKey(StateManager.IS_BUILDING_INITIAL_STATE))
{
- if (getFacesContext().getAttributes().containsKey(StateManager.IS_BUILDING_INITIAL_STATE))
- {
- _initialDescendantFullComponentState
- = saveDescendantInitialComponentStates(getFacesContext(), getChildren().iterator(), false);
- }
+ _initialDescendantFullComponentState
+ = saveDescendantInitialComponentStates(getFacesContext(), getChildren().iterator(), false);
}
super.markInitialState();
}
@@ -1549,7 +1547,7 @@ public class UIData extends UIComponentB
}
StringBuilder bld = _getSharedStringBuilder(context);
- return bld.append(clientId).append(UINamingContainer.getSeparatorChar(context)).append(rowIndex).toString();
+ return bld.append(clientId).append(context.getNamingContainerSeparatorChar()).append(rowIndex).toString();
}
/**
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java Thu Nov 14 14:38:06 2013
@@ -284,16 +284,6 @@ public class UIForm extends UIComponentB
}
@Override
- public Object saveState(FacesContext context)
- {
- // The saveState() method of UIForm must call setSubmitted(false) before calling super.saveState() as an
- // extra precaution to ensure the submitted state is not persisted across requests.
- //setSubmitted(false);
-
- return super.saveState(context);
- }
-
- @Override
public boolean visitTree(VisitContext context, VisitCallback callback)
{
if (!isPrependId())
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java Thu Nov 14 14:38:06 2013
@@ -379,20 +379,6 @@ public class UISelectMany extends UIInpu
}
}
- /**
- * First part is identical to super.validate except the empty condition. Second part: iterate through UISelectItem
- * and UISelectItems and check current values against these items
- */
- @Override
- public void validate(FacesContext context)
- {
- // TODO : Setting the submitted value to null in the super class causes a bug, if set to
- // null, you'll get the following error :
- // java.lang.NullPointerException at
- //org.apache.myfaces.renderkit._SharedRendererUtils.getConvertedUISelectManyValue(_SharedRendererUtils.java:118)
- super.validate(context);
- }
-
@Override
protected Object getConvertedValue(FacesContext context, Object submittedValue) throws ConverterException
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java Thu Nov 14 14:38:06 2013
@@ -162,12 +162,6 @@ public class UIViewParameter extends UII
return converter.getAsString (context, this, value);
}
- @Override
- public Object getSubmittedValue()
- {
- return super.getSubmittedValue();
- }
-
@JSFProperty(tagExcluded=true)
@Override
public boolean isImmediate()
@@ -267,6 +261,10 @@ public class UIViewParameter extends UII
return delegateRenderer;
}
+ /**
+ * The idea of this method is to be called from AbstractFacesInitializer.
+ */
+ @SuppressWarnings("unused")
private static void releaseRenderer()
{
if (log.isLoggable(Level.FINEST))
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java Thu Nov 14 14:38:06 2013
@@ -616,19 +616,6 @@ public class UIViewRoot extends UICompon
}
/**
- * DO NOT USE.
- * <p>
- * As this component has no "id" property, it has no clientId property either.
- */
- @Override
- public String getClientId(FacesContext context)
- {
- return super.getClientId(context);
- // Call parent method due to TCK problems
- // return null;
- }
-
- /**
* @since 2.0
*/
public List<UIComponent> getComponentResources(FacesContext context, String target)
@@ -1278,26 +1265,10 @@ public class UIViewRoot extends UICompon
// throw new UnsupportedOperationException();
}
- /**
- * DO NOT USE.
- * <p>
- * Although this class extends a base-class that defines a read/write id property, it makes no sense for this
- * particular subclass to support it. The tag library does not export this property for use, but there is no way to
- * "undeclare" a java method. Yes, this is broken OO design: direct all complaints to the JSF spec group.
- * <p>
- * This property should be disabled (ie throw an exception if invoked). However there are currently several places
- * that call this method (eg during restoreState) so it just does the normal thing for the moment. TODO: fix callers
- * then make this throw an exception.
- *
- * @JSFProperty tagExcluded="true"
- */
+ @JSFProperty(tagExcluded=true)
@Override
public void setId(String id)
{
- // throw new UnsupportedOperationException();
-
- // Leave enabled for now. Things like the TreeStructureManager call this,
- // even though they probably should not.
super.setId(id);
}
@@ -1838,7 +1809,7 @@ public class UIViewRoot extends UICompon
/**
* Agregates events for ANY_PHASE and current phase
*/
- private class Events
+ private static class Events
{
private final List<FacesEvent> _anyPhase;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentUtils.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentUtils.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentUtils.java Thu Nov 14 14:38:06 2013
@@ -136,7 +136,7 @@ class _ComponentUtils
*/
static UIComponent findComponent(UIComponent findBase, String id, final char separatorChar)
{
- if (!(findBase instanceof NamingContainer) && idsAreEqual(id, findBase, separatorChar))
+ if (!(findBase instanceof NamingContainer) && idsAreEqual(id, findBase))
{
return findBase;
}
@@ -154,7 +154,7 @@ class _ComponentUtils
return find;
}
}
- else if (idsAreEqual(id, facet, separatorChar))
+ else if (idsAreEqual(id, facet))
{
return facet;
}
@@ -172,13 +172,13 @@ class _ComponentUtils
return find;
}
}
- else if (idsAreEqual(id, child, separatorChar))
+ else if (idsAreEqual(id, child))
{
return child;
}
}
- if (findBase instanceof NamingContainer && idsAreEqual(id, findBase, separatorChar))
+ if (findBase instanceof NamingContainer && idsAreEqual(id, findBase))
{
return findBase;
}
@@ -254,35 +254,16 @@ class _ComponentUtils
* Return true if the specified component matches the provided id. This needs some quirks to handle components whose
* id value gets dynamically "tweaked", eg a UIData component whose id gets the current row index appended to it.
*/
- private static boolean idsAreEqual(String id, UIComponent cmp, final char separatorChar)
+ private static boolean idsAreEqual(String id, UIComponent cmp)
{
if (id.equals(cmp.getId()))
{
return true;
}
- /* By the spec, findComponent algorithm does not take into account UIData.rowIndex() property,
- * because it just scan over nested plain ids.
- if (cmp instanceof UIData)
- {
- UIData uiData = ((UIData)cmp);
-
- if (uiData.getRowIndex() == -1)
- {
- return dynamicIdIsEqual(id, cmp.getId());
- }
- return id.equals(cmp.getId() + separatorChar + uiData.getRowIndex());
- }
- */
-
return false;
}
- private static boolean dynamicIdIsEqual(String dynamicId, String id)
- {
- return dynamicId.matches(id + ":[0-9]*");
- }
-
static void callValidators(FacesContext context, UIInput input, Object convertedValue)
{
// first invoke the list of validator components
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_LabeledFacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_LabeledFacesMessage.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_LabeledFacesMessage.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_LabeledFacesMessage.java Thu Nov 14 14:38:06 2013
@@ -34,12 +34,6 @@ class _LabeledFacesMessage extends Faces
super();
}
- public _LabeledFacesMessage(Severity severity, String summary, String detail, Object args[])
- {
- super(severity, summary, detail);
-
- }
-
public _LabeledFacesMessage(Severity severity, String summary, String detail)
{
super(severity, summary, detail);
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java Thu Nov 14 14:38:06 2013
@@ -161,19 +161,17 @@ class _SharedRendererUtils
converter = facesContext.getApplication().createConverter(
componentType);
- if (converter == null)
+ if (converter == null && !Object.class.equals(componentType))
{
// could not obtain a Converter
// --> check if we maybe do not really have to convert
- if (!Object.class.equals(componentType))
- {
- // target is not an Object array
- // and not a String array (checked some lines above)
- // and we do not have a Converter
- throw new ConverterException(
- "Could not obtain a Converter for "
- + componentType.getName());
- }
+
+ // target is not an Object array
+ // and not a String array (checked some lines above)
+ // and we do not have a Converter
+ throw new ConverterException(
+ "Could not obtain a Converter for "
+ + componentType.getName());
}
}
// instantiate the array
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java Thu Nov 14 14:38:06 2013
@@ -62,13 +62,6 @@ public class NumberConverter
public static final String PATTERN_ID = "javax.faces.converter.NumberConverter.PATTERN";
public static final String PERCENT_ID = "javax.faces.converter.NumberConverter.PERCENT";
- private static final boolean JAVA_VERSION_14;
-
- static
- {
- JAVA_VERSION_14 = checkJavaVersion14();
- }
-
private String _currencyCode;
private String _currencySymbol;
private Locale _locale;
@@ -283,14 +276,7 @@ public class NumberConverter
}
boolean useCurrencyCode;
- if (JAVA_VERSION_14)
- {
- useCurrencyCode = _currencyCode != null;
- }
- else
- {
- useCurrencyCode = _currencySymbol == null;
- }
+ useCurrencyCode = _currencyCode != null;
if (useCurrencyCode)
{
@@ -573,61 +559,6 @@ public class NumberConverter
clearInitialState();
}
- private static boolean checkJavaVersion14()
- {
- String version = System.getProperty("java.version");
- if (version == null)
- {
- return false;
- }
- byte java14 = 0;
- for (int idx = version.indexOf('.'), i = 0; idx > 0 || version != null; i++)
- {
- if (idx > 0)
- {
- byte value = Byte.parseByte(version.substring(0, 1));
- version = version.substring(idx + 1, version.length());
- idx = version.indexOf('.');
- switch (i)
- {
- case 0:
- if (value == 1)
- {
- java14 = 1;
- break;
- }
- else if (value > 1)
- {
- java14 = 2;
- }
- // fallthru
- case 1:
- if (java14 > 0 && value >= 4)
- {
- java14 = 2;
- }
- //;
- // fallthru
- default:
- idx = 0;
- version = null;
- break;
- }
- }
- else
- {
- byte value = Byte.parseByte(version.substring(0, 1));
- if (java14 > 0 && value >= 4)
- {
- java14 = 2;
- }
- break;
- }
- }
- return java14 == 2;
- }
-
-
private DecimalFormatSymbols getDecimalFormatSymbols()
{
return new DecimalFormatSymbols(getLocale());
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/_LabeledFacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/_LabeledFacesMessage.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/_LabeledFacesMessage.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/_LabeledFacesMessage.java Thu Nov 14 14:38:06 2013
@@ -34,11 +34,6 @@ class _LabeledFacesMessage extends Faces
super();
}
- public _LabeledFacesMessage(Severity severity, String summary, String detail, Object args[])
- {
- super(severity, summary, detail);
- }
-
public _LabeledFacesMessage(Severity severity, String summary, String detail)
{
super(severity, summary, detail);
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionActionListener.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionActionListener.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionActionListener.java Thu Nov 14 14:38:06 2013
@@ -103,7 +103,7 @@ public class MethodExpressionActionListe
{
do
{
- if (cause != null && cause instanceof AbortProcessingException)
+ if (cause instanceof AbortProcessingException)
{
ape = (AbortProcessingException) cause;
break;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionValueChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionValueChangeListener.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionValueChangeListener.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionValueChangeListener.java Thu Nov 14 14:38:06 2013
@@ -100,7 +100,7 @@ public class MethodExpressionValueChange
{
do
{
- if (cause != null && cause instanceof AbortProcessingException)
+ if (cause instanceof AbortProcessingException)
{
ape = (AbortProcessingException) cause;
break;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java Thu Nov 14 14:38:06 2013
@@ -439,12 +439,14 @@ public class BeanValidator implements Va
}
@JSFProperty
+ @SuppressWarnings("unused")
private Boolean isDisabled()
{
return null;
}
@JSFProperty
+ @SuppressWarnings("unused")
private String getFor()
{
return null;
@@ -537,7 +539,7 @@ final class _ValueReferenceWrapper
* The object the reference points to.
* @return base.
*/
- public final Object getBase()
+ public Object getBase()
{
return base;
}
@@ -546,7 +548,7 @@ final class _ValueReferenceWrapper
* The property the reference points to.
* @return property.
*/
- public final Object getProperty()
+ public Object getProperty()
{
return property;
}
@@ -622,27 +624,27 @@ final class _ValueReferenceResolver exte
}
// ############################ Standard delegating implementations ############################
- public final Class<?> getType(final ELContext ctx, final Object base, final Object property)
+ public Class<?> getType(final ELContext ctx, final Object base, final Object property)
{
return resolver.getType(ctx, base, property);
}
- public final void setValue(final ELContext ctx, final Object base, final Object property, final Object value)
+ public void setValue(final ELContext ctx, final Object base, final Object property, final Object value)
{
resolver.setValue(ctx, base, property, value);
}
- public final boolean isReadOnly(final ELContext ctx, final Object base, final Object property)
+ public boolean isReadOnly(final ELContext ctx, final Object base, final Object property)
{
return resolver.isReadOnly(ctx, base, property);
}
- public final Iterator<FeatureDescriptor> getFeatureDescriptors(final ELContext ctx, final Object base)
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(final ELContext ctx, final Object base)
{
return resolver.getFeatureDescriptors(ctx, base);
}
- public final Class<?> getCommonPropertyType(final ELContext ctx, final Object base)
+ public Class<?> getCommonPropertyType(final ELContext ctx, final Object base)
{
return resolver.getCommonPropertyType(ctx, base);
}
@@ -674,48 +676,48 @@ final class _ELContextDecorator extends
* @return The ELResolver passed into the constructor.
*/
@Override
- public final ELResolver getELResolver()
+ public ELResolver getELResolver()
{
return interceptingResolver;
}
// ############################ Standard delegating implementations ############################
- public final FunctionMapper getFunctionMapper()
+ public FunctionMapper getFunctionMapper()
{
return ctx.getFunctionMapper();
}
- public final VariableMapper getVariableMapper()
+ public VariableMapper getVariableMapper()
{
return ctx.getVariableMapper();
}
- public final void setPropertyResolved(final boolean resolved)
+ public void setPropertyResolved(final boolean resolved)
{
ctx.setPropertyResolved(resolved);
}
- public final boolean isPropertyResolved()
+ public boolean isPropertyResolved()
{
return ctx.isPropertyResolved();
}
- public final void putContext(final Class key, Object contextObject)
+ public void putContext(final Class key, Object contextObject)
{
ctx.putContext(key, contextObject);
}
- public final Object getContext(final Class key)
+ public Object getContext(final Class key)
{
return ctx.getContext(key);
}
- public final Locale getLocale()
+ public Locale getLocale()
{
return ctx.getLocale();
}
- public final void setLocale(final Locale locale)
+ public void setLocale(final Locale locale)
{
ctx.setLocale(locale);
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java Thu Nov 14 14:38:06 2013
@@ -261,12 +261,14 @@ public class DoubleRangeValidator
}
@JSFProperty(faceletsOnly=true)
+ @SuppressWarnings("unused")
private Boolean isDisabled()
{
return null;
}
@JSFProperty(faceletsOnly=true)
+ @SuppressWarnings("unused")
private String getFor()
{
return null;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java Thu Nov 14 14:38:06 2013
@@ -238,12 +238,14 @@ public class LengthValidator
}
@JSFProperty(faceletsOnly=true)
+ @SuppressWarnings("unused")
private Boolean isDisabled()
{
return null;
}
@JSFProperty(faceletsOnly=true)
+ @SuppressWarnings("unused")
private String getFor()
{
return null;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/RegexValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/RegexValidator.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/RegexValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/RegexValidator.java Thu Nov 14 14:38:06 2013
@@ -238,12 +238,14 @@ public class RegexValidator implements V
}
@JSFProperty(faceletsOnly=true)
+ @SuppressWarnings("unused")
private Boolean isDisabled()
{
return null;
}
@JSFProperty(faceletsOnly=true)
+ @SuppressWarnings("unused")
private String getFor()
{
return null;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/RequiredValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/RequiredValidator.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/RequiredValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/RequiredValidator.java Thu Nov 14 14:38:06 2013
@@ -88,12 +88,14 @@ public class RequiredValidator implement
}
@JSFProperty(faceletsOnly=true)
+ @SuppressWarnings("unused")
private Boolean isDisabled()
{
return null;
}
@JSFProperty(faceletsOnly=true)
+ @SuppressWarnings("unused")
private String getFor()
{
return null;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/_LabeledFacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/_LabeledFacesMessage.java?rev=1541918&r1=1541917&r2=1541918&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/_LabeledFacesMessage.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/_LabeledFacesMessage.java Thu Nov 14 14:38:06 2013
@@ -34,12 +34,6 @@ class _LabeledFacesMessage extends Faces
super();
}
- public _LabeledFacesMessage(Severity severity, String summary, String detail, Object args[])
- {
- super(severity, summary, detail);
-
- }
-
public _LabeledFacesMessage(Severity severity, String summary, String detail)
{
super(severity, summary, detail);
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=1541918&r1=1541917&r2=1541918&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 Thu Nov 14 14:38:06 2013
@@ -43,8 +43,6 @@ import org.apache.myfaces.buildtools.mav
*/
public class PreJsf2ExceptionHandlerFactory extends ExceptionHandlerFactory
{
- //private static final Log log = LogFactory.getLog (PreJsf2ExceptionHandlerFactory.class);
- private static final Logger log = Logger.getLogger(PreJsf2ExceptionHandlerFactory.class.getName());
public PreJsf2ExceptionHandlerFactory()
{
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=1541918&r1=1541917&r2=1541918&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 Thu Nov 14 14:38:06 2013
@@ -293,7 +293,7 @@ public class PartialVisitContext extends
// out the trailing id segmetn.
private String _getIdFromClientId(String clientId)
{
- final char separator = UINamingContainer.getSeparatorChar(_facesContext);
+ final char separator = getFacesContext().getNamingContainerSeparatorChar();
int lastIndex = clientId.lastIndexOf(separator);
String id = null;
@@ -323,7 +323,7 @@ public class PartialVisitContext extends
// each ancestor NamingContainer client id. For each ancestor
// NamingContainer, add an entry into the map for the full client
// id.
- final char separator = UINamingContainer.getSeparatorChar(_facesContext);
+ final char separator = getFacesContext().getNamingContainerSeparatorChar();
int length = clientId.length();
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=1541918&r1=1541917&r2=1541918&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 Thu Nov 14 14:38:06 2013
@@ -453,7 +453,8 @@ public class HtmlAjaxBehaviorRenderer ex
UIComponent target = contextComponent.findComponent(id);
if (target == null)
{
- target = contextComponent.findComponent(UINamingContainer.getSeparatorChar(context.getFacesContext()) + id);
+ target = contextComponent.findComponent(
+ context.getFacesContext().getNamingContainerSeparatorChar() + id);
}
if (target != null)
{
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=1541918&r1=1541917&r2=1541918&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 Thu Nov 14 14:38:06 2013
@@ -117,7 +117,7 @@ class UILeaf extends UIComponent impleme
{
StringBuilder bld = _getSharedStringBuilder(context);
_clientId = bld.append(containerClientId).append(
- UINamingContainer.getSeparatorChar(context)).append(id).toString();
+ context.getNamingContainerSeparatorChar()).append(id).toString();
}
else
{
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=1541918&r1=1541917&r2=1541918&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 Thu Nov 14 14:38:06 2013
@@ -268,7 +268,7 @@ public class UIRepeat extends UIComponen
}
StringBuilder bld = _getBuffer(); //SharedStringBuilder(context);
- return bld.append(clientId).append(UINamingContainer.getSeparatorChar(context)).append(index).toString();
+ return bld.append(clientId).append(context.getNamingContainerSeparatorChar()).append(index).toString();
}
private RepeatStatus _getRepeatStatus()
@@ -1011,7 +1011,7 @@ public class UIRepeat extends UIComponen
{
// Check if the clientId for the component, which we
// are looking for, has a rowIndex attached
- char separator = UINamingContainer.getSeparatorChar(context);
+ char separator = context.getNamingContainerSeparatorChar();
String subId = clientId.substring(baseClientId.length() + 1);
//If the char next to baseClientId is the separator one and
//the subId matches the regular expression
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=1541918&r1=1541917&r2=1541918&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 Thu Nov 14 14:38:06 2013
@@ -69,7 +69,7 @@ public class AttachedObjectTargetImpl im
if (targetsArray.length > 0)
{
List<UIComponent> targetsList = new ArrayList<UIComponent>(targetsArray.length);
- final char separatorChar = UINamingContainer.getSeparatorChar(facesContext);
+ final char separatorChar = facesContext.getNamingContainerSeparatorChar();
UIComponent facetBase = topLevelComponent.getFacet(UIComponent.COMPOSITE_FACET_NAME);
for (String target : targetsArray)
{
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=1541918&r1=1541917&r2=1541918&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 Thu Nov 14 14:38:06 2013
@@ -639,7 +639,7 @@ public final class ComponentSupport
public static UIComponent findComponentChildOrFacetFrom(FacesContext facesContext, UIComponent parent, String expr)
{
- final char separatorChar = UINamingContainer.getSeparatorChar(facesContext);
+ final char separatorChar = facesContext.getNamingContainerSeparatorChar();
int separator = expr.indexOf(separatorChar);
if (separator == -1)
{
@@ -719,7 +719,7 @@ public final class ComponentSupport
public static String getFindComponentExpression(FacesContext facesContext, UIComponent component)
{
- char separatorChar = UINamingContainer.getSeparatorChar(facesContext);
+ char separatorChar = facesContext.getNamingContainerSeparatorChar();
UIComponent parent = component.getParent();
StringBuilder sb = new StringBuilder();
sb.append(component.getId());
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=1541918&r1=1541917&r2=1541918&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 Thu Nov 14 14:38:06 2013
@@ -206,7 +206,7 @@ public final class RendererUtils
{
if (parent instanceof NamingContainer)
{
- idBuf.insert(0, UINamingContainer.getSeparatorChar(context));
+ idBuf.insert(0, context.getNamingContainerSeparatorChar());
idBuf.insert(0, parent.getId());
}
}
@@ -1263,8 +1263,7 @@ public final class RendererUtils
UIComponent forComponent = uiComponent.findComponent(forAttr);
if (forComponent == null)
{
- final char separatorChar = UINamingContainer
- .getSeparatorChar(facesContext);
+ final char separatorChar = facesContext.getNamingContainerSeparatorChar();
Level level = Level.WARNING;
boolean productionStage = facesContext.isProjectStage(ProjectStage.Production);
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=1541918&r1=1541917&r2=1541918&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 Thu Nov 14 14:38:06 2013
@@ -335,7 +335,7 @@ public class HtmlCheckboxRendererBase ex
String clientId = uiComponent.getClientId(facesContext);
String itemId = (itemNum == null)? null : clientId +
- UINamingContainer.getSeparatorChar(facesContext) + itemNum;
+ facesContext.getNamingContainerSeparatorChar() + itemNum;
ResponseWriter writer = facesContext.getResponseWriter();
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=1541918&r1=1541917&r2=1541918&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 Thu Nov 14 14:38:06 2013
@@ -131,8 +131,7 @@ public final class HtmlJavaScriptUtils
ScriptContext context, boolean autoScroll)
{
- final char separatorChar = UINamingContainer
- .getSeparatorChar(facesContext);
+ final char separatorChar = facesContext.getNamingContainerSeparatorChar();
context.prettyLine();
//render a function to create a hidden input, if it doesn't exist
@@ -535,8 +534,7 @@ public final class HtmlJavaScriptUtils
public static String getClearHiddenCommandFormParamsFunctionName(
String formName)
{
- final char separatorChar = UINamingContainer
- .getSeparatorChar(FacesContext.getCurrentInstance());
+ final char separatorChar = FacesContext.getCurrentInstance().getNamingContainerSeparatorChar();
if (formName == null)
{
return "'" + HtmlRendererUtils.CLEAR_HIDDEN_FIELD_FN_NAME
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=1541918&r1=1541917&r2=1541918&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 Thu Nov 14 14:38:06 2013
@@ -319,7 +319,7 @@ public class HtmlRadioRendererBase
String clientId = uiComponent.getClientId(facesContext);
String itemId = (itemNum == null)? null : clientId +
- UINamingContainer.getSeparatorChar(facesContext) + itemNum;
+ facesContext.getNamingContainerSeparatorChar() + itemNum;
ResponseWriter writer = facesContext.getResponseWriter();
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=1541918&r1=1541917&r2=1541918&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 Thu Nov 14 14:38:06 2013
@@ -1552,8 +1552,8 @@ public final class HtmlRendererUtils
{
return HIDDEN_COMMANDLINK_FIELD_NAME_TRINIDAD;
}
- return formInfo.getFormName() + UINamingContainer.getSeparatorChar(FacesContext
- .getCurrentInstance()) + HIDDEN_COMMANDLINK_FIELD_NAME;
+ return formInfo.getFormName() + FacesContext.getCurrentInstance().getNamingContainerSeparatorChar()
+ + HIDDEN_COMMANDLINK_FIELD_NAME;
}
public static String getHiddenCommandLinkFieldName(
@@ -1563,7 +1563,7 @@ public final class HtmlRendererUtils
{
return HIDDEN_COMMANDLINK_FIELD_NAME_TRINIDAD;
}
- return formInfo.getFormName() + UINamingContainer.getSeparatorChar(facesContext)
+ return formInfo.getFormName() + FacesContext.getCurrentInstance().getNamingContainerSeparatorChar()
+ HIDDEN_COMMANDLINK_FIELD_NAME;
}
@@ -1597,7 +1597,7 @@ public final class HtmlRendererUtils
public static String getHiddenCommandLinkFieldNameMyfacesOld(
FormInfo formInfo)
{
- return formInfo.getFormName() + UINamingContainer.getSeparatorChar(FacesContext.getCurrentInstance())
+ return formInfo.getFormName() + FacesContext.getCurrentInstance().getNamingContainerSeparatorChar()
+ HIDDEN_COMMANDLINK_FIELD_NAME_MYFACES_OLD;
}