You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2006/06/17 20:29:16 UTC
svn commit: r415043 - in
/myfaces/core/branches/jsf12/api/src/main/java/javax/faces: component/
component/html/ context/ model/ validator/ webapp/
Author: dennisbyrne
Date: Sat Jun 17 11:29:15 2006
New Revision: 415043
URL: http://svn.apache.org/viewvc?rev=415043&view=rev
Log:
adding 30+ methods for binary compatibility w/ the RI
changed logging in javax.faces.webapp from INFO to DEBUG
5 UOEs in this commit
Modified:
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UISelectMany.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UISelectOne.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlDataTable.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputSecret.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputText.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputTextarea.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlOutputLabel.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlPanelGrid.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlPanelGroup.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlSelectBooleanCheckbox.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ExternalContext.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ResponseWriter.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/SelectItem.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/LongRangeValidator.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ConverterELTag.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ConverterTag.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentELTag.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ValidatorELTag.java
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UISelectMany.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UISelectMany.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UISelectMany.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UISelectMany.java Sat Jun 17 11:29:15 2006
@@ -41,6 +41,8 @@
{
public static final String INVALID_MESSAGE_ID = "javax.faces.component.UISelectMany.INVALID";
+ private String label ;
+
public Object[] getSelectedValues()
{
return (Object[]) getValue();
@@ -437,4 +439,39 @@
}
//------------------ GENERATED CODE END ---------------------------------------
+
+ public Object saveState(FacesContext context)
+ {
+ Object values[] = new Object[2];
+ values[0] = super.saveState(context);
+ values[1] = label;
+ return ((Object) (values));
+ }
+
+ public void restoreState(FacesContext context, Object state)
+ {
+ Object values[] = (Object[])state;
+ super.restoreState(context, values[0]);
+ label = (String)values[1];
+ }
+
+ /**
+ * @since 1.2
+ */
+
+ public String getLabel()
+ {
+ if (label != null) return label;
+ ValueBinding vb = getValueBinding("label");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
+
+ /**
+ * @since 1.2
+ */
+
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UISelectOne.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UISelectOne.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UISelectOne.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UISelectOne.java Sat Jun 17 11:29:15 2006
@@ -17,6 +17,7 @@
import javax.faces.component._SelectItemsUtil._ValueConverter;
import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
/**
* Component for choosing one option out of a set of possibilities.
@@ -34,6 +35,8 @@
{
public static final String INVALID_MESSAGE_ID = "javax.faces.component.UISelectOne.INVALID";
+ private String label ;
+
/**
* Verify that the result of converting the newly submitted value is
* <i>equal</i> to the value property of one of the child SelectItem
@@ -84,4 +87,39 @@
}
//------------------ GENERATED CODE END ---------------------------------------
+
+ public Object saveState(FacesContext context)
+ {
+ Object values[] = new Object[2];
+ values[0] = super.saveState(context);
+ values[1] = label;
+ return ((Object) (values));
+ }
+
+ public void restoreState(FacesContext context, Object state)
+ {
+ Object values[] = (Object[])state;
+ super.restoreState(context, values[0]);
+ label = (String)values[1];
+ }
+
+ /**
+ * @since 1.2
+ */
+
+ public String getLabel()
+ {
+ if (label != null) return label;
+ ValueBinding vb = getValueBinding("label");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
+
+ /**
+ * @since 1.2
+ */
+
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlDataTable.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlDataTable.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlDataTable.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlDataTable.java Sat Jun 17 11:29:15 2006
@@ -80,7 +80,10 @@
private String _summary = null;
private String _title = null;
private String _width = null;
-
+
+ private String captionClass ;
+ private String captionStyle ;
+
public HtmlDataTable()
{
setRendererType(DEFAULT_RENDERER_TYPE);
@@ -412,10 +415,9 @@
return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
-
public Object saveState(FacesContext context)
{
- Object values[] = new Object[28];
+ Object values[] = new Object[30];
values[0] = super.saveState(context);
values[1] = _bgcolor;
values[2] = _border;
@@ -444,6 +446,8 @@
values[25] = _summary;
values[26] = _title;
values[27] = _width;
+ values[28] = captionClass;
+ values[29] = captionStyle;
return ((Object) (values));
}
@@ -478,6 +482,34 @@
_summary = (String)values[25];
_title = (String)values[26];
_width = (String)values[27];
+ captionClass = (String)values[28];
+ captionStyle = (String)values[29];
}
//------------------ GENERATED CODE END ---------------------------------------
+
+ public String getCaptionClass()
+ {
+ if (captionClass != null) return captionClass;
+ ValueBinding vb = getValueBinding("captionClass");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
+
+ public void setCaptionClass(String captionClass)
+ {
+ this.captionClass = captionClass;
+ }
+
+
+ public String getCaptionStyle()
+ {
+ if (captionStyle != null) return captionStyle;
+ ValueBinding vb = getValueBinding("captionStyle");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
+
+
+ public void setCaptionStyle(String captionStyle)
+ {
+ this.captionStyle = captionStyle;
+ }
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputSecret.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputSecret.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputSecret.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputSecret.java Sat Jun 17 11:29:15 2006
@@ -64,7 +64,10 @@
private String _styleClass = null;
private String _tabindex = null;
private String _title = null;
-
+
+ private String autocomplete ;
+ private String label;
+
public HtmlInputSecret()
{
setRendererType(DEFAULT_RENDERER_TYPE);
@@ -400,10 +403,9 @@
return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
-
public Object saveState(FacesContext context)
{
- Object values[] = new Object[28];
+ Object values[] = new Object[30];
values[0] = super.saveState(context);
values[1] = _accesskey;
values[2] = _alt;
@@ -432,6 +434,8 @@
values[25] = _styleClass;
values[26] = _tabindex;
values[27] = _title;
+ values[28] = autocomplete;
+ values[29] = label;
return ((Object) (values));
}
@@ -466,6 +470,32 @@
_styleClass = (String)values[25];
_tabindex = (String)values[26];
_title = (String)values[27];
+ autocomplete = (String) values[28];
+ label = (String) values[29];
}
//------------------ GENERATED CODE END ---------------------------------------
+
+ public String getAutocomplete()
+ {
+ if (autocomplete != null) return autocomplete;
+ ValueBinding vb = getValueBinding("autocomplete");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
+
+ public void setAutocomplete(String autocomplete)
+ {
+ this.autocomplete = autocomplete;
+ }
+
+ public String getLabel()
+ {
+ if (label != null) return label;
+ ValueBinding vb = getValueBinding("label");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
+
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputText.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputText.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputText.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputText.java Sat Jun 17 11:29:15 2006
@@ -62,6 +62,8 @@
private String _tabindex = null;
private String _title = null;
+ private String label;
+
public HtmlInputText()
{
setRendererType(DEFAULT_RENDERER_TYPE);
@@ -400,7 +402,7 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[28];
+ Object values[] = new Object[29];
values[0] = super.saveState(context);
values[1] = _accesskey;
values[2] = _alt;
@@ -429,6 +431,7 @@
values[25] = _styleClass;
values[26] = _tabindex;
values[27] = _title;
+ values[28] = label;
return ((Object) (values));
}
@@ -463,6 +466,19 @@
_styleClass = (String)values[25];
_tabindex = (String)values[26];
_title = (String)values[27];
+ label = (String)values[28];
}
//------------------ GENERATED CODE END ---------------------------------------
+
+ public String getLabel()
+ {
+ if (label != null) return label;
+ ValueBinding vb = getValueBinding("label");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
+
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputTextarea.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputTextarea.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputTextarea.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlInputTextarea.java Sat Jun 17 11:29:15 2006
@@ -62,6 +62,8 @@
private String _tabindex = null;
private String _title = null;
+ private String label;
+
public HtmlInputTextarea()
{
setRendererType(DEFAULT_RENDERER_TYPE);
@@ -402,6 +404,7 @@
values[23] = _styleClass;
values[24] = _tabindex;
values[25] = _title;
+ values[26] = label;
return ((Object) (values));
}
@@ -434,6 +437,19 @@
_styleClass = (String)values[23];
_tabindex = (String)values[24];
_title = (String)values[25];
+ label = (String)values[26];
}
//------------------ GENERATED CODE END ---------------------------------------
+
+ public String getLabel()
+ {
+ if (label != null) return label;
+ ValueBinding vb = getValueBinding("label");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
+
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlOutputLabel.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlOutputLabel.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlOutputLabel.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlOutputLabel.java Sat Jun 17 11:29:15 2006
@@ -52,6 +52,8 @@
private String _styleClass = null;
private String _tabindex = null;
private String _title = null;
+
+ private Boolean escape;
public HtmlOutputLabel()
{
@@ -302,7 +304,7 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[21];
+ Object values[] = new Object[22];
values[0] = super.saveState(context);
values[1] = _accesskey;
values[2] = _dir;
@@ -324,6 +326,7 @@
values[18] = _styleClass;
values[19] = _tabindex;
values[20] = _title;
+ values[21] = escape;
return ((Object) (values));
}
@@ -351,6 +354,21 @@
_styleClass = (String)values[18];
_tabindex = (String)values[19];
_title = (String)values[20];
+ escape = (Boolean)values[21];
}
//------------------ GENERATED CODE END ---------------------------------------
+
+ public boolean isEscape()
+ {
+ if (escape != null) return escape.booleanValue();
+ ValueBinding vb = getValueBinding("escape");
+ Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+ return v != null ? v.booleanValue() : false; // TODO find out of false is the default?
+ }
+
+ public void setEscape(boolean escape)
+ {
+ this.escape = escape;
+ }
+
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlPanelGrid.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlPanelGrid.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlPanelGrid.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlPanelGrid.java Sat Jun 17 11:29:15 2006
@@ -64,6 +64,9 @@
private String _summary = null;
private String _title = null;
private String _width = null;
+
+ private String captionClass ;
+ private String captionStyle ;
public HtmlPanelGrid()
{
@@ -442,6 +445,8 @@
values[26] = _summary;
values[27] = _title;
values[28] = _width;
+ values[29] = captionClass;
+ values[30] = captionStyle;
return ((Object) (values));
}
@@ -477,6 +482,35 @@
_summary = (String)values[26];
_title = (String)values[27];
_width = (String)values[28];
+ captionClass = (String)values[29];
+ captionStyle = (String)values[30];
}
//------------------ GENERATED CODE END ---------------------------------------
+
+ public String getCaptionClass()
+ {
+ if (captionClass != null) return captionClass;
+ ValueBinding vb = getValueBinding("captionClass");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
+
+ public void setCaptionClass(String captionClass)
+ {
+ this.captionClass = captionClass;
+ }
+
+ public String getCaptionStyle()
+ {
+ if (captionStyle != null) return captionStyle;
+ ValueBinding vb = getValueBinding("captionStyle");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
+
+ public void setCaptionStyle(String captionStyle)
+ {
+ this.captionStyle = captionStyle;
+ }
+
+
+
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlPanelGroup.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlPanelGroup.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlPanelGroup.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlPanelGroup.java Sat Jun 17 11:29:15 2006
@@ -34,6 +34,7 @@
private String _style = null;
private String _styleClass = null;
+ private String layout;
public HtmlPanelGroup()
{
@@ -68,10 +69,11 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[3];
+ Object values[] = new Object[4];
values[0] = super.saveState(context);
values[1] = _style;
values[2] = _styleClass;
+ values[3] = layout;
return ((Object) (values));
}
@@ -81,6 +83,19 @@
super.restoreState(context, values[0]);
_style = (String)values[1];
_styleClass = (String)values[2];
+ layout = (String)values[3];
}
//------------------ GENERATED CODE END ---------------------------------------
+
+ public void setLayout(String layout)
+ {
+ this.layout = layout;
+ }
+
+ public String getLayout()
+ {
+ if (layout != null) return layout;
+ ValueBinding vb = getValueBinding("layout");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlSelectBooleanCheckbox.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlSelectBooleanCheckbox.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlSelectBooleanCheckbox.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/html/HtmlSelectBooleanCheckbox.java Sat Jun 17 11:29:15 2006
@@ -57,6 +57,8 @@
private String _styleClass = null;
private String _tabindex = null;
private String _title = null;
+
+ private String label;
public HtmlSelectBooleanCheckbox()
{
@@ -345,7 +347,7 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[24];
+ Object values[] = new Object[25];
values[0] = super.saveState(context);
values[1] = _accesskey;
values[2] = _dir;
@@ -370,6 +372,7 @@
values[21] = _styleClass;
values[22] = _tabindex;
values[23] = _title;
+ values[24] = label;
return ((Object) (values));
}
@@ -400,6 +403,20 @@
_styleClass = (String)values[21];
_tabindex = (String)values[22];
_title = (String)values[23];
+ label = (String)values[24];
}
//------------------ GENERATED CODE END ---------------------------------------
+
+ public String getLabel()
+ {
+ if (label != null) return label;
+ ValueBinding vb = getValueBinding("label");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ }
+
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
+
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ExternalContext.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ExternalContext.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ExternalContext.java Sat Jun 17 11:29:15 2006
@@ -149,6 +149,12 @@
throw new UnsupportedOperationException();
}
+ public String getResponseCharacterEncoding()
+ {
+ throw new UnsupportedOperationException(
+ "JSF 1.2 : figure out how to tell if this is a Portlet request");
+ }
+
public abstract boolean isUserInRole(String role);
public abstract void log(String message);
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ResponseWriter.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ResponseWriter.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ResponseWriter.java Sat Jun 17 11:29:15 2006
@@ -71,4 +71,10 @@
throws IOException;
public abstract ResponseWriter cloneWithWriter(Writer writer);
+
+ /**
+ * @since 1.2
+ */
+
+ public abstract void writeText(Object object, UIComponent component, String string);
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java Sat Jun 17 11:29:15 2006
@@ -89,4 +89,13 @@
getWrapped().writeAttribute(name, value, property);
}
+ /**
+ * @since 1.2
+ */
+
+ public void writeText(Object object, UIComponent component, String string)
+ {
+ getWrapped().writeText(object, component, string);
+ }
+
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/SelectItem.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/SelectItem.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/SelectItem.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/SelectItem.java Sat Jun 17 11:29:15 2006
@@ -31,6 +31,7 @@
private String _label;
private String _description;
private boolean _disabled;
+ private boolean escape;
// CONSTRUCTORS
public SelectItem()
@@ -76,6 +77,17 @@
_disabled = disabled;
}
+ public SelectItem(Object value, String label, String description, boolean disabled, boolean escape)
+ {
+ if (value == null) throw new NullPointerException("value");
+ if (label == null) throw new NullPointerException("label");
+ _value = value;
+ _label = label;
+ _description = description;
+ _disabled = disabled;
+ this.escape = escape;
+ }
+
// METHODS
public String getDescription()
{
@@ -118,4 +130,15 @@
if (value == null) throw new NullPointerException("value");
_value = value;
}
+
+ public boolean isEscape()
+ {
+ return escape;
+ }
+
+ public void setEscape(boolean escape)
+ {
+ this.escape = escape;
+ }
+
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java Sat Jun 17 11:29:15 2006
@@ -34,7 +34,8 @@
public static final String MAXIMUM_MESSAGE_ID = "javax.faces.validator.DoubleRangeValidator.MAXIMUM";
public static final String MINIMUM_MESSAGE_ID = "javax.faces.validator.DoubleRangeValidator.MINIMUM";
public static final String TYPE_MESSAGE_ID = "javax.faces.validator.DoubleRangeValidator.TYPE";
-
+ public static final String NOT_IN_RANGE_MESSAGE_ID = "javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE";
+
private Double _minimum = null;
private Double _maximum = null;
private boolean _transient = false;
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/LongRangeValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/LongRangeValidator.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/LongRangeValidator.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/LongRangeValidator.java Sat Jun 17 11:29:15 2006
@@ -34,7 +34,8 @@
public static final String MINIMUM_MESSAGE_ID = "javax.faces.validator.LongRangeValidator.MINIMUM";
public static final String TYPE_MESSAGE_ID = "javax.faces.validator.LongRangeValidator.TYPE";
public static final String VALIDATOR_ID = "javax.faces.LongRange";
-
+ public static final String NOT_IN_RANGE_MESSAGE_ID = "javax.faces.validator.LongRangeValidator.NOT_IN_RANGE";
+
private Long _minimum = null;
private Long _maximum = null;
private boolean _transient = false;
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ConverterELTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ConverterELTag.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ConverterELTag.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ConverterELTag.java Sat Jun 17 11:29:15 2006
@@ -22,8 +22,8 @@
public int doStartTag() throws JspException
{
- if( log.isInfoEnabled() )
- log.info("JSF 1.2 SPEC : Create a new instance of " +
+ if( log.isDebugEnabled() )
+ log.debug("JSF 1.2 SPEC : Create a new instance of " +
"the specified Converter class");
Converter converter = createConverter();
@@ -31,8 +31,8 @@
if (converter == null)
throw new JspException("Could not create Converter instance");
- if( log.isInfoEnabled() )
- log.info("JSF 1.2 SPEC : ... and register it with the " +
+ if( log.isDebugEnabled() )
+ log.debug("JSF 1.2 SPEC : ... and register it with the " +
"UIComponent instance associated with our" +
" most immediately surrounding " +
"UIComponentClassicTagBase instance");
@@ -44,8 +44,8 @@
throw new JspException(
"Could not obtain reference to parent UIComponentClassicTagBase instance ");
- if( log.isInfoEnabled() )
- log.info("JSF 1.2 SPEC : ... if the UIComponent " +
+ if( log.isDebugEnabled() )
+ log.debug("JSF 1.2 SPEC : ... if the UIComponent " +
"instance was created by this execution " +
"of the containing JSP page.");
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ConverterTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ConverterTag.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ConverterTag.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ConverterTag.java Sat Jun 17 11:29:15 2006
@@ -98,4 +98,8 @@
}
}
+ public void setBinding(String binding)
+ {
+ throw new UnsupportedOperationException("1.2");
+ }
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentELTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentELTag.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentELTag.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentELTag.java Sat Jun 17 11:29:15 2006
@@ -38,8 +38,8 @@
"during the execution of this tag handler instance");
}
- if( log.isInfoEnabled() )
- log.info("rendered set if a value for the " +
+ if( log.isDebugEnabled() )
+ log.debug("rendered set if a value for the " +
"rendered property is specified for " +
"this tag handler instance.");
@@ -55,8 +55,8 @@
component.setValueExpression("rendered", rendered);
}
- if( log.isInfoEnabled() )
- log.info("rendererType set if the getRendererType()" +
+ if( log.isDebugEnabled() )
+ log.debug("rendererType set if the getRendererType()" +
" method returns a non-null value.");
String renderType = getRendererType();
@@ -76,26 +76,26 @@
UIComponent component;
- if(log.isInfoEnabled())
- log.info("JSF SPEC 1.2 : If this " +
+ if(log.isDebugEnabled())
+ log.debug("JSF SPEC 1.2 : If this " +
"UIComponentELTag has a non-null binding");
if( binding != null )
{
- if(log.isInfoEnabled())
- log.info("... call Application.createComponent");
+ if(log.isDebugEnabled())
+ log.debug("... call Application.createComponent");
component = app.createComponent(binding, context, componentType);
}else{
- if(log.isInfoEnabled())
- log.info("... called with only the component type");
+ if(log.isDebugEnabled())
+ log.debug("... called with only the component type");
component = app.createComponent(componentType);
}
- if(log.isInfoEnabled())
- log.info("... initialize the components id and other properties");
+ if(log.isDebugEnabled())
+ log.debug("... initialize the components id and other properties");
component.setId(newId);
setProperties(component);
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ValidatorELTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ValidatorELTag.java?rev=415043&r1=415042&r2=415043&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ValidatorELTag.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/ValidatorELTag.java Sat Jun 17 11:29:15 2006
@@ -22,8 +22,8 @@
public int doStartTag() throws JspException
{
- if (log.isInfoEnabled())
- log.info("JSF 1.2 SPEC : Create a new instance "
+ if (log.isDebugEnabled())
+ log.debug("JSF 1.2 SPEC : Create a new instance "
+ "of the specified Validator");
Validator validator = createValidator();
@@ -31,8 +31,8 @@
if (validator == null)
throw new JspException("Could not create a Validator");
- if (log.isInfoEnabled())
- log.info(" ... and register it with the UIComponent "
+ if (log.isDebugEnabled())
+ log.debug(" ... and register it with the UIComponent "
+ "instance associated with our most "
+ "immediately surrounding UIComponentTagBase");
@@ -43,8 +43,8 @@
throw new JspException(
"Could not obtain reference to parent UIComponentClassicTagBase instance ");
- if (log.isInfoEnabled())
- log.info(" ... if the UIComponent instance was created "
+ if (log.isDebugEnabled())
+ log.debug(" ... if the UIComponent instance was created "
+ "by this execution of the containing JSP page.");
if (tag.getCreated())