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 2008/08/15 04:13:30 UTC
svn commit: r686110 [3/6] - in
/myfaces/extensions/validator/branches/jsf_1.1: ./ core/
core/src/main/java/org/apache/myfaces/extensions/validator/
core/src/main/java/org/apache/myfaces/extensions/validator/core/
core/src/main/java/org/apache/myfaces/e...
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ELUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ELUtils.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ELUtils.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ELUtils.java Thu Aug 14 19:13:27 2008
@@ -27,64 +27,97 @@
*
* @author Gerhard Petracek
*/
-public class ELUtils {
- public static Class getTypeOfValueBindingForExpression(FacesContext facesContext, String valueBindingExpression) {
+public class ELUtils
+{
+ public static Class getTypeOfValueBindingForExpression(
+ FacesContext facesContext, String valueBindingExpression)
+ {
//due to a restriction with the ri
- Object bean = ELUtils.getValueOfExpression(facesContext, valueBindingExpression);
+ Object bean = ELUtils.getValueOfExpression(facesContext,
+ valueBindingExpression);
return (bean != null) ? bean.getClass() : null;
}
- public static Object getBean(String beanName) {
+ public static Object getBean(String beanName)
+ {
FacesContext facesContext = FacesContext.getCurrentInstance();
- return facesContext.getApplication().getVariableResolver().resolveVariable(facesContext, beanName);
+ return facesContext.getApplication().getVariableResolver()
+ .resolveVariable(facesContext, beanName);
}
//TODO refactor - problem - static values - jsf 1.2 e.g.: ${value}
- public static Object getBaseObject(String valueBindingExpression, UIComponent uiComponent) {
- if (valueBindingExpression.lastIndexOf(".") == -1) {
- return uiComponent.getValueBinding("value").getValue(FacesContext.getCurrentInstance());
+ public static Object getBaseObject(String valueBindingExpression,
+ UIComponent uiComponent)
+ {
+ if (valueBindingExpression.lastIndexOf(".") == -1)
+ {
+ return uiComponent.getValueBinding("value").getValue(
+ FacesContext.getCurrentInstance());
}
return getBaseObject(valueBindingExpression);
}
- public static Object getBaseObject(String valueBindingExpression) {
- String newExpression = valueBindingExpression.substring(0, valueBindingExpression.lastIndexOf(".")) + "}";
-
- return getValueOfExpression(FacesContext.getCurrentInstance(), newExpression);
- }
-
- public static Object getValueOfExpression(FacesContext facesContext, String valueBindingExpression) {
- return (valueBindingExpression != null) ? facesContext.getApplication().createValueBinding(valueBindingExpression).getValue(facesContext) : null;
- }
-
- public static boolean isExpressionValid(FacesContext facesContext, String valueBindingExpression) {
- return facesContext.getApplication().createValueBinding(valueBindingExpression) != null;
- }
-
-
- public static String getReliableValueBindingExpression(UIComponent uiComponent) {
+ public static Object getBaseObject(String valueBindingExpression)
+ {
+ String newExpression = valueBindingExpression.substring(0,
+ valueBindingExpression.lastIndexOf("."))
+ + "}";
+
+ return getValueOfExpression(FacesContext.getCurrentInstance(),
+ newExpression);
+ }
+
+ public static Object getValueOfExpression(FacesContext facesContext,
+ String valueBindingExpression)
+ {
+ return (valueBindingExpression != null) ? facesContext.getApplication()
+ .createValueBinding(valueBindingExpression).getValue(
+ facesContext) : null;
+ }
+
+ public static boolean isExpressionValid(FacesContext facesContext,
+ String valueBindingExpression)
+ {
+ return facesContext.getApplication().createValueBinding(
+ valueBindingExpression) != null;
+ }
+
+ public static String getReliableValueBindingExpression(
+ UIComponent uiComponent)
+ {
String valueBindingExpression = getValueBindingExpression(uiComponent);
String baseExpression = valueBindingExpression;
- if(baseExpression.contains(".")) {
- baseExpression = baseExpression.substring(0, valueBindingExpression.lastIndexOf(".")) + "}";
+ if (baseExpression.contains("."))
+ {
+ baseExpression = baseExpression.substring(0, valueBindingExpression
+ .lastIndexOf("."))
+ + "}";
}
- if(getTypeOfValueBindingForExpression(FacesContext.getCurrentInstance(), baseExpression) == null) {
- valueBindingExpression = FaceletsTaglibExpressionUtils.tryToCreateValueBindingForFaceletsBinding(uiComponent);
+ if (getTypeOfValueBindingForExpression(FacesContext
+ .getCurrentInstance(), baseExpression) == null)
+ {
+ valueBindingExpression = FaceletsTaglibExpressionUtils
+ .tryToCreateValueBindingForFaceletsBinding(uiComponent);
}
return valueBindingExpression;
}
- public static String getValueBindingExpression(UIComponent uiComponent) {
+ public static String getValueBindingExpression(UIComponent uiComponent)
+ {
ValueBinding valueExpression = uiComponent.getValueBinding("value");
- return (valueExpression != null) ? valueExpression.getExpressionString() : null;
+ return (valueExpression != null) ? valueExpression
+ .getExpressionString() : null;
}
- public static Class getTypeOfValueBindingForComponent(FacesContext facesContext, UIComponent uiComponent) {
+ public static Class getTypeOfValueBindingForComponent(
+ FacesContext facesContext, UIComponent uiComponent)
+ {
ValueBinding valueBinding = uiComponent.getValueBinding("value");
- return (valueBinding != null) ? valueBinding.getType(facesContext) : null;
+ return (valueBinding != null) ? valueBinding.getType(facesContext)
+ : null;
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java Thu Aug 14 19:13:27 2008
@@ -18,9 +18,11 @@
*/
package org.apache.myfaces.extensions.validator.util;
-import org.apache.myfaces.extensions.validator.core.InformationProviderBean;
-import org.apache.myfaces.extensions.validator.core.ProcessedInformationEntry;
-import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,116 +36,161 @@
import javax.faces.event.PhaseListener;
import javax.faces.lifecycle.Lifecycle;
import javax.faces.lifecycle.LifecycleFactory;
-import java.util.*;
+
+import org.apache.myfaces.extensions.validator.core.InformationProviderBean;
+import org.apache.myfaces.extensions.validator.core.ProcessedInformationEntry;
+import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
+
/**
* @author Gerhard Petracek
*/
-public class ExtValUtils {
+public class ExtValUtils
+{
private static final Log LOGGER = LogFactory.getLog(ExtValUtils.class);
- public static String getBasePackage() {
+ public static String getBasePackage()
+ {
return getInformationProviderBean().getBasePackage();
}
- public static InformationProviderBean getInformationProviderBean() {
- Map applicationMap = FacesContext.getCurrentInstance().getExternalContext().getApplicationMap();
- InformationProviderBean bean = (InformationProviderBean) applicationMap.get(InformationProviderBean.BEAN_NAME);
+ public static InformationProviderBean getInformationProviderBean()
+ {
+ Map applicationMap = FacesContext.getCurrentInstance()
+ .getExternalContext().getApplicationMap();
+ InformationProviderBean bean = (InformationProviderBean) applicationMap
+ .get(InformationProviderBean.BEAN_NAME);
- if (bean == null) {
+ if (bean == null)
+ {
return initInformationProviderBean(applicationMap);
}
return bean;
}
- private static InformationProviderBean initInformationProviderBean(Map applicationMap) {
+ private static InformationProviderBean initInformationProviderBean(
+ Map applicationMap)
+ {
List<String> informationProviderBeanClassNames = new ArrayList<String>();
- informationProviderBeanClassNames.add(WebXmlParameter.CUSTOM_CONVENTION_INFO_PROVIDER_BEAN);
- informationProviderBeanClassNames.add(ExtValUtils.getCustomInformationProviderBeanClassName());
- informationProviderBeanClassNames.add(InformationProviderBean.class.getName());
+ informationProviderBeanClassNames
+ .add(WebXmlParameter.CUSTOM_CONVENTION_INFO_PROVIDER_BEAN);
+ informationProviderBeanClassNames.add(ExtValUtils
+ .getCustomInformationProviderBeanClassName());
+ informationProviderBeanClassNames.add(InformationProviderBean.class
+ .getName());
InformationProviderBean informationProviderBean;
- for (String className : informationProviderBeanClassNames) {
- informationProviderBean = (InformationProviderBean) ClassUtils.tryToInstantiateClassForName(className);
-
- if (informationProviderBean != null) {
- applicationMap.put(InformationProviderBean.BEAN_NAME, informationProviderBean);
+ for (String className : informationProviderBeanClassNames)
+ {
+ informationProviderBean = (InformationProviderBean) ClassUtils
+ .tryToInstantiateClassForName(className);
+
+ if (informationProviderBean != null)
+ {
+ applicationMap.put(InformationProviderBean.BEAN_NAME,
+ informationProviderBean);
return informationProviderBean;
}
}
- throw new IllegalStateException(InformationProviderBean.class.getName() + " not found");
+ throw new IllegalStateException(InformationProviderBean.class.getName()
+ + " not found");
}
- public static String getCustomInformationProviderBeanClassName() {
- InformationProviderBean bean = (InformationProviderBean) ELUtils.getBean(InformationProviderBean.CUSTOM_BEAN);
+ public static String getCustomInformationProviderBeanClassName()
+ {
+ InformationProviderBean bean = (InformationProviderBean) ELUtils
+ .getBean(InformationProviderBean.CUSTOM_BEAN);
return (bean != null) ? bean.getClass().getName() : null;
}
- public static void deregisterPhaseListener(PhaseListener phaseListener) {
- LifecycleFactory lifecycleFactory = (LifecycleFactory) FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
+ public static void deregisterPhaseListener(PhaseListener phaseListener)
+ {
+ LifecycleFactory lifecycleFactory = (LifecycleFactory) FactoryFinder
+ .getFactory(FactoryFinder.LIFECYCLE_FACTORY);
String currentId;
Lifecycle currentLifecycle;
Iterator lifecycleIds = lifecycleFactory.getLifecycleIds();
- while (lifecycleIds.hasNext()) {
+ while (lifecycleIds.hasNext())
+ {
currentId = (String) lifecycleIds.next();
currentLifecycle = lifecycleFactory.getLifecycle(currentId);
currentLifecycle.removePhaseListener(phaseListener);
}
}
- public static final String VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY = ExtValUtils.class.getName();
+ public static final String VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY = ExtValUtils.class
+ .getName();
- public static Map<String, ProcessedInformationEntry> getOrInitValueBindingConvertedValueMapping() {
- Map requestMap = FacesContext.getCurrentInstance().getExternalContext().getRequestMap();
+ public static Map<String, ProcessedInformationEntry> getOrInitValueBindingConvertedValueMapping()
+ {
+ Map requestMap = FacesContext.getCurrentInstance().getExternalContext()
+ .getRequestMap();
- if (!requestMap.containsKey(VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY)) {
+ if (!requestMap.containsKey(VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY))
+ {
resetCrossValidationStorage();
}
- return (Map<String, ProcessedInformationEntry>) requestMap.get(VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY);
+ return (Map<String, ProcessedInformationEntry>) requestMap
+ .get(VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY);
}
- public static void resetCrossValidationStorage() {
- FacesContext.getCurrentInstance().getExternalContext().getRequestMap().put(VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY, new HashMap<String, ProcessedInformationEntry>());
+ public static void resetCrossValidationStorage()
+ {
+ FacesContext.getCurrentInstance().getExternalContext().getRequestMap()
+ .put(VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY,
+ new HashMap<String, ProcessedInformationEntry>());
}
/*
* workaround: mapping clientId -> proxy -> after restore view: find component + set converter of the mapping
* TODO: find a better solution - multi-window-mode
*/
- public static final String PROXY_MAPPING_KEY = VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY + ":proxyMapping";
+ public static final String PROXY_MAPPING_KEY = VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY
+ + ":proxyMapping";
- public static Map<String, Object> getOrInitProxyMapping() {
+ public static Map<String, Object> getOrInitProxyMapping()
+ {
FacesContext facesContext = FacesContext.getCurrentInstance();
//session scope is just the worst case - cleanup after restore view
Map sessionMap = facesContext.getExternalContext().getSessionMap();
String viewId = facesContext.getViewRoot().getViewId();
- if (!sessionMap.containsKey(PROXY_MAPPING_KEY) || !((Map)sessionMap.get(PROXY_MAPPING_KEY)).containsKey(viewId)) {
+ if (!sessionMap.containsKey(PROXY_MAPPING_KEY)
+ || !((Map) sessionMap.get(PROXY_MAPPING_KEY))
+ .containsKey(viewId))
+ {
resetProxyMapping(viewId);
}
- return (Map<String, Object>) ((Map)sessionMap.get(PROXY_MAPPING_KEY)).get(viewId);
+ return (Map<String, Object>) ((Map) sessionMap.get(PROXY_MAPPING_KEY))
+ .get(viewId);
}
- public static void resetProxyMapping(String viewId) {
- Map sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
+ public static void resetProxyMapping(String viewId)
+ {
+ Map sessionMap = FacesContext.getCurrentInstance().getExternalContext()
+ .getSessionMap();
Map<String, Map<String, Object>> storage;
- if(sessionMap.containsKey(PROXY_MAPPING_KEY)) {
- storage = (Map)sessionMap.get(PROXY_MAPPING_KEY);
- } else {
+ if (sessionMap.containsKey(PROXY_MAPPING_KEY))
+ {
+ storage = (Map) sessionMap.get(PROXY_MAPPING_KEY);
+ }
+ else
+ {
storage = new HashMap<String, Map<String, Object>>();
}
Map<String, Object> map;
- if(!storage.containsKey(viewId)) {
+ if (!storage.containsKey(viewId))
+ {
map = new HashMap<String, Object>();
storage.put(viewId, map);
}
@@ -151,58 +198,74 @@
sessionMap.put(PROXY_MAPPING_KEY, storage);
}
- public static final String PROCESSED_CONVERTER_COUNT_KEY = VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY + ":processedConverterCount";
+ public static final String PROCESSED_CONVERTER_COUNT_KEY = VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY
+ + ":processedConverterCount";
- public static Integer getProcessedConverterCount() {
- Map requestMap = FacesContext.getCurrentInstance().getExternalContext().getRequestMap();
+ public static Integer getProcessedConverterCount()
+ {
+ Map requestMap = FacesContext.getCurrentInstance().getExternalContext()
+ .getRequestMap();
- if (!requestMap.containsKey(PROCESSED_CONVERTER_COUNT_KEY)) {
+ if (!requestMap.containsKey(PROCESSED_CONVERTER_COUNT_KEY))
+ {
resetProcessedConverterMapping();
}
return (Integer) requestMap.get(PROCESSED_CONVERTER_COUNT_KEY);
}
- public static void setProcessedConverterCount(Integer count) {
- Map requestMap = FacesContext.getCurrentInstance().getExternalContext().getRequestMap();
+ public static void setProcessedConverterCount(Integer count)
+ {
+ Map requestMap = FacesContext.getCurrentInstance().getExternalContext()
+ .getRequestMap();
- if (!requestMap.containsKey(PROCESSED_CONVERTER_COUNT_KEY)) {
+ if (!requestMap.containsKey(PROCESSED_CONVERTER_COUNT_KEY))
+ {
resetProcessedConverterMapping();
}
requestMap.put(PROCESSED_CONVERTER_COUNT_KEY, count);
}
- public static void resetProcessedConverterMapping() {
- FacesContext.getCurrentInstance().getExternalContext().getRequestMap().put(PROCESSED_CONVERTER_COUNT_KEY, 0);
+ public static void resetProcessedConverterMapping()
+ {
+ FacesContext.getCurrentInstance().getExternalContext().getRequestMap()
+ .put(PROCESSED_CONVERTER_COUNT_KEY, 0);
}
- public static void increaseProcessedConverterCount() {
+ public static void increaseProcessedConverterCount()
+ {
setProcessedConverterCount(getProcessedConverterCount() + 1);
}
- public static void decreaseProcessedConverterCount() {
+ public static void decreaseProcessedConverterCount()
+ {
setProcessedConverterCount(getProcessedConverterCount() - 1);
}
- public static boolean useProxyMapping() {
+ public static boolean useProxyMapping()
+ {
String initParam = WebXmlParameter.DEACTIVATE_PROXY_MAPPING;
- boolean disableProxyMapping = (initParam != null && initParam.trim().equalsIgnoreCase("true"));
+ boolean disableProxyMapping = (initParam != null && initParam.trim()
+ .equalsIgnoreCase("true"));
return !(useFallbackAdapters() || disableProxyMapping);
}
@Deprecated
- public static boolean useFallbackAdapters() {
+ public static boolean useFallbackAdapters()
+ {
String initParam = WebXmlParameter.USE_ADAPTERS;
return (initParam != null && initParam.trim().equalsIgnoreCase("true"));
}
- public static void restoreProxies() {
+ public static void restoreProxies()
+ {
UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot();
- if (viewRoot != null && ExtValUtils.useProxyMapping()) {
+ if (viewRoot != null && ExtValUtils.useProxyMapping())
+ {
Map componentConverterMapping = ExtValUtils.getOrInitProxyMapping();
Iterator current = componentConverterMapping.keySet().iterator();
@@ -210,83 +273,111 @@
Converter converter;
Converter converterOfComponent;
UIComponent component = null;
- while (current.hasNext()) {
+ while (current.hasNext())
+ {
key = (String) current.next();
converter = (Converter) componentConverterMapping.get(key);
- try {
+ try
+ {
component = viewRoot.findComponent(key);
- } catch (IllegalArgumentException e) {
- //do nothing - it's just a ri bug with complex components - resolveComponentInComplexComponent will return the correct component
+ }
+ catch (IllegalArgumentException e)
+ {
+ //do nothing - it's just a ri bug with complex components -
+ //resolveComponentInComplexComponent will return the correct component
}
- if (component == null) {
- component = resolveComponentInComplexComponent(viewRoot, component, key);
+ if (component == null)
+ {
+ component = resolveComponentInComplexComponent(viewRoot,
+ component, key);
- if (component == null) {
+ if (component == null)
+ {
continue;
}
}
- if (!(component instanceof ValueHolder)) {
+ if (!(component instanceof ValueHolder))
+ {
continue;
}
converterOfComponent = ((ValueHolder) component).getConverter();
//converterOfComponent lost callback during state-saving -> set converter of same type
- if (converterOfComponent != null && converterOfComponent.getClass().getSuperclass().equals(converter.getClass().getSuperclass())) {
+ if (converterOfComponent != null
+ && converterOfComponent.getClass().getSuperclass()
+ .equals(converter.getClass().getSuperclass()))
+ {
((ValueHolder) component).setConverter(converter);
}
}
}
- if (ExtValUtils.useProxyMapping()) {
- ExtValUtils.resetProxyMapping(FacesContext.getCurrentInstance().getViewRoot().getViewId());
+ if (ExtValUtils.useProxyMapping())
+ {
+ ExtValUtils.resetProxyMapping(FacesContext.getCurrentInstance()
+ .getViewRoot().getViewId());
}
}
//TODO
- private static UIComponent resolveComponentInComplexComponent(UIComponent viewRoot, UIComponent component, String key) {
+ private static UIComponent resolveComponentInComplexComponent(
+ UIComponent viewRoot, UIComponent component, String key)
+ {
int index = key.lastIndexOf(":");
- if(index == -1) {
+ if (index == -1)
+ {
return null;
}
-
+
String newKey = key.substring(0, index);
- if (viewRoot.findComponent(newKey) == null) {
+ if (viewRoot.findComponent(newKey) == null)
+ {
int newIndex = newKey.lastIndexOf(":");
- if (newIndex < 1) {
+ if (newIndex < 1)
+ {
return null;
}
newKey = newKey.substring(0, newIndex);
component = viewRoot.findComponent(newKey);
- if (component == null) {
+ if (component == null)
+ {
return null;
- } else {
- return tryToResolveChildComponent(component, key.substring(key.lastIndexOf(":")));
+ }
+ else
+ {
+ return tryToResolveChildComponent(component, key.substring(key
+ .lastIndexOf(":")));
}
}
return null;
}
//TODO
- private static UIComponent tryToResolveChildComponent(UIComponent component, String endOfKey) {
+ private static UIComponent tryToResolveChildComponent(
+ UIComponent component, String endOfKey)
+ {
FacesContext facesContext = FacesContext.getCurrentInstance();
String clientId = component.getClientId(facesContext);
- if (clientId.contains(":") && clientId.substring(clientId.lastIndexOf(":")).endsWith(endOfKey)) {
+ if (clientId.contains(":") && clientId.substring(clientId.lastIndexOf(":")).endsWith(endOfKey))
+ {
return component;
}
UIComponent foundComponent;
- for (UIComponent child : (List<UIComponent>) component.getChildren()) {
+ for (UIComponent child : (List<UIComponent>) component.getChildren())
+ {
foundComponent = tryToResolveChildComponent(child, endOfKey);
- if (foundComponent != null) {
+ if (foundComponent != null)
+ {
return foundComponent;
}
}
@@ -294,33 +385,46 @@
return null;
}
- public static final String ORIGINAL_APPLICATION_KEY = VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY + ":wrapped_application";
+ public static final String ORIGINAL_APPLICATION_KEY = VALUE_BINDING_CONVERTED_VALUE_MAPPING_KEY
+ + ":wrapped_application";
//in order to access the wrapped application and support other Application wrappers
- public static void setOriginalApplication(Application application) {
+ public static void setOriginalApplication(Application application)
+ {
FacesContext facesContext = FacesContext.getCurrentInstance();
- Map applicationMap = facesContext.getExternalContext().getApplicationMap();
+ Map applicationMap = facesContext.getExternalContext()
+ .getApplicationMap();
- if (!applicationMap.containsKey(ORIGINAL_APPLICATION_KEY)) {
- synchronized (ExtValUtils.class) {
+ if (!applicationMap.containsKey(ORIGINAL_APPLICATION_KEY))
+ {
+ synchronized (ExtValUtils.class)
+ {
applicationMap.put(ORIGINAL_APPLICATION_KEY, application);
- if(LOGGER.isTraceEnabled()) {
+ if(LOGGER.isTraceEnabled())
+ {
LOGGER.trace("the original application is " + application.getClass().getName());
}
}
}
}
- public static Application getOriginalApplication() {
- return (Application) FacesContext.getCurrentInstance().getExternalContext().getApplicationMap().get(ORIGINAL_APPLICATION_KEY);
+ public static Application getOriginalApplication()
+ {
+ return (Application) FacesContext.getCurrentInstance()
+ .getExternalContext().getApplicationMap().get(
+ ORIGINAL_APPLICATION_KEY);
}
- public static Converter tryToCreateOriginalConverter(FacesContext facesContext, UIComponent uiComponent) {
+ public static Converter tryToCreateOriginalConverter(
+ FacesContext facesContext, UIComponent uiComponent)
+ {
//for backward compatibility: cross-validation workaround with hidden field and static value
- Class valueBindingType = ELUtils.getTypeOfValueBindingForComponent(facesContext, uiComponent);
+ Class valueBindingType = ELUtils.getTypeOfValueBindingForComponent(
+ facesContext, uiComponent);
- if (valueBindingType == null) {
+ if (valueBindingType == null)
+ {
return null;
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FaceletsTaglibExpressionUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FaceletsTaglibExpressionUtils.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FaceletsTaglibExpressionUtils.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FaceletsTaglibExpressionUtils.java Thu Aug 14 19:13:27 2008
@@ -19,7 +19,6 @@
package org.apache.myfaces.extensions.validator.util;
import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
import java.io.Externalizable;
import java.lang.reflect.AccessibleObject;
@@ -34,20 +33,30 @@
/**
* @author Gerhard Petracek
*/
-public class FaceletsTaglibExpressionUtils {
- public static String tryToCreateValueBindingForFaceletsBinding(UIComponent uiComponent) {
- String faceletsValueBindingExpression = ELUtils.getValueBindingExpression(uiComponent);
+public class FaceletsTaglibExpressionUtils
+{
+ public static String tryToCreateValueBindingForFaceletsBinding(
+ UIComponent uiComponent)
+ {
+ String faceletsValueBindingExpression = ELUtils
+ .getValueBindingExpression(uiComponent);
+
+ try
+ {
+ List<String> foundBindings = extractELTerms(uiComponent
+ .getValueBinding("value"));
- try {
- List<String> foundBindings = extractELTerms(uiComponent.getValueBinding("value"));
-
- return faceletsValueBindingExpression.substring(0, 1) + "{" + createBinding(foundBindings) + "}";
- } catch (Throwable t) {
+ return faceletsValueBindingExpression.substring(0, 1) + "{"
+ + createBinding(foundBindings) + "}";
+ }
+ catch (Throwable t)
+ {
return faceletsValueBindingExpression;
}
}
- private static String createBinding(List<String> expressions) {
+ private static String createBinding(List<String> expressions)
+ {
String result = "";
String prevFaceletsAttributeName = null;
@@ -58,30 +67,43 @@
String[] foundBindingDetails;
String[] bindingDetails;
- for (String entry : expressions) {
- if (entry.startsWith("ValueExpression[")) {
+ for (String entry : expressions)
+ {
+ if (entry.startsWith("ValueExpression["))
+ {
continue;
}
//TODO log entry
foundBindingDetails = entry.split(" ");
indexOfBindingDetails = findIndexOfBindingDetails(foundBindingDetails);
- if (indexOfBindingDetails == -1) {
+ if (indexOfBindingDetails == -1)
+ {
return null;
}
- bindingDetails = foundBindingDetails[indexOfBindingDetails].split("=");
+ bindingDetails = foundBindingDetails[indexOfBindingDetails]
+ .split("=");
- if (bindingDetails.length < 2) {
+ if (bindingDetails.length < 2)
+ {
return null;
}
currentBinding = bindingDetails[1];
- if (prevFaceletsAttributeName != null) {
- partOfBinding = currentBinding.substring(currentBinding.indexOf(prevFaceletsAttributeName) + prevFaceletsAttributeName.length(), currentBinding.indexOf("}"));
+ if (prevFaceletsAttributeName != null)
+ {
+ partOfBinding = currentBinding.substring(currentBinding
+ .indexOf(prevFaceletsAttributeName)
+ + prevFaceletsAttributeName.length(), currentBinding
+ .indexOf("}"));
result = result + partOfBinding;
- } else {
- result = currentBinding.substring(currentBinding.indexOf("{") + 1, currentBinding.indexOf("}"));
+ }
+ else
+ {
+ result = currentBinding.substring(
+ currentBinding.indexOf("{") + 1, currentBinding
+ .indexOf("}"));
}
prevFaceletsAttributeName = bindingDetails[0];
@@ -89,10 +111,13 @@
return result;
}
- private static int findIndexOfBindingDetails(String[] bindingDetails) {
+ private static int findIndexOfBindingDetails(String[] bindingDetails)
+ {
int count = 0;
- for (String entry : bindingDetails) {
- if (entry.contains("=")) {
+ for (String entry : bindingDetails)
+ {
+ if (entry.contains("="))
+ {
return count;
}
count++;
@@ -100,21 +125,29 @@
return -1;
}
- private static List<String> extractELTerms(Object o) {
+ private static List<String> extractELTerms(Object o)
+ {
List<String> foundELTerms = new ArrayList<String>();
- try {
- if (resolveELTerms(o, new HashMap<Object, Object>(), foundELTerms, 0) > 0) {
+ try
+ {
+ if (resolveELTerms(o, new HashMap<Object, Object>(), foundELTerms,
+ 0) > 0)
+ {
return foundELTerms;
}
}
- catch (Exception ex) {
+ catch (Exception ex)
+ {
return null;
}
return null;
}
- private static int resolveELTerms(Object o, Map<Object, Object> visited, List<String> foundELTerms, int count) throws Exception {
- if (o == null || visited.containsKey(o) || count > 50) {
+ private static int resolveELTerms(Object o, Map<Object, Object> visited,
+ List<String> foundELTerms, int count) throws Exception
+ {
+ if (o == null || visited.containsKey(o) || count > 50)
+ {
return 0;
}
@@ -124,36 +157,50 @@
Class c = o.getClass();
//inspect maps
- if (o instanceof Map) {
+ if (o instanceof Map)
+ {
- for (Object entry : ((Map) o).values()) {
- elCount += resolveELTerms(entry, visited, foundELTerms, count + 1);
+ for (Object entry : ((Map) o).values())
+ {
+ elCount += resolveELTerms(entry, visited, foundELTerms,
+ count + 1);
}
return elCount;
}
- if (isELTerm(o)) {
- if (foundELTerms != null) {
+ if (isELTerm(o))
+ {
+ if (foundELTerms != null)
+ {
foundELTerms.add(o.toString());
}
return ++elCount;
}
//analyze arrays
- if (c.isArray()) {
+ if (c.isArray())
+ {
int length = Array.getLength(o);
//check array [L -> no array of primitive types
- if (o.toString().startsWith("[L")) {
- for (int i = 0; i < length; i++) {
- if (o.toString().startsWith("[Ljava.lang.String")) {
- if (isELTerm(Array.get(o, i))) {
- if (foundELTerms != null) {
+ if (o.toString().startsWith("[L"))
+ {
+ for (int i = 0; i < length; i++)
+ {
+ if (o.toString().startsWith("[Ljava.lang.String"))
+ {
+ if (isELTerm(Array.get(o, i)))
+ {
+ if (foundELTerms != null)
+ {
foundELTerms.add(o.toString());
}
elCount++;
}
- } else {
- elCount += resolveELTerms(Array.get(o, i), visited, foundELTerms, count + 1);
+ }
+ else
+ {
+ elCount += resolveELTerms(Array.get(o, i), visited,
+ foundELTerms, count + 1);
}
}
}
@@ -161,46 +208,63 @@
}
List<Field> attributes = findAllAttributes(c, new ArrayList<Field>());
- Field[] fields = (Field[]) attributes.toArray(new Field[attributes.size()]);
+ Field[] fields = (Field[]) attributes.toArray(new Field[attributes
+ .size()]);
AccessibleObject.setAccessible(fields, true);
- for (Field currentField : fields) {
- if (currentField.get(o) == null) {
+ for (Field currentField : fields)
+ {
+ if (currentField.get(o) == null)
+ {
continue;
}
- if (currentField.getType().equals(String.class)) {
- if (currentField.get(o) != null && isELTerm(currentField.get(o))) {
- if (foundELTerms != null) {
+ if (currentField.getType().equals(String.class))
+ {
+ if (currentField.get(o) != null
+ && isELTerm(currentField.get(o)))
+ {
+ if (foundELTerms != null)
+ {
foundELTerms.add(o.toString());
}
elCount++;
}
- } else if (!currentField.getType().isPrimitive()) {
- elCount += resolveELTerms(currentField.get(o), visited, foundELTerms, count + 1);
+ }
+ else if (!currentField.getType().isPrimitive())
+ {
+ elCount += resolveELTerms(currentField.get(o), visited,
+ foundELTerms, count + 1);
}
}
return elCount;
}
- private static boolean isELTerm(Object o) {
- if (o instanceof ValueBinding || o instanceof Externalizable) {
+ private static boolean isELTerm(Object o)
+ {
+ if (o instanceof ValueBinding || o instanceof Externalizable)
+ {
return false;
}
String s = o.toString();
- return ((s.contains("#") || s.contains("$")) && s.contains("{") && s.contains("}"));
+ return ((s.contains("#") || s.contains("$")) && s.contains("{") && s
+ .contains("}"));
}
- private static List<Field> findAllAttributes(Class c, List<Field> attributes) {
- if (c == null) {
+ private static List<Field> findAllAttributes(Class c, List<Field> attributes)
+ {
+ if (c == null)
+ {
return attributes;
}
findAllAttributes(c.getSuperclass(), attributes);
Field[] fields = c.getDeclaredFields();
- for (Field currentField : fields) {
- if (!Modifier.isStatic(currentField.getModifiers())) {
+ for (Field currentField : fields)
+ {
+ if (!Modifier.isStatic(currentField.getModifiers()))
+ {
attributes.add(currentField);
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FactoryUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FactoryUtils.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FactoryUtils.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FactoryUtils.java Thu Aug 14 19:13:27 2008
@@ -37,21 +37,31 @@
* @author Gerhard Petracek
*/
//TODO
-public class FactoryUtils {
+public class FactoryUtils
+{
private static AnnotationExtractorFactory annotationExtractorFactory;
- public static AnnotationExtractorFactory getAnnotationExtractorFactory() {
- if (annotationExtractorFactory == null) {
+ public static AnnotationExtractorFactory getAnnotationExtractorFactory()
+ {
+ if (annotationExtractorFactory == null)
+ {
List<String> annotationExtractorFactoryClassNames = new ArrayList<String>();
- annotationExtractorFactoryClassNames.add(WebXmlParameter.CUSTOM_ANNOTATION_EXTRACTOR_FACTORY);
- annotationExtractorFactoryClassNames.add(ExtValUtils.getInformationProviderBean().getCustomAnnotationExtractorFactory());
- annotationExtractorFactoryClassNames.add(DefaultAnnotationExtractorFactory.class.getName());
+ annotationExtractorFactoryClassNames
+ .add(WebXmlParameter.CUSTOM_ANNOTATION_EXTRACTOR_FACTORY);
+ annotationExtractorFactoryClassNames.add(ExtValUtils
+ .getInformationProviderBean()
+ .getCustomAnnotationExtractorFactory());
+ annotationExtractorFactoryClassNames
+ .add(DefaultAnnotationExtractorFactory.class.getName());
+
+ for (String className : annotationExtractorFactoryClassNames)
+ {
+ annotationExtractorFactory = (AnnotationExtractorFactory) ClassUtils
+ .tryToInstantiateClassForName(className);
- for (String className : annotationExtractorFactoryClassNames) {
- annotationExtractorFactory = (AnnotationExtractorFactory) ClassUtils.tryToInstantiateClassForName(className);
-
- if (annotationExtractorFactory != null) {
+ if (annotationExtractorFactory != null)
+ {
//TODO logging
break;
}
@@ -63,18 +73,27 @@
private static ClassMappingFactory<Annotation, ValidationStrategy> validationStrategyFactory;
- public static ClassMappingFactory<Annotation, ValidationStrategy> getValidationStrategyFactory() {
- if (validationStrategyFactory == null) {
+ public static ClassMappingFactory<Annotation, ValidationStrategy> getValidationStrategyFactory()
+ {
+ if (validationStrategyFactory == null)
+ {
List<String> validationStrategyFactoryClassNames = new ArrayList<String>();
- validationStrategyFactoryClassNames.add(WebXmlParameter.CUSTOM_VALIDATION_STRATEGY_FACTORY);
- validationStrategyFactoryClassNames.add(ExtValUtils.getInformationProviderBean().getCustomValidationStrategyFactory());
- validationStrategyFactoryClassNames.add(DefaultValidationStrategyFactory.class.getName());
-
- for (String className : validationStrategyFactoryClassNames) {
- validationStrategyFactory = (ClassMappingFactory<Annotation, ValidationStrategy>) ClassUtils.tryToInstantiateClassForName(className);
+ validationStrategyFactoryClassNames
+ .add(WebXmlParameter.CUSTOM_VALIDATION_STRATEGY_FACTORY);
+ validationStrategyFactoryClassNames.add(ExtValUtils
+ .getInformationProviderBean()
+ .getCustomValidationStrategyFactory());
+ validationStrategyFactoryClassNames
+ .add(DefaultValidationStrategyFactory.class.getName());
+
+ for (String className : validationStrategyFactoryClassNames)
+ {
+ validationStrategyFactory = (ClassMappingFactory<Annotation, ValidationStrategy>) ClassUtils
+ .tryToInstantiateClassForName(className);
- if (validationStrategyFactory != null) {
+ if (validationStrategyFactory != null)
+ {
//TODO logging
break;
}
@@ -86,18 +105,27 @@
private static ClassMappingFactory<ValidationStrategy, MessageResolver> messageResolverFactory;
- public static ClassMappingFactory<ValidationStrategy, MessageResolver> getMessageResolverFactory() {
- if (messageResolverFactory == null) {
+ public static ClassMappingFactory<ValidationStrategy, MessageResolver> getMessageResolverFactory()
+ {
+ if (messageResolverFactory == null)
+ {
List<String> messageResolverFactoryClassNames = new ArrayList<String>();
- messageResolverFactoryClassNames.add(WebXmlParameter.CUSTOM_MESSAGE_RESOLVER_FACTORY);
- messageResolverFactoryClassNames.add(ExtValUtils.getInformationProviderBean().getCustomMessageResolverFactory());
- messageResolverFactoryClassNames.add(DefaultMessageResolverFactory.class.getName());
+ messageResolverFactoryClassNames
+ .add(WebXmlParameter.CUSTOM_MESSAGE_RESOLVER_FACTORY);
+ messageResolverFactoryClassNames.add(ExtValUtils
+ .getInformationProviderBean()
+ .getCustomMessageResolverFactory());
+ messageResolverFactoryClassNames
+ .add(DefaultMessageResolverFactory.class.getName());
+
+ for (String className : messageResolverFactoryClassNames)
+ {
+ messageResolverFactory = (ClassMappingFactory<ValidationStrategy, MessageResolver>) ClassUtils
+ .tryToInstantiateClassForName(className);
- for (String className : messageResolverFactoryClassNames) {
- messageResolverFactory = (ClassMappingFactory<ValidationStrategy, MessageResolver>) ClassUtils.tryToInstantiateClassForName(className);
-
- if (messageResolverFactory != null) {
+ if (messageResolverFactory != null)
+ {
//TODO logging
break;
}
@@ -110,18 +138,27 @@
private static ClassMappingFactory<Converter, Converter> converterAdapterFactory;
@Deprecated
- public static ClassMappingFactory<Converter, Converter> getConverterAdapterFactory() {
- if (converterAdapterFactory == null) {
+ public static ClassMappingFactory<Converter, Converter> getConverterAdapterFactory()
+ {
+ if (converterAdapterFactory == null)
+ {
List<String> converterAdapterFactoryClassNames = new ArrayList<String>();
- converterAdapterFactoryClassNames.add(WebXmlParameter.CUSTOM_CONVERTER_ADAPTER_FACTORY);
- converterAdapterFactoryClassNames.add(ExtValUtils.getInformationProviderBean().getCustomConverterAdapterFactory());
- converterAdapterFactoryClassNames.add(DefaultConverterAdapterFactory.class.getName());
-
- for (String className : converterAdapterFactoryClassNames) {
- converterAdapterFactory = (ClassMappingFactory<Converter, Converter>) ClassUtils.tryToInstantiateClassForName(className);
+ converterAdapterFactoryClassNames
+ .add(WebXmlParameter.CUSTOM_CONVERTER_ADAPTER_FACTORY);
+ converterAdapterFactoryClassNames.add(ExtValUtils
+ .getInformationProviderBean()
+ .getCustomConverterAdapterFactory());
+ converterAdapterFactoryClassNames
+ .add(DefaultConverterAdapterFactory.class.getName());
+
+ for (String className : converterAdapterFactoryClassNames)
+ {
+ converterAdapterFactory = (ClassMappingFactory<Converter, Converter>) ClassUtils
+ .tryToInstantiateClassForName(className);
- if (converterAdapterFactory != null) {
+ if (converterAdapterFactory != null)
+ {
//TODO logging
break;
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/WebXmlUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/WebXmlUtils.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/WebXmlUtils.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/WebXmlUtils.java Thu Aug 14 19:13:27 2008
@@ -25,10 +25,14 @@
/**
* @author Gerhard Petracek
*/
-public class WebXmlUtils {
+public class WebXmlUtils
+{
- public static String getInitParameter(String key) {
- String value = FacesContext.getCurrentInstance().getExternalContext().getInitParameter(ExtValInformation.WEBXML_PARAM_PREFIX + "." + key);
+ public static String getInitParameter(String key)
+ {
+ String value = FacesContext.getCurrentInstance().getExternalContext()
+ .getInitParameter(
+ ExtValInformation.WEBXML_PARAM_PREFIX + "." + key);
//TODO
return (value != null) ? value.replace(" ", "").trim() : null;
}
Propchange: myfaces/extensions/validator/branches/jsf_1.1/examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 19:13:27 2008
@@ -0,0 +1,10 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings
+maven-eclipse.xml
+.externalToolBuilders
Propchange: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 14 19:13:27 2008
@@ -0,0 +1,10 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings
+maven-eclipse.xml
+.externalToolBuilders
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/pom.xml?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/pom.xml (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/pom.xml Thu Aug 14 19:13:27 2008
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/extensions/validator/demo/domain/Person.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/extensions/validator/demo/domain/Person.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/extensions/validator/demo/domain/Person.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/extensions/validator/demo/domain/Person.java Thu Aug 14 19:13:27 2008
@@ -29,7 +29,8 @@
import javax.persistence.TemporalType;
import java.util.Date;
-public class Person {
+public class Person
+{
@Length(minimum = 2)
@Column(nullable = false, length = 20)
@NotEquals("lastName")
@@ -63,67 +64,83 @@
@Column(nullable = false)
private int numberOfSiblings;
- public String getFirstName() {
+ public String getFirstName()
+ {
return firstName;
}
- public void setFirstName(String firstName) {
+ public void setFirstName(String firstName)
+ {
this.firstName = firstName;
}
- public String getLastName() {
+ public String getLastName()
+ {
return lastName;
}
- public void setLastName(String lastName) {
+ public void setLastName(String lastName)
+ {
this.lastName = lastName;
}
- public String getPassword() {
+ public String getPassword()
+ {
return password;
}
- public void setPassword(String password) {
+ public void setPassword(String password)
+ {
this.password = password;
}
- public Date getBirthday() {
+ public Date getBirthday()
+ {
return birthday;
}
- public void setBirthday(Date birthday) {
+ public void setBirthday(Date birthday)
+ {
this.birthday = birthday;
}
- public Date getFinalExam() {
+ public Date getFinalExam()
+ {
return finalExam;
}
- public void setFinalExam(Date finalExam) {
+ public void setFinalExam(Date finalExam)
+ {
this.finalExam = finalExam;
}
- public String getNickName() {
+ public String getNickName()
+ {
return nickName;
}
- public void setNickName(String nickName) {
+ public void setNickName(String nickName)
+ {
this.nickName = nickName;
}
- public String getEmail() {
+ public String getEmail()
+ {
return email;
}
- public void setEmail(String email) {
+ public void setEmail(String email)
+ {
this.email = email;
}
- public int getNumberOfSiblings() {
+ public int getNumberOfSiblings()
+ {
return numberOfSiblings;
}
- public void setNumberOfSiblings(int numberOfSiblings) {
+ public void setNumberOfSiblings(int numberOfSiblings)
+ {
this.numberOfSiblings = numberOfSiblings;
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java Thu Aug 14 19:13:27 2008
@@ -28,7 +28,8 @@
import org.apache.myfaces.extensions.validator.baseval.annotation.Validator;
import org.apache.myfaces.custom.emailvalidator.EmailValidator;
-public class RegistrationPage {
+public class RegistrationPage
+{
//the old password of the person isn't used within the page
//-> validate with value of the model
@@ -53,12 +54,14 @@
private Person person;
- public String finish() {
+ public String finish()
+ {
this.person.setPassword(this.password);
return "home";
}
- public String updateNickName() {
+ public String updateNickName()
+ {
this.person.setNickName(this.newNickName);
return "home";
}
@@ -66,64 +69,78 @@
//combine gui related annotations with the annoations of the domain model
@JoinValidation("#{person.email}")
@Validator(EmailValidator.class)
- public String getEmail() {
+ public String getEmail()
+ {
return this.person.getEmail();
}
- public void setEmail(String email) {
+ public void setEmail(String email)
+ {
this.person.setEmail(email);
}
@JoinValidation("#{person.numberOfSiblings}")
@LongRange(maximum = 20)
- public int getNumberOfSiblings() {
+ public int getNumberOfSiblings()
+ {
return this.person.getNumberOfSiblings();
}
- public void setNumberOfSiblings(int numberOfSiblings) {
+ public void setNumberOfSiblings(int numberOfSiblings)
+ {
this.person.setNumberOfSiblings(numberOfSiblings);
}
/*
* generated
*/
- public String getOldPassword() {
+ public String getOldPassword()
+ {
return oldPassword;
}
- public void setOldPassword(String oldPassword) {
+ public void setOldPassword(String oldPassword)
+ {
this.oldPassword = oldPassword;
}
- public String getPassword() {
+ public String getPassword()
+ {
return password;
}
- public void setPassword(String password) {
+ public void setPassword(String password)
+ {
this.password = password;
}
- public String getPasswordRepeated() {
+ public String getPasswordRepeated()
+ {
return passwordRepeated;
}
- public void setPasswordRepeated(String passwordRepeated) {
+ public void setPasswordRepeated(String passwordRepeated)
+ {
this.passwordRepeated = passwordRepeated;
}
- public Person getPerson() {
+ public Person getPerson()
+ {
return person;
}
- public void setPerson(Person person) {
+ public void setPerson(Person person)
+ {
this.person = person;
}
- public String getNewNickName() {
+ public String getNewNickName()
+ {
return newNickName;
}
- public void setNewNickName(String newNickName) {
+ public void setNewNickName(String newNickName)
+ {
this.newNickName = newNickName;
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverterAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverterAdapter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverterAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverterAdapter.java Thu Aug 14 19:13:27 2008
@@ -25,21 +25,30 @@
import javax.faces.convert.ConverterException;
/*generated code - don't change!*/
-public class ColorConverterAdapter extends org.apache.myfaces.trinidad.convert.ColorConverter {
- private Converter smartConverter;
+public class ColorConverterAdapter extends
+ org.apache.myfaces.trinidad.convert.ColorConverter
+{
+ private Converter smartConverter;
- public ColorConverterAdapter() {
- this(new org.apache.myfaces.trinidad.convert.ColorConverter());
- }
+ public ColorConverterAdapter()
+ {
+ this(new org.apache.myfaces.trinidad.convert.ColorConverter());
+ }
- public ColorConverterAdapter(Converter converter) {
- this.smartConverter = new ExtValFallbackConverter(converter);
- }
+ public ColorConverterAdapter(Converter converter)
+ {
+ this.smartConverter = new ExtValFallbackConverter(converter);
+ }
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- return this.smartConverter.getAsObject(context, component, value);
- }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- return this.smartConverter.getAsString(context, component, value);
- }
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) throws ConverterException
+ {
+ return this.smartConverter.getAsObject(context, component, value);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) throws ConverterException
+ {
+ return this.smartConverter.getAsString(context, component, value);
+ }
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverterAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverterAdapter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverterAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverterAdapter.java Thu Aug 14 19:13:27 2008
@@ -25,21 +25,30 @@
import javax.faces.convert.ConverterException;
/*generated code - don't change!*/
-public class DateTimeConverterAdapter extends org.apache.myfaces.trinidad.convert.DateTimeConverter {
- private Converter smartConverter;
+public class DateTimeConverterAdapter extends
+ org.apache.myfaces.trinidad.convert.DateTimeConverter
+{
+ private Converter smartConverter;
- public DateTimeConverterAdapter() {
- this(new org.apache.myfaces.trinidad.convert.DateTimeConverter());
- }
+ public DateTimeConverterAdapter()
+ {
+ this(new org.apache.myfaces.trinidad.convert.DateTimeConverter());
+ }
- public DateTimeConverterAdapter(Converter converter) {
- this.smartConverter = new ExtValFallbackConverter(converter);
- }
+ public DateTimeConverterAdapter(Converter converter)
+ {
+ this.smartConverter = new ExtValFallbackConverter(converter);
+ }
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- return this.smartConverter.getAsObject(context, component, value);
- }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- return this.smartConverter.getAsString(context, component, value);
- }
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) throws ConverterException
+ {
+ return this.smartConverter.getAsObject(context, component, value);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) throws ConverterException
+ {
+ return this.smartConverter.getAsString(context, component, value);
+ }
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverterAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverterAdapter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverterAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverterAdapter.java Thu Aug 14 19:13:27 2008
@@ -25,21 +25,30 @@
import javax.faces.convert.ConverterException;
/*generated code - don't change!*/
-public class NumberConverterAdapter extends org.apache.myfaces.trinidad.convert.NumberConverter {
- private Converter smartConverter;
+public class NumberConverterAdapter extends
+ org.apache.myfaces.trinidad.convert.NumberConverter
+{
+ private Converter smartConverter;
- public NumberConverterAdapter() {
- this(new org.apache.myfaces.trinidad.convert.NumberConverter());
- }
+ public NumberConverterAdapter()
+ {
+ this(new org.apache.myfaces.trinidad.convert.NumberConverter());
+ }
- public NumberConverterAdapter(Converter converter) {
- this.smartConverter = new ExtValFallbackConverter(converter);
- }
+ public NumberConverterAdapter(Converter converter)
+ {
+ this.smartConverter = new ExtValFallbackConverter(converter);
+ }
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- return this.smartConverter.getAsObject(context, component, value);
- }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- return this.smartConverter.getAsString(context, component, value);
- }
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) throws ConverterException
+ {
+ return this.smartConverter.getAsObject(context, component, value);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) throws ConverterException
+ {
+ return this.smartConverter.getAsString(context, component, value);
+ }
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ByteConverterAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ByteConverterAdapter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ByteConverterAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ByteConverterAdapter.java Thu Aug 14 19:13:27 2008
@@ -25,21 +25,30 @@
import javax.faces.convert.ConverterException;
/*generated code - don't change!*/
-public class ByteConverterAdapter extends org.apache.myfaces.trinidadinternal.convert.ByteConverter {
- private Converter smartConverter;
+public class ByteConverterAdapter extends
+ org.apache.myfaces.trinidadinternal.convert.ByteConverter
+{
+ private Converter smartConverter;
- public ByteConverterAdapter() {
- this(new org.apache.myfaces.trinidadinternal.convert.ByteConverter());
- }
+ public ByteConverterAdapter()
+ {
+ this(new org.apache.myfaces.trinidadinternal.convert.ByteConverter());
+ }
- public ByteConverterAdapter(Converter converter) {
- this.smartConverter = new ExtValFallbackConverter(converter);
- }
+ public ByteConverterAdapter(Converter converter)
+ {
+ this.smartConverter = new ExtValFallbackConverter(converter);
+ }
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- return this.smartConverter.getAsObject(context, component, value);
- }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- return this.smartConverter.getAsString(context, component, value);
- }
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) throws ConverterException
+ {
+ return this.smartConverter.getAsObject(context, component, value);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) throws ConverterException
+ {
+ return this.smartConverter.getAsString(context, component, value);
+ }
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverterAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverterAdapter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverterAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverterAdapter.java Thu Aug 14 19:13:27 2008
@@ -25,21 +25,30 @@
import javax.faces.convert.ConverterException;
/*generated code - don't change!*/
-public class ColorConverterAdapter extends org.apache.myfaces.trinidadinternal.convert.ColorConverter {
- private Converter smartConverter;
+public class ColorConverterAdapter extends
+ org.apache.myfaces.trinidadinternal.convert.ColorConverter
+{
+ private Converter smartConverter;
- public ColorConverterAdapter() {
- this(new org.apache.myfaces.trinidadinternal.convert.ColorConverter());
- }
+ public ColorConverterAdapter()
+ {
+ this(new org.apache.myfaces.trinidadinternal.convert.ColorConverter());
+ }
- public ColorConverterAdapter(Converter converter) {
- this.smartConverter = new ExtValFallbackConverter(converter);
- }
+ public ColorConverterAdapter(Converter converter)
+ {
+ this.smartConverter = new ExtValFallbackConverter(converter);
+ }
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- return this.smartConverter.getAsObject(context, component, value);
- }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- return this.smartConverter.getAsString(context, component, value);
- }
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) throws ConverterException
+ {
+ return this.smartConverter.getAsObject(context, component, value);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) throws ConverterException
+ {
+ return this.smartConverter.getAsString(context, component, value);
+ }
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverterAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverterAdapter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverterAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverterAdapter.java Thu Aug 14 19:13:27 2008
@@ -25,21 +25,31 @@
import javax.faces.convert.ConverterException;
/*generated code - don't change!*/
-public class DateTimeConverterAdapter extends org.apache.myfaces.trinidadinternal.convert.DateTimeConverter {
- private Converter smartConverter;
+public class DateTimeConverterAdapter extends
+ org.apache.myfaces.trinidadinternal.convert.DateTimeConverter
+{
+ private Converter smartConverter;
- public DateTimeConverterAdapter() {
- this(new org.apache.myfaces.trinidadinternal.convert.DateTimeConverter());
- }
+ public DateTimeConverterAdapter()
+ {
+ this(
+ new org.apache.myfaces.trinidadinternal.convert.DateTimeConverter());
+ }
- public DateTimeConverterAdapter(Converter converter) {
- this.smartConverter = new ExtValFallbackConverter(converter);
- }
+ public DateTimeConverterAdapter(Converter converter)
+ {
+ this.smartConverter = new ExtValFallbackConverter(converter);
+ }
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- return this.smartConverter.getAsObject(context, component, value);
- }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- return this.smartConverter.getAsString(context, component, value);
- }
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) throws ConverterException
+ {
+ return this.smartConverter.getAsObject(context, component, value);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) throws ConverterException
+ {
+ return this.smartConverter.getAsString(context, component, value);
+ }
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/DoubleConverterAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/DoubleConverterAdapter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/DoubleConverterAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/DoubleConverterAdapter.java Thu Aug 14 19:13:27 2008
@@ -25,21 +25,30 @@
import javax.faces.convert.ConverterException;
/*generated code - don't change!*/
-public class DoubleConverterAdapter extends org.apache.myfaces.trinidadinternal.convert.DoubleConverter {
- private Converter smartConverter;
+public class DoubleConverterAdapter extends
+ org.apache.myfaces.trinidadinternal.convert.DoubleConverter
+{
+ private Converter smartConverter;
- public DoubleConverterAdapter() {
- this(new org.apache.myfaces.trinidadinternal.convert.DoubleConverter());
- }
+ public DoubleConverterAdapter()
+ {
+ this(new org.apache.myfaces.trinidadinternal.convert.DoubleConverter());
+ }
- public DoubleConverterAdapter(Converter converter) {
- this.smartConverter = new ExtValFallbackConverter(converter);
- }
+ public DoubleConverterAdapter(Converter converter)
+ {
+ this.smartConverter = new ExtValFallbackConverter(converter);
+ }
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- return this.smartConverter.getAsObject(context, component, value);
- }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- return this.smartConverter.getAsString(context, component, value);
- }
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) throws ConverterException
+ {
+ return this.smartConverter.getAsObject(context, component, value);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) throws ConverterException
+ {
+ return this.smartConverter.getAsString(context, component, value);
+ }
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/FloatConverterAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/FloatConverterAdapter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/FloatConverterAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/FloatConverterAdapter.java Thu Aug 14 19:13:27 2008
@@ -25,21 +25,30 @@
import javax.faces.convert.ConverterException;
/*generated code - don't change!*/
-public class FloatConverterAdapter extends org.apache.myfaces.trinidadinternal.convert.FloatConverter {
- private Converter smartConverter;
+public class FloatConverterAdapter extends
+ org.apache.myfaces.trinidadinternal.convert.FloatConverter
+{
+ private Converter smartConverter;
- public FloatConverterAdapter() {
- this(new org.apache.myfaces.trinidadinternal.convert.FloatConverter());
- }
+ public FloatConverterAdapter()
+ {
+ this(new org.apache.myfaces.trinidadinternal.convert.FloatConverter());
+ }
- public FloatConverterAdapter(Converter converter) {
- this.smartConverter = new ExtValFallbackConverter(converter);
- }
+ public FloatConverterAdapter(Converter converter)
+ {
+ this.smartConverter = new ExtValFallbackConverter(converter);
+ }
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- return this.smartConverter.getAsObject(context, component, value);
- }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- return this.smartConverter.getAsString(context, component, value);
- }
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) throws ConverterException
+ {
+ return this.smartConverter.getAsObject(context, component, value);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) throws ConverterException
+ {
+ return this.smartConverter.getAsString(context, component, value);
+ }
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/IntegerConverterAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/IntegerConverterAdapter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/IntegerConverterAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/IntegerConverterAdapter.java Thu Aug 14 19:13:27 2008
@@ -25,21 +25,30 @@
import javax.faces.convert.ConverterException;
/*generated code - don't change!*/
-public class IntegerConverterAdapter extends org.apache.myfaces.trinidadinternal.convert.IntegerConverter {
- private Converter smartConverter;
+public class IntegerConverterAdapter extends
+ org.apache.myfaces.trinidadinternal.convert.IntegerConverter
+{
+ private Converter smartConverter;
- public IntegerConverterAdapter() {
- this(new org.apache.myfaces.trinidadinternal.convert.IntegerConverter());
- }
+ public IntegerConverterAdapter()
+ {
+ this(new org.apache.myfaces.trinidadinternal.convert.IntegerConverter());
+ }
- public IntegerConverterAdapter(Converter converter) {
- this.smartConverter = new ExtValFallbackConverter(converter);
- }
+ public IntegerConverterAdapter(Converter converter)
+ {
+ this.smartConverter = new ExtValFallbackConverter(converter);
+ }
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- return this.smartConverter.getAsObject(context, component, value);
- }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- return this.smartConverter.getAsString(context, component, value);
- }
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) throws ConverterException
+ {
+ return this.smartConverter.getAsObject(context, component, value);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) throws ConverterException
+ {
+ return this.smartConverter.getAsString(context, component, value);
+ }
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverterAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverterAdapter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverterAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverterAdapter.java Thu Aug 14 19:13:27 2008
@@ -25,21 +25,30 @@
import javax.faces.convert.ConverterException;
/*generated code - don't change!*/
-public class LongConverterAdapter extends org.apache.myfaces.trinidadinternal.convert.LongConverter {
- private Converter smartConverter;
+public class LongConverterAdapter extends
+ org.apache.myfaces.trinidadinternal.convert.LongConverter
+{
+ private Converter smartConverter;
- public LongConverterAdapter() {
- this(new org.apache.myfaces.trinidadinternal.convert.LongConverter());
- }
+ public LongConverterAdapter()
+ {
+ this(new org.apache.myfaces.trinidadinternal.convert.LongConverter());
+ }
- public LongConverterAdapter(Converter converter) {
- this.smartConverter = new ExtValFallbackConverter(converter);
- }
+ public LongConverterAdapter(Converter converter)
+ {
+ this.smartConverter = new ExtValFallbackConverter(converter);
+ }
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- return this.smartConverter.getAsObject(context, component, value);
- }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- return this.smartConverter.getAsString(context, component, value);
- }
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) throws ConverterException
+ {
+ return this.smartConverter.getAsObject(context, component, value);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) throws ConverterException
+ {
+ return this.smartConverter.getAsString(context, component, value);
+ }
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverterAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverterAdapter.java?rev=686110&r1=686109&r2=686110&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverterAdapter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/examples/fallback_demo/src/main/java/org/apache/myfaces/trinidadinternal/convert/NumberConverterAdapter.java Thu Aug 14 19:13:27 2008
@@ -25,21 +25,30 @@
import javax.faces.convert.ConverterException;
/*generated code - don't change!*/
-public class NumberConverterAdapter extends org.apache.myfaces.trinidadinternal.convert.NumberConverter {
- private Converter smartConverter;
+public class NumberConverterAdapter extends
+ org.apache.myfaces.trinidadinternal.convert.NumberConverter
+{
+ private Converter smartConverter;
- public NumberConverterAdapter() {
- this(new org.apache.myfaces.trinidadinternal.convert.NumberConverter());
- }
+ public NumberConverterAdapter()
+ {
+ this(new org.apache.myfaces.trinidadinternal.convert.NumberConverter());
+ }
- public NumberConverterAdapter(Converter converter) {
- this.smartConverter = new ExtValFallbackConverter(converter);
- }
+ public NumberConverterAdapter(Converter converter)
+ {
+ this.smartConverter = new ExtValFallbackConverter(converter);
+ }
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
- return this.smartConverter.getAsObject(context, component, value);
- }
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
- return this.smartConverter.getAsString(context, component, value);
- }
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) throws ConverterException
+ {
+ return this.smartConverter.getAsObject(context, component, value);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) throws ConverterException
+ {
+ return this.smartConverter.getAsString(context, component, value);
+ }
}