You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2008/09/17 12:38:47 UTC
svn commit: r696230 - in
/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src:
META-INF/empire-tags.tld org/apache/empire/struts2/jsp/tags/TableDataTag.java
Author: doebele
Date: Wed Sep 17 03:38:46 2008
New Revision: 696230
URL: http://svn.apache.org/viewvc?rev=696230&view=rev
Log:
EMPIREDB-16
Modified:
incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/META-INF/empire-tags.tld
incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableDataTag.java
Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/META-INF/empire-tags.tld
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/META-INF/empire-tags.tld?rev=696230&r1=696229&r2=696230&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/META-INF/empire-tags.tld (original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/META-INF/empire-tags.tld Wed Sep 17 03:38:46 2008
@@ -46,7 +46,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -63,7 +63,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -98,7 +98,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -210,7 +210,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -276,7 +276,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -443,7 +443,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -478,13 +478,13 @@
<attribute>
<name>default</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -600,7 +600,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -612,13 +612,13 @@
<attribute>
<name>cssOddClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>cssOddStyle</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -630,19 +630,19 @@
<attribute>
<name>currentClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>columnClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>columnStyle</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -813,7 +813,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -860,7 +860,7 @@
<attribute>
<name>currentClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -878,13 +878,13 @@
<attribute>
<name>columnClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>columnStyle</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -902,7 +902,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1012,7 +1012,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1143,7 +1143,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1199,7 +1199,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1290,7 +1290,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1402,7 +1402,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1509,7 +1509,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1610,7 +1610,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1657,13 +1657,13 @@
<attribute>
<name>linkClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1704,7 +1704,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1763,7 +1763,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -1837,7 +1837,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
@@ -2004,7 +2004,7 @@
<attribute>
<name>cssClass</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableDataTag.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableDataTag.java?rev=696230&r1=696229&r2=696230&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableDataTag.java (original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableDataTag.java Wed Sep 17 03:38:46 2008
@@ -29,6 +29,9 @@
@SuppressWarnings("serial")
public class TableDataTag extends DataValueTag
{
+ // Default Row Info
+ private static final TableRowTag.RowInfo defaultRowInfo = new TableRowTag.RowInfo();
+
// Column Properties
protected String width;
protected String height;
@@ -102,15 +105,15 @@
// done
return result;
}
-
+
private TableRowTag.RowInfo getRowInfo()
{
Object ri = getPageAttribute(TableRowTag.ROWINFO_ATTRIBUTE, null);
if (ri instanceof TableRowTag.RowInfo)
return ((TableRowTag.RowInfo)ri);
// No current Column Info available
- log.error("No table row information available! <e:tr> Tag missing?" + getPageName());
- return new TableRowTag.RowInfo();
+ log.debug("No table row information available! <e:tr> Tag missing?" + getPageName());
+ return defaultRowInfo;
}
private String getCssClass(TableRowTag.RowInfo ri)