You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by fe...@apache.org on 2004/12/01 10:32:21 UTC
cvs commit: jakarta-taglibs-sandbox/datagrid/xml datagrid.xml
felipeal 2004/12/01 01:32:21
Modified: datagrid/src/org/apache/taglibs/datagrid DataGridTag.java
datagrid/xml datagrid.xml
Log:
more bugfixes from Nestor
Revision Changes Path
1.7 +34 -33 jakarta-taglibs-sandbox/datagrid/src/org/apache/taglibs/datagrid/DataGridTag.java
Index: DataGridTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs-sandbox/datagrid/src/org/apache/taglibs/datagrid/DataGridTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DataGridTag.java 29 Nov 2004 00:16:01 -0000 1.6
+++ DataGridTag.java 1 Dec 2004 09:32:21 -0000 1.7
@@ -255,8 +255,8 @@
if (element.getNodeName ().equals ("header"))
{
- if (element.hasAttribute ("style")) headerStyle = element.getAttribute ("style");
- if (element.hasAttribute ("styleClass")) headerStyleClass = element.getAttribute ("styleClass");
+ if (element.hasAttribute ("style")) headerStyle = ExpressionLanguageHelper.evalString ("style", element.getAttribute ("style"), this, pageContext);
+ if (element.hasAttribute ("styleClass")) headerStyleClass = ExpressionLanguageHelper.evalString ("styleClass", element.getAttribute ("styleClass"), this, pageContext);
if (element.hasAttribute ("show"))
{
valueBoolean = ExpressionLanguageHelper.evalBoolean ("show", element.getAttribute ("show"), this, pageContext);
@@ -265,8 +265,8 @@
}
else if (element.getNodeName ().equals ("footer"))
{
- if (element.hasAttribute ("style")) footerStyle = element.getAttribute ("style");
- if (element.hasAttribute ("styleClass")) footerStyleClass = element.getAttribute ("styleClass");
+ if (element.hasAttribute ("style")) footerStyle = ExpressionLanguageHelper.evalString ("style", element.getAttribute ("style"), this, pageContext);
+ if (element.hasAttribute ("styleClass")) footerStyleClass = ExpressionLanguageHelper.evalString ("styleClass", element.getAttribute ("styleClass"), this, pageContext);
if (element.hasAttribute ("show"))
{
valueBoolean = ExpressionLanguageHelper.evalBoolean ("show", element.getAttribute ("show"), this, pageContext);
@@ -277,13 +277,13 @@
{
if (element.hasAttribute ("style")) rowsStyle = element.getAttribute ("style");
if (element.hasAttribute ("styleClass")) rowsStyleClass = element.getAttribute ("styleClass");
- if (element.hasAttribute ("hiliteStyleClass")) rowsHiliteStyleClass = element.getAttribute ("hiliteStyleClass");
+ if (element.hasAttribute ("hiliteStyleClass")) rowsHiliteStyleClass = ExpressionLanguageHelper.evalString ("hiliteStyleClass", element.getAttribute ("hiliteStyleClass"), this, pageContext);
}
else if (element.getNodeName ().equals ("alternateRows"))
{
if (element.hasAttribute ("style")) alternateRowsStyle = element.getAttribute ("style");
if (element.hasAttribute ("styleClass")) alternateRowsStyleClass = element.getAttribute ("styleClass");
- if (element.hasAttribute ("hiliteStyleClass")) alternateRowsHiliteStyleClass = element.getAttribute ("hiliteStyleClass");
+ if (element.hasAttribute ("hiliteStyleClass")) alternateRowsHiliteStyleClass = ExpressionLanguageHelper.evalString ("hiliteStyleClass", element.getAttribute ("hiliteStyleClass"), this, pageContext);
}
else if (element.getNodeName ().equals ("paging"))
{
@@ -344,11 +344,11 @@
if (element.getNodeName ().equals ("header"))
{
- if (element.hasAttribute ("style")) column.setHeaderStyle (element.getAttribute ("style"));
- if (element.hasAttribute ("styleClass")) column.setHeaderStyleClass (element.getAttribute ("styleClass"));
- if (element.hasAttribute ("value")) column.setHeaderValue (element.getAttribute ("value"));
- if (element.hasAttribute ("hAlign")) column.setHeaderHorizontalAlign (element.getAttribute ("hAlign"));
- if (element.hasAttribute ("vAlign")) column.setHeaderVerticalAlign (element.getAttribute ("vAlign"));
+ if (element.hasAttribute ("style")) column.setHeaderStyle (ExpressionLanguageHelper.evalString ("style", element.getAttribute ("style"), this, pageContext));
+ if (element.hasAttribute ("styleClass")) column.setHeaderStyleClass (ExpressionLanguageHelper.evalString ("styleClass", element.getAttribute ("styleClass"), this, pageContext));
+ if (element.hasAttribute ("value")) column.setHeaderValue (ExpressionLanguageHelper.evalString ("value", element.getAttribute ("value"), this, pageContext));
+ if (element.hasAttribute ("hAlign")) column.setHeaderHorizontalAlign (ExpressionLanguageHelper.evalString ("hAlign", element.getAttribute ("hAlign"), this, pageContext));
+ if (element.hasAttribute ("vAlign")) column.setHeaderVerticalAlign (ExpressionLanguageHelper.evalString ("vAlign", element.getAttribute ("vAlign"), this, pageContext));
value = XmlHelper.getText (element);
if (value.length () > 0) column.setHeaderValue (value);
@@ -359,8 +359,8 @@
if (element.hasAttribute ("styleClass")) column.setItemStyleClass (element.getAttribute ("styleClass"));
if (element.hasAttribute ("value")) column.setItemValue (element.getAttribute ("value"));
if (element.hasAttribute ("pattern")) column.setItemPattern (ExpressionLanguageHelper.evalString ("pattern", element.getAttribute ("pattern"), this, pageContext));
- if (element.hasAttribute ("hAlign")) column.setItemHorizontalAlign (element.getAttribute ("hAlign"));
- if (element.hasAttribute ("vAlign")) column.setItemVerticalAlign (element.getAttribute ("vAlign"));
+ if (element.hasAttribute ("hAlign")) column.setItemHorizontalAlign (ExpressionLanguageHelper.evalString ("hAlign", element.getAttribute ("hAlign"), this, pageContext));
+ if (element.hasAttribute ("vAlign")) column.setItemVerticalAlign (ExpressionLanguageHelper.evalString ("vAlign", element.getAttribute ("vAlign"), this, pageContext));
if (element.hasAttribute ("hyperLink")) column.setItemHyperLinkValue (element.getAttribute ("hyperLink"));
if (element.hasAttribute ("hyperLinkTarget")) column.setItemHyperLinkTarget (element.getAttribute ("hyperLinkTarget"));
@@ -369,11 +369,11 @@
}
else if (element.getNodeName ().equals ("footer"))
{
- if (element.hasAttribute ("style")) column.setFooterStyle (element.getAttribute ("style"));
- if (element.hasAttribute ("styleClass")) column.setFooterStyleClass (element.getAttribute ("styleClass"));
+ if (element.hasAttribute ("style")) column.setFooterStyle (ExpressionLanguageHelper.evalString ("style", element.getAttribute ("style"), this, pageContext));
+ if (element.hasAttribute ("styleClass")) column.setFooterStyleClass (ExpressionLanguageHelper.evalString ("styleClass", element.getAttribute ("styleClass"), this, pageContext));
if (element.hasAttribute ("value")) column.setFooterValue (element.getAttribute ("value"));
- if (element.hasAttribute ("hAlign")) column.setFooterHorizontalAlign (element.getAttribute ("hAlign"));
- if (element.hasAttribute ("vAlign")) column.setFooterVerticalAlign (element.getAttribute ("vAlign"));
+ if (element.hasAttribute ("hAlign")) column.setFooterHorizontalAlign (ExpressionLanguageHelper.evalString ("hAlign", element.getAttribute ("hAlign"), this, pageContext));
+ if (element.hasAttribute ("vAlign")) column.setFooterVerticalAlign (ExpressionLanguageHelper.evalString ("vAlign", element.getAttribute ("vAlign"), this, pageContext));
value = XmlHelper.getText (element);
if (value.length () > 0) column.setFooterValue (value);
@@ -426,6 +426,7 @@
row.setAlternateStyle (ExpressionLanguageHelper.evalString ("style", alternateRowsStyle, this, pageContext));
if (alternateRowsStyleClass != null)
row.setAlternateStyleClass (ExpressionLanguageHelper.evalString ("styleClass", alternateRowsStyleClass, this, pageContext));
+
for (indexColumn = 0; indexColumn < columnsSize; indexColumn++)
{
column = (Column) columns.get (indexColumn);
@@ -698,16 +699,16 @@
for (indexColumn = 0; indexColumn < columnsSize; indexColumn++)
{
column = (Column) columns.get (indexColumn);
-
+ cell = row.getCells () [indexColumn];
+
out.print ("<td");
if (column.getWidth () != null) out.print (" width=\"" + column.getWidth () + "\"");
if (column.getItemHorizontalAlign () != null) out.print (" align=\"" + column.getItemHorizontalAlign () + "\"");
if (column.getItemVerticalAlign () != null) out.print (" valign=\"" + column.getItemVerticalAlign () + "\"");
- if (column.getItemStyleClass () != null) out.print (" class=\"" + column.getItemStyleClass () + "\"");
- if (column.getItemStyle () != null) out.print (" style=\"" + column.getItemStyle () + "\"");
+ if (cell.getStyleClass () != null) out.print (" class=\"" + cell.getStyleClass () + "\"");
+ if (cell.getStyle () != null) out.print (" style=\"" + cell.getStyle () + "\"");
out.println (">");
- cell = row.getCells () [indexColumn];
if (cell.getValue () != null)
{
if (column.getItemPattern () != null)
@@ -942,9 +943,9 @@
*
* @param String height defines the height of the data grid when scrolling is enabled.
*/
- public void setHeight (String value)
+ public void setHeight (String value) throws Exception
{
- height = value;
+ height = ExpressionLanguageHelper.evalString ("height", value, this, pageContext);
}
/**
@@ -952,9 +953,9 @@
*
* @param String width defines the width in pixels or percentages of the data grid.
*/
- public void setWidth (String value)
+ public void setWidth (String value) throws Exception
{
- width = value;
+ width = ExpressionLanguageHelper.evalString ("width", value, this, pageContext);
}
/**
@@ -962,9 +963,9 @@
*
* @param String cellPadding defines the cell padding used in the data grid.
*/
- public void setCellPadding (String value)
+ public void setCellPadding (String value) throws Exception
{
- cellPadding = value;
+ cellPadding = ExpressionLanguageHelper.evalString ("cellPadding", value, this, pageContext);
}
/**
@@ -972,9 +973,9 @@
*
* @param String cellSpacing defines the cell spacing used in the data grid.
*/
- public void setCellSpacing (String value)
+ public void setCellSpacing (String value) throws Exception
{
- cellSpacing = value;
+ cellSpacing = ExpressionLanguageHelper.evalString ("cellSpacing", value, this, pageContext);
}
/**
@@ -982,9 +983,9 @@
*
* @param String style defines the CSS style to be used in the datagrid.
*/
- public void setStyle (String value)
+ public void setStyle (String value) throws Exception
{
- style = value;
+ style = ExpressionLanguageHelper.evalString ("style", value, this, pageContext);
}
/**
@@ -992,9 +993,9 @@
*
* @param String styleClass defines the CSS class to be used in the datagrid.
*/
- public void setStyleClass (String value)
+ public void setStyleClass (String value) throws Exception
{
- styleClass = value;
+ styleClass = ExpressionLanguageHelper.evalString ("styleClass", value, this, pageContext);
}
/**
1.7 +26 -0 jakarta-taglibs-sandbox/datagrid/xml/datagrid.xml
Index: datagrid.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs-sandbox/datagrid/xml/datagrid.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- datagrid.xml 29 Nov 2004 00:16:01 -0000 1.6
+++ datagrid.xml 1 Dec 2004 09:32:21 -0000 1.7
@@ -130,6 +130,18 @@
<description>Attribute to set a vertical scroll bar. If the value is true a vertical scroll bar will be rendered with the datagrid.</description>
</attribute>
<attribute>
+ <name>rules</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <description>Attribute to set the rules attribute of the datagrid table.</description>
+ </attribute>
+ <attribute>
+ <name>frame</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <description>Attribute to set the frame attribute of the datagrid table.</description>
+ </attribute>
+ <attribute>
<name>style</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -255,6 +267,20 @@
<!-- The following is used to generate the tag library revision history
changes.html file. There can be 0 .. N revisions. Each revision
can have 0 .. N sections, each section can have 0 .. N items. -->
+
+<revision release="Development" date="12/01/2004">
+ <description>
+ Bug fix.
+ </description>
+ <section name="Bugs Fixed">
+ <item>
+ Fixed problems with JSTL Expression Language for attributes "cellPadding", "cellSpacing", "rules", "frame", "style", "styleClass", "hAlign" and "vAlign"..
+ </item>
+ <item>
+ TLD file didn't include "rules" and "frames" attributes.
+ </item>
+ </section>
+</revision>
<revision release="Development" date="11/27/2004">
<description>
---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org