You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/08/01 12:18:22 UTC
svn commit: r226769 - in /myfaces/tomahawk/trunk:
src/java/org/apache/myfaces/component/html/ext/
src/java/org/apache/myfaces/custom/datascroller/ tld/
Author: mmarinschek
Date: Mon Aug 1 03:18:11 2005
New Revision: 226769
URL: http://svn.apache.org/viewcvs?rev=226769&view=rev
Log:
changed extensions.tld to work for swapImage again, slight changes in DataScroller to enable subclassing
Modified:
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScroller.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java
myfaces/tomahawk/trunk/tld/myfaces_ext.tld
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java?rev=226769&r1=226768&r2=226769&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java Mon Aug 1 03:18:11 2005
@@ -471,7 +471,7 @@
}
/**
- * @return
+ * @return _SerializableDataModel
*/
private _SerializableDataModel createSerializableDataModel()
{
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java?rev=226769&r1=226768&r2=226769&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java Mon Aug 1 03:18:11 2005
@@ -301,8 +301,7 @@
protected void setDataModel(DataModel datamodel)
{
- _dataModelMap
- .put(getParent().getClientId(getFacesContext()),
+ _dataModelMap.put(getParent().getClientId(getFacesContext()),
datamodel);
}
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScroller.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScroller.java?rev=226769&r1=226768&r2=226769&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScroller.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScroller.java Mon Aug 1 03:18:11 2005
@@ -422,12 +422,12 @@
private Boolean _renderFacetsIfSinglePage = null;
private Boolean _immediate;
- protected static final String FACET_FIRST = "first".intern();
- protected static final String FACET_PREVIOUS = "previous".intern();
- protected static final String FACET_NEXT = "next".intern();
- protected static final String FACET_LAST = "last".intern();
- protected static final String FACET_FAST_FORWARD = "fastf".intern();
- protected static final String FACET_FAST_REWIND = "fastr".intern();
+ public static final String FACET_FIRST = "first".intern();
+ public static final String FACET_PREVIOUS = "previous".intern();
+ public static final String FACET_NEXT = "next".intern();
+ public static final String FACET_LAST = "last".intern();
+ public static final String FACET_FAST_FORWARD = "fastf".intern();
+ public static final String FACET_FAST_REWIND = "fastr".intern();
public HtmlDataScroller()
{
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java?rev=226769&r1=226768&r2=226769&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datascroller/HtmlDataScrollerRenderer.java Mon Aug 1 03:18:11 2005
@@ -208,7 +208,7 @@
removeVariables(facesContext, scroller);
}
- public void renderScroller(FacesContext facesContext, HtmlDataScroller scroller)
+ protected void renderScroller(FacesContext facesContext, HtmlDataScroller scroller)
throws IOException
{
ResponseWriter writer = facesContext.getResponseWriter();
@@ -282,7 +282,7 @@
writer.endElement("table");
}
- private void renderFacet(FacesContext facesContext, HtmlDataScroller scroller,
+ protected void renderFacet(FacesContext facesContext, HtmlDataScroller scroller,
UIComponent facetComp, String facetName) throws IOException
{
UIComponent link = getLink(facesContext, scroller, facetComp, facetName);
Modified: myfaces/tomahawk/trunk/tld/myfaces_ext.tld
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/tld/myfaces_ext.tld?rev=226769&r1=226768&r2=226769&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/tld/myfaces_ext.tld (original)
+++ myfaces/tomahawk/trunk/tld/myfaces_ext.tld Mon Aug 1 03:18:11 2005
@@ -2455,6 +2455,7 @@
&ui_graphic_attributes;
&html_universal_attributes;
&html_img_attributes;
+ &spec_img_attributes;
<attribute><name>onclick</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
<attribute><name>ondblclick</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>
<attribute><name>onkeypress</name> <required>false</required> <rtexprvalue>false</rtexprvalue></attribute>