[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui ...
Peter Muir
peter at bleepbleep.org.uk
Sun Feb 18 15:49:16 EST 2007
User: pmuir
Date: 07/02/18 15:49:16
Modified: src/ui/org/jboss/seam/ui UISelectItems.java
Log:
minor
Revision Changes Path
1.8 +258 -195 jboss-seam/src/ui/org/jboss/seam/ui/UISelectItems.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UISelectItems.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/UISelectItems.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- UISelectItems.java 18 Feb 2007 20:45:57 -0000 1.7
+++ UISelectItems.java 18 Feb 2007 20:49:16 -0000 1.8
@@ -11,13 +11,16 @@
import javax.faces.el.ValueBinding;
import javax.faces.model.DataModel;
-public class UISelectItems extends javax.faces.component.UISelectItems {
+public class UISelectItems extends javax.faces.component.UISelectItems
+{
- private class NullableSelectItem extends javax.faces.model.SelectItem {
+ private class NullableSelectItem extends javax.faces.model.SelectItem
+ {
private Object value;
- private NullableSelectItem(Object value, String label) {
+ private NullableSelectItem(Object value, String label)
+ {
super.setLabel(label);
this.value = value;
}
@@ -35,71 +38,98 @@
private static final String NO_SELECTION_VALUE = null;
private String noSelectionLabel;
+
private Boolean hideNoSelectionLabel;
+
private String var;
+
private String label;
+
private Boolean disabled;
- public String getNoSelectionLabel() {
- if (noSelectionLabel != null) {
+ public String getNoSelectionLabel()
+ {
+ if (noSelectionLabel != null)
+ {
return noSelectionLabel;
- } else {
+ }
+ else
+ {
return getString("noSelectionLabel");
}
}
- public void setNoSelectionLabel(String noSelectionLabel) {
+ public void setNoSelectionLabel(String noSelectionLabel)
+ {
this.noSelectionLabel = noSelectionLabel;
}
- public boolean isHideNoSelectionLabel() {
- if (hideNoSelectionLabel != null) {
+ public boolean isHideNoSelectionLabel()
+ {
+ if (hideNoSelectionLabel != null)
+ {
return hideNoSelectionLabel;
- } else {
+ }
+ else
+ {
Boolean value = getBoolean("hideNoSelectionLabel");
return value == null ? false : value;
}
}
- public void setHideNoSelectionLabel(boolean hideNoSelection) {
+ public void setHideNoSelectionLabel(boolean hideNoSelection)
+ {
this.hideNoSelectionLabel = hideNoSelection;
}
- public String getVar() {
+ public String getVar()
+ {
return var;
}
- public void setVar(String var) {
+ public void setVar(String var)
+ {
this.var = var;
}
- public String getLabel() {
- if (label != null) {
+ public String getLabel()
+ {
+ if (label != null)
+ {
return label;
- } else {
+ }
+ else
+ {
return getString("label");
}
}
- public void setLabel(String label) {
+ public void setLabel(String label)
+ {
this.label = label;
}
- public boolean isDisabled() {
- if (disabled != null) {
+ public boolean isDisabled()
+ {
+ if (disabled != null)
+ {
return disabled;
- } else {
+ }
+ else
+ {
Boolean value = getBoolean("disabled");
return value != null ? value : false;
}
}
- public void setDisabled(boolean disabled) {
+ public void setDisabled(boolean disabled)
+ {
this.disabled = disabled;
}
@Override
- public void restoreState(FacesContext context, Object state) {
+ public void restoreState(FacesContext context, Object state)
+ {
Object[] values = (Object[]) state;
super.restoreState(context, values[0]);
noSelectionLabel = (String) values[1];
@@ -110,7 +140,8 @@
}
@Override
- public Object saveState(FacesContext context) {
+ public Object saveState(FacesContext context)
+ {
Object[] values = new Object[6];
values[0] = super.saveState(context);
@@ -122,26 +153,35 @@
return values;
}
- private String getString(String localName) {
+ private String getString(String localName)
+ {
ValueBinding vb = getValueBinding(localName);
- if (vb == null) {
+ if (vb == null)
+ {
return null;
- } else {
+ }
+ else
+ {
return vb.getValue(getFacesContext()).toString();
}
}
- private Boolean getBoolean(String localName) {
+ private Boolean getBoolean(String localName)
+ {
String string = getString(localName);
- if (string != null) {
+ if (string != null)
+ {
return Boolean.valueOf(string);
- } else {
+ }
+ else
+ {
return null;
}
}
@Override
- public Object getValue() {
+ public Object getValue()
+ {
return createSelectItems(super.getValue());
}
@@ -176,58 +216,81 @@
{
List<javax.faces.model.SelectItem> selectItems = new ArrayList<javax.faces.model.SelectItem>();
addNoSelectionLabel(selectItems, iterable);
- for (Object o : iterable) {
+ for (Object o : iterable)
+ {
initVar(o);
selectItems.add(new javax.faces.model.SelectItem(o, getLabel(), "", isDisabled()));
destroyVar();
}
return selectItems;
- } else {
+ }
+ else
+ {
ValueBinding vb = this.getValueBinding("value");
- if (vb != null) {
- throw new IllegalArgumentException("selectItems' value=\"" + vb.getExpressionString() + "\" must implement java.lang.Iteratable, be an array or a JSF DataModel but it is " + iterable + " (" + vb.getType(getFacesContext()) + ")");
- } else {
- throw new IllegalArgumentException("selectItems' value must implement java.lang.Iteratable, be an array or a JSF DataModel but is " + iterable);
+ if (vb != null)
+ {
+ throw new IllegalArgumentException(
+ "selectItems' value=\""
+ + vb.getExpressionString()
+ + "\" must implement java.lang.Iteratable, be an array or a JSF DataModel but it is "
+ + iterable + " (" + vb.getType(getFacesContext()) + ")");
+ }
+ else
+ {
+ throw new IllegalArgumentException(
+ "selectItems' value must implement java.lang.Iteratable, be an array or a JSF DataModel but is "
+ + iterable);
}
}
}
- private boolean addNoSelectionLabel(List<javax.faces.model.SelectItem> selectItems, Object originalValue) {
+ private boolean addNoSelectionLabel(List<javax.faces.model.SelectItem> selectItems,
+ Object originalValue)
+ {
boolean add = true;
- if (isHideNoSelectionLabel() && getParentValue() != null){
+ if (isHideNoSelectionLabel() && getParentValue() != null)
+ {
add = false;
}
- if (add && getNoSelectionLabel() != null) {
+ if (add && getNoSelectionLabel() != null)
+ {
NullableSelectItem s = new NullableSelectItem(NO_SELECTION_VALUE, getNoSelectionLabel());
selectItems.add(s);
ConverterChain converterChain = new ConverterChain(this.getParent());
converterChain.addConverterToChain(new NoSelectionConverter(), ConverterChain.CHAIN_START);
return true;
- } else {
+ }
+ else
+ {
return false;
}
}
@SuppressWarnings("unchecked")
- private void initVar(Object varValue) {
- if (getVar() == null) {
+ private void initVar(Object varValue)
+ {
+ if (getVar() == null)
+ {
throw new FacesException("var attribute must be set");
}
- getFacesContext().getExternalContext().getRequestMap().put(
- getVar(), varValue);
+ getFacesContext().getExternalContext().getRequestMap().put(getVar(), varValue);
}
- private void destroyVar() {
- getFacesContext().getExternalContext().getRequestMap().remove(
- getVar());
+ private void destroyVar()
+ {
+ getFacesContext().getExternalContext().getRequestMap().remove(getVar());
}
- private Object getParentValue() {
- if (getParent() instanceof ValueHolder) {
+ private Object getParentValue()
+ {
+ if (getParent() instanceof ValueHolder)
+ {
ValueHolder parent = (ValueHolder) getParent();
return parent.getValue();
- } else {
+ }
+ else
+ {
return null;
}
}
More information about the jboss-cvs-commits
mailing list