Author: alexsmirnov Date: 2010-11-29 19:36:07 -0500 (Mon, 29 Nov 2010) New Revision: 20220 Added: branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/component/UITransient.java Modified: branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/component/UIValidatorScript.java branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidator.java Log: CODING IN PROGRESS - issue RF-9612: Create JSF 2.0 resource loading extension to dynamically add scripts and its dependencies. https://jira.jboss.org/browse/RF-9612 Added: branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/component/UITransient.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/component/UITransient.java (rev 0) +++ branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/component/UITransient.java 2010-11-30 00:36:07 UTC (rev 20220) @@ -0,0 +1,402 @@ +package org.richfaces.component; + +import java.io.IOException; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.el.ValueExpression; +import javax.faces.component.NamingContainer; +import javax.faces.component.UIComponent; +import javax.faces.component.UINamingContainer; +import javax.faces.component.UniqueIdVendor; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.FacesEvent; +import javax.faces.event.FacesListener; +import javax.faces.render.Renderer; + +import org.richfaces.renderkit.html.ValidatorScriptRenderer; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterators; + +public abstract class UITransient extends UIComponent { + + public static final String COMPONENT_FAMILY = "org.richfaces.Script"; + private String id; + + private UIComponent parent; + + private String target = "form"; + + private final Map<String, Object> attributesMap = new AttributesMap(); + + + private String clientId; + + public UITransient() { + super(); + } + + + public void setTarget(String target) { + this.target = target; + } + + public String getTarget() { + return target; + } + + @Override + public String getFamily() { + return COMPONENT_FAMILY; + } + + public Object saveState(FacesContext context) { + // This is transient component + return null; + } + + public void restoreState(FacesContext context, Object state) { + // Do nothing, this component never saved + + } + + public boolean isTransient() { + return true; + } + + public void setTransient(boolean newTransientValue) { + + } + + @Override + public Map<String, Object> getAttributes() { + return attributesMap; + } + + @Override + public ValueBinding getValueBinding(String name) { + return null; + } + + @Override + public void setValueBinding(String name, ValueBinding binding) { + // do nothing + + } + + @Override + public ValueExpression getValueExpression(String name) { + return null; + } + + @Override + public void setValueExpression(String name, ValueExpression binding) { + // do nothing + } + + @Override + public String getClientId(FacesContext context) { + if (context == null) { + throw new NullPointerException(); + } + + // if the clientId is not yet set + if (this.clientId == null) { + UIComponent namingContainerAncestor = this.getNamingContainerAncestor(); + String parentId = null; + + // give the parent the opportunity to first + // grab a unique clientId + if (namingContainerAncestor != null) { + parentId = namingContainerAncestor.getContainerClientId(context); + } + + // now resolve our own client id + String clientId = getId(); + if (clientId == null) { + if (null != namingContainerAncestor && namingContainerAncestor instanceof UniqueIdVendor) { + clientId = ((UniqueIdVendor) namingContainerAncestor).createUniqueId(context, null); + } else { + clientId = context.getViewRoot().createUniqueId(); + } + setId(clientId); + } + if (parentId != null) { + StringBuilder idBuilder = new StringBuilder(parentId.length() + 1 + clientId.length()); + clientId = idBuilder.append(parentId).append(UINamingContainer.getSeparatorChar(context)) + .append(clientId).toString(); + } + + // allow the renderer to convert the clientId + Renderer renderer = this.getRenderer(context); + if (renderer != null) { + this.clientId = renderer.convertClientId(context, clientId); + } else { + this.clientId = clientId; + } + } + return this.clientId; + } + + private UIComponent getNamingContainerAncestor() { + UIComponent namingContainer = this.getParent(); + while (namingContainer != null) { + if (namingContainer instanceof NamingContainer) { + return namingContainer; + } + namingContainer = namingContainer.getParent(); + } + return null; + } + + @Override + public String getId() { + return this.id; + } + + @Override + public void setId(String id) { + this.id = id; + + } + + @Override + public UIComponent getParent() { + return this.parent; + } + + @Override + public void setParent(UIComponent parent) { + this.parent = parent; + } + + @Override + public boolean isRendered() { + return true; + } + + @Override + public void setRendered(boolean rendered) { + // always rendered + } + + @Override + public String getRendererType() { + return ValidatorScriptRenderer.RENDERER_TYPE; + } + + @Override + public void setRendererType(String rendererType) { + // TODO Auto-generated method stub + + } + + @Override + public boolean getRendersChildren() { + return false; + } + + @Override + public List<UIComponent> getChildren() { + return Collections.emptyList(); + } + + @Override + public int getChildCount() { + return 0; + } + + @Override + public UIComponent findComponent(String expr) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Map<String, UIComponent> getFacets() { + return Collections.emptyMap(); + } + + @Override + public UIComponent getFacet(String name) { + return null; + } + + @Override + public Iterator<UIComponent> getFacetsAndChildren() { + return Iterators.emptyIterator(); + } + + @Override + public void broadcast(FacesEvent event) throws AbortProcessingException { + // Do nothing + } + + @Override + public void decode(FacesContext context) { + // Do nothing + } + + @Override + public void encodeBegin(FacesContext context) throws IOException { + // TODO Auto-generated method stub + + } + + @Override + public void encodeChildren(FacesContext context) throws IOException { + // TODO Auto-generated method stub + + } + + @Override + public void encodeEnd(FacesContext context) throws IOException { + Renderer renderer = getRenderer(context); + if(null != renderer){ + renderer.encodeEnd(context, this); + } + } + + @Override + protected void addFacesListener(FacesListener listener) { + } + + @Override + protected FacesListener[] getFacesListeners(Class clazz) { + return new FacesListener[0]; + } + + @Override + protected void removeFacesListener(FacesListener listener) { + } + + @Override + public void queueEvent(FacesEvent event) { + if (null != getParent()) { + getParent().queueEvent(event); + } + + } + + @Override + public void processRestoreState(FacesContext context, Object state) { + // Do nothing, this component does not have state. + + } + + @Override + public void processDecodes(FacesContext context) { + // Do nothing + + } + + @Override + public void processValidators(FacesContext context) { + // Do nothing + + } + + @Override + public void processUpdates(FacesContext context) { + // Do nothing + } + + @Override + public Object processSaveState(FacesContext context) { + // Should never be used + return null; + } + + @Override + protected FacesContext getFacesContext() { + return FacesContext.getCurrentInstance(); + } + + @Override + protected Renderer getRenderer(FacesContext context) { + String rendererType = getRendererType(); + Renderer result = null; + if (rendererType != null) { + result = context.getRenderKit().getRenderer(getFamily(), rendererType); + } + return result; + } + + final class AttributesMap implements Map<String, Object> { + public void clear() { + // do nothing + + } + + public boolean containsKey(Object key) { + + return "target".equals(key)||"id".equals(key)||"clientId".equals(key); + } + + public boolean containsValue(Object value) { + return false; + } + + public Set<java.util.Map.Entry<String, Object>> entrySet() { + return Collections.emptySet(); + } + + public Object get(Object key) { + if("target".equals(key)){ + return getTarget(); + } else if ("id".equals(key)) { + return getId(); + } else if ("clientId".equals(key)) { + return getClientId(); + } + return null; + } + + public boolean isEmpty() { + return false; + } + + public Set<String> keySet() { + return ImmutableSet.of("target","id","clientId"); + } + + public Object put(String key, Object value) { + if("target".equals(key)){ + String target = getTarget(); + setTarget((String) value); + return target; + } else if ("id".equals(key)) { + String id = getId(); + setId((String) value); + return id; + } + return null; + } + + public void putAll(Map<? extends String, ? extends Object> m) { + + + } + + public Object remove(Object key) { + return null; + } + + public int size() { + return 3; + } + + public Collection<Object> values() { + return ImmutableList.<Object>of(getTarget(),getId(),getClientId()); + } + } + +} \ No newline at end of file Property changes on: branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/component/UITransient.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/component/UIValidatorScript.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/component/UIValidatorScript.java 2010-11-30 00:05:46 UTC (rev 20219) +++ branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/component/UIValidatorScript.java 2010-11-30 00:36:07 UTC (rev 20220) @@ -23,32 +23,17 @@ package org.richfaces.component; -import java.io.IOException; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import javax.el.ValueExpression; -import javax.faces.component.NamingContainer; -import javax.faces.component.UIComponent; -import javax.faces.component.UINamingContainer; -import javax.faces.component.UniqueIdVendor; -import javax.faces.context.FacesContext; -import javax.faces.el.ValueBinding; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.FacesEvent; -import javax.faces.event.FacesListener; -import javax.faces.render.Renderer; import org.richfaces.renderkit.html.ComponentValidatorScript; -import org.richfaces.renderkit.html.ValidatorScriptRenderer; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterators; import com.google.common.collect.Lists; /** @@ -60,94 +45,17 @@ * @author asmirnov(a)exadel.com * */ -public class UIValidatorScript extends UIComponent { +public class UIValidatorScript extends UITransient { - private final class AttributesMap implements Map<String, Object> { - public void clear() { - // do nothing - - } - public boolean containsKey(Object key) { - - return "target".equals(key)||"id".equals(key)||"clientId".equals(key); - } - - public boolean containsValue(Object value) { - return false; - } - - public Set<java.util.Map.Entry<String, Object>> entrySet() { - return Collections.emptySet(); - } - - public Object get(Object key) { - if("target".equals(key)){ - return getTarget(); - } else if ("id".equals(key)) { - return getId(); - } else if ("clientId".equals(key)) { - return getClientId(); - } - return null; - } - - public boolean isEmpty() { - return false; - } - - public Set<String> keySet() { - return ImmutableSet.of("target","id","clientId"); - } - - public Object put(String key, Object value) { - if("target".equals(key)){ - String target = getTarget(); - setTarget((String) value); - return target; - } else if ("id".equals(key)) { - String id = getId(); - setId((String) value); - return id; - } - return null; - } - - public void putAll(Map<? extends String, ? extends Object> m) { - - - } - - public Object remove(Object key) { - return null; - } - - public int size() { - return 3; - } - - public Collection<Object> values() { - return ImmutableList.<Object>of(getTarget(),getId(),getClientId()); - } - } - public static final String COMPONENT_TYPE = "org.richfaces.ValidatorScript"; - public static final String COMPONENT_FAMILY = "org.richfaces.Script"; - - private String id; - private UIComponent parent; - private String target="form"; - private final List<ComponentValidatorScript> scripts = Lists.newArrayList(); + final List<ComponentValidatorScript> scripts = Lists.newArrayList(); - private final Map<String, Object> attributesMap = new AttributesMap(); - - private String clientId; - public Collection<ComponentValidatorScript> getScripts() { return scripts; } - + public ComponentValidatorScript addOrFindScript(ComponentValidatorScript validatorScript) { // TODO optimize for (ComponentValidatorScript script : this.scripts) { @@ -159,288 +67,4 @@ return validatorScript; } - public void setTarget(String target) { - this.target = target; - } - - public String getTarget() { - return target; - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - public Object saveState(FacesContext context) { - // This is transient component - return null; - } - - public void restoreState(FacesContext context, Object state) { - // Do nothing, this component never saved - - } - - public boolean isTransient() { - return true; - } - - public void setTransient(boolean newTransientValue) { - - } - - @Override - public Map<String, Object> getAttributes() { - return attributesMap; - } - - @Override - public ValueBinding getValueBinding(String name) { - return null; - } - - @Override - public void setValueBinding(String name, ValueBinding binding) { - // do nothing - - } - - @Override - public ValueExpression getValueExpression(String name) { - return null; - } - - @Override - public void setValueExpression(String name, ValueExpression binding) { - // do nothing - } - - @Override - public String getClientId(FacesContext context) { - if (context == null) { - throw new NullPointerException(); - } - - // if the clientId is not yet set - if (this.clientId == null) { - UIComponent namingContainerAncestor = this.getNamingContainerAncestor(); - String parentId = null; - - // give the parent the opportunity to first - // grab a unique clientId - if (namingContainerAncestor != null) { - parentId = namingContainerAncestor.getContainerClientId(context); - } - - // now resolve our own client id - String clientId = getId(); - if (clientId == null) { - if (null != namingContainerAncestor && namingContainerAncestor instanceof UniqueIdVendor) { - clientId = ((UniqueIdVendor) namingContainerAncestor).createUniqueId(context, null); - } else { - clientId = context.getViewRoot().createUniqueId(); - } - setId(clientId); - } - if (parentId != null) { - StringBuilder idBuilder = new StringBuilder(parentId.length() + 1 + clientId.length()); - clientId = idBuilder.append(parentId).append(UINamingContainer.getSeparatorChar(context)) - .append(clientId).toString(); - } - - // allow the renderer to convert the clientId - Renderer renderer = this.getRenderer(context); - if (renderer != null) { - this.clientId = renderer.convertClientId(context, clientId); - } else { - this.clientId = clientId; - } - } - return this.clientId; - } - - private UIComponent getNamingContainerAncestor() { - UIComponent namingContainer = this.getParent(); - while (namingContainer != null) { - if (namingContainer instanceof NamingContainer) { - return namingContainer; - } - namingContainer = namingContainer.getParent(); - } - return null; - } - - @Override - public String getId() { - return this.id; - } - - @Override - public void setId(String id) { - this.id = id; - - } - - @Override - public UIComponent getParent() { - return this.parent; - } - - @Override - public void setParent(UIComponent parent) { - this.parent = parent; - } - - @Override - public boolean isRendered() { - return true; - } - - @Override - public void setRendered(boolean rendered) { - // always rendered - } - - @Override - public String getRendererType() { - return ValidatorScriptRenderer.RENDERER_TYPE; - } - - @Override - public void setRendererType(String rendererType) { - // TODO Auto-generated method stub - - } - - @Override - public boolean getRendersChildren() { - return false; - } - - @Override - public List<UIComponent> getChildren() { - return Collections.emptyList(); - } - - @Override - public int getChildCount() { - return 0; - } - - @Override - public UIComponent findComponent(String expr) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Map<String, UIComponent> getFacets() { - return Collections.emptyMap(); - } - - @Override - public UIComponent getFacet(String name) { - return null; - } - - @Override - public Iterator<UIComponent> getFacetsAndChildren() { - return Iterators.emptyIterator(); - } - - @Override - public void broadcast(FacesEvent event) throws AbortProcessingException { - // Do nothing - } - - @Override - public void decode(FacesContext context) { - // Do nothing - } - - @Override - public void encodeBegin(FacesContext context) throws IOException { - // TODO Auto-generated method stub - - } - - @Override - public void encodeChildren(FacesContext context) throws IOException { - // TODO Auto-generated method stub - - } - - @Override - public void encodeEnd(FacesContext context) throws IOException { - Renderer renderer = getRenderer(context); - if(null != renderer){ - renderer.encodeEnd(context, this); - } - } - - @Override - protected void addFacesListener(FacesListener listener) { - } - - @Override - protected FacesListener[] getFacesListeners(Class clazz) { - return new FacesListener[0]; - } - - @Override - protected void removeFacesListener(FacesListener listener) { - } - - @Override - public void queueEvent(FacesEvent event) { - if (null != getParent()) { - getParent().queueEvent(event); - } - - } - - @Override - public void processRestoreState(FacesContext context, Object state) { - // Do nothing, this component does not have state. - - } - - @Override - public void processDecodes(FacesContext context) { - // Do nothing - - } - - @Override - public void processValidators(FacesContext context) { - // Do nothing - - } - - @Override - public void processUpdates(FacesContext context) { - // Do nothing - } - - @Override - public Object processSaveState(FacesContext context) { - // Should never be used - return null; - } - - @Override - protected FacesContext getFacesContext() { - return FacesContext.getCurrentInstance(); - } - - @Override - protected Renderer getRenderer(FacesContext context) { - String rendererType = getRendererType(); - Renderer result = null; - if (rendererType != null) { - result = context.getRenderKit().getRenderer(getFamily(), rendererType); - } - return result; - } } Modified: branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidator.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidator.java 2010-11-30 00:05:46 UTC (rev 20219) +++ branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidator.java 2010-11-30 00:36:07 UTC (rev 20220) @@ -36,7 +36,9 @@ @Override protected Collection<String> validate(FacesContext facesContext, Object base, String property, Object value, Set<String> profiles) { + @SuppressWarnings("rawtypes") Class beanType = base.getClass(); + @SuppressWarnings("unchecked") Set<ConstraintViolation<Object>> constrains = getValidator(facesContext).validateValue(beanType, property, value, getGroups(profiles)); return extractMessages(constrains);