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 [2/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...
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java Fri Aug 10 08:22:19 2007
@@ -44,8 +44,33 @@
//private static final Log log = LogFactory.getLog(HtmlPanelTabbedPane.class);
private MethodBinding _tabChangeListener = null;
+ private static final int DEFAULT_BORDER = Integer.MIN_VALUE;
//TODO: additional HTML Table attributes (see HtmlPanelTabbedPaneTag)
+ // HTML table attributes
+ private String _align;
+ 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 void decode(FacesContext context)
{
@@ -330,7 +355,9 @@
public String getDisabledTabStyleClass()
{
- return _disabledTabStyleClass;
+ if (_disabledTabStyleClass != null) return _disabledTabStyleClass;
+ ValueBinding vb = getValueBinding("disabledTabStyleClass");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
}
@@ -352,9 +379,262 @@
_serverSideTabSwitch = new Boolean( serverSideTabSwitch );
}
+ 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 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[12];
+ Object values[] = new Object[33];
values[0] = super.saveState(context);
values[1] = _selectedIndex;
values[2] = _bgcolor;
@@ -367,6 +647,27 @@
values[9] = _disabledTabStyleClass;
values[10] = _serverSideTabSwitch;
values[11] = _activePanelTabVar;
+ 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;
+ values[32] = _align;
return ((Object) (values));
}
@@ -385,6 +686,27 @@
_disabledTabStyleClass = (String)values[9];
_serverSideTabSwitch = (Boolean) values[10];
_activePanelTabVar = (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];
+ _align = (String)values[32];
}
//------------------ GENERATED CODE END ---------------------------------------
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTree.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTree.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTree.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTree.java Fri Aug 10 08:22:19 2007
@@ -70,7 +70,6 @@
private IconProvider iconProvider;
private boolean itemStatesRestored = false;
private String var;
- private String styleClass;
private String nodeClass;
private String rowClasses;
private String columnClasses;
@@ -151,7 +150,7 @@
*/
public String getVar()
{
- return var;
+ return getStringValue(var, "var");
}
@@ -336,18 +335,6 @@
}
- public String getStyleClass()
- {
- return getStringValue(styleClass, "styleClass");
- }
-
-
- public void setStyleClass(String styleClass)
- {
- this.styleClass = styleClass;
- }
-
-
public String getNodeClass()
{
return getStringValue(nodeClass, "nodeClass");
@@ -587,7 +574,7 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[25];
+ Object values[] = new Object[24];
values[0] = super.saveState(context);
values[1] = iconChildFirst;
values[2] = iconChildMiddle;
@@ -602,7 +589,7 @@
values[11] = iconNodeOpenLast;
values[12] = iconNodeOpenMiddle;
values[13] = iconNoline;
- values[14] = styleClass;
+ values[14] = var;
values[15] = nodeClass;
values[16] = selectedNodeClass;
values[17] = new Integer(uniqueIdCounter);
@@ -612,7 +599,6 @@
values[21] = expireListeners;
values[22] = rowClasses;
values[23] = columnClasses;
- values[24] = var;
return ((Object) (values));
}
@@ -634,7 +620,7 @@
iconNodeOpenLast = (String) values[11];
iconNodeOpenMiddle = (String) values[12];
iconNoline = (String) values[13];
- styleClass = (String) values[14];
+ var = (String) values[14];
nodeClass = (String) values[15];
selectedNodeClass = (String) values[16];
uniqueIdCounter = ((Integer) values[17]).intValue();
@@ -644,7 +630,6 @@
expireListeners = (Long) values[21];
rowClasses = (String) values[22];
columnClasses = (String) values[23];
- var = (String) values[24];
addToModelListeners();
}
@@ -1008,4 +993,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTreeImageCommandLink.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTreeImageCommandLink.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTreeImageCommandLink.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTreeImageCommandLink.java Fri Aug 10 08:22:19 2007
@@ -20,6 +20,7 @@
import javax.faces.component.html.HtmlCommandLink;
import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
/**
@@ -52,7 +53,9 @@
public String getImage()
{
- return image;
+ if (image != null) return image;
+ ValueBinding vb = getValueBinding("image");
+ return vb != null ? (String) vb.getValue(getFacesContext()) : null;
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeTag.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeTag.java Fri Aug 10 08:22:19 2007
@@ -392,6 +392,7 @@
selectedNodeClass = null;
iconClass = null;
expandRoot = false;
+ expireListeners = null;
}
/**
@@ -440,4 +441,4 @@
setStringProperty(component, "iconClass", iconClass);
setLongProperty(component, "expireListeners", expireListeners);
}
-}
\ No newline at end of file
+}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlCommandLinkTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlCommandLinkTag.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlCommandLinkTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlCommandLinkTag.java Fri Aug 10 08:22:19 2007
@@ -59,6 +59,9 @@
_enabledOnUserRole=null;
_visibleOnUserRole=null;
_actionFor = null;
+ _disabled = null;
+ _disabledStyle = null;
+ _disabledStyleClass = null;
}
protected void setProperties(UIComponent component)
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGridTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGridTag.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGridTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGridTag.java Fri Aug 10 08:22:19 2007
@@ -53,6 +53,9 @@
super.release();
_enabledOnUserRole=null;
_visibleOnUserRole=null;
+ _displayValueOnly = null;
+ _displayValueOnlyStyle = null;
+ _displayValueOnlyStyleClass = null;
}
protected void setProperties(UIComponent component)
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGroupTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGroupTag.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGroupTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlPanelGroupTag.java Fri Aug 10 08:22:19 2007
@@ -61,6 +61,9 @@
_visibleOnUserRole=null;
_colspan=null;
_layout = null;
+ _displayValueOnly = null;
+ _displayValueOnlyStyle = null;
+ _displayValueOnlyStyleClass = null;
}
protected void setProperties(UIComponent component)
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectBooleanCheckboxTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectBooleanCheckboxTag.java?view=diff&rev=564616&r1=564615&r2=564616
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectBooleanCheckboxTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlSelectBooleanCheckboxTag.java Fri Aug 10 08:22:19 2007
@@ -19,6 +19,7 @@
package org.apache.myfaces.taglib.html.ext;
import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlSelectBooleanCheckboxTagBase;
import org.apache.myfaces.component.UserRoleAware;
import org.apache.myfaces.component.html.ext.HtmlSelectBooleanCheckbox;
@@ -49,6 +50,8 @@
private String _displayValueOnly;
private String _displayValueOnlyStyle;
private String _displayValueOnlyStyleClass;
+
+ private String _escape;
public void release() {
super.release();
@@ -58,6 +61,7 @@
_displayValueOnly=null;
_displayValueOnlyStyle=null;
_displayValueOnlyStyleClass=null;
+ _escape = null;
}
protected void setProperties(UIComponent component)
@@ -69,6 +73,12 @@
setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR, _displayValueOnlyStyle);
setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR, _displayValueOnlyStyleClass);
+ setBooleanProperty(component, JSFAttr.ESCAPE_ATTR, _escape);
+ }
+
+ public void setEscape(String escape)
+ {
+ _escape = escape;
}
public void setEnabledOnUserRole(String enabledOnUserRole)