refactored class names
diff --git a/api/src/main/java/javax/faces/component/UIComponent.java b/api/src/main/java/javax/faces/component/UIComponent.java
index b9657ba..efa9db4 100755
--- a/api/src/main/java/javax/faces/component/UIComponent.java
+++ b/api/src/main/java/javax/faces/component/UIComponent.java
@@ -18,7 +18,7 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._ClassUtils;
+import org.apache.myfaces.core.api.shared.ClassUtils;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -626,7 +626,7 @@
{
FacesContext context = getFacesContext();
Locale locale = context.getViewRoot().getLocale();
- ClassLoader loader = _ClassUtils.getContextClassLoader();
+ ClassLoader loader = ClassUtils.getContextClassLoader();
try
{
diff --git a/api/src/main/java/javax/faces/component/UIComponentBase.java b/api/src/main/java/javax/faces/component/UIComponentBase.java
index 4838e8b..c02d982 100755
--- a/api/src/main/java/javax/faces/component/UIComponentBase.java
+++ b/api/src/main/java/javax/faces/component/UIComponentBase.java
@@ -18,7 +18,7 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._ComponentUtils;
+import org.apache.myfaces.core.api.shared.ComponentUtils;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
@@ -698,7 +698,7 @@
UIComponent findBase;
if (expr.charAt(0) == separatorChar)
{
- findBase = _ComponentUtils.getRootComponent(this);
+ findBase = ComponentUtils.findRootComponent(this);
expr = expr.substring(1);
}
else
@@ -709,18 +709,18 @@
}
else
{
- findBase = _ComponentUtils.findParentNamingContainer(this, true /* root if not found */);
+ findBase = ComponentUtils.findClosestNamingContainer(this, true /* root if not found */);
}
}
int separator = expr.indexOf(separatorChar);
if (separator == -1)
{
- return _ComponentUtils.findComponent(findBase, expr, separatorChar);
+ return ComponentUtils.findComponent(findBase, expr, separatorChar);
}
String id = expr.substring(0, separator);
- findBase = _ComponentUtils.findComponent(findBase, id, separatorChar);
+ findBase = ComponentUtils.findComponent(findBase, id, separatorChar);
if (findBase == null)
{
return null;
@@ -900,7 +900,7 @@
// NamingContainer but UniqueIdVendor is UIViewRoot. Anyway we just can't be 100% sure about this
// fact, so it is better to scan for the closest UniqueIdVendor. If it is not found use
// viewRoot.createUniqueId, otherwise use UniqueIdVendor.createUniqueId(context,seed).
- UniqueIdVendor parentUniqueIdVendor = _ComponentUtils.closest(UniqueIdVendor.class, this);
+ UniqueIdVendor parentUniqueIdVendor = ComponentUtils.findClosest(UniqueIdVendor.class, this);
if (parentUniqueIdVendor == null)
{
UIViewRoot viewRoot = context.getViewRoot();
@@ -914,7 +914,7 @@
String location = getComponentLocation(this);
throw new FacesException("Cannot create clientId. No id is assigned for component"
+ " to create an id and UIViewRoot is not defined: "
- + _ComponentUtils.getPathToComponent(this)
+ + ComponentUtils.getPathToComponent(this)
+ (location != null ? " created from: " + location : ""));
}
}
@@ -925,7 +925,7 @@
setId(id);
}
- UIComponent namingContainer = _ComponentUtils.findParentNamingContainer(this, false);
+ UIComponent namingContainer = ComponentUtils.findClosestNamingContainer(this, false);
if (namingContainer != null)
{
String containerClientId = namingContainer.getContainerClientId(context);
@@ -1288,7 +1288,7 @@
if (renderer == null)
{
String location = getComponentLocation(this);
- String logStr = "No Renderer found for component " + _ComponentUtils.getPathToComponent(this)
+ String logStr = "No Renderer found for component " + ComponentUtils.getPathToComponent(this)
+ " (component-family=" + getFamily()
+ ", renderer-type=" + rendererType + ')'
+ (location != null ? " created from: " + location : "");
diff --git a/api/src/main/java/javax/faces/component/UIData.java b/api/src/main/java/javax/faces/component/UIData.java
index c165dee..ba81cef 100644
--- a/api/src/main/java/javax/faces/component/UIData.java
+++ b/api/src/main/java/javax/faces/component/UIData.java
@@ -18,8 +18,8 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._ClassUtils;
-import org.apache.myfaces.core.api.shared._ComponentUtils;
+import org.apache.myfaces.core.api.shared.ClassUtils;
+import org.apache.myfaces.core.api.shared.ComponentUtils;
import java.io.IOException;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
@@ -137,7 +137,7 @@
Method createDataModelMethod = null;
try
{
- dataModelBuilderClass = _ClassUtils.classForName(FACES_DATA_MODEL_MANAGER_CLASS_NAME);
+ dataModelBuilderClass = ClassUtils.classForName(FACES_DATA_MODEL_MANAGER_CLASS_NAME);
if (dataModelBuilderClass != null)
{
createDataModelMethod = dataModelBuilderClass.getMethod("createDataModel",
@@ -1795,7 +1795,7 @@
UIComponent child = getChildren().get(i);
if (child instanceof UIColumn)
{
- if (!_ComponentUtils.isRendered(context, child))
+ if (!ComponentUtils.isRendered(context, child))
{
// Column is not visible
continue;
@@ -1849,7 +1849,7 @@
UIComponent child = getChildren().get(i);
if (child instanceof UIColumn)
{
- if (!_ComponentUtils.isRendered(context, child))
+ if (!ComponentUtils.isRendered(context, child))
{
// Column is not visible
continue;
diff --git a/api/src/main/java/javax/faces/component/UIForm.java b/api/src/main/java/javax/faces/component/UIForm.java
index 1e10c64..50d3486 100755
--- a/api/src/main/java/javax/faces/component/UIForm.java
+++ b/api/src/main/java/javax/faces/component/UIForm.java
@@ -18,7 +18,7 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._ComponentUtils;
+import org.apache.myfaces.core.api.shared.ComponentUtils;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
@@ -58,7 +58,7 @@
if (!isPrependId() && seed == null)
{
bld = new StringBuilder();
- UniqueIdVendor parentUniqueIdVendor = _ComponentUtils.closest(UniqueIdVendor.class, this);
+ UniqueIdVendor parentUniqueIdVendor = ComponentUtils.findClosest(UniqueIdVendor.class, this);
if (parentUniqueIdVendor == null)
{
UIViewRoot viewRoot = context.getViewRoot();
@@ -73,7 +73,7 @@
String location = getComponentLocation(this);
throw new FacesException("Cannot create clientId. No id is assigned for component"
+ " to create an id and UIViewRoot is not defined: "
- + _ComponentUtils.getPathToComponent(this)
+ + ComponentUtils.getPathToComponent(this)
+ (location != null ? " created from: " + location : ""));
}
}
@@ -405,7 +405,7 @@
return super.getContainerClientId(ctx);
}
- UIComponent parentNamingContainer = _ComponentUtils.findParentNamingContainer(this, false);
+ UIComponent parentNamingContainer = ComponentUtils.findClosestNamingContainer(this, false);
if (parentNamingContainer != null)
{
return parentNamingContainer.getContainerClientId(ctx);
diff --git a/api/src/main/java/javax/faces/component/UIInput.java b/api/src/main/java/javax/faces/component/UIInput.java
index 19b6743..ea723ce 100644
--- a/api/src/main/java/javax/faces/component/UIInput.java
+++ b/api/src/main/java/javax/faces/component/UIInput.java
@@ -18,8 +18,8 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._SharedRendererUtils;
-import org.apache.myfaces.core.api.shared._ComponentUtils;
+import org.apache.myfaces.core.api.shared.SharedRendererUtils;
+import org.apache.myfaces.core.api.shared.ComponentUtils;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFListener;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
@@ -52,9 +52,9 @@
import java.util.List;
import java.util.Map;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFExclude;
-import org.apache.myfaces.core.api.shared._BeanValidationUtils;
-import org.apache.myfaces.core.api.shared._ExternalSpecifications;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.BeanValidationUtils;
+import org.apache.myfaces.core.api.shared.ExternalSpecifications;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* UICommand is a base abstraction for components that implement ActionSource.
@@ -419,9 +419,9 @@
//context.getExternalContext().log(e.getMessage(), e);
// Create a FacesMessage with the id UPDATE_MESSAGE_ID
- FacesMessage facesMessage = _MessageUtils.getMessage(context,
+ FacesMessage facesMessage = MessageUtils.getMessage(context,
context.getViewRoot().getLocale(), FacesMessage.SEVERITY_ERROR, UPDATE_MESSAGE_ID,
- new Object[] { _MessageUtils.getLabel(context, this) });
+ new Object[] { MessageUtils.getLabel(context, this) });
// create an UpdateModelException and enqueue it since
// we are not allowed to throw it directly here
@@ -460,8 +460,8 @@
}
else
{
- _MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID,
- new Object[] { _MessageUtils.getLabel(context, this) });
+ MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID,
+ new Object[] { MessageUtils.getLabel(context, this) });
}
setValid(false);
return;
@@ -469,7 +469,7 @@
if (!isEmpty || shouldValidateEmptyFields(context))
{
- _ComponentUtils.callValidators(context, this, convertedValue);
+ ComponentUtils.callValidators(context, this, convertedValue);
}
}
@@ -530,7 +530,7 @@
param = param.toLowerCase();
}
- if (param.equals("auto") && _ExternalSpecifications.isBeanValidationAvailable())
+ if (param.equals("auto") && ExternalSpecifications.isBeanValidationAvailable())
{
validateEmptyFields = true;
}
@@ -712,8 +712,8 @@
}
else
{
- _MessageUtils.addErrorMessage(context, this, CONVERSION_MESSAGE_ID,
- new Object[] { _MessageUtils.getLabel(context, this) });
+ MessageUtils.addErrorMessage(context, this, CONVERSION_MESSAGE_ID,
+ new Object[] { MessageUtils.getLabel(context, this) });
}
}
setValid(false);
@@ -773,7 +773,7 @@
}
else if (submittedValue instanceof String)
{
- Converter converter = _SharedRendererUtils.findUIOutputConverter(context, this);
+ Converter converter = SharedRendererUtils.findUIOutputConverter(context, this);
if (converter != null)
{
return converter.getAsObject(context, this, (String) submittedValue);
@@ -908,14 +908,14 @@
@Override
public Validator[] getValidators()
{
- if (_ExternalSpecifications.isBeanValidationAvailable()
+ if (ExternalSpecifications.isBeanValidationAvailable()
&& Boolean.TRUE.equals(this.getAttributes().containsKey(BEAN_BEFORE_JSF_PROPERTY)))
{
int bvIndex = -1;
for (int i = 0; i < _validatorList.size(); i++)
{
Validator v = _validatorList.get(i);
- if (_BeanValidationUtils.isBeanValidator(v))
+ if (BeanValidationUtils.isBeanValidator(v))
{
bvIndex = i;
break;
diff --git a/api/src/main/java/javax/faces/component/UISelectMany.java b/api/src/main/java/javax/faces/component/UISelectMany.java
index 89525f5..d4bc6d0 100644
--- a/api/src/main/java/javax/faces/component/UISelectMany.java
+++ b/api/src/main/java/javax/faces/component/UISelectMany.java
@@ -18,9 +18,9 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._SharedRendererUtils;
-import org.apache.myfaces.core.api.shared._ComponentUtils;
-import org.apache.myfaces.core.api.shared._SelectItemsIterator;
+import org.apache.myfaces.core.api.shared.SharedRendererUtils;
+import org.apache.myfaces.core.api.shared.ComponentUtils;
+import org.apache.myfaces.core.api.shared.SelectItemsIterator;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
@@ -40,8 +40,8 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperties;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
-import org.apache.myfaces.core.api.shared._ExternalSpecifications;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.ExternalSpecifications;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* Base class for the various component classes that allow a user to select zero or more options from a set.
@@ -282,7 +282,7 @@
// verify that iterator was successfully created for convertedValue type
if (itemValues == null)
{
- _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID, new Object[] { _MessageUtils.getLabel(
+ MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID, new Object[] { MessageUtils.getLabel(
context, this) });
setValid(false);
return;
@@ -301,8 +301,8 @@
}
else
{
- _MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID,
- new Object[] { _MessageUtils.getLabel(context, this) });
+ MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID,
+ new Object[] { MessageUtils.getLabel(context, this) });
}
setValid(false);
return;
@@ -312,7 +312,7 @@
// if we are required to validate empty fields
if (hasValues || shouldValidateEmptyFields(context))
{
- _ComponentUtils.callValidators(context, this, convertedValue);
+ ComponentUtils.callValidators(context, this, convertedValue);
}
if (isValid() && hasValues)
@@ -321,7 +321,7 @@
// Since the iterator is used twice, it has sense to traverse it only once.
Collection<SelectItem> items = new ArrayList<>();
- for (Iterator<SelectItem> iter = new _SelectItemsIterator(this, context); iter.hasNext();)
+ for (Iterator<SelectItem> iter = new SelectItemsIterator(this, context); iter.hasNext();)
{
items.add(iter.next());
}
@@ -340,8 +340,8 @@
converter)
))
{
- _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID,
- new Object[] { _MessageUtils.getLabel(context, this) });
+ MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID,
+ new Object[] { MessageUtils.getLabel(context, this) });
setValid(false);
return;
}
@@ -363,7 +363,7 @@
}
else if (submittedValue instanceof String[])
{
- return _SharedRendererUtils.getConvertedUISelectManyValue(context, this, (String[]) submittedValue);
+ return SharedRendererUtils.getConvertedUISelectManyValue(context, this, (String[]) submittedValue);
}
return submittedValue;
}
@@ -420,7 +420,7 @@
param = param.toLowerCase();
}
- if (param.equals("auto") && _ExternalSpecifications.isBeanValidationAvailable())
+ if (param.equals("auto") && ExternalSpecifications.isBeanValidationAvailable())
{
validateEmptyFields = true;
}
diff --git a/api/src/main/java/javax/faces/component/UISelectOne.java b/api/src/main/java/javax/faces/component/UISelectOne.java
index c5e90f0..53a3bc4 100644
--- a/api/src/main/java/javax/faces/component/UISelectOne.java
+++ b/api/src/main/java/javax/faces/component/UISelectOne.java
@@ -18,7 +18,7 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._SelectItemsIterator;
+import org.apache.myfaces.core.api.shared.SelectItemsIterator;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -31,7 +31,7 @@
import javax.faces.model.SelectItem;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* Component for choosing one option out of a set of possibilities.
@@ -167,7 +167,7 @@
// Since the iterator is used twice, it has sense to traverse it only once.
Collection<SelectItem> items = new ArrayList<>();
- for (Iterator<SelectItem> iter = new _SelectItemsIterator(this, context); iter.hasNext();)
+ for (Iterator<SelectItem> iter = new SelectItemsIterator(this, context); iter.hasNext();)
{
items.add(iter.next());
}
@@ -191,8 +191,8 @@
return;
}
- _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID,
- new Object[] {_MessageUtils.getLabel(context, this) });
+ MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID,
+ new Object[] {MessageUtils.getLabel(context, this) });
setValid(false);
}
diff --git a/api/src/main/java/javax/faces/component/UIViewParameter.java b/api/src/main/java/javax/faces/component/UIViewParameter.java
index a6b2f85..ed81224 100644
--- a/api/src/main/java/javax/faces/component/UIViewParameter.java
+++ b/api/src/main/java/javax/faces/component/UIViewParameter.java
@@ -18,7 +18,7 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._ClassUtils;
+import org.apache.myfaces.core.api.shared.ClassUtils;
import java.io.IOException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
@@ -37,7 +37,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
*
@@ -198,9 +198,9 @@
}
else
{
- Object label = _MessageUtils.getLabel(context, this);
+ Object label = MessageUtils.getLabel(context, this);
- message = _MessageUtils.getMessage(context, context.getViewRoot().getLocale(),
+ message = MessageUtils.getMessage(context, context.getViewRoot().getLocale(),
FacesMessage.SEVERITY_ERROR, REQUIRED_MESSAGE_ID, new Object[] { label });
}
@@ -248,7 +248,7 @@
private static Renderer getDelegateRenderer(FacesContext context)
{
- ClassLoader classLoader = _ClassUtils.getContextClassLoader();
+ ClassLoader classLoader = ClassUtils.getContextClassLoader();
Renderer delegateRenderer = delegateRendererMap.get(classLoader);
if(delegateRenderer == null)
{
diff --git a/api/src/main/java/javax/faces/component/UIViewRoot.java b/api/src/main/java/javax/faces/component/UIViewRoot.java
index 4120b9b..41f474b 100644
--- a/api/src/main/java/javax/faces/component/UIViewRoot.java
+++ b/api/src/main/java/javax/faces/component/UIViewRoot.java
@@ -18,9 +18,9 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._ClassUtils;
-import org.apache.myfaces.core.api.shared._ComponentUtils;
-import org.apache.myfaces.core.api.shared._LocaleUtils;
+import org.apache.myfaces.core.api.shared.ClassUtils;
+import org.apache.myfaces.core.api.shared.ComponentUtils;
+import org.apache.myfaces.core.api.shared.LocaleUtils;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -117,7 +117,7 @@
try
{
VIEW_SCOPE_PROXY_MAP_CLASS
- = _ClassUtils.classForName("org.apache.myfaces.view.ViewScopeProxyMap");
+ = ClassUtils.classForName("org.apache.myfaces.view.ViewScopeProxyMap");
}
catch (Exception e)
{
@@ -127,7 +127,7 @@
try
{
REQUEST_VIEW_CONTEXT_CLASS
- = _ClassUtils.classForName("org.apache.myfaces.context.RequestViewContext");
+ = ClassUtils.classForName("org.apache.myfaces.context.RequestViewContext");
REQUEST_VIEW_CONTEXT_GET_INSTANCE = REQUEST_VIEW_CONTEXT_CLASS.getMethod("getCurrentInstance",
new Class[] { FacesContext.class });
REQUEST_VIEW_CONTEXT_SET_RENDER_TARGET = REQUEST_VIEW_CONTEXT_CLASS.getMethod("setRenderTarget",
@@ -478,15 +478,14 @@
PropertyKeys.resourceDependencyUniqueIdCounter);
uniqueIdCounter = (uniqueIdCounter == null) ? 0 : uniqueIdCounter;
getStateHelper().put(PropertyKeys.resourceDependencyUniqueIdCounter, (uniqueIdCounter+1));
- if (uniqueIdCounter >= _ComponentUtils.UNIQUE_COMPONENT_RD_IDS_SIZE)
+ if (uniqueIdCounter >= ComponentUtils.UNIQUE_COMPONENT_RD_IDS_SIZE)
{
StringBuilder bld = _getSharedStringBuilder(context);
- return bld.append(UNIQUE_ID_PREFIX).append(
- _ComponentUtils.RD_ID_PREFIX).append(uniqueIdCounter).toString();
+ return bld.append(UNIQUE_ID_PREFIX).append(ComponentUtils.RD_ID_PREFIX).append(uniqueIdCounter).toString();
}
else
{
- return _ComponentUtils.UNIQUE_COMPONENT_RD_IDS[uniqueIdCounter];
+ return ComponentUtils.UNIQUE_COMPONENT_RD_IDS[uniqueIdCounter];
}
}
else
@@ -494,15 +493,14 @@
Integer uniqueIdCounter = (Integer) getStateHelper().get(PropertyKeys.uniqueIdCounter);
uniqueIdCounter = (uniqueIdCounter == null) ? 0 : uniqueIdCounter;
getStateHelper().put(PropertyKeys.uniqueIdCounter, (uniqueIdCounter+1));
- if (uniqueIdCounter >= _ComponentUtils.UNIQUE_COMPONENT_V_IDS_SIZE)
+ if (uniqueIdCounter >= ComponentUtils.UNIQUE_COMPONENT_V_IDS_SIZE)
{
StringBuilder bld = _getSharedStringBuilder(context);
- return bld.append(UNIQUE_ID_PREFIX).append(
- _ComponentUtils.V_ID_PREFIX).append(uniqueIdCounter).toString();
+ return bld.append(UNIQUE_ID_PREFIX).append(ComponentUtils.V_ID_PREFIX).append(uniqueIdCounter).toString();
}
else
{
- return _ComponentUtils.UNIQUE_COMPONENT_V_IDS[uniqueIdCounter];
+ return ComponentUtils.UNIQUE_COMPONENT_V_IDS[uniqueIdCounter];
}
}
}
@@ -809,7 +807,7 @@
}
else
{
- return (Locale) _LocaleUtils.toLocale(veLocale.toString());
+ return (Locale) LocaleUtils.toLocale(veLocale.toString());
}
}
else
@@ -822,7 +820,7 @@
}
else if (locale instanceof String)
{
- return _LocaleUtils.toLocale((String)locale);
+ return LocaleUtils.toLocale((String)locale);
}
}
@@ -896,7 +894,7 @@
{
if (_viewScope == null && create)
{
- _viewScope = (Map<String, Object>) _ClassUtils.newInstance(VIEW_SCOPE_PROXY_MAP_CLASS);
+ _viewScope = (Map<String, Object>) ClassUtils.newInstance(VIEW_SCOPE_PROXY_MAP_CLASS);
FacesContext facesContext = getFacesContext();
if (facesContext != null)
{
diff --git a/api/src/main/java/javax/faces/component/_SelectItemsUtil.java b/api/src/main/java/javax/faces/component/_SelectItemsUtil.java
index c031ed9..807bb45 100644
--- a/api/src/main/java/javax/faces/component/_SelectItemsUtil.java
+++ b/api/src/main/java/javax/faces/component/_SelectItemsUtil.java
@@ -18,7 +18,7 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._ClassUtils;
+import org.apache.myfaces.core.api.shared.ClassUtils;
import java.util.Arrays;
import java.util.Iterator;
@@ -143,11 +143,11 @@
{
targetClass = targetClass.getSuperclass();
}
- itemValue = _ClassUtils.convertToTypeNoLogging(facesContext, itemValue, targetClass);
+ itemValue = ClassUtils.convertToTypeNoLogging(facesContext, itemValue, targetClass);
}
else
{
- itemValue = _ClassUtils.convertToTypeNoLogging(facesContext, itemValue, value.getClass());
+ itemValue = ClassUtils.convertToTypeNoLogging(facesContext, itemValue, value.getClass());
}
}
catch (IllegalArgumentException e)
diff --git a/api/src/main/java/javax/faces/component/html/_HtmlInputFile.java b/api/src/main/java/javax/faces/component/html/_HtmlInputFile.java
index d06eb68..9e799ed 100644
--- a/api/src/main/java/javax/faces/component/html/_HtmlInputFile.java
+++ b/api/src/main/java/javax/faces/component/html/_HtmlInputFile.java
@@ -23,7 +23,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* Renders a HTML input element.
@@ -96,8 +96,8 @@
}
else
{
- _MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID,
- new Object[] { _MessageUtils.getLabel(context, this) });
+ MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID,
+ new Object[] { MessageUtils.getLabel(context, this) });
}
setValid(false);
return;
diff --git a/api/src/main/java/javax/faces/convert/BigDecimalConverter.java b/api/src/main/java/javax/faces/convert/BigDecimalConverter.java
index a40e53a..08a9abe 100755
--- a/api/src/main/java/javax/faces/convert/BigDecimalConverter.java
+++ b/api/src/main/java/javax/faces/convert/BigDecimalConverter.java
@@ -24,7 +24,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
import java.math.BigDecimal;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
@@ -69,10 +69,10 @@
}
catch (NumberFormatException e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
DECIMAL_ID,
new Object[]{value,new BigDecimal(4815.16).toString(),
- _MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
@@ -100,8 +100,8 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
diff --git a/api/src/main/java/javax/faces/convert/BigIntegerConverter.java b/api/src/main/java/javax/faces/convert/BigIntegerConverter.java
index 3607e36..a447375 100755
--- a/api/src/main/java/javax/faces/convert/BigIntegerConverter.java
+++ b/api/src/main/java/javax/faces/convert/BigIntegerConverter.java
@@ -24,7 +24,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
import java.math.BigInteger;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
@@ -65,9 +65,9 @@
}
catch (NumberFormatException e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
BIGINTEGER_ID,
- new Object[]{value,"2345",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ new Object[]{value,"2345",MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
@@ -95,8 +95,8 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
diff --git a/api/src/main/java/javax/faces/convert/BooleanConverter.java b/api/src/main/java/javax/faces/convert/BooleanConverter.java
index d2b0ddd..5945b1e 100755
--- a/api/src/main/java/javax/faces/convert/BooleanConverter.java
+++ b/api/src/main/java/javax/faces/convert/BooleanConverter.java
@@ -22,7 +22,7 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
@@ -63,9 +63,9 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
BOOLEAN_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
@@ -93,8 +93,8 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
diff --git a/api/src/main/java/javax/faces/convert/ByteConverter.java b/api/src/main/java/javax/faces/convert/ByteConverter.java
index e63d198..ece5f11 100755
--- a/api/src/main/java/javax/faces/convert/ByteConverter.java
+++ b/api/src/main/java/javax/faces/convert/ByteConverter.java
@@ -22,7 +22,7 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
@@ -63,9 +63,9 @@
}
catch (NumberFormatException e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
BYTE_ID,
- new Object[]{value,"156",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ new Object[]{value,"156",MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
@@ -93,8 +93,8 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
diff --git a/api/src/main/java/javax/faces/convert/CharacterConverter.java b/api/src/main/java/javax/faces/convert/CharacterConverter.java
index 87a372a..5db6fd7 100755
--- a/api/src/main/java/javax/faces/convert/CharacterConverter.java
+++ b/api/src/main/java/javax/faces/convert/CharacterConverter.java
@@ -22,7 +22,7 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
@@ -63,9 +63,9 @@
}
catch(Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
CHARACTER_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
@@ -93,8 +93,8 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
diff --git a/api/src/main/java/javax/faces/convert/DateTimeConverter.java b/api/src/main/java/javax/faces/convert/DateTimeConverter.java
index ebc8947..f9d2283 100755
--- a/api/src/main/java/javax/faces/convert/DateTimeConverter.java
+++ b/api/src/main/java/javax/faces/convert/DateTimeConverter.java
@@ -42,7 +42,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* This tag associates a date time converter with the nearest parent UIComponent.
@@ -152,21 +152,21 @@
currentDate = ZonedDateTime.now();
}
Object[] args = new Object[]{value,
- format.format(currentDate),_MessageUtils.getLabel(facesContext, uiComponent)};
+ format.format(currentDate),MessageUtils.getLabel(facesContext, uiComponent)};
if(type.equals(TYPE_LOCAL_DATE))
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, DATE_ID, args));
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, DATE_ID, args));
}
else if (type.equals(TYPE_LOCAL_TIME) || type.equals(TYPE_OFFSET_TIME))
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, TIME_ID, args));
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, TIME_ID, args));
}
else if (type.equals(TYPE_LOCAL_DATE_TIME) || type.equals(TYPE_OFFSET_DATE_TIME)
|| type.equals(TYPE_ZONED_DATE_TIME))
{
throw new ConverterException(
- _MessageUtils.getErrorMessage(facesContext, DATETIME_ID, args));
+ MessageUtils.getErrorMessage(facesContext, DATETIME_ID, args));
}
else
{
@@ -190,20 +190,20 @@
{
String type = getType();
Object[] args = new Object[]{value,
- format.format(new Date()),_MessageUtils.getLabel(facesContext, uiComponent)};
+ format.format(new Date()),MessageUtils.getLabel(facesContext, uiComponent)};
if(type.equals(TYPE_DATE))
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, DATE_ID, args));
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, DATE_ID, args));
}
else if (type.equals(TYPE_TIME))
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, TIME_ID, args));
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, TIME_ID, args));
}
else if (type.equals(TYPE_BOTH))
{
throw new ConverterException(
- _MessageUtils.getErrorMessage(facesContext, DATETIME_ID, args));
+ MessageUtils.getErrorMessage(facesContext, DATETIME_ID, args));
}
else
{
@@ -249,8 +249,8 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
return null;
@@ -269,8 +269,8 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
diff --git a/api/src/main/java/javax/faces/convert/DoubleConverter.java b/api/src/main/java/javax/faces/convert/DoubleConverter.java
index b75ec23..984d652 100755
--- a/api/src/main/java/javax/faces/convert/DoubleConverter.java
+++ b/api/src/main/java/javax/faces/convert/DoubleConverter.java
@@ -25,7 +25,7 @@
import java.text.DecimalFormatSymbols;
import java.util.Locale;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
@@ -67,9 +67,9 @@
}
catch (NumberFormatException e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
DOUBLE_ID,
- new Object[]{value,"4214",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ new Object[]{value,"4214",MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
@@ -150,8 +150,8 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
diff --git a/api/src/main/java/javax/faces/convert/EnumConverter.java b/api/src/main/java/javax/faces/convert/EnumConverter.java
index 2c724b1..910988f 100644
--- a/api/src/main/java/javax/faces/convert/EnumConverter.java
+++ b/api/src/main/java/javax/faces/convert/EnumConverter.java
@@ -25,7 +25,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
@@ -99,9 +99,9 @@
}
Object[] params =
- new Object[] { value, firstConstantOfEnum(), _MessageUtils.getLabel(facesContext, uiComponent) };
+ new Object[] { value, firstConstantOfEnum(), MessageUtils.getLabel(facesContext, uiComponent) };
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, ENUM_ID, params));
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, ENUM_ID, params));
}
@Override
@@ -135,9 +135,9 @@
catch (IllegalArgumentException e)
{
Object[] params =
- new Object[] { value, firstConstantOfEnum(), _MessageUtils.getLabel(facesContext, uiComponent) };
+ new Object[] { value, firstConstantOfEnum(), MessageUtils.getLabel(facesContext, uiComponent) };
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, ENUM_ID, params));
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, ENUM_ID, params));
}
}
@@ -145,8 +145,8 @@
{
if (targetClass == null)
{
- Object[] params = new Object[] { value, _MessageUtils.getLabel(facesContext, uiComponent) };
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, ENUM_NO_CLASS_ID, params));
+ Object[] params = new Object[] { value, MessageUtils.getLabel(facesContext, uiComponent) };
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, ENUM_NO_CLASS_ID, params));
}
}
diff --git a/api/src/main/java/javax/faces/convert/FloatConverter.java b/api/src/main/java/javax/faces/convert/FloatConverter.java
index bd39757..2db283d 100755
--- a/api/src/main/java/javax/faces/convert/FloatConverter.java
+++ b/api/src/main/java/javax/faces/convert/FloatConverter.java
@@ -22,7 +22,7 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
@@ -63,9 +63,9 @@
}
catch (NumberFormatException e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
FLOAT_ID,
- new Object[]{value,"50000",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ new Object[]{value,"50000",MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
@@ -93,8 +93,8 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
diff --git a/api/src/main/java/javax/faces/convert/IntegerConverter.java b/api/src/main/java/javax/faces/convert/IntegerConverter.java
index f66086a..e74c9d0 100755
--- a/api/src/main/java/javax/faces/convert/IntegerConverter.java
+++ b/api/src/main/java/javax/faces/convert/IntegerConverter.java
@@ -22,7 +22,7 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
@@ -63,9 +63,9 @@
}
catch (NumberFormatException e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
INTEGER_ID,
- new Object[]{value,"21",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ new Object[]{value,"21",MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
@@ -93,8 +93,8 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
diff --git a/api/src/main/java/javax/faces/convert/LongConverter.java b/api/src/main/java/javax/faces/convert/LongConverter.java
index 50cd287..2ba3986 100755
--- a/api/src/main/java/javax/faces/convert/LongConverter.java
+++ b/api/src/main/java/javax/faces/convert/LongConverter.java
@@ -22,7 +22,7 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
@@ -63,9 +63,9 @@
}
catch (NumberFormatException e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
LONG_ID,
- new Object[]{value,"9392218515",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ new Object[]{value,"9392218515",MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
@@ -93,8 +93,8 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
diff --git a/api/src/main/java/javax/faces/convert/NumberConverter.java b/api/src/main/java/javax/faces/convert/NumberConverter.java
index 0d968aa..6789375 100755
--- a/api/src/main/java/javax/faces/convert/NumberConverter.java
+++ b/api/src/main/java/javax/faces/convert/NumberConverter.java
@@ -37,7 +37,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* This tag creates a number formatting converter and associates it
@@ -158,30 +158,30 @@
{
if (getPattern() != null)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
PATTERN_ID,
- new Object[]{value, "$###,###", _MessageUtils.getLabel(facesContext, uiComponent)}));
+ new Object[]{value, "$###,###", MessageUtils.getLabel(facesContext, uiComponent)}));
}
else if (getType().equals("number"))
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
NUMBER_ID,
new Object[]{value, format.format(21),
- _MessageUtils.getLabel(facesContext, uiComponent)}));
+ MessageUtils.getLabel(facesContext, uiComponent)}));
}
else if (getType().equals("currency"))
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
CURRENCY_ID,
new Object[]{value, format.format(42.25),
- _MessageUtils.getLabel(facesContext, uiComponent)}));
+ MessageUtils.getLabel(facesContext, uiComponent)}));
}
else if (getType().equals("percent"))
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
PERCENT_ID,
new Object[]{value, format.format(.90),
- _MessageUtils.getLabel(facesContext, uiComponent)}));
+ MessageUtils.getLabel(facesContext, uiComponent)}));
}
}
}
@@ -255,8 +255,8 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
diff --git a/api/src/main/java/javax/faces/convert/ShortConverter.java b/api/src/main/java/javax/faces/convert/ShortConverter.java
index 0bba0c7..d868d9c 100755
--- a/api/src/main/java/javax/faces/convert/ShortConverter.java
+++ b/api/src/main/java/javax/faces/convert/ShortConverter.java
@@ -22,7 +22,7 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
@@ -63,9 +63,9 @@
}
catch (NumberFormatException e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext,
SHORT_ID,
- new Object[]{value,"21",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ new Object[]{value,"21",MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
@@ -93,8 +93,8 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(MessageUtils.getErrorMessage(facesContext, STRING_ID,
+ new Object[]{value,MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
diff --git a/api/src/main/java/javax/faces/validator/BeanValidator.java b/api/src/main/java/javax/faces/validator/BeanValidator.java
index 41f302e..40a9461 100644
--- a/api/src/main/java/javax/faces/validator/BeanValidator.java
+++ b/api/src/main/java/javax/faces/validator/BeanValidator.java
@@ -18,8 +18,8 @@
*/
package javax.faces.validator;
-import org.apache.myfaces.core.api.shared._MessageUtils;
-import org.apache.myfaces.core.api.shared._ExternalSpecifications;
+import org.apache.myfaces.core.api.shared.MessageUtils;
+import org.apache.myfaces.core.api.shared.ExternalSpecifications;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
@@ -225,8 +225,8 @@
{
ConstraintViolation constraintViolation = (ConstraintViolation) violation;
String message = constraintViolation.getMessage();
- Object[] args = new Object[]{ message, _MessageUtils.getLabel(context, component) };
- FacesMessage msg = _MessageUtils.getErrorMessage(context, MESSAGE_ID, args);
+ Object[] args = new Object[]{ message, MessageUtils.getLabel(context, component) };
+ FacesMessage msg = MessageUtils.getErrorMessage(context, MESSAGE_ID, args);
messages.add(msg);
}
@@ -338,7 +338,7 @@
{
synchronized (this)
{
- if (_ExternalSpecifications.isBeanValidationAvailable())
+ if (ExternalSpecifications.isBeanValidationAvailable())
{
ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
applicationMap.put(VALIDATOR_FACTORY_KEY, factory);
diff --git a/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java b/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
index bdb01c8..7a97ca8 100755
--- a/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
+++ b/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
@@ -18,7 +18,7 @@
*/
package javax.faces.validator;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
import javax.faces.component.PartialStateHolder;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -101,8 +101,8 @@
{
if (dvalue < _minimum || dvalue > _maximum)
{
- Object[] args = {_minimum, _maximum,_MessageUtils.getLabel(facesContext, uiComponent)};
- throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, NOT_IN_RANGE_MESSAGE_ID,
+ Object[] args = {_minimum, _maximum,MessageUtils.getLabel(facesContext, uiComponent)};
+ throw new ValidatorException(MessageUtils.getErrorMessage(facesContext, NOT_IN_RANGE_MESSAGE_ID,
args));
}
}
@@ -110,16 +110,16 @@
{
if (dvalue < _minimum)
{
- Object[] args = {_minimum,_MessageUtils.getLabel(facesContext, uiComponent)};
- throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, MINIMUM_MESSAGE_ID, args));
+ Object[] args = {_minimum,MessageUtils.getLabel(facesContext, uiComponent)};
+ throw new ValidatorException(MessageUtils.getErrorMessage(facesContext, MINIMUM_MESSAGE_ID, args));
}
}
else if (_maximum != null)
{
if (dvalue > _maximum)
{
- Object[] args = {_maximum,_MessageUtils.getLabel(facesContext, uiComponent)};
- throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, MAXIMUM_MESSAGE_ID, args));
+ Object[] args = {_maximum,MessageUtils.getLabel(facesContext, uiComponent)};
+ throw new ValidatorException(MessageUtils.getErrorMessage(facesContext, MAXIMUM_MESSAGE_ID, args));
}
}
}
@@ -138,8 +138,8 @@
}
catch (NumberFormatException e)
{
- Object[] args = {_MessageUtils.getLabel(facesContext, uiComponent)};
- throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, TYPE_MESSAGE_ID, args));
+ Object[] args = {MessageUtils.getLabel(facesContext, uiComponent)};
+ throw new ValidatorException(MessageUtils.getErrorMessage(facesContext, TYPE_MESSAGE_ID, args));
}
}
diff --git a/api/src/main/java/javax/faces/validator/LengthValidator.java b/api/src/main/java/javax/faces/validator/LengthValidator.java
index ccb3d6e..f1ea552 100755
--- a/api/src/main/java/javax/faces/validator/LengthValidator.java
+++ b/api/src/main/java/javax/faces/validator/LengthValidator.java
@@ -18,7 +18,7 @@
*/
package javax.faces.validator;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
import javax.faces.component.PartialStateHolder;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -102,8 +102,8 @@
{
if (length < _minimum)
{
- Object[] args = {_minimum,_MessageUtils.getLabel(facesContext, uiComponent)};
- throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, MINIMUM_MESSAGE_ID, args));
+ Object[] args = {_minimum,MessageUtils.getLabel(facesContext, uiComponent)};
+ throw new ValidatorException(MessageUtils.getErrorMessage(facesContext, MINIMUM_MESSAGE_ID, args));
}
}
@@ -111,8 +111,8 @@
{
if (length > _maximum)
{
- Object[] args = {_maximum,_MessageUtils.getLabel(facesContext, uiComponent)};
- throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, MAXIMUM_MESSAGE_ID, args));
+ Object[] args = {_maximum,MessageUtils.getLabel(facesContext, uiComponent)};
+ throw new ValidatorException(MessageUtils.getErrorMessage(facesContext, MAXIMUM_MESSAGE_ID, args));
}
}
}
diff --git a/api/src/main/java/javax/faces/validator/LongRangeValidator.java b/api/src/main/java/javax/faces/validator/LongRangeValidator.java
index 9259923..c3f6d6b 100755
--- a/api/src/main/java/javax/faces/validator/LongRangeValidator.java
+++ b/api/src/main/java/javax/faces/validator/LongRangeValidator.java
@@ -18,7 +18,7 @@
*/
package javax.faces.validator;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
import javax.faces.component.PartialStateHolder;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -102,8 +102,8 @@
{
if (dvalue < _minimum || dvalue > _maximum)
{
- Object[] args = {_minimum, _maximum,_MessageUtils.getLabel(facesContext, uiComponent)};
- throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext,
+ Object[] args = {_minimum, _maximum,MessageUtils.getLabel(facesContext, uiComponent)};
+ throw new ValidatorException(MessageUtils.getErrorMessage(facesContext,
NOT_IN_RANGE_MESSAGE_ID, args));
}
}
@@ -111,16 +111,16 @@
{
if (dvalue < _minimum)
{
- Object[] args = {_minimum,_MessageUtils.getLabel(facesContext, uiComponent)};
- throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, MINIMUM_MESSAGE_ID, args));
+ Object[] args = {_minimum,MessageUtils.getLabel(facesContext, uiComponent)};
+ throw new ValidatorException(MessageUtils.getErrorMessage(facesContext, MINIMUM_MESSAGE_ID, args));
}
}
else if (_maximum != null)
{
if (dvalue > _maximum)
{
- Object[] args = {_maximum,_MessageUtils.getLabel(facesContext, uiComponent)};
- throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, MAXIMUM_MESSAGE_ID, args));
+ Object[] args = {_maximum,MessageUtils.getLabel(facesContext, uiComponent)};
+ throw new ValidatorException(MessageUtils.getErrorMessage(facesContext, MAXIMUM_MESSAGE_ID, args));
}
}
}
@@ -139,8 +139,8 @@
}
catch (NumberFormatException e)
{
- Object[] args = {_MessageUtils.getLabel(facesContext, uiComponent)};
- throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, TYPE_MESSAGE_ID, args));
+ Object[] args = {MessageUtils.getLabel(facesContext, uiComponent)};
+ throw new ValidatorException(MessageUtils.getErrorMessage(facesContext, TYPE_MESSAGE_ID, args));
}
}
diff --git a/api/src/main/java/javax/faces/validator/RegexValidator.java b/api/src/main/java/javax/faces/validator/RegexValidator.java
index 8e3e412..4cfb35c 100644
--- a/api/src/main/java/javax/faces/validator/RegexValidator.java
+++ b/api/src/main/java/javax/faces/validator/RegexValidator.java
@@ -18,7 +18,7 @@
*/
package javax.faces.validator;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
@@ -136,8 +136,8 @@
// and type expected in validator but behaviour is not specified.
// We use message for String conversion here:
// javax.faces.converter.STRING={1}: Could not convert ''{0}'' to a string
- Object[] args = {value, _MessageUtils.getLabel(context, component)};
- throw new ValidatorException(_MessageUtils.getErrorMessage(context, "javax.faces.converter.STRING", args));
+ Object[] args = {value, MessageUtils.getLabel(context, component)};
+ throw new ValidatorException(MessageUtils.getErrorMessage(context, "javax.faces.converter.STRING", args));
}
CharSequence charSequence = (CharSequence) value;
@@ -145,7 +145,7 @@
Pattern thePattern;
if (pattern == null || pattern.equals(EMPTY_STRING))
{
- throw new ValidatorException(_MessageUtils.getErrorMessage(context, PATTERN_NOT_SET_MESSAGE_ID, null));
+ throw new ValidatorException(MessageUtils.getErrorMessage(context, PATTERN_NOT_SET_MESSAGE_ID, null));
}
try
@@ -154,14 +154,14 @@
}
catch (PatternSyntaxException pse)
{
- throw new ValidatorException(_MessageUtils.getErrorMessage(context, MATCH_EXCEPTION_MESSAGE_ID, null));
+ throw new ValidatorException(MessageUtils.getErrorMessage(context, MATCH_EXCEPTION_MESSAGE_ID, null));
}
if (!thePattern.matcher(charSequence).matches())
{
//TODO: Present the patternExpression in a more user friendly way
- Object[] args = {thePattern, _MessageUtils.getLabel(context, component)};
- throw new ValidatorException(_MessageUtils.getErrorMessage(context, NOT_MATCHED_MESSAGE_ID, args));
+ Object[] args = {thePattern, MessageUtils.getLabel(context, component)};
+ throw new ValidatorException(MessageUtils.getErrorMessage(context, NOT_MATCHED_MESSAGE_ID, args));
}
}
diff --git a/api/src/main/java/javax/faces/validator/RequiredValidator.java b/api/src/main/java/javax/faces/validator/RequiredValidator.java
index 0514583..018be15 100644
--- a/api/src/main/java/javax/faces/validator/RequiredValidator.java
+++ b/api/src/main/java/javax/faces/validator/RequiredValidator.java
@@ -18,7 +18,7 @@
*/
package javax.faces.validator;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -81,10 +81,10 @@
requiredMessage));
}
}
- throw new ValidatorException(_MessageUtils.getMessage(facesContext,
+ throw new ValidatorException(MessageUtils.getMessage(facesContext,
facesContext.getViewRoot().getLocale(),
FacesMessage.SEVERITY_ERROR, UIInput.REQUIRED_MESSAGE_ID,
- new Object[] { _MessageUtils.getLabel(facesContext,
+ new Object[] { MessageUtils.getLabel(facesContext,
uiComponent) }));
}
}
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/_BeanValidationUtils.java b/api/src/main/java/org/apache/myfaces/core/api/shared/BeanValidationUtils.java
similarity index 97%
rename from api/src/main/java/org/apache/myfaces/core/api/shared/_BeanValidationUtils.java
rename to api/src/main/java/org/apache/myfaces/core/api/shared/BeanValidationUtils.java
index a0d7da9..8aabd47 100644
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/_BeanValidationUtils.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/BeanValidationUtils.java
@@ -27,7 +27,7 @@
*
* @since 2.0
*/
-public final class _BeanValidationUtils
+public final class BeanValidationUtils
{
public static boolean isBeanValidator(Validator v)
{
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/_ClassUtils.java b/api/src/main/java/org/apache/myfaces/core/api/shared/ClassUtils.java
similarity index 98%
rename from api/src/main/java/org/apache/myfaces/core/api/shared/_ClassUtils.java
rename to api/src/main/java/org/apache/myfaces/core/api/shared/ClassUtils.java
index 89e05f3..bbd83e7 100755
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/_ClassUtils.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/ClassUtils.java
@@ -40,11 +40,11 @@
import javax.faces.FacesException;
import javax.faces.context.FacesContext;
-public class _ClassUtils
+public class ClassUtils
{
// ~ Static fields/initializers -----------------------------------------------------------------
- private static final Logger log = Logger.getLogger(_ClassUtils.class.getName());
+ private static final Logger log = Logger.getLogger(ClassUtils.class.getName());
public static final Class<boolean[]> BOOLEAN_ARRAY_CLASS = boolean[].class;
public static final Class<byte[]> BYTE_ARRAY_CLASS = byte[].class;
@@ -147,7 +147,7 @@
// fallback: Try ClassLoader for ClassUtils (i.e. the myfaces.jar lib)
return (Class<T>) Class.forName(type,
false, // do not initialize for faster startup
- _ClassUtils.class.getClassLoader());
+ClassUtils.class.getClassLoader());
}
}
@@ -297,7 +297,7 @@
URL url = getContextClassLoader().getResource(resource);
if (url == null)
{
- url = _ClassUtils.class.getClassLoader().getResource(resource);
+ url = ClassUtils.class.getClassLoader().getResource(resource);
}
return url;
}
@@ -308,7 +308,7 @@
if (stream == null)
{
// fallback
- stream = _ClassUtils.class.getClassLoader().getResourceAsStream(resource);
+ stream = ClassUtils.class.getClassLoader().getResourceAsStream(resource);
}
return stream;
}
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/_ComponentUtils.java b/api/src/main/java/org/apache/myfaces/core/api/shared/ComponentUtils.java
similarity index 94%
rename from api/src/main/java/org/apache/myfaces/core/api/shared/_ComponentUtils.java
rename to api/src/main/java/org/apache/myfaces/core/api/shared/ComponentUtils.java
index 5b5964d..7e742e7 100755
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/_ComponentUtils.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/ComponentUtils.java
@@ -28,10 +28,7 @@
import javax.faces.component.UIInput;
import javax.faces.component.UIViewRoot;
-/**
- * A collection of static helper methods for locating UIComponents.
- */
-public class _ComponentUtils
+public class ComponentUtils
{
public static final String V_ID_PREFIX = "__v_";
public static final String RD_ID_PREFIX = "__rd_";
@@ -59,13 +56,13 @@
UNIQUE_COMPONENT_V_IDS = uniqueV;
}
- private _ComponentUtils()
+ private ComponentUtils()
{
}
- public static UIComponent findParentNamingContainer(UIComponent component, boolean returnRootIfNotFound)
+ public static UIComponent findClosestNamingContainer(UIComponent component, boolean returnRootIfNotFound)
{
- NamingContainer result = closest(NamingContainer.class, component);
+ NamingContainer result = findClosest(NamingContainer.class, component);
if (result != null)
{
return (UIComponent) result;
@@ -73,13 +70,13 @@
if (returnRootIfNotFound)
{
- return getRootComponent(component);
+ return findRootComponent(component);
}
return null;
}
- public static <T> T closest(Class<T> type, UIComponent base)
+ public static <T> T findClosest(Class<T> type, UIComponent base)
{
UIComponent parent = base.getParent();
@@ -96,7 +93,7 @@
return null;
}
- public static UIComponent getRootComponent(UIComponent component)
+ public static UIComponent findRootComponent(UIComponent component)
{
UIComponent parent;
for (;;)
@@ -117,8 +114,6 @@
* <i>not</i> search into any child naming container components; this is expected to be handled by the caller of
* this method.
* <p>
- * For an implementation of findComponent which does descend into child naming components, see
- * org.apache.myfaces.custom.util.ComponentUtils.
*
* @return findBase, a descendant of findBase, or null.
*/
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/_ExternalSpecifications.java b/api/src/main/java/org/apache/myfaces/core/api/shared/ExternalSpecifications.java
similarity index 88%
rename from api/src/main/java/org/apache/myfaces/core/api/shared/_ExternalSpecifications.java
rename to api/src/main/java/org/apache/myfaces/core/api/shared/ExternalSpecifications.java
index c0936ec..6dcf067 100644
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/_ExternalSpecifications.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/ExternalSpecifications.java
@@ -20,13 +20,11 @@
/**
* <p>
- * Package-private utility class for determining which specifications are available
- * in the current process. See JIRA issue: http://issues.apache.org/jira/browse/MYFACES-2386
* This is a stripped down version of: org.apache.myfaces.util.ExternalSpecifications
* </p>
* @since 2.0
*/
-public final class _ExternalSpecifications
+public final class ExternalSpecifications
{
private static volatile Boolean beanValidationAvailable;
@@ -59,7 +57,7 @@
// Trial-error approach to check for Bean Validation impl existence.
// If any Exception occurs here, we assume that Bean Validation is not available.
// The cause may be anything, i.e. NoClassDef, config error...
- _BeanValidationUtils.tryBuildDefaultValidatorFactory();
+ BeanValidationUtils.tryBuildDefaultValidatorFactory();
}
catch (Throwable t)
{
@@ -78,7 +76,7 @@
/**
* this class should not be instantiated.
*/
- private _ExternalSpecifications()
+ private ExternalSpecifications()
{
}
}
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/_LocaleUtils.java b/api/src/main/java/org/apache/myfaces/core/api/shared/LocaleUtils.java
similarity index 99%
rename from api/src/main/java/org/apache/myfaces/core/api/shared/_LocaleUtils.java
rename to api/src/main/java/org/apache/myfaces/core/api/shared/LocaleUtils.java
index 3e25e65..9c9f16b 100644
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/_LocaleUtils.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/LocaleUtils.java
@@ -40,7 +40,7 @@
* @since 2.2
* @version $Id$
*/
-public class _LocaleUtils
+public class LocaleUtils
{
/** Concurrent map of language locales by country. */
@@ -58,7 +58,7 @@
* <p>This constructor is public to permit tools that require a JavaBean instance
* to operate.</p>
*/
- public _LocaleUtils()
+ public LocaleUtils()
{
super();
}
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/_MessageUtils.java b/api/src/main/java/org/apache/myfaces/core/api/shared/MessageUtils.java
similarity index 97%
rename from api/src/main/java/org/apache/myfaces/core/api/shared/_MessageUtils.java
rename to api/src/main/java/org/apache/myfaces/core/api/shared/MessageUtils.java
index ab960fe..1da0939 100755
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/_MessageUtils.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/MessageUtils.java
@@ -31,7 +31,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-public class _MessageUtils
+public class MessageUtils
{
private static final String DETAIL_SUFFIX = "_detail";
@@ -136,7 +136,7 @@
if (args != null && args.length > 0)
{
- return new _ParametrizableFacesMessage(severity, summary, detail, args, locale);
+ return new ParametrizableFacesMessage(severity, summary, detail, args, locale);
}
else
{
@@ -206,13 +206,13 @@
{
return ResourceBundle.getBundle(bundleName,
locale,
- _MessageUtils.class.getClassLoader());
+ MessageUtils.class.getClassLoader());
}
else
{
return ResourceBundle.getBundle(bundleName,
locale,
- _MessageUtils.class.getClassLoader(), bundleControl);
+ MessageUtils.class.getClassLoader(), bundleControl);
}
}
catch (MissingResourceException ignore2)
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/_ParametrizableFacesMessage.java b/api/src/main/java/org/apache/myfaces/core/api/shared/ParametrizableFacesMessage.java
similarity index 93%
rename from api/src/main/java/org/apache/myfaces/core/api/shared/_ParametrizableFacesMessage.java
rename to api/src/main/java/org/apache/myfaces/core/api/shared/ParametrizableFacesMessage.java
index 4e06f77..9a238a8 100644
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/_ParametrizableFacesMessage.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/ParametrizableFacesMessage.java
@@ -29,7 +29,7 @@
* This class encapsulates a FacesMessage to evaluate the label
* expression on render response, where f:loadBundle is available
*/
-public class _ParametrizableFacesMessage extends FacesMessage
+public class ParametrizableFacesMessage extends FacesMessage
{
private static final long serialVersionUID = 7792947730961657948L;
@@ -39,7 +39,7 @@
private transient Object evaluatedArgs[];
private Locale locale;
- public _ParametrizableFacesMessage(String summary, String detail, Object[] args, Locale locale)
+ public ParametrizableFacesMessage(String summary, String detail, Object[] args, Locale locale)
{
super(summary, detail);
if (locale == null)
@@ -50,7 +50,7 @@
this.args = args;
}
- public _ParametrizableFacesMessage(FacesMessage.Severity severity, String summary, String detail, Object[] args,
+ public ParametrizableFacesMessage(FacesMessage.Severity severity, String summary, String detail, Object[] args,
Locale locale)
{
super(severity, summary, detail);
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/_SelectItemsIterator.java b/api/src/main/java/org/apache/myfaces/core/api/shared/SelectItemsIterator.java
similarity index 96%
rename from api/src/main/java/org/apache/myfaces/core/api/shared/_SelectItemsIterator.java
rename to api/src/main/java/org/apache/myfaces/core/api/shared/SelectItemsIterator.java
index 2dc6427..c9f4964 100644
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/_SelectItemsIterator.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/SelectItemsIterator.java
@@ -36,14 +36,9 @@
import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
-// ATTENTION
-// This class is associated with org.apache.myfaces.util.SelectItemsIterator.
-// Changes here should also be applied to this class.
-
-public class _SelectItemsIterator implements Iterator<SelectItem>
+public class SelectItemsIterator implements Iterator<SelectItem>
{
-
- private static final Logger log = Logger.getLogger(_SelectItemsIterator.class.getName());
+ private static final Logger log = Logger.getLogger(SelectItemsIterator.class.getName());
// org.apache.myfaces.util.SelectItemsIterator uses JSFAttr
private static final String VAR_ATTR = "var";
@@ -62,7 +57,7 @@
private Object _currentValue;
private FacesContext _facesContext;
- public _SelectItemsIterator(UIComponent selectItemsParent, FacesContext facesContext)
+ public SelectItemsIterator(UIComponent selectItemsParent, FacesContext facesContext)
{
_children = selectItemsParent.getChildCount() > 0
? selectItemsParent.getChildren().iterator()
@@ -136,7 +131,7 @@
ValueExpression expression = uiSelectItem.getValueExpression("value");
throw new IllegalArgumentException("ValueExpression '"
+ (expression == null ? null : expression.getExpressionString()) + "' of UISelectItem : "
- + _ComponentUtils.getPathToComponent(child)
+ + ComponentUtils.getPathToComponent(child)
+ " does not reference an Object of type SelectItem");
}
_nextItem = (SelectItem) item;
@@ -199,7 +194,7 @@
+ " array, Iterable or Map, but of type: {2}",
new Object[] {
(expression == null ? null : expression.getExpressionString()),
- _ComponentUtils.getPathToComponent(child),
+ ComponentUtils.getPathToComponent(child),
(value == null ? null : value.getClass().getName())
});
}
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/_SharedRendererUtils.java b/api/src/main/java/org/apache/myfaces/core/api/shared/SharedRendererUtils.java
similarity index 97%
rename from api/src/main/java/org/apache/myfaces/core/api/shared/_SharedRendererUtils.java
rename to api/src/main/java/org/apache/myfaces/core/api/shared/SharedRendererUtils.java
index 6393cc9..984bc6e 100755
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/_SharedRendererUtils.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/SharedRendererUtils.java
@@ -41,12 +41,7 @@
import javax.faces.model.SelectItem;
import javax.faces.model.SelectItemGroup;
-/**
- * The util methods in this class are shared between the javax.faces.component package and the
- * org.apache.myfaces.renderkit package. Please note: Any changes here must also apply to the class in the other
- * package!
- */
-public class _SharedRendererUtils
+public class SharedRendererUtils
{
static final String COLLECTION_TYPE_KEY = "collectionType";
static final String VALUE_TYPE_KEY = "valueType";
@@ -178,7 +173,7 @@
if (converter == null)
{
// try to get the by-type-converter from the type of the SelectItems
- _SelectItemsIterator iterator = new _SelectItemsIterator(component, facesContext);
+ SelectItemsIterator iterator = new SelectItemsIterator(component, facesContext);
converter = getSelectItemsValueConverter(iterator, facesContext);
}
@@ -355,7 +350,7 @@
{
try
{
- type = _ClassUtils.forName((String) attribute);
+ type = ClassUtils.forName((String) attribute);
}
catch (ClassNotFoundException cnfe)
{
@@ -409,7 +404,7 @@
{
log(facesContext,
"Found attribute valueType on component " +
- _ComponentUtils.getPathToComponent(component) +
+ ComponentUtils.getPathToComponent(component) +
", but could not get a by-type converter for type " +
valueType.getName(),
null);
diff --git a/api/src/main/resources/META-INF/componentClass20.vm b/api/src/main/resources/META-INF/componentClass20.vm
index 42e121d..3eece99 100644
--- a/api/src/main/resources/META-INF/componentClass20.vm
+++ b/api/src/main/resources/META-INF/componentClass20.vm
@@ -36,7 +36,7 @@
import javax.el.ValueExpression;
import javax.faces.context.FacesContext;
import java.util.Collections;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
$utils.importTagClasses($component)
#if ($component.isTemplate())
diff --git a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
index d108e15..cfa153b 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
@@ -61,7 +61,7 @@
import javax.faces.application.ViewHandler;
import javax.faces.view.ViewDeclarationLanguage;
import org.apache.myfaces.config.MyfacesConfig;
-import org.apache.myfaces.core.api.shared._LocaleUtils;
+import org.apache.myfaces.core.api.shared.LocaleUtils;
import org.apache.myfaces.util.SharedStringBuilder;
import org.apache.myfaces.resource.ContractResource;
import org.apache.myfaces.resource.ContractResourceLoader;
@@ -1157,11 +1157,11 @@
{
token = resourceId.substring(start, firstSlash);
//Try to derive a locale object
- Locale locale = _LocaleUtils.deriveLocale(token);
+ Locale locale = LocaleUtils.deriveLocale(token);
// If the locale was derived and it is available,
// assume that portion of the resourceId it as a locale prefix.
- if (locale != null && _LocaleUtils.isAvailableLocale(locale))
+ if (locale != null && LocaleUtils.isAvailableLocale(locale))
{
localePrefix = token;
start = firstSlash+1;
@@ -1324,11 +1324,11 @@
{
token = resourceId.substring(start, firstSlash);
//Try to derive a locale object
- Locale locale = _LocaleUtils.deriveLocale(token);
+ Locale locale = LocaleUtils.deriveLocale(token);
// If the locale was derived and it is available,
// assume that portion of the resourceId it as a locale prefix.
- if (locale != null && _LocaleUtils.isAvailableLocale(locale))
+ if (locale != null && LocaleUtils.isAvailableLocale(locale))
{
localePrefix = token;
start = firstSlash+1;
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java b/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java
index 2fd38f6..fa8309d 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java
@@ -48,8 +48,8 @@
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
import javax.faces.model.SelectItem;
-import org.apache.myfaces.core.api.shared._SelectItemsIterator;
-import org.apache.myfaces.core.api.shared._SharedRendererUtils;
+import org.apache.myfaces.core.api.shared.SelectItemsIterator;
+import org.apache.myfaces.core.api.shared.SharedRendererUtils;
import org.apache.myfaces.util.ComponentUtils;
import org.apache.myfaces.util.lang.HashMapUtils;
@@ -443,7 +443,7 @@
if (considerValueType)
{
// try to get a converter from the valueType attribute
- converter = _SharedRendererUtils.getValueTypeConverter(facesContext, component);
+ converter = SharedRendererUtils.getValueTypeConverter(facesContext, component);
if (converter != null)
{
return converter;
@@ -473,8 +473,7 @@
if (Collection.class.isAssignableFrom(valueType) || Object.class.equals(valueType))
{
// try to get the by-type-converter from the type of the SelectItems
- return _SharedRendererUtils.getSelectItemsValueConverter(
- new _SelectItemsIterator(component, facesContext),
+ return SharedRendererUtils.getSelectItemsValueConverter(new SelectItemsIterator(component, facesContext),
facesContext);
}
@@ -496,8 +495,7 @@
{
// There is no converter for Object class
// try to get the by-type-converter from the type of the SelectItems
- return _SharedRendererUtils.getSelectItemsValueConverter(
- new _SelectItemsIterator(component, facesContext),
+ return SharedRendererUtils.getSelectItemsValueConverter(new SelectItemsIterator(component, facesContext),
facesContext);
}
@@ -589,7 +587,7 @@
{
List<SelectItem> list = new ArrayList<>();
- for (_SelectItemsIterator iter = new _SelectItemsIterator(uiComponent, facesContext); iter.hasNext();)
+ for (SelectItemsIterator iter = new SelectItemsIterator(uiComponent, facesContext); iter.hasNext();)
{
list.add(iter.next());
}
@@ -849,7 +847,7 @@
+ ComponentUtils.getPathToComponent(selectMany) + "expected");
}
- return _SharedRendererUtils.getConvertedUISelectManyValue(facesContext,
+ return SharedRendererUtils.getConvertedUISelectManyValue(facesContext,
selectMany, (String[]) submittedValue, considerValueType);
}
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/SelectItemsUtils.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/SelectItemsUtils.java
index c80e657..f5bea46 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/SelectItemsUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/SelectItemsUtils.java
@@ -31,7 +31,7 @@
import javax.faces.convert.Converter;
import javax.faces.model.SelectItem;
import javax.faces.model.SelectItemGroup;
-import org.apache.myfaces.core.api.shared._SelectItemsIterator;
+import org.apache.myfaces.core.api.shared.SelectItemsIterator;
import org.apache.myfaces.renderkit.RendererUtils;
import static org.apache.myfaces.renderkit.html.util.HtmlRendererUtils.isHideNoSelectionOption;
@@ -46,7 +46,7 @@
{
List<SelectItemInfo> list = new ArrayList<>();
- for (_SelectItemsIterator iter = new _SelectItemsIterator(uiSelectMany, facesContext); iter.hasNext();)
+ for (SelectItemsIterator iter = new SelectItemsIterator(uiSelectMany, facesContext); iter.hasNext();)
{
list.add(new SelectItemInfo(iter.next(), iter.getCurrentComponent(), iter.getCurrentValue()));
}
@@ -56,7 +56,7 @@
public static List<SelectItemInfo> getSelectItemInfoList(UISelectOne uiSelectOne, FacesContext facesContext)
{
List<SelectItemInfo> list = new ArrayList<>();
- for (_SelectItemsIterator iter = new _SelectItemsIterator(uiSelectOne, facesContext); iter.hasNext();)
+ for (SelectItemsIterator iter = new SelectItemsIterator(uiSelectOne, facesContext); iter.hasNext();)
{
list.add(new SelectItemInfo(iter.next(), iter.getCurrentComponent(), iter.getCurrentValue()));
}
diff --git a/impl/src/main/java/org/apache/myfaces/util/lang/ClassUtils.java b/impl/src/main/java/org/apache/myfaces/util/lang/ClassUtils.java
index 4bbb9a0..e4e6595 100755
--- a/impl/src/main/java/org/apache/myfaces/util/lang/ClassUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/util/lang/ClassUtils.java
@@ -24,10 +24,9 @@
import java.util.Collection;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.myfaces.core.api.shared._ClassUtils;
-public final class ClassUtils extends _ClassUtils
+public final class ClassUtils extends org.apache.myfaces.core.api.shared.ClassUtils
{
//~ Static fields/initializers -----------------------------------------------------------------
diff --git a/impl/src/test/java/javax/faces/component/UISelectItemsTest.java b/impl/src/test/java/javax/faces/component/UISelectItemsTest.java
index 06d4b42..f5523d9 100644
--- a/impl/src/test/java/javax/faces/component/UISelectItemsTest.java
+++ b/impl/src/test/java/javax/faces/component/UISelectItemsTest.java
@@ -18,7 +18,7 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._SelectItemsIterator;
+import org.apache.myfaces.core.api.shared.SelectItemsIterator;
import java.util.ArrayList;
import java.util.List;
@@ -54,7 +54,7 @@
UISelectOne selectOne = new UISelectOne();
selectOne.getChildren().add(selectItems);
- _SelectItemsIterator iter = new _SelectItemsIterator(selectOne, facesContext);
+ SelectItemsIterator iter = new SelectItemsIterator(selectOne, facesContext);
List<String> options = new ArrayList<String>();
while(iter.hasNext())
{
@@ -80,7 +80,7 @@
UISelectOne selectOne = new UISelectOne();
selectOne.getChildren().add(selectItems);
- _SelectItemsIterator iter = new _SelectItemsIterator(selectOne, facesContext);
+ SelectItemsIterator iter = new SelectItemsIterator(selectOne, facesContext);
int[] options = new int[3];
for (int i = 0; i < 3; i++)
{
diff --git a/impl/src/test/java/javax/faces/component/_ComponentUtilsTest.java b/impl/src/test/java/javax/faces/component/_ComponentUtilsTest.java
index 5e437a5..62f3947 100644
--- a/impl/src/test/java/javax/faces/component/_ComponentUtilsTest.java
+++ b/impl/src/test/java/javax/faces/component/_ComponentUtilsTest.java
@@ -18,7 +18,7 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._ComponentUtils;
+import org.apache.myfaces.core.api.shared.ComponentUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -32,16 +32,16 @@
@Test
public void testIsRendered() {
UIComponent uiComponent = new UIOutput();
- boolean rendered = _ComponentUtils.isRendered(facesContext, uiComponent);
+ boolean rendered = ComponentUtils.isRendered(facesContext, uiComponent);
assertTrue(rendered);
uiComponent.setRendered(false);
- rendered = _ComponentUtils.isRendered(facesContext, uiComponent);
+ rendered = ComponentUtils.isRendered(facesContext, uiComponent);
assertFalse(rendered);
UIOutput uiOutput = new UIOutput();
UIComponent parent = MockRenderedValueExpression.setUpComponentStack(facesContext, uiOutput, false);
- rendered = _ComponentUtils.isRendered(facesContext, uiComponent);
+ rendered = ComponentUtils.isRendered(facesContext, uiComponent);
assertFalse(rendered);
assertEquals("isRendered must not change current component", parent,
UIComponent.getCurrentComponent(facesContext));
diff --git a/impl/src/test/java/javax/faces/component/_SelectItemsUtilTest.java b/impl/src/test/java/javax/faces/component/_SelectItemsUtilTest.java
index b32506b..0ef049e 100644
--- a/impl/src/test/java/javax/faces/component/_SelectItemsUtilTest.java
+++ b/impl/src/test/java/javax/faces/component/_SelectItemsUtilTest.java
@@ -18,7 +18,7 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._SelectItemsIterator;
+import org.apache.myfaces.core.api.shared.SelectItemsIterator;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -33,7 +33,7 @@
private static final String NO_SELECTION_ITEM_VALUE = "1.0";
private UISelectOne uiComponent;
private Float value;
- private _SelectItemsIterator iterator;
+ private SelectItemsIterator iterator;
private UISelectItem noSelectionOption;
private UISelectItem selectItem1;
private UISelectItem selectItem2;
@@ -63,7 +63,7 @@
selectItem3.setItemValue("1.3");
uiComponent.getChildren().add(selectItem3);
- iterator = new _SelectItemsIterator(uiComponent, facesContext);
+ iterator = new SelectItemsIterator(uiComponent, facesContext);
}
@After
@@ -99,7 +99,7 @@
selectItem1.setItemValue("ONE");
selectItem2.setItemValue("TWO");
selectItem3.setItemValue("THREE");
- iterator = new _SelectItemsIterator(uiComponent, facesContext);
+ iterator = new SelectItemsIterator(uiComponent, facesContext);
Object enumValue = MockEnum.THREE;
boolean matchValue = _SelectItemsUtil.matchValue(facesContext, uiComponent, enumValue, iterator, null);
@@ -118,7 +118,7 @@
selectItem1.setItemValue("ONE");
selectItem2.setItemValue("TWO");
selectItem3.setItemValue("THREE");
- iterator = new _SelectItemsIterator(uiComponent, facesContext);
+ iterator = new SelectItemsIterator(uiComponent, facesContext);
Object enumValue = MockEnum.TWO;
boolean matchValue = _SelectItemsUtil.matchValue(facesContext, uiComponent, enumValue, iterator, null);
diff --git a/impl/src/test/java/javax/faces/component/_SharedRendererUtilsTest.java b/impl/src/test/java/javax/faces/component/_SharedRendererUtilsTest.java
index bb62e47..d365a63 100644
--- a/impl/src/test/java/javax/faces/component/_SharedRendererUtilsTest.java
+++ b/impl/src/test/java/javax/faces/component/_SharedRendererUtilsTest.java
@@ -18,7 +18,7 @@
*/
package javax.faces.component;
-import org.apache.myfaces.core.api.shared._SharedRendererUtils;
+import org.apache.myfaces.core.api.shared.SharedRendererUtils;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
@@ -201,7 +201,7 @@
*/
public void testGetConvertedUISelectManyValueNoConverterNoValueExpression()
{
- Object target = _SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
+ Object target = SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
assertTrue(target instanceof Object[]);
assertTrue(Arrays.deepEquals((Object[]) target, submittedValue));
}
@@ -216,7 +216,7 @@
externalContext.getApplicationMap().put("bean", new Bean());
ValueExpression expr = new MockValueExpression("#{bean.intArrayValue}", int[].class);
uiSelectMany.setValueExpression("value", expr);
- Object target = _SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
+ Object target = SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
assertTrue(target instanceof int[]);
int[] array = (int[]) target;
assertTrue(new Integer(submittedValue[0]).equals(array[0]));
@@ -234,7 +234,7 @@
externalContext.getApplicationMap().put("bean", new Bean());
ValueExpression expr = new MockValueExpression("#{bean.floatArrayValue}", Float[].class);
uiSelectMany.setValueExpression("value", expr);
- Object target = _SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
+ Object target = SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
assertTrue(target instanceof Float[]);
Float[] array = (Float[]) target;
assertTrue(new Float(submittedValue[0]).equals(array[0]));
@@ -252,7 +252,7 @@
ValueExpression expr = new MockValueExpression("#{bean.pojoArrayValue}", POJO[].class);
uiSelectMany.setValueExpression("value", expr);
uiSelectMany.setConverter(pojoConverter);
- Object target = _SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
+ Object target = SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
assertTrue(target instanceof POJO[]);
POJO[] array = (POJO[]) target;
assertTrue(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[0]).equals(array[0]));
@@ -272,7 +272,7 @@
ValueExpression expr = new MockValueExpression("#{bean.pojoCollectionValue}", Collection.class);
uiSelectMany.setValueExpression("value", expr);
uiSelectMany.setConverter(pojoConverter);
- Object target = _SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
+ Object target = SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
assertTrue(target instanceof Collection);
Collection collection = (Collection) target;
assertTrue(collection.contains(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[0])));
@@ -294,7 +294,7 @@
uiSelectMany.setValueExpression("value", expr);
uiSelectMany.setConverter(pojoConverter);
uiSelectMany.getAttributes().put("collectionType", "java.util.HashSet");
- Object target = _SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
+ Object target = SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
assertTrue(target instanceof HashSet);
HashSet hashSet = (HashSet) target;
assertTrue(hashSet.contains(pojoConverter.getAsObject(facesContext, uiSelectMany, submittedValue[0])));
@@ -313,7 +313,7 @@
uiSelectMany.setValueExpression("value", expr);
try
{
- _SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
+ SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
fail();
}
catch (ConverterException ce)
@@ -336,7 +336,7 @@
uiSelectMany.getAttributes().put("collectionType", "java.util.Collection");
try
{
- _SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
+ SharedRendererUtils.getConvertedUISelectManyValue(facesContext, uiSelectMany, submittedValue);
fail();
}
catch (FacesException fe)
diff --git a/impl/src/test/java/javax/faces/convert/MessageUtilsTest.java b/impl/src/test/java/javax/faces/convert/MessageUtilsTest.java
index 4a10978..57c8418 100644
--- a/impl/src/test/java/javax/faces/convert/MessageUtilsTest.java
+++ b/impl/src/test/java/javax/faces/convert/MessageUtilsTest.java
@@ -20,7 +20,7 @@
import javax.el.ValueExpression;
import javax.faces.component.html.HtmlInputText;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.el.MockValueExpression;
@@ -49,7 +49,7 @@
{
HtmlInputText inputText = new HtmlInputText();
inputText.getAttributes().put("label", "testLabel");
- Object label = _MessageUtils.getLabel(facesContext, inputText);
+ Object label = MessageUtils.getLabel(facesContext, inputText);
assertEquals("testLabel", label);
}
@@ -60,7 +60,7 @@
ValueExpression expression = new MockValueExpression("#{requestScope.lbl}", String.class);
inputText.setValueExpression("label", expression);
- Object label = _MessageUtils.getLabel(facesContext, inputText);
+ Object label = MessageUtils.getLabel(facesContext, inputText);
assertEquals("testLabel", label);
}
@@ -68,7 +68,7 @@
{
HtmlInputText inputText = new HtmlInputText();
inputText.setId("testId");
- Object label = _MessageUtils.getLabel(facesContext, inputText);
+ Object label = MessageUtils.getLabel(facesContext, inputText);
assertEquals("testId", label);
}
}
\ No newline at end of file
diff --git a/impl/src/test/java/javax/faces/validator/_MessageUtilsTest.java b/impl/src/test/java/javax/faces/validator/_MessageUtilsTest.java
index 29a8836..b2f30ac 100644
--- a/impl/src/test/java/javax/faces/validator/_MessageUtilsTest.java
+++ b/impl/src/test/java/javax/faces/validator/_MessageUtilsTest.java
@@ -18,7 +18,7 @@
*/
package javax.faces.validator;
-import org.apache.myfaces.core.api.shared._MessageUtils;
+import org.apache.myfaces.core.api.shared.MessageUtils;
import java.util.HashMap;
import static org.easymock.EasyMock.expect;
@@ -73,7 +73,7 @@
expect(valueExpression.getValue(elContext)).andReturn(s);
mocksControl.replay();
- Assert.assertEquals(_MessageUtils.getErrorMessage(facesContext, "javax.faces.validator.DoubleRangeValidator.MAXIMUM",
+ Assert.assertEquals(MessageUtils.getErrorMessage(facesContext, "javax.faces.validator.DoubleRangeValidator.MAXIMUM",
new Object[] { "xyz", "xxx" }).getDetail(),
"xxx: Validation Error: Value is greater than allowable maximum of 'xyz'");
}
