You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gr...@apache.org on 2007/08/10 17:22:24 UTC
svn commit: r564616 [1/2] - in
/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces:
component/html/ext/ custom/calendar/ custom/collapsiblepanel/
custom/crosstable/ custom/datalist/ custom/fileupload/ custom/inputHtml/
custom/layout/ custom/n...
Author: grantsmith
Date: Fri Aug 10 08:22:19 2007
New Revision: 564616
URL: http://svn.apache.org/viewvc?view=rev&rev=564616
Log:
Patches for TOMAHAWK-955
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlCommandLink.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlInputTextarea.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanel.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/HtmlColumns.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/datalist/HtmlDataList.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUploadTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtml.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayout.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigation.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlCommandNavigationItemTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenu.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenuTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTable.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/radio/HtmlRadio.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTree.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTreeImageCommandLink.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlCommandLinkTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGridTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGroupTag.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectBooleanCheckboxTag.java
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlCommandLink.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlCommandLink.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlCommandLink.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlCommandLink.java Fri Aug 10 08:22:19 2007
@@ -53,7 +53,6 @@
public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlCommandLink";
public static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.Link";
- private String _target = null;
private String _enabledOnUserRole = null;
private String _visibleOnUserRole = null;
private String _actionFor = null;
@@ -67,18 +66,6 @@
}
- public void setTarget(String target)
- {
- _target = target;
- }
-
- public String getTarget()
- {
- if (_target != null) return _target;
- ValueBinding vb = getValueBinding("target");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
- }
-
public void setEnabledOnUserRole(String enabledOnUserRole)
{
_enabledOnUserRole = enabledOnUserRole;
@@ -160,15 +147,14 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[8];
+ Object values[] = new Object[7];
values[0] = super.saveState(context);
- values[1] = _target;
- values[2] = _enabledOnUserRole;
- values[3] = _visibleOnUserRole;
- values[4] = _actionFor;
- values[5] = _disabled;
- values[6] = _disabledStyle;
- values[7] = _disabledStyleClass;
+ values[1] = _enabledOnUserRole;
+ values[2] = _visibleOnUserRole;
+ values[3] = _actionFor;
+ values[4] = _disabled;
+ values[5] = _disabledStyle;
+ values[6] = _disabledStyleClass;
return values;
}
@@ -176,13 +162,12 @@
{
Object values[] = (Object[])state;
super.restoreState(context, values[0]);
- _target = (String)values[1];
- _enabledOnUserRole = (String)values[2];
- _visibleOnUserRole = (String)values[3];
- _actionFor = (String)values[4];
- _disabled = (Boolean) values[5];
- _disabledStyle = (String) values[6];
- _disabledStyleClass = (String) values[7];
+ _enabledOnUserRole = (String)values[1];
+ _visibleOnUserRole = (String)values[2];
+ _actionFor = (String)values[3];
+ _disabled = (Boolean) values[4];
+ _disabledStyle = (String) values[5];
+ _disabledStyleClass = (String) values[6];
}
//------------------ GENERATED CODE END ---------------------------------------
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java Fri Aug 10 08:22:19 2007
@@ -57,6 +57,9 @@
private static final boolean DEFAULT_SORTABLE = false;
private static final Class OBJECT_ARRAY_CLASS = (new Object[0]).getClass();
+ private static final Integer DEFAULT_NEWSPAPER_COLUMNS = new Integer(1);
+ private static final String DEFAULT_NEWSPAPER_ORIENTATION = "vertical";
+
/**
* the property names
*/
@@ -67,7 +70,7 @@
/**
* the value of the column count property
*/
- private int _newspaperColumns = 1;
+ private Integer _newspaperColumns = null;
/**
* the value of the newspaper orientation property
*/
@@ -817,7 +820,7 @@
values[30] = _sortedColumnVar;
values[31] = new Integer(_sortColumnIndex);
- values[32] = new Integer(_newspaperColumns);
+ values[32] = _newspaperColumns;
values[33] = _newspaperOrientation;
values[34] = _bodyStyle;
values[35] = _bodyStyleClass;
@@ -949,7 +952,7 @@
_rowGroupStyleClass = (String) values[29];
_sortedColumnVar = (String) values[30];
_sortColumnIndex = values[31] != null ? ((Integer) values[31]).intValue() : -1;
- _newspaperColumns = ((Integer) values[32]).intValue();
+ _newspaperColumns = (Integer) values[32];
_newspaperOrientation = (String) values[33];
_bodyStyle = (String) values[34];
_bodyStyleClass = (String) values[35];
@@ -1327,7 +1330,10 @@
public String getVarDetailToggler()
{
- return _varDetailToggler;
+ if (_varDetailToggler != null)
+ return _varDetailToggler;
+ ValueBinding vb = getValueBinding("varDetailToggler");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
}
public String getRowGroupStyle()
@@ -1433,14 +1439,16 @@
/**
* Set the number of columns the table will be divided over.
*/
- public int getNewspaperColumns()
- {
- return _newspaperColumns;
+ public int getNewspaperColumns() {
+ if (_newspaperColumns != null) return _newspaperColumns.intValue();
+ ValueBinding vb = getValueBinding(NEWSPAPER_COLUMNS_PROPERTY);
+ Integer v = vb != null ? (Integer)vb.getValue(getFacesContext()) : DEFAULT_NEWSPAPER_COLUMNS;
+ return v.intValue();
}
public void setNewspaperColumns(int newspaperColumns)
{
- this._newspaperColumns = newspaperColumns;
+ this._newspaperColumns = new Integer(newspaperColumns);
}
/**
@@ -1451,10 +1459,14 @@
this._newspaperOrientation = newspaperOrientation;
}
- public String getNewspaperOrientation()
- {
- return _newspaperOrientation;
- }
+ public String getNewspaperOrientation() {
+ if(_newspaperOrientation != null)
+ return _newspaperOrientation;
+
+ ValueBinding vb = getValueBinding(NEWSPAPER_ORIENTATION_PROPERTY);
+ String v = vb != null ? (String)vb.getValue(getFacesContext()) : DEFAULT_NEWSPAPER_ORIENTATION;
+ return v;
+ }
/**
* Gets the spacer facet, between each pair of newspaper columns.
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlInputTextarea.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlInputTextarea.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlInputTextarea.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlInputTextarea.java Fri Aug 10 08:22:19 2007
@@ -99,13 +99,14 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[6];
+ Object values[] = new Object[7];
values[0] = super.saveState(context);
values[1] = _enabledOnUserRole;
values[2] = _visibleOnUserRole;
values[3] = _displayValueOnly;
values[4] = _displayValueOnlyStyle;
values[5] = _displayValueOnlyStyleClass;
+ values[6] = _wrap;
return ((Object) (values));
}
@@ -118,6 +119,7 @@
_displayValueOnly = (Boolean)values[3];
_displayValueOnlyStyle = (String)values[4];
_displayValueOnlyStyleClass = (String)values[5];
+ _wrap = (String)values[6];
}
//------------------ GENERATED CODE END ---------------------------------------
@@ -159,13 +161,14 @@
_displayValueOnlyStyleClass = displayValueOnlyStyleClass;
}
-
public String getWrap() {
- return _wrap;
+ if (_wrap != null) return _wrap;
+ ValueBinding vb = getValueBinding("wrap");
+ String v = vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return v;
}
-
public void setWrap(String wrap) {
_wrap = wrap;
}
-}
\ No newline at end of file
+}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java Fri Aug 10 08:22:19 2007
@@ -151,13 +151,14 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[6];
+ Object values[] = new Object[7];
values[0] = super.saveState(context);
values[1] = _enabledOnUserRole;
values[2] = _visibleOnUserRole;
values[3] = _displayValueOnly;
values[4] = _displayValueOnlyStyle;
values[5] = _displayValueOnlyStyleClass;
+ values[6] = _escape;
return ((Object) (values));
}
@@ -170,6 +171,7 @@
_displayValueOnly = (Boolean)values[3];
_displayValueOnlyStyle = (String)values[4];
_displayValueOnlyStyleClass = (String)values[5];
+ _escape = (Boolean)values[6];
}
//------------------ GENERATED CODE END ---------------------------------------
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java Fri Aug 10 08:22:19 2007
@@ -135,13 +135,14 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[6];
+ Object values[] = new Object[7];
values[0] = super.saveState(context);
values[1] = _enabledOnUserRole;
values[2] = _visibleOnUserRole;
values[3] = _displayValueOnly;
values[4] = _displayValueOnlyStyle;
values[5] = _displayValueOnlyStyleClass;
+ values[6] = _escape;
return ((Object) (values));
}
@@ -154,6 +155,7 @@
_displayValueOnly = (Boolean)values[3];
_displayValueOnlyStyle = (String)values[4];
_displayValueOnlyStyleClass = (String)values[5];
+ _escape = (Boolean)values[6];
}
//------------------ GENERATED CODE END ---------------------------------------
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java Fri Aug 10 08:22:19 2007
@@ -135,13 +135,14 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[6];
+ Object values[] = new Object[7];
values[0] = super.saveState(context);
values[1] = _enabledOnUserRole;
values[2] = _visibleOnUserRole;
values[3] = _displayValueOnly;
values[4] = _displayValueOnlyStyle;
values[5] = _displayValueOnlyStyleClass;
+ values[6] = _escape;
return ((Object) (values));
}
@@ -154,6 +155,7 @@
_displayValueOnly = (Boolean)values[3];
_displayValueOnlyStyle = (String)values[4];
_displayValueOnlyStyleClass = (String)values[5];
+ _escape = (Boolean)values[6];
}
//------------------ GENERATED CODE END ---------------------------------------
private Boolean _escape = null;
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java Fri Aug 10 08:22:19 2007
@@ -135,13 +135,14 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[6];
+ Object values[] = new Object[7];
values[0] = super.saveState(context);
values[1] = _enabledOnUserRole;
values[2] = _visibleOnUserRole;
values[3] = _displayValueOnly;
values[4] = _displayValueOnlyStyle;
values[5] = _displayValueOnlyStyleClass;
+ values[6] = _escape;
return ((Object) (values));
}
@@ -154,6 +155,7 @@
_displayValueOnly = (Boolean)values[3];
_displayValueOnlyStyle = (String)values[4];
_displayValueOnlyStyleClass = (String)values[5];
+ _escape = (Boolean)values[6];
}
//------------------ GENERATED CODE END ---------------------------------------
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.java Fri Aug 10 08:22:19 2007
@@ -135,13 +135,14 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[6];
+ Object values[] = new Object[7];
values[0] = super.saveState(context);
values[1] = _enabledOnUserRole;
values[2] = _visibleOnUserRole;
values[3] = _displayValueOnly;
values[4] = _displayValueOnlyStyle;
values[5] = _displayValueOnlyStyleClass;
+ values[6] = _escape;
return ((Object) (values));
}
@@ -154,6 +155,7 @@
_displayValueOnly = (Boolean)values[3];
_displayValueOnlyStyle = (String)values[4];
_displayValueOnlyStyleClass = (String)values[5];
+ _escape = (Boolean)values[6];
}
//------------------ GENERATED CODE END ---------------------------------------
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java Fri Aug 10 08:22:19 2007
@@ -202,12 +202,14 @@
public static final String DEFAULT_RENDERER_TYPE ="org.apache.myfaces.Radio";
private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
+ private static final boolean DEFAULT_ESCAPE = true;
private String _enabledOnUserRole = null;
private String _visibleOnUserRole = null;
private Boolean _displayValueOnly = null;
private String _displayValueOnlyStyle = null;
private String _displayValueOnlyStyleClass = null;
+ private Boolean _escape = null;
public HtmlSelectOneRadio()
{
@@ -277,6 +279,19 @@
_displayValueOnlyStyleClass = displayValueOnlyStyleClass;
}
+ public void setEscape(boolean escape)
+ {
+ _escape = Boolean.valueOf(escape);
+ }
+
+ 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() : DEFAULT_ESCAPE;
+ }
+
public boolean isRendered()
{
if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
@@ -285,13 +300,14 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[6];
+ Object values[] = new Object[7];
values[0] = super.saveState(context);
values[1] = _enabledOnUserRole;
values[2] = _visibleOnUserRole;
values[3] = _displayValueOnly;
values[4] = _displayValueOnlyStyle;
values[5] = _displayValueOnlyStyleClass;
+ values[6] = _escape;
return ((Object) (values));
}
@@ -304,6 +320,7 @@
_displayValueOnly = (Boolean)values[3];
_displayValueOnlyStyle = (String)values[4];
_displayValueOnlyStyleClass = (String)values[5];
+ _escape = (Boolean)values[6];
}
//------------------ GENERATED CODE END ---------------------------------------
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java Fri Aug 10 08:22:19 2007
@@ -401,7 +401,7 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[26];
+ Object values[] = new Object[27];
values[0] = super.saveState(context);
values[1] = _monthYearRowClass;
values[2] = _weekRowClass;
@@ -428,6 +428,7 @@
values[23] = _popupButtonImageUrl;
values[24] = _helpText;
values[25] = _popupLeft;
+ values[26] = _popupTodayDateFormat;
return ((Object) (values));
}
@@ -460,6 +461,7 @@
_popupButtonImageUrl = (String)values[23];
_helpText = (String)values[24];
_popupLeft = (Boolean)values[25];
+ _popupTodayDateFormat = (String)values[26];
}
//------------------ GENERATED CODE END ---------------------------------------
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java Fri Aug 10 08:22:19 2007
@@ -34,14 +34,8 @@
private String _accesskey;
private String _align;
private String _alt;
- private String _disabled;
private String _maxlength;
- private String _onblur;
- private String _onchange;
- private String _onfocus;
- private String _onselect;
private String _size;
- private String _tabindex;
//private static final Log log = LogFactory.getLog(HtmlInputCalendarTag.class);
public String getComponentType()
@@ -135,14 +129,8 @@
setStringProperty(component, HTML.ACCESSKEY_ATTR, _accesskey);
setStringProperty(component, HTML.ALIGN_ATTR, _align);
setStringProperty(component, HTML.ALT_ATTR, _alt);
- setBooleanProperty(component, HTML.DISABLED_ATTR, _disabled);
setIntegerProperty(component, HTML.MAXLENGTH_ATTR, _maxlength);
- setStringProperty(component, HTML.ONBLUR_ATTR, _onblur);
- setStringProperty(component, HTML.ONCHANGE_ATTR, _onchange);
- setStringProperty(component, HTML.ONFOCUS_ATTR, _onfocus);
- setStringProperty(component, HTML.ONSELECT_ATTR, _onselect);
setIntegerProperty(component, HTML.SIZE_ATTR, _size);
- setStringProperty(component, HTML.TABINDEX_ATTR, _tabindex);
setStringProperty(component, "monthYearRowClass", _monthYearRowClass);
@@ -320,43 +308,14 @@
_alt = alt;
}
- public void setDisabled(String disabled)
- {
- _disabled = disabled;
- }
-
public void setMaxlength(String maxlength)
{
_maxlength = maxlength;
}
- public void setOnblur(String onblur)
- {
- _onblur = onblur;
- }
-
- public void setOnchange(String onchange)
- {
- _onchange = onchange;
- }
-
- public void setOnfocus(String onfocus)
- {
- _onfocus = onfocus;
- }
-
- public void setOnselect(String onselect)
- {
- _onselect = onselect;
- }
-
public void setSize(String size)
{
_size = size;
}
- public void setTabindex(String tabindex)
- {
- _tabindex = tabindex;
- }
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanel.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanel.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanel.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanel.java Fri Aug 10 08:22:19 2007
@@ -265,11 +265,13 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[4];
+ Object values[] = new Object[6];
values[0] = super.saveState(context);
values[1] = _title;
values[2] = _var;
values[3] = _titleVar;
+ values[4] = _style;
+ values[5] = _styleClass;
return ((Object) (values));
}
@@ -280,6 +282,8 @@
_title = (String)values[1];
_var = (String)values[2];
_titleVar = (String) values[3];
+ _style = (String)values[4];
+ _styleClass = (String)values[5];
}
public void setCurrentlyCollapsed(boolean collapsed)
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/HtmlColumns.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/HtmlColumns.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/HtmlColumns.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/crosstable/HtmlColumns.java Fri Aug 10 08:22:19 2007
@@ -104,7 +104,7 @@
}
public String getWidth() {
- return _width;
+ return (String) getLocalOrValueBindingValue(_width, "width");
}
public void setWidth(String width) {
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/datalist/HtmlDataList.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/datalist/HtmlDataList.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/datalist/HtmlDataList.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/datalist/HtmlDataList.java Fri Aug 10 08:22:19 2007
@@ -442,7 +442,7 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[17];
+ Object values[] = new Object[18];
values[0] = super.saveState(context);
values[1] = _layout;
values[2] = _rowIndexVar;
@@ -460,6 +460,7 @@
values[14] = _style;
values[15] = _styleClass;
values[16] = _title;
+ values[17] = _itemStyleClass;
return values;
}
@@ -483,6 +484,7 @@
_style = (String)values[14];
_styleClass = (String)values[15];
_title = (String)values[16];
+ _itemStyleClass = (String)values[17];
}
//------------------ GENERATED CODE END ---------------------------------------
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUploadTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUploadTag.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUploadTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUploadTag.java Fri Aug 10 08:22:19 2007
@@ -64,7 +64,6 @@
private String _onchange;
private String _onfocus;
private String _onselect;
- private String _readonly;
private String _size;
private String _tabindex;
@@ -97,7 +96,6 @@
_onchange=null;
_onfocus=null;
_onselect=null;
- _readonly=null;
_size=null;
_tabindex=null;
_accept=null;
@@ -122,7 +120,6 @@
setStringProperty(component, HTML.ONCHANGE_ATTR, _onchange);
setStringProperty(component, HTML.ONFOCUS_ATTR, _onfocus);
setStringProperty(component, HTML.ONSELECT_ATTR, _onselect);
- setBooleanProperty(component, HTML.READONLY_ATTR, _readonly);
setIntegerProperty(component, HTML.SIZE_ATTR, _size);
setStringProperty(component, HTML.TABINDEX_ATTR, _tabindex);
@@ -196,11 +193,6 @@
public void setOnselect(String onselect)
{
_onselect = onselect;
- }
-
- public void setReadonly(String readonly)
- {
- _readonly = readonly;
}
public void setSize(String size)
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtml.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtml.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtml.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtml.java Fri Aug 10 08:22:19 2007
@@ -41,9 +41,6 @@
private static final Log log = LogFactory.getLog(HtmlInputText.class);
- private String _style;
- private String _styleClass;
-
private String _fallback;
private String _type;
@@ -64,27 +61,21 @@
}
public Object saveState(FacesContext context) {
- Object values[] = new Object[5];
+ Object values[] = new Object[4];
values[0] = super.saveState(context);
- String[] display = new String[2];
- display[0] = _style;
- display[1] = _styleClass;
-
- values[1] = display;
-
String[] types = new String[2];
types[0] = _fallback;
types[1] = _type;
- values[2] = types;
+ values[1] = types;
Boolean toolBarButtons[] = new Boolean[3];
toolBarButtons[0] = _allowEditSource;
toolBarButtons[1] = _allowExternalLinks;
toolBarButtons[2] = _addKupuLogo;
- values[3] = toolBarButtons;
+ values[2] = toolBarButtons;
Boolean toolBoxes[] = new Boolean[7];
toolBoxes[0] = _showAllToolBoxes;
@@ -95,7 +86,7 @@
toolBoxes[5] = _showCleanupExpressionsToolBox;
toolBoxes[6] = _showDebugToolBox;
- values[4] = toolBoxes;
+ values[3] = toolBoxes;
return values;
}
@@ -104,20 +95,16 @@
Object values[] = (Object[]) state;
super.restoreState(context, values[0]);
- String[] display = (String[]) values[1];
- _style = display[0];
- _styleClass = display[1];
-
- String[] types = (String[]) values[2];
+ String[] types = (String[]) values[1];
_fallback = types[0];
_type = types[1];
- Boolean[] toolBarButtons = (Boolean[]) values[3];
+ Boolean[] toolBarButtons = (Boolean[]) values[2];
_allowEditSource = toolBarButtons[0];
_allowExternalLinks = toolBarButtons[1];
_addKupuLogo = toolBarButtons[2];
- Boolean[] toolBoxes = (Boolean[]) values[4];
+ Boolean[] toolBoxes = (Boolean[]) values[3];
_showAllToolBoxes = toolBoxes[0];
_showPropertiesToolBox = toolBoxes[1];
_showLinksToolBox = toolBoxes[2];
@@ -127,26 +114,6 @@
_showDebugToolBox = toolBoxes[6];
}
- public String getStyle(){
- if (_style != null)
- return _style;
- ValueBinding vb = getValueBinding("style");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
- }
- public void setStyle(String style){
- this._style = style;
- }
-
- public String getStyleClass(){
- if (_styleClass != null)
- return _styleClass;
- ValueBinding vb = getValueBinding("styleClass");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
- }
- public void setStyleClass(String styleClass){
- this._styleClass = styleClass;
- }
-
public String getFallback(){
if (_fallback != null)
return _fallback;
@@ -382,4 +349,4 @@
return html.substring(bodyStartIndex, bodyEndIndex+1).trim();
}
-}
\ No newline at end of file
+}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayout.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayout.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayout.java Fri Aug 10 08:22:19 2007
@@ -34,8 +34,34 @@
{
//private static final Log log = LogFactory.getLog(HtmlPanelLayout.class);
- //HTML table attributes
- //TODO!
+ private static final int DEFAULT_BORDER = Integer.MIN_VALUE;
+ private static final String DEFAULT_LAYOUT = "classic";
+
+ // HTML table attributes
+ private String _align;
+ private String _bgcolor;
+ private Integer _border;
+ private String _cellpadding;
+ private String _cellspacing;
+ private String _frame;
+ private String _rules;
+ private String _summary;
+ private String _width;
+
+ // HTML standard attributes
+ private String _dir = null;
+ private String _lang = null;
+ private String _onclick = null;
+ private String _ondblclick = null;
+ private String _onkeydown = null;
+ private String _onkeypress = null;
+ private String _onkeyup = null;
+ private String _onmousedown = null;
+ private String _onmousemove = null;
+ private String _onmouseout = null;
+ private String _onmouseover = null;
+ private String _onmouseup = null;
+ private String _title = null;
// typesafe facet getters
@@ -95,7 +121,7 @@
{
if (_layout != null) return _layout;
ValueBinding vb = getValueBinding("layout");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ return vb != null ? (String) vb.getValue(getFacesContext()) : DEFAULT_LAYOUT;
}
public void setHeaderClass(String headerClass)
@@ -107,7 +133,7 @@
{
if (_headerClass != null) return _headerClass;
ValueBinding vb = getValueBinding("headerClass");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
}
public void setNavigationClass(String navigationClass)
@@ -119,7 +145,7 @@
{
if (_navigationClass != null) return _navigationClass;
ValueBinding vb = getValueBinding("navigationClass");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
}
public void setBodyClass(String bodyClass)
@@ -131,7 +157,7 @@
{
if (_bodyClass != null) return _bodyClass;
ValueBinding vb = getValueBinding("bodyClass");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
}
public void setFooterClass(String footerClass)
@@ -143,7 +169,7 @@
{
if (_footerClass != null) return _footerClass;
ValueBinding vb = getValueBinding("footerClass");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
}
public void setHeaderStyle(String headerStyle)
@@ -155,7 +181,7 @@
{
if (_headerStyle != null) return _headerStyle;
ValueBinding vb = getValueBinding("headerStyle");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
}
public void setNavigationStyle(String navigationStyle)
@@ -167,7 +193,7 @@
{
if (_navigationStyle != null) return _navigationStyle;
ValueBinding vb = getValueBinding("navigationStyle");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
}
public void setBodyStyle(String bodyStyle)
@@ -179,7 +205,7 @@
{
if (_bodyStyle != null) return _bodyStyle;
ValueBinding vb = getValueBinding("bodyStyle");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
}
public void setFooterStyle(String footerStyle)
@@ -191,13 +217,277 @@
{
if (_footerStyle != null) return _footerStyle;
ValueBinding vb = getValueBinding("footerStyle");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
}
+ public void setAlign(String align)
+ {
+ _align = align;
+ }
+
+ public String getAlign()
+ {
+ if (_align != null) return _align;
+ ValueBinding vb = getValueBinding("align");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setBgcolor(String bgcolor)
+ {
+ _bgcolor = bgcolor;
+ }
+
+ public String getBgcolor()
+ {
+ if (_bgcolor != null) return _bgcolor;
+ ValueBinding vb = getValueBinding("bgcolor");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setBorder(int border)
+ {
+ _border = new Integer(border);
+ }
+
+ public int getBorder()
+ {
+ if (_border != null) return _border.intValue();
+ ValueBinding vb = getValueBinding("border");
+ Number v = vb != null ? (Number)vb.getValue(getFacesContext()) : null;
+ return v != null ? v.intValue() : DEFAULT_BORDER;
+ }
+
+ public void setCellpadding(String cellpadding)
+ {
+ _cellpadding = cellpadding;
+ }
+
+ public String getCellpadding()
+ {
+ if (_cellpadding != null) return _cellpadding;
+ ValueBinding vb = getValueBinding("cellpadding");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setCellspacing(String cellspacing)
+ {
+ _cellspacing = cellspacing;
+ }
+
+ public String getCellspacing()
+ {
+ if (_cellspacing != null) return _cellspacing;
+ ValueBinding vb = getValueBinding("cellspacing");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setDir(String dir)
+ {
+ _dir = dir;
+ }
+
+ public String getDir()
+ {
+ if (_dir != null) return _dir;
+ ValueBinding vb = getValueBinding("dir");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setFrame(String frame)
+ {
+ _frame = frame;
+ }
+
+ public String getFrame()
+ {
+ if (_frame != null) return _frame;
+ ValueBinding vb = getValueBinding("frame");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setLang(String lang)
+ {
+ _lang = lang;
+ }
+
+ public String getLang()
+ {
+ if (_lang != null) return _lang;
+ ValueBinding vb = getValueBinding("lang");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnclick(String onclick)
+ {
+ _onclick = onclick;
+ }
+
+ public String getOnclick()
+ {
+ if (_onclick != null) return _onclick;
+ ValueBinding vb = getValueBinding("onclick");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOndblclick(String ondblclick)
+ {
+ _ondblclick = ondblclick;
+ }
+
+ public String getOndblclick()
+ {
+ if (_ondblclick != null) return _ondblclick;
+ ValueBinding vb = getValueBinding("ondblclick");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnkeydown(String onkeydown)
+ {
+ _onkeydown = onkeydown;
+ }
+
+ public String getOnkeydown()
+ {
+ if (_onkeydown != null) return _onkeydown;
+ ValueBinding vb = getValueBinding("onkeydown");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnkeypress(String onkeypress)
+ {
+ _onkeypress = onkeypress;
+ }
+
+ public String getOnkeypress()
+ {
+ if (_onkeypress != null) return _onkeypress;
+ ValueBinding vb = getValueBinding("onkeypress");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnkeyup(String onkeyup)
+ {
+ _onkeyup = onkeyup;
+ }
+
+ public String getOnkeyup()
+ {
+ if (_onkeyup != null) return _onkeyup;
+ ValueBinding vb = getValueBinding("onkeyup");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmousedown(String onmousedown)
+ {
+ _onmousedown = onmousedown;
+ }
+
+ public String getOnmousedown()
+ {
+ if (_onmousedown != null) return _onmousedown;
+ ValueBinding vb = getValueBinding("onmousedown");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmousemove(String onmousemove)
+ {
+ _onmousemove = onmousemove;
+ }
+
+ public String getOnmousemove()
+ {
+ if (_onmousemove != null) return _onmousemove;
+ ValueBinding vb = getValueBinding("onmousemove");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmouseout(String onmouseout)
+ {
+ _onmouseout = onmouseout;
+ }
+
+ public String getOnmouseout()
+ {
+ if (_onmouseout != null) return _onmouseout;
+ ValueBinding vb = getValueBinding("onmouseout");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmouseover(String onmouseover)
+ {
+ _onmouseover = onmouseover;
+ }
+
+ public String getOnmouseover()
+ {
+ if (_onmouseover != null) return _onmouseover;
+ ValueBinding vb = getValueBinding("onmouseover");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmouseup(String onmouseup)
+ {
+ _onmouseup = onmouseup;
+ }
+
+ public String getOnmouseup()
+ {
+ if (_onmouseup != null) return _onmouseup;
+ ValueBinding vb = getValueBinding("onmouseup");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setRules(String rules)
+ {
+ _rules = rules;
+ }
+
+ public String getRules()
+ {
+ if (_rules != null) return _rules;
+ ValueBinding vb = getValueBinding("rules");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setSummary(String summary)
+ {
+ _summary = summary;
+ }
+
+ public String getSummary()
+ {
+ if (_summary != null) return _summary;
+ ValueBinding vb = getValueBinding("summary");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setTitle(String title)
+ {
+ _title = title;
+ }
+
+ public String getTitle()
+ {
+ if (_title != null) return _title;
+ ValueBinding vb = getValueBinding("title");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setWidth(String width)
+ {
+ _width = width;
+ }
+
+ public String getWidth()
+ {
+ if (_width != null) return _width;
+ ValueBinding vb = getValueBinding("width");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
public Object saveState(FacesContext context)
{
- Object values[] = new Object[10];
+ Object values[] = new Object[32];
values[0] = super.saveState(context);
values[1] = _layout;
values[2] = _headerClass;
@@ -208,6 +498,28 @@
values[7] = _navigationStyle;
values[8] = _bodyStyle;
values[9] = _footerStyle;
+ values[10] = _align;
+ values[11] = _bgcolor;
+ values[12] = _border;
+ values[13] = _cellpadding;
+ values[14] = _cellspacing;
+ values[15] = _frame;
+ values[16] = _rules;
+ values[17] = _summary;
+ values[18] = _width;
+ values[19] = _dir;
+ values[20] = _lang;
+ values[21] = _onclick;
+ values[22] = _ondblclick;
+ values[23] = _onkeydown;
+ values[24] = _onkeypress;
+ values[25] = _onkeyup;
+ values[26] = _onmousedown;
+ values[27] = _onmousemove;
+ values[28] = _onmouseout;
+ values[29] = _onmouseover;
+ values[30] = _onmouseup;
+ values[31] = _title;
return ((Object) (values));
}
@@ -224,6 +536,28 @@
_navigationStyle = (String)values[7];
_bodyStyle = (String)values[8];
_footerStyle = (String)values[9];
+ _align = (String)values[10];
+ _bgcolor = (String)values[11];
+ _border = (Integer)values[12];
+ _cellpadding = (String)values[13];
+ _cellspacing = (String)values[14];
+ _frame = (String)values[15];
+ _rules = (String)values[16];
+ _summary = (String)values[17];
+ _width = (String)values[18];
+ _dir = (String)values[19];
+ _lang = (String)values[20];
+ _onclick = (String)values[21];
+ _ondblclick = (String)values[22];
+ _onkeydown = (String)values[23];
+ _onkeypress = (String)values[24];
+ _onkeyup = (String)values[25];
+ _onmousedown = (String)values[26];
+ _onmousemove = (String)values[27];
+ _onmouseout = (String)values[28];
+ _onmouseover = (String)values[29];
+ _onmouseup = (String)values[30];
+ _title = (String)values[31];
}
//------------------ GENERATED CODE END ---------------------------------------
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.java Fri Aug 10 08:22:19 2007
@@ -121,7 +121,7 @@
setStringProperty(component, HTML.ALIGN_ATTR, _align);
setStringProperty(component, HTML.BGCOLOR_ATTR, _bgcolor);
- setStringProperty(component, HTML.BORDER_ATTR, _border);
+ setIntegerProperty(component, HTML.BORDER_ATTR, _border);
setStringProperty(component, HTML.CELLPADDING_ATTR, _cellpadding);
setStringProperty(component, HTML.CELLSPACING_ATTR, _cellspacing);
setStringProperty(component, HTML.DATAFLD_ATTR, _datafld);
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigation.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigation.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigation.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigation.java Fri Aug 10 08:22:19 2007
@@ -44,6 +44,8 @@
{
private static final Log log = LogFactory.getLog(HtmlPanelNavigation.class);
+ private static final int DEFAULT_BORDER = Integer.MIN_VALUE;
+
private static final String PREVIOUS_VIEW_ROOT = HtmlPanelNavigation.class.getName() + ".PREVIOUS_VIEW_ROOT";
private boolean _itemOpenActiveStatesRestored = false;
@@ -120,6 +122,32 @@
}
}
+ // HTML table attributes
+ private String _align;
+ private String _bgcolor;
+ private Integer _border;
+ private String _cellpadding;
+ private String _cellspacing;
+ private String _frame;
+ private String _rules;
+ private String _summary;
+ private String _width;
+
+ // HTML standard attributes
+ private String _dir = null;
+ private String _lang = null;
+ private String _onclick = null;
+ private String _ondblclick = null;
+ private String _onkeydown = null;
+ private String _onkeypress = null;
+ private String _onkeyup = null;
+ private String _onmousedown = null;
+ private String _onmousemove = null;
+ private String _onmouseout = null;
+ private String _onmouseover = null;
+ private String _onmouseup = null;
+ private String _title = null;
+
//------------------ GENERATED CODE BEGIN (do not modify!) --------------------
public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlPanelNavigation";
@@ -244,7 +272,7 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[9];
+ Object values[] = new Object[31];
values[0] = super.saveState(context);
values[1] = _itemClass;
values[2] = _openItemClass;
@@ -254,6 +282,28 @@
values[6] = _openItemStyle;
values[7] = _activeItemStyle;
values[8] = _separatorStyle;
+ values[9] = _title;
+ values[10] = _align;
+ values[11] = _bgcolor;
+ values[12] = _border;
+ values[13] = _cellpadding;
+ values[14] = _cellspacing;
+ values[15] = _frame;
+ values[16] = _rules;
+ values[17] = _summary;
+ values[18] = _width;
+ values[19] = _dir;
+ values[20] = _lang;
+ values[21] = _onclick;
+ values[22] = _ondblclick;
+ values[23] = _onkeydown;
+ values[24] = _onkeypress;
+ values[25] = _onkeyup;
+ values[26] = _onmousedown;
+ values[27] = _onmousemove;
+ values[28] = _onmouseout;
+ values[29] = _onmouseover;
+ values[30] = _onmouseup;
return ((Object) (values));
}
@@ -269,6 +319,293 @@
_openItemStyle = (String)values[6];
_activeItemStyle = (String)values[7];
_separatorStyle = (String)values[8];
+ _title = (String)values[9];
+ _align = (String)values[10];
+ _bgcolor = (String)values[11];
+ _border = (Integer)values[12];
+ _cellpadding = (String)values[13];
+ _cellspacing = (String)values[14];
+ _frame = (String)values[15];
+ _rules = (String)values[16];
+ _summary = (String)values[17];
+ _width = (String)values[18];
+ _dir = (String)values[19];
+ _lang = (String)values[20];
+ _onclick = (String)values[21];
+ _ondblclick = (String)values[22];
+ _onkeydown = (String)values[23];
+ _onkeypress = (String)values[24];
+ _onkeyup = (String)values[25];
+ _onmousedown = (String)values[26];
+ _onmousemove = (String)values[27];
+ _onmouseout = (String)values[28];
+ _onmouseover = (String)values[29];
+ _onmouseup = (String)values[30];
}
//------------------ GENERATED CODE END ---------------------------------------
+ public void setAlign(String align)
+ {
+ _align = align;
+ }
+
+ public String getAlign()
+ {
+ if (_align != null) return _align;
+ ValueBinding vb = getValueBinding("align");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setBgcolor(String bgcolor)
+ {
+ _bgcolor = bgcolor;
+ }
+
+ public String getBgcolor()
+ {
+ if (_bgcolor != null) return _bgcolor;
+ ValueBinding vb = getValueBinding("bgcolor");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setBorder(int border)
+ {
+ _border = new Integer(border);
+ }
+
+ public int getBorder()
+ {
+ if (_border != null) return _border.intValue();
+ ValueBinding vb = getValueBinding("border");
+ Number v = vb != null ? (Number)vb.getValue(getFacesContext()) : null;
+ return v != null ? v.intValue() : DEFAULT_BORDER;
+ }
+
+ public void setCellpadding(String cellpadding)
+ {
+ _cellpadding = cellpadding;
+ }
+
+ public String getCellpadding()
+ {
+ if (_cellpadding != null) return _cellpadding;
+ ValueBinding vb = getValueBinding("cellpadding");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setCellspacing(String cellspacing)
+ {
+ _cellspacing = cellspacing;
+ }
+
+ public String getCellspacing()
+ {
+ if (_cellspacing != null) return _cellspacing;
+ ValueBinding vb = getValueBinding("cellspacing");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setDir(String dir)
+ {
+ _dir = dir;
+ }
+
+ public String getDir()
+ {
+ if (_dir != null) return _dir;
+ ValueBinding vb = getValueBinding("dir");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setFrame(String frame)
+ {
+ _frame = frame;
+ }
+
+ public String getFrame()
+ {
+ if (_frame != null) return _frame;
+ ValueBinding vb = getValueBinding("frame");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setLang(String lang)
+ {
+ _lang = lang;
+ }
+
+ public String getLang()
+ {
+ if (_lang != null) return _lang;
+ ValueBinding vb = getValueBinding("lang");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnclick(String onclick)
+ {
+ _onclick = onclick;
+ }
+
+ public String getOnclick()
+ {
+ if (_onclick != null) return _onclick;
+ ValueBinding vb = getValueBinding("onclick");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOndblclick(String ondblclick)
+ {
+ _ondblclick = ondblclick;
+ }
+
+ public String getOndblclick()
+ {
+ if (_ondblclick != null) return _ondblclick;
+ ValueBinding vb = getValueBinding("ondblclick");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnkeydown(String onkeydown)
+ {
+ _onkeydown = onkeydown;
+ }
+
+ public String getOnkeydown()
+ {
+ if (_onkeydown != null) return _onkeydown;
+ ValueBinding vb = getValueBinding("onkeydown");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnkeypress(String onkeypress)
+ {
+ _onkeypress = onkeypress;
+ }
+
+ public String getOnkeypress()
+ {
+ if (_onkeypress != null) return _onkeypress;
+ ValueBinding vb = getValueBinding("onkeypress");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnkeyup(String onkeyup)
+ {
+ _onkeyup = onkeyup;
+ }
+
+ public String getOnkeyup()
+ {
+ if (_onkeyup != null) return _onkeyup;
+ ValueBinding vb = getValueBinding("onkeyup");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmousedown(String onmousedown)
+ {
+ _onmousedown = onmousedown;
+ }
+
+ public String getOnmousedown()
+ {
+ if (_onmousedown != null) return _onmousedown;
+ ValueBinding vb = getValueBinding("onmousedown");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmousemove(String onmousemove)
+ {
+ _onmousemove = onmousemove;
+ }
+
+ public String getOnmousemove()
+ {
+ if (_onmousemove != null) return _onmousemove;
+ ValueBinding vb = getValueBinding("onmousemove");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmouseout(String onmouseout)
+ {
+ _onmouseout = onmouseout;
+ }
+
+ public String getOnmouseout()
+ {
+ if (_onmouseout != null) return _onmouseout;
+ ValueBinding vb = getValueBinding("onmouseout");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmouseover(String onmouseover)
+ {
+ _onmouseover = onmouseover;
+ }
+
+ public String getOnmouseover()
+ {
+ if (_onmouseover != null) return _onmouseover;
+ ValueBinding vb = getValueBinding("onmouseover");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmouseup(String onmouseup)
+ {
+ _onmouseup = onmouseup;
+ }
+
+ public String getOnmouseup()
+ {
+ if (_onmouseup != null) return _onmouseup;
+ ValueBinding vb = getValueBinding("onmouseup");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setRules(String rules)
+ {
+ _rules = rules;
+ }
+
+ public String getRules()
+ {
+ if (_rules != null) return _rules;
+ ValueBinding vb = getValueBinding("rules");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setSummary(String summary)
+ {
+ _summary = summary;
+ }
+
+ public String getSummary()
+ {
+ if (_summary != null) return _summary;
+ ValueBinding vb = getValueBinding("summary");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setTitle(String title)
+ {
+ _title = title;
+ }
+
+ public String getTitle()
+ {
+ if (_title != null) return _title;
+ ValueBinding vb = getValueBinding("title");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setWidth(String width)
+ {
+ _width = width;
+ }
+
+ public String getWidth()
+ {
+ if (_width != null) return _width;
+ ValueBinding vb = getValueBinding("width");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java Fri Aug 10 08:22:19 2007
@@ -63,6 +63,12 @@
_enabledOnUserRole= null;
_visibleOnUserRole= null;
_activeOnViewIds = null;
+ _actionListener = null;
+ _immediate = null;
+ _target = null;
+ _disabled = null;
+ _disabledStyle = null;
+ _disabledStyleClass = null;
}
public String getComponentType()
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlCommandNavigationItemTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlCommandNavigationItemTag.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlCommandNavigationItemTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlCommandNavigationItemTag.java Fri Aug 10 08:22:19 2007
@@ -45,7 +45,16 @@
return HtmlNavigationMenuRenderer.RENDERER_TYPE;
}
- protected void setProperties(UIComponent component) {
+
+ public void release() {
+ super.release();
+ _open = null;
+ _active = null;
+ _activeOnViewIds = null;
+ _externalLink = null;
+ }
+
+ protected void setProperties(UIComponent component) {
super.setProperties(component);
setBooleanProperty(component, OPEN_ATTR, _open);
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenu.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenu.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenu.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenu.java Fri Aug 10 08:22:19 2007
@@ -44,6 +44,7 @@
private static final Log log = LogFactory.getLog(HtmlPanelNavigationMenu.class);
static final String PREVIOUS_VIEW_ROOT = HtmlPanelNavigationMenu.class.getName() + ".PREVIOUS_VIEW_ROOT";
+ private static final int DEFAULT_BORDER = Integer.MIN_VALUE;
private boolean _itemOpenActiveStatesRestored = false;
private Boolean _disabled;
private String _disabledStyle;
@@ -125,6 +126,32 @@
private Boolean _expandAll = null;
private Boolean _renderAll = null;
+ // HTML table attributes
+ private String _align;
+ private String _bgcolor;
+ private Integer _border;
+ private String _cellpadding;
+ private String _cellspacing;
+ private String _frame;
+ private String _rules;
+ private String _summary;
+ private String _width;
+
+ // HTML standard attributes
+ private String _dir = null;
+ private String _lang = null;
+ private String _onclick = null;
+ private String _ondblclick = null;
+ private String _onkeydown = null;
+ private String _onkeypress = null;
+ private String _onkeyup = null;
+ private String _onmousedown = null;
+ private String _onmousemove = null;
+ private String _onmouseout = null;
+ private String _onmouseover = null;
+ private String _onmouseup = null;
+ private String _title = null;
+
public HtmlPanelNavigationMenu()
{
setRendererType(DEFAULT_RENDERER_TYPE);
@@ -316,9 +343,274 @@
_disabledStyleClass = disabledStyleClass;
}
+ public void setAlign(String align)
+ {
+ _align = align;
+ }
+
+ public String getAlign()
+ {
+ if (_align != null) return _align;
+ ValueBinding vb = getValueBinding("align");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setBgcolor(String bgcolor)
+ {
+ _bgcolor = bgcolor;
+ }
+
+ public String getBgcolor()
+ {
+ if (_bgcolor != null) return _bgcolor;
+ ValueBinding vb = getValueBinding("bgcolor");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setBorder(int border)
+ {
+ _border = new Integer(border);
+ }
+
+ public int getBorder()
+ {
+ if (_border != null) return _border.intValue();
+ ValueBinding vb = getValueBinding("border");
+ Number v = vb != null ? (Number)vb.getValue(getFacesContext()) : null;
+ return v != null ? v.intValue() : DEFAULT_BORDER;
+ }
+
+ public void setCellpadding(String cellpadding)
+ {
+ _cellpadding = cellpadding;
+ }
+
+ public String getCellpadding()
+ {
+ if (_cellpadding != null) return _cellpadding;
+ ValueBinding vb = getValueBinding("cellpadding");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setCellspacing(String cellspacing)
+ {
+ _cellspacing = cellspacing;
+ }
+
+ public String getCellspacing()
+ {
+ if (_cellspacing != null) return _cellspacing;
+ ValueBinding vb = getValueBinding("cellspacing");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setDir(String dir)
+ {
+ _dir = dir;
+ }
+
+ public String getDir()
+ {
+ if (_dir != null) return _dir;
+ ValueBinding vb = getValueBinding("dir");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setFrame(String frame)
+ {
+ _frame = frame;
+ }
+
+ public String getFrame()
+ {
+ if (_frame != null) return _frame;
+ ValueBinding vb = getValueBinding("frame");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setLang(String lang)
+ {
+ _lang = lang;
+ }
+
+ public String getLang()
+ {
+ if (_lang != null) return _lang;
+ ValueBinding vb = getValueBinding("lang");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnclick(String onclick)
+ {
+ _onclick = onclick;
+ }
+
+ public String getOnclick()
+ {
+ if (_onclick != null) return _onclick;
+ ValueBinding vb = getValueBinding("onclick");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOndblclick(String ondblclick)
+ {
+ _ondblclick = ondblclick;
+ }
+
+ public String getOndblclick()
+ {
+ if (_ondblclick != null) return _ondblclick;
+ ValueBinding vb = getValueBinding("ondblclick");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnkeydown(String onkeydown)
+ {
+ _onkeydown = onkeydown;
+ }
+
+ public String getOnkeydown()
+ {
+ if (_onkeydown != null) return _onkeydown;
+ ValueBinding vb = getValueBinding("onkeydown");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnkeypress(String onkeypress)
+ {
+ _onkeypress = onkeypress;
+ }
+
+ public String getOnkeypress()
+ {
+ if (_onkeypress != null) return _onkeypress;
+ ValueBinding vb = getValueBinding("onkeypress");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnkeyup(String onkeyup)
+ {
+ _onkeyup = onkeyup;
+ }
+
+ public String getOnkeyup()
+ {
+ if (_onkeyup != null) return _onkeyup;
+ ValueBinding vb = getValueBinding("onkeyup");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmousedown(String onmousedown)
+ {
+ _onmousedown = onmousedown;
+ }
+
+ public String getOnmousedown()
+ {
+ if (_onmousedown != null) return _onmousedown;
+ ValueBinding vb = getValueBinding("onmousedown");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmousemove(String onmousemove)
+ {
+ _onmousemove = onmousemove;
+ }
+
+ public String getOnmousemove()
+ {
+ if (_onmousemove != null) return _onmousemove;
+ ValueBinding vb = getValueBinding("onmousemove");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmouseout(String onmouseout)
+ {
+ _onmouseout = onmouseout;
+ }
+
+ public String getOnmouseout()
+ {
+ if (_onmouseout != null) return _onmouseout;
+ ValueBinding vb = getValueBinding("onmouseout");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmouseover(String onmouseover)
+ {
+ _onmouseover = onmouseover;
+ }
+
+ public String getOnmouseover()
+ {
+ if (_onmouseover != null) return _onmouseover;
+ ValueBinding vb = getValueBinding("onmouseover");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setOnmouseup(String onmouseup)
+ {
+ _onmouseup = onmouseup;
+ }
+
+ public String getOnmouseup()
+ {
+ if (_onmouseup != null) return _onmouseup;
+ ValueBinding vb = getValueBinding("onmouseup");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setRules(String rules)
+ {
+ _rules = rules;
+ }
+
+ public String getRules()
+ {
+ if (_rules != null) return _rules;
+ ValueBinding vb = getValueBinding("rules");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setSummary(String summary)
+ {
+ _summary = summary;
+ }
+
+ public String getSummary()
+ {
+ if (_summary != null) return _summary;
+ ValueBinding vb = getValueBinding("summary");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setTitle(String title)
+ {
+ _title = title;
+ }
+
+ public String getTitle()
+ {
+ if (_title != null) return _title;
+ ValueBinding vb = getValueBinding("title");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setWidth(String width)
+ {
+ _width = width;
+ }
+
+ public String getWidth()
+ {
+ if (_width != null) return _width;
+ ValueBinding vb = getValueBinding("width");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
public Object saveState(FacesContext context)
{
- Object values[] = new Object[16];
+ Object values[] = new Object[38];
values[0] = super.saveState(context);
values[1] = _itemClass;
values[2] = _openItemClass;
@@ -335,6 +627,28 @@
values[13] = _disabledStyle;
values[14] = _disabledStyleClass;
values[15] = _renderAll;
+ values[16] = _rules;
+ values[17] = _summary;
+ values[18] = _width;
+ values[19] = _dir;
+ values[20] = _lang;
+ values[21] = _onclick;
+ values[22] = _ondblclick;
+ values[23] = _onkeydown;
+ values[24] = _onkeypress;
+ values[25] = _onkeyup;
+ values[26] = _onmousedown;
+ values[27] = _onmousemove;
+ values[28] = _onmouseout;
+ values[29] = _onmouseover;
+ values[30] = _onmouseup;
+ values[31] = _title;
+ values[32] = _align;
+ values[33] = _bgcolor;
+ values[34] = _border;
+ values[35] = _cellpadding;
+ values[36] = _cellspacing;
+ values[37] = _frame;
return values;
}
@@ -357,5 +671,27 @@
_disabledStyle = (String) values[13];
_disabledStyleClass = (String) values[14];
_renderAll = (Boolean) values[15];
+ _rules = (String)values[16];
+ _summary = (String)values[17];
+ _width = (String)values[18];
+ _dir = (String)values[19];
+ _lang = (String)values[20];
+ _onclick = (String)values[21];
+ _ondblclick = (String)values[22];
+ _onkeydown = (String)values[23];
+ _onkeypress = (String)values[24];
+ _onkeyup = (String)values[25];
+ _onmousedown = (String)values[26];
+ _onmousemove = (String)values[27];
+ _onmouseout = (String)values[28];
+ _onmouseover = (String)values[29];
+ _onmouseup = (String)values[30];
+ _title = (String)values[31];
+ _align = (String)values[32];
+ _bgcolor = (String)values[33];
+ _border = (Integer)values[34];
+ _cellpadding = (String)values[35];
+ _cellspacing = (String)values[36];
+ _frame = (String)values[37];
}
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenuTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenuTag.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenuTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenuTag.java Fri Aug 10 08:22:19 2007
@@ -129,7 +129,7 @@
setStringProperty(component, HTML.ALIGN_ATTR, _align);
setStringProperty(component, HTML.BGCOLOR_ATTR, _bgcolor);
- setStringProperty(component, HTML.BORDER_ATTR, _border);
+ setIntegerProperty(component, HTML.BORDER_ATTR, _border);
setStringProperty(component, HTML.CELLPADDING_ATTR, _cellpadding);
setStringProperty(component, HTML.CELLSPACING_ATTR, _cellspacing);
setStringProperty(component, HTML.DATAFLD_ATTR, _datafld);
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuTag.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuTag.java Fri Aug 10 08:22:19 2007
@@ -51,6 +51,7 @@
_theme=null;
_enabledOnUserRole=null;
_visibleOnUserRole=null;
+ _immediate = null;
}
public String getComponentType()
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTable.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTable.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTable.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTable.java Fri Aug 10 08:22:19 2007
@@ -21,6 +21,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.component.html.HtmlDataTable;
+import javax.faces.el.ValueBinding;
/**
* Model for a table in multiple balanced columns.
@@ -38,8 +39,10 @@
public static final String NEWSPAPER_COLUMNS_PROPERTY = "newspaperColumns";
public static final String SPACER_FACET_NAME = "spacer";
+ private static final Integer DEFAULT_NEWSPAPER_COLUMNS = new Integer(1);
+
/** the value of the column count property */
- private int newspaperColumns = 1;
+ private Integer newspaperColumns = null;
public HtmlNewspaperTable() {
setRendererType(RENDERER_TYPE);
@@ -49,10 +52,14 @@
* Set the number of columns the table will be divided over.
*/
public int getNewspaperColumns() {
- return newspaperColumns;
+ if (newspaperColumns != null) return newspaperColumns.intValue();
+ ValueBinding vb = getValueBinding(NEWSPAPER_COLUMNS_PROPERTY);
+ Integer v = vb != null ? (Integer)vb.getValue(getFacesContext()) : DEFAULT_NEWSPAPER_COLUMNS;
+ return v.intValue();
}
+
public void setNewspaperColumns(int newspaperColumns) {
- this.newspaperColumns = newspaperColumns;
+ this.newspaperColumns = new Integer(newspaperColumns);
}
/**
@@ -68,13 +75,13 @@
public Object saveState(FacesContext context) {
Object values[] = new Object[2];
values[0] = super.saveState(context);
- values[1] = new Integer(newspaperColumns);
+ values[1] = newspaperColumns;
return values;
}
public void restoreState(FacesContext context, Object state) {
Object values[] = (Object[])state;
super.restoreState(context, values[0]);
- newspaperColumns = ((Integer)values[1]).intValue();
+ newspaperColumns = (Integer)values[1];
}
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableTag.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableTag.java Fri Aug 10 08:22:19 2007
@@ -39,6 +39,7 @@
public void release() {
super.release();
newspaperColumns = null;
+ newspaperOrientation = null;
}
public String getComponentType() {
@@ -66,4 +67,4 @@
setIntegerProperty(component, HtmlNewspaperTable.NEWSPAPER_COLUMNS_PROPERTY, newspaperColumns);
setStringProperty(component, HtmlDataTable.NEWSPAPER_ORIENTATION_PROPERTY, newspaperOrientation);
}
-}
\ No newline at end of file
+}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/radio/HtmlRadio.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/radio/HtmlRadio.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/radio/HtmlRadio.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/radio/HtmlRadio.java Fri Aug 10 08:22:19 2007
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.custom.radio;
+import org.apache.myfaces.component.UserRoleUtils;
import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
import javax.faces.component.UIComponentBase;
@@ -45,6 +46,8 @@
private String _for = null;
private Integer _index = null;
+ private String _enabledOnUserRole = null;
+ private String _visibleOnUserRole = null;
public HtmlRadio()
{
@@ -81,14 +84,39 @@
return v != null ? v.intValue() : Integer.MIN_VALUE;
}
+ public String getEnabledOnUserRole()
+ {
+ if (_enabledOnUserRole != null) return _enabledOnUserRole;
+ ValueBinding vb = getValueBinding("enabledOnUserRole");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+ public void setVisibleOnUserRole(String visibleOnUserRole)
+ {
+ _visibleOnUserRole = visibleOnUserRole;
+ }
+ public String getVisibleOnUserRole()
+ {
+ if (_visibleOnUserRole != null) return _visibleOnUserRole;
+ ValueBinding vb = getValueBinding("visibleOnUserRole");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
+ }
+
+ public boolean isRendered()
+ {
+ if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
+ return super.isRendered();
+ }
+
public Object saveState(FacesContext context)
{
- Object values[] = new Object[3];
+ Object values[] = new Object[5];
values[0] = super.saveState(context);
values[1] = _for;
values[2] = _index;
+ values[3] = _enabledOnUserRole;
+ values[4] = _visibleOnUserRole;
return ((Object) (values));
}
@@ -98,6 +126,8 @@
super.restoreState(context, values[0]);
_for = (String)values[1];
_index = (Integer)values[2];
+ _enabledOnUserRole = (String)values[3];
+ _visibleOnUserRole = (String)values[4];
}
//------------------ GENERATED CODE END ---------------------------------------