Author: dsvyatobatsko
Date: 2008-07-09 06:11:06 -0400 (Wed, 09 Jul 2008)
New Revision: 9480
Modified:
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/component/UIBeanValidator.java
Log:
removed redundant methods
Modified:
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/component/UIBeanValidator.java
===================================================================
---
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/component/UIBeanValidator.java 2008-07-09
09:13:32 UTC (rev 9479)
+++
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/component/UIBeanValidator.java 2008-07-09
10:11:06 UTC (rev 9480)
@@ -30,110 +30,98 @@
* JSF component class
*
*/
-public abstract class UIBeanValidator extends UIComponentBase implements
- AjaxComponent, AjaxSupport {
+public abstract class UIBeanValidator extends UIComponentBase implements AjaxComponent,
AjaxSupport {
- public static final String COMPONENT_TYPE = "org.richfaces.BeanValidator";
+ public static final String COMPONENT_TYPE = "org.richfaces.BeanValidator";
- public static final String COMPONENT_FAMILY = "org.richfaces.BeanValidator";
+ public static final String COMPONENT_FAMILY =
"org.richfaces.BeanValidator";
- public abstract String getEvent();
+ @Override
+ public void setParent(UIComponent parent) {
+ super.setParent(parent);
- public abstract void setEvent(String event);
+ if (null != parent) {
+ setParentProperties(parent);
+ }
+ }
- // public abstract boolean isBypassUpdates();
- //
- // public abstract void setBypassUpdates(boolean bypass);
+ /**
+ * @param parent
+ * @throws FaceletException
+ * @throws FacesException
+ */
+ public void setParentProperties(UIComponent parent) throws FaceletException,
FacesException {
+ if (!(parent instanceof EditableValueHolder)) {
+ throw new FaceletException("Parent component must be an
EditableValueHolder");
+ }
- public void setParent(UIComponent parent) {
- super.setParent(parent);
+ Validator[] validators = ((EditableValueHolder) parent).getValidators();
- if (null != parent) {
- setParentProperties(parent);
- }
- }
+ boolean isFacesValidatorPresent = false;
+ for (Validator validator : validators) {
+ if (validator instanceof FacesBeanValidator) {
+ isFacesValidatorPresent = true;
+ break;
+ }
+ }
- /**
- * @param parent
- * @throws FaceletException
- * @throws FacesException
- */
- public void setParentProperties(UIComponent parent)
- throws FaceletException, FacesException {
- if (!(parent instanceof EditableValueHolder)) {
- throw new FaceletException(
- "Parent component must be an EditableValueHolder");
- }
+ if (!isFacesValidatorPresent) {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ FacesBeanValidator validator = (FacesBeanValidator)
facesContext.getApplication().createValidator(
+ "org.richfaces.BeanValidator");
+ ((EditableValueHolder) parent).addValidator(validator);
+ }
- Validator[] validators = ((EditableValueHolder) parent).getValidators();
+ if (null != getEvent()) {
+ ValueExpression binding = new EventValueExpression(this);
+ parent.setValueExpression(getEvent(), binding);
+ }
+ }
- boolean isFacesValidatorPresent = false;
- for (Validator validator : validators) {
- if (validator instanceof FacesBeanValidator) {
- isFacesValidatorPresent = true;
- break;
- }
- }
+ @Override
+ public void broadcast(FacesEvent event) throws AbortProcessingException {
+ super.broadcast(event);
+ if (event.getComponent() == this) {
+ if (event instanceof ValidationEvent) {
+ // ByPass UpdateModelValue
+ FacesContext.getCurrentInstance().renderResponse();
+ } else if (event instanceof AjaxEvent) {
+ // TODO - find all UIMessages components for a parent UIInput.
+ // for an ajaxSingle component, re-render only target message.
+ }
+ }
+ }
- if (!isFacesValidatorPresent) {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- FacesBeanValidator validator = (FacesBeanValidator) facesContext
- .getApplication().createValidator(
- "org.richfaces.BeanValidator");
- ((EditableValueHolder) parent).addValidator(validator);
- }
+ @Override
+ public void queueEvent(FacesEvent event) {
+ if (event instanceof ValidationEvent && event.getComponent() == this) {
+ UIComponent parent = getParent();
+ if (parent instanceof UIInput) {
+ UIInput input = (UIInput) parent;
+ if (input.isImmediate()) {
+ event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
+ } else {
+ event.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
+ }
+ }
+ }
+ super.queueEvent(event);
+ }
- if (null != getEvent()) {
- ValueExpression binding = new EventValueExpression(this);
- parent.setValueExpression(getEvent(), binding);
- }
- }
+ public String getEventString() {
+ StringBuffer buildOnEvent = new StringBuffer();
+ String onsubmit = getOnsubmit();
+ // Insert script to call before submit ajax request.
+ if (null != onsubmit) {
+ buildOnEvent.append(onsubmit).append(";");
+ }
+ buildOnEvent.append(AjaxRendererUtils.buildOnEvent(this, getFacesContext(),
getEvent()));
+ String script = buildOnEvent.toString();
+ return script;
+ }
- @Override
- public void broadcast(FacesEvent event) throws AbortProcessingException {
- super.broadcast(event);
- if (event.getComponent() == this) {
- if (event instanceof ValidationEvent) {
- // ByPass UpdateModelValue
- FacesContext.getCurrentInstance().renderResponse();
- } else if (event instanceof AjaxEvent) {
- // TODO - find all UIMessages components for a parent UIInput.
- // for an ajaxSingle component, re-render only target message.
- }
- }
- }
+ public UIComponent getSingleComponent() {
+ return getParent();
+ }
- @Override
- public void queueEvent(FacesEvent event) {
- if (event instanceof ValidationEvent && event.getComponent() == this) {
- UIComponent parent = getParent();
- if (parent instanceof UIInput) {
- UIInput input = (UIInput) parent;
- if (input.isImmediate()) {
- event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
- } else {
- event.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
- }
- }
- }
- super.queueEvent(event);
- }
-
- public String getEventString() {
- StringBuffer buildOnEvent = new StringBuffer();
- String onsubmit = getOnsubmit();
- // Insert script to call before submit ajax request.
- if (null != onsubmit) {
- buildOnEvent.append(onsubmit).append(";");
- }
- buildOnEvent.append(AjaxRendererUtils.buildOnEvent(this,
- getFacesContext(), getEvent()));
- String script = buildOnEvent.toString();
- return script;
- }
-
- public UIComponent getSingleComponent() {
- return getParent();
- }
-
}