Update of /cvsroot/displaytag/display09/src/org/displaytag/tags
In directory sc8-pr-cvs1:/tmp/cvs-serv553/src/org/displaytag/tags
Modified Files:
TableTagExtraInfo.java TableProperties.java TemplateTag.java
ColumnTag.java HtmlTableTag.java SetPropertyTag.java
TableTag.java TableTagParameters.java
Log Message:
formatted code, some javadoc improvements and small fixes
Index: TableTagExtraInfo.java
===================================================================
RCS file:
/cvsroot/displaytag/display09/src/org/displaytag/tags/TableTagExtraInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TableTagExtraInfo.java 21 Jun 2003 12:51:18 -0000 1.1
--- TableTagExtraInfo.java 9 Aug 2003 19:54:08 -0000 1.2
***************
*** 11,20 ****
public class TableTagExtraInfo extends TagExtraInfo
{
!
/**
* suffix added to id for saving row number in pagecontext
*/
! public static final String ROWNUM_SUFFIX= "_rowNum";
!
/**
* Variabiles TableTag makes available in the pageContext
--- 11,20 ----
public class TableTagExtraInfo extends TagExtraInfo
{
!
/**
* suffix added to id for saving row number in pagecontext
*/
! public static final String ROWNUM_SUFFIX = "_rowNum";
!
/**
* Variabiles TableTag makes available in the pageContext
***************
*** 34,41 ****
// current row
! VariableInfo lInfo1= new VariableInfo(pData.getId(),
"java.lang.Object", true, VariableInfo.NESTED);
// current row number
! VariableInfo lInfo2=
new VariableInfo(pData.getId() + ROWNUM_SUFFIX,
"java.lang.Integer", true, VariableInfo.NESTED);
--- 34,41 ----
// current row
! VariableInfo lInfo1 = new VariableInfo(pData.getId(),
"java.lang.Object", true, VariableInfo.NESTED);
// current row number
! VariableInfo lInfo2 =
new VariableInfo(pData.getId() + ROWNUM_SUFFIX,
"java.lang.Integer", true, VariableInfo.NESTED);
Index: TableProperties.java
===================================================================
RCS file: /cvsroot/displaytag/display09/src/org/displaytag/tags/TableProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TableProperties.java 21 Jun 2003 12:51:18 -0000 1.1
--- TableProperties.java 9 Aug 2003 19:54:08 -0000 1.2
***************
*** 18,39 ****
/**
! * Field mLog
*/
! private static Log mLog= LogFactory.getLog(TableProperties.class);
/**
* Field DEFAULT_FILENAME
*/
! private static final String DEFAULT_FILENAME= "TableTag.properties";
/**
* Field mPropertiesFilename
*/
! private static String mPropertiesFilename= DEFAULT_FILENAME;
/**
* Field mUserFilename
*/
! private static String mUserFilename= null;
/**
--- 18,39 ----
/**
! * logger
*/
! private static Log mLog = LogFactory.getLog(TableProperties.class);
/**
* Field DEFAULT_FILENAME
*/
! private static final String DEFAULT_FILENAME = "TableTag.properties";
/**
* Field mPropertiesFilename
*/
! private static String mPropertiesFilename = DEFAULT_FILENAME;
/**
* Field mUserFilename
*/
! private static String mUserFilename = null;
/**
***************
*** 52,56 ****
public static void setPropertiesFilename(String pPropertiesFilename)
{
! mUserFilename= pPropertiesFilename;
}
--- 52,56 ----
public static void setPropertiesFilename(String pPropertiesFilename)
{
! mUserFilename = pPropertiesFilename;
}
***************
*** 58,206 ****
* Field mProp
*/
! private Properties mProp= null;
/**
* Field PROPERTY_BOOLEAN_EXPORTCSV
*/
! private static final String PROPERTY_BOOLEAN_EXPORTCSV= "export.csv";
/**
* Field PROPERTY_BOOLEAN_EXPORTEXCEL
*/
! private static final String PROPERTY_BOOLEAN_EXPORTEXCEL= "export.excel";
/**
* Field PROPERTY_BOOLEAN_EXPORTXML
*/
! private static final String PROPERTY_BOOLEAN_EXPORTXML= "export.xml";
/**
* Field PROPERTY_STRING_EXPORTCSV_LABEL
*/
! private static final String PROPERTY_STRING_EXPORTCSV_LABEL=
"export.csv.label";
/**
* Field PROPERTY_STRING_EXPORTEXCEL_LABEL
*/
! private static final String PROPERTY_STRING_EXPORTEXCEL_LABEL=
"export.excel.label";
/**
* Field PROPERTY_STRING_EXPORTXML_LABEL
*/
! private static final String PROPERTY_STRING_EXPORTXML_LABEL=
"export.xml.label";
/**
* Field PROPERTY_BOOLEAN_EXPORTCSV_HEADER
*/
! private static final String PROPERTY_BOOLEAN_EXPORTCSV_HEADER=
"export.csv.include_header";
/**
* Field PROPERTY_BOOLEAN_EXPORTEXCEL_HEADER
*/
! private static final String PROPERTY_BOOLEAN_EXPORTEXCEL_HEADER=
"export.excel.include_header";
/**
* Field PROPERTY_STRING_EXPORTBANNER
*/
! private static final String PROPERTY_STRING_EXPORTBANNER= "export.banner";
/**
* Field PROPERTY_STRING_EXPORTBANNER_SEPARATOR
*/
! private static final String PROPERTY_STRING_EXPORTBANNER_SEPARATOR=
"export.banner.sepchar";
/**
* Field PROPERTY_BOOLEAN_EXPORTDECORATED
*/
! private static final String PROPERTY_BOOLEAN_EXPORTDECORATED=
"export.decorated";
/**
* Field PROPERTY_STRING_EXPORTAMOUNT
*/
! private static final String PROPERTY_STRING_EXPORTAMOUNT= "export.amount";
/**
* Field PROPERTY_STRING_EXPORT_FILENAME
*/
! private static final String PROPERTY_STRING_EXPORT_FILENAME= "export.filename";
/**
* Field PROPERTY_BOOLEAN_SHOWHEADER
*/
! private static final String PROPERTY_BOOLEAN_SHOWHEADER= "basic.show.header";
/**
* Field PROPERTY_STRING_EMPTYLIST_MESSAGE
*/
! private static final String PROPERTY_STRING_EMPTYLIST_MESSAGE=
"basic.msg.empty_list";
/**
* Field PROPERTY_STRING_BANNER_PLACEMENT
*/
! private static final String PROPERTY_STRING_BANNER_PLACEMENT=
"paging.banner.placement";
/**
* Field PROPERTY_STRING_PAGING_INVALIDPAGE
*/
! private static final String PROPERTY_STRING_PAGING_INVALIDPAGE=
"error.msg.invalid_page";
/**
* Field PROPERTY_STRING_PAGING_ITEM_NAME
*/
! private static final String PROPERTY_STRING_PAGING_ITEM_NAME=
"paging.banner.item_name";
/**
* Field PROPERTY_STRING_PAGING_ITEMS_NAME
*/
! private static final String PROPERTY_STRING_PAGING_ITEMS_NAME=
"paging.banner.items_name";
/**
* Field PROPERTY_STRING_PAGING_NOITEMS
*/
! private static final String PROPERTY_STRING_PAGING_NOITEMS=
"paging.banner.no_items_found";
/**
* Field PROPERTY_STRING_PAGING_FOUND_ONEITEM
*/
! private static final String PROPERTY_STRING_PAGING_FOUND_ONEITEM=
"paging.banner.one_item_found";
/**
* Field PROPERTY_STRING_PAGING_FOUND_ALLITEMS
*/
! private static final String PROPERTY_STRING_PAGING_FOUND_ALLITEMS=
"paging.banner.all_items_found";
/**
* Field PROPERTY_STRING_PAGING_FOUND_SOMEITEMS
*/
! private static final String PROPERTY_STRING_PAGING_FOUND_SOMEITEMS=
"paging.banner.some_items_found";
/**
* Field PROPERTY_INT_PAGING_GROUPSIZE
*/
! private static final String PROPERTY_INT_PAGING_GROUPSIZE=
"paging.banner.group_size";
/**
* Field PROPERTY_STRING_PAGING_BANNER_ONEPAGE
*/
! private static final String PROPERTY_STRING_PAGING_BANNER_ONEPAGE=
"paging.banner.onepage";
/**
* Field PROPERTY_STRING_PAGING_BANNER_FIRST
*/
! private static final String PROPERTY_STRING_PAGING_BANNER_FIRST=
"paging.banner.first";
/**
* Field PROPERTY_STRING_PAGING_BANNER_LAST
*/
! private static final String PROPERTY_STRING_PAGING_BANNER_LAST=
"paging.banner.last";
/**
* Field PROPERTY_STRING_PAGING_BANNER_FULL
*/
! private static final String PROPERTY_STRING_PAGING_BANNER_FULL=
"paging.banner.full";
/**
* Field PROPERTY_STRING_PAGING_PAGE_LINK
*/
! private static final String PROPERTY_STRING_PAGING_PAGE_LINK=
"paging.banner.page.link";
/**
* Field PROPERTY_STRING_PAGING_PAGE_SELECTED
*/
! private static final String PROPERTY_STRING_PAGING_PAGE_SELECTED=
"paging.banner.page.selected";
/**
* Field PROPERTY_STRING_PAGING_PAGE_SPARATOR
*/
! private static final String PROPERTY_STRING_PAGING_PAGE_SPARATOR=
"paging.banner.page.separator";
/**
* Field PROPERTY_STRING_SAVE_EXCEL_FILENAME
*/
! private static final String PROPERTY_STRING_SAVE_EXCEL_FILENAME=
"save.excel.filename";
/**
* Field PROPERTY_STRING_SAVE_EXCEL_BANNER
*/
! private static final String PROPERTY_STRING_SAVE_EXCEL_BANNER=
"save.excel.banner";
/**
--- 58,206 ----
* Field mProp
*/
! private Properties mProp = null;
/**
* Field PROPERTY_BOOLEAN_EXPORTCSV
*/
! private static final String PROPERTY_BOOLEAN_EXPORTCSV = "export.csv";
/**
* Field PROPERTY_BOOLEAN_EXPORTEXCEL
*/
! private static final String PROPERTY_BOOLEAN_EXPORTEXCEL = "export.excel";
/**
* Field PROPERTY_BOOLEAN_EXPORTXML
*/
! private static final String PROPERTY_BOOLEAN_EXPORTXML = "export.xml";
/**
* Field PROPERTY_STRING_EXPORTCSV_LABEL
*/
! private static final String PROPERTY_STRING_EXPORTCSV_LABEL =
"export.csv.label";
/**
* Field PROPERTY_STRING_EXPORTEXCEL_LABEL
*/
! private static final String PROPERTY_STRING_EXPORTEXCEL_LABEL =
"export.excel.label";
/**
* Field PROPERTY_STRING_EXPORTXML_LABEL
*/
! private static final String PROPERTY_STRING_EXPORTXML_LABEL =
"export.xml.label";
/**
* Field PROPERTY_BOOLEAN_EXPORTCSV_HEADER
*/
! private static final String PROPERTY_BOOLEAN_EXPORTCSV_HEADER =
"export.csv.include_header";
/**
* Field PROPERTY_BOOLEAN_EXPORTEXCEL_HEADER
*/
! private static final String PROPERTY_BOOLEAN_EXPORTEXCEL_HEADER =
"export.excel.include_header";
/**
* Field PROPERTY_STRING_EXPORTBANNER
*/
! private static final String PROPERTY_STRING_EXPORTBANNER = "export.banner";
/**
* Field PROPERTY_STRING_EXPORTBANNER_SEPARATOR
*/
! private static final String PROPERTY_STRING_EXPORTBANNER_SEPARATOR =
"export.banner.sepchar";
/**
* Field PROPERTY_BOOLEAN_EXPORTDECORATED
*/
! private static final String PROPERTY_BOOLEAN_EXPORTDECORATED =
"export.decorated";
/**
* Field PROPERTY_STRING_EXPORTAMOUNT
*/
! private static final String PROPERTY_STRING_EXPORTAMOUNT = "export.amount";
/**
* Field PROPERTY_STRING_EXPORT_FILENAME
*/
! private static final String PROPERTY_STRING_EXPORT_FILENAME =
"export.filename";
/**
* Field PROPERTY_BOOLEAN_SHOWHEADER
*/
! private static final String PROPERTY_BOOLEAN_SHOWHEADER = "basic.show.header";
/**
* Field PROPERTY_STRING_EMPTYLIST_MESSAGE
*/
! private static final String PROPERTY_STRING_EMPTYLIST_MESSAGE =
"basic.msg.empty_list";
/**
* Field PROPERTY_STRING_BANNER_PLACEMENT
*/
! private static final String PROPERTY_STRING_BANNER_PLACEMENT =
"paging.banner.placement";
/**
* Field PROPERTY_STRING_PAGING_INVALIDPAGE
*/
! private static final String PROPERTY_STRING_PAGING_INVALIDPAGE =
"error.msg.invalid_page";
/**
* Field PROPERTY_STRING_PAGING_ITEM_NAME
*/
! private static final String PROPERTY_STRING_PAGING_ITEM_NAME =
"paging.banner.item_name";
/**
* Field PROPERTY_STRING_PAGING_ITEMS_NAME
*/
! private static final String PROPERTY_STRING_PAGING_ITEMS_NAME =
"paging.banner.items_name";
/**
* Field PROPERTY_STRING_PAGING_NOITEMS
*/
! private static final String PROPERTY_STRING_PAGING_NOITEMS =
"paging.banner.no_items_found";
/**
* Field PROPERTY_STRING_PAGING_FOUND_ONEITEM
*/
! private static final String PROPERTY_STRING_PAGING_FOUND_ONEITEM =
"paging.banner.one_item_found";
/**
* Field PROPERTY_STRING_PAGING_FOUND_ALLITEMS
*/
! private static final String PROPERTY_STRING_PAGING_FOUND_ALLITEMS =
"paging.banner.all_items_found";
/**
* Field PROPERTY_STRING_PAGING_FOUND_SOMEITEMS
*/
! private static final String PROPERTY_STRING_PAGING_FOUND_SOMEITEMS =
"paging.banner.some_items_found";
/**
* Field PROPERTY_INT_PAGING_GROUPSIZE
*/
! private static final String PROPERTY_INT_PAGING_GROUPSIZE =
"paging.banner.group_size";
/**
* Field PROPERTY_STRING_PAGING_BANNER_ONEPAGE
*/
! private static final String PROPERTY_STRING_PAGING_BANNER_ONEPAGE =
"paging.banner.onepage";
/**
* Field PROPERTY_STRING_PAGING_BANNER_FIRST
*/
! private static final String PROPERTY_STRING_PAGING_BANNER_FIRST =
"paging.banner.first";
/**
* Field PROPERTY_STRING_PAGING_BANNER_LAST
*/
! private static final String PROPERTY_STRING_PAGING_BANNER_LAST =
"paging.banner.last";
/**
* Field PROPERTY_STRING_PAGING_BANNER_FULL
*/
! private static final String PROPERTY_STRING_PAGING_BANNER_FULL =
"paging.banner.full";
/**
* Field PROPERTY_STRING_PAGING_PAGE_LINK
*/
! private static final String PROPERTY_STRING_PAGING_PAGE_LINK =
"paging.banner.page.link";
/**
* Field PROPERTY_STRING_PAGING_PAGE_SELECTED
*/
! private static final String PROPERTY_STRING_PAGING_PAGE_SELECTED =
"paging.banner.page.selected";
/**
* Field PROPERTY_STRING_PAGING_PAGE_SPARATOR
*/
! private static final String PROPERTY_STRING_PAGING_PAGE_SPARATOR =
"paging.banner.page.separator";
/**
* Field PROPERTY_STRING_SAVE_EXCEL_FILENAME
*/
! private static final String PROPERTY_STRING_SAVE_EXCEL_FILENAME =
"save.excel.filename";
/**
* Field PROPERTY_STRING_SAVE_EXCEL_BANNER
*/
! private static final String PROPERTY_STRING_SAVE_EXCEL_BANNER =
"save.excel.banner";
/**
***************
*** 210,214 ****
public String getPagingInvalidPage()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_INVALIDPAGE);
}
--- 210,214 ----
public String getPagingInvalidPage()
{
! return getProperty(PROPERTY_STRING_PAGING_INVALIDPAGE);
}
***************
*** 219,223 ****
public String getPagingItemName()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_ITEM_NAME);
}
--- 219,223 ----
public String getPagingItemName()
{
! return getProperty(PROPERTY_STRING_PAGING_ITEM_NAME);
}
***************
*** 228,232 ****
public String getPagingItemsName()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_ITEMS_NAME);
}
--- 228,232 ----
public String getPagingItemsName()
{
! return getProperty(PROPERTY_STRING_PAGING_ITEMS_NAME);
}
***************
*** 237,241 ****
public String getPagingFoundNoItems()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_NOITEMS);
}
--- 237,241 ----
public String getPagingFoundNoItems()
{
! return getProperty(PROPERTY_STRING_PAGING_NOITEMS);
}
***************
*** 246,250 ****
public String getPagingFoundOneItem()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_FOUND_ONEITEM);
}
--- 246,250 ----
public String getPagingFoundOneItem()
{
! return getProperty(PROPERTY_STRING_PAGING_FOUND_ONEITEM);
}
***************
*** 255,259 ****
public String getPagingFoundAllItems()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_FOUND_ALLITEMS);
}
--- 255,259 ----
public String getPagingFoundAllItems()
{
! return getProperty(PROPERTY_STRING_PAGING_FOUND_ALLITEMS);
}
***************
*** 264,268 ****
public String getPagingFoundSomeItems()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_FOUND_SOMEITEMS);
}
--- 264,268 ----
public String getPagingFoundSomeItems()
{
! return getProperty(PROPERTY_STRING_PAGING_FOUND_SOMEITEMS);
}
***************
*** 283,287 ****
public String getPagingBannerOnePage()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_BANNER_ONEPAGE);
}
--- 283,287 ----
public String getPagingBannerOnePage()
{
! return getProperty(PROPERTY_STRING_PAGING_BANNER_ONEPAGE);
}
***************
*** 292,296 ****
public String getPagingBannerFirst()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_BANNER_FIRST);
}
--- 292,296 ----
public String getPagingBannerFirst()
{
! return getProperty(PROPERTY_STRING_PAGING_BANNER_FIRST);
}
***************
*** 301,305 ****
public String getPagingBannerLast()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_BANNER_LAST);
}
--- 301,305 ----
public String getPagingBannerLast()
{
! return getProperty(PROPERTY_STRING_PAGING_BANNER_LAST);
}
***************
*** 310,314 ****
public String getPagingBannerFull()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_BANNER_FULL);
}
--- 310,314 ----
public String getPagingBannerFull()
{
! return getProperty(PROPERTY_STRING_PAGING_BANNER_FULL);
}
***************
*** 319,323 ****
public String getPagingPageLink()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_PAGE_LINK);
}
--- 319,323 ----
public String getPagingPageLink()
{
! return getProperty(PROPERTY_STRING_PAGING_PAGE_LINK);
}
***************
*** 328,332 ****
public String getPagingPageSelected()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_PAGE_SELECTED);
}
--- 328,332 ----
public String getPagingPageSelected()
{
! return getProperty(PROPERTY_STRING_PAGING_PAGE_SELECTED);
}
***************
*** 337,341 ****
public String getPagingPageSeparator()
{
! return mProp.getProperty(PROPERTY_STRING_PAGING_PAGE_SPARATOR);
}
--- 337,341 ----
public String getPagingPageSeparator()
{
! return getProperty(PROPERTY_STRING_PAGING_PAGE_SPARATOR);
}
***************
*** 400,404 ****
protected String getExportCsvLabel()
{
! return mProp.getProperty(PROPERTY_STRING_EXPORTCSV_LABEL);
}
--- 400,404 ----
protected String getExportCsvLabel()
{
! return getProperty(PROPERTY_STRING_EXPORTCSV_LABEL);
}
***************
*** 409,413 ****
protected String getExportExcelLabel()
{
! return mProp.getProperty(PROPERTY_STRING_EXPORTEXCEL_LABEL);
}
--- 409,413 ----
protected String getExportExcelLabel()
{
! return getProperty(PROPERTY_STRING_EXPORTEXCEL_LABEL);
}
***************
*** 418,422 ****
protected String getExportXmlLabel()
{
! return mProp.getProperty(PROPERTY_STRING_EXPORTXML_LABEL);
}
--- 418,422 ----
protected String getExportXmlLabel()
{
! return getProperty(PROPERTY_STRING_EXPORTXML_LABEL);
}
***************
*** 427,431 ****
protected String getExportFileName()
{
! return mProp.getProperty(PROPERTY_STRING_EXPORT_FILENAME);
}
--- 427,431 ----
protected String getExportFileName()
{
! return getProperty(PROPERTY_STRING_EXPORT_FILENAME);
}
***************
*** 436,440 ****
protected String getExportBanner()
{
! return mProp.getProperty(PROPERTY_STRING_EXPORTBANNER);
}
--- 436,440 ----
protected String getExportBanner()
{
! return getProperty(PROPERTY_STRING_EXPORTBANNER);
}
***************
*** 445,449 ****
protected String getExportBannerSeparator()
{
! return mProp.getProperty(PROPERTY_STRING_EXPORTBANNER_SEPARATOR);
}
--- 445,449 ----
protected String getExportBannerSeparator()
{
! return getProperty(PROPERTY_STRING_EXPORTBANNER_SEPARATOR);
}
***************
*** 463,467 ****
protected String getEmptyListMessage()
{
! return mProp.getProperty(PROPERTY_STRING_EMPTYLIST_MESSAGE);
}
--- 463,467 ----
protected String getEmptyListMessage()
{
! return getProperty(PROPERTY_STRING_EMPTYLIST_MESSAGE);
}
***************
*** 472,476 ****
protected boolean getExportFullList()
{
! return "list".equals(mProp.getProperty(PROPERTY_STRING_EXPORTAMOUNT));
}
--- 472,476 ----
protected boolean getExportFullList()
{
! return "list".equals(getProperty(PROPERTY_STRING_EXPORTAMOUNT));
}
***************
*** 481,485 ****
protected boolean getAddPagingBannerTop()
{
! String lPlacement= mProp.getProperty(PROPERTY_STRING_BANNER_PLACEMENT);
return ("top".equals(lPlacement) || "both".equals(lPlacement));
}
--- 481,485 ----
protected boolean getAddPagingBannerTop()
{
! String lPlacement = getProperty(PROPERTY_STRING_BANNER_PLACEMENT);
return ("top".equals(lPlacement) || "both".equals(lPlacement));
}
***************
*** 491,495 ****
protected boolean getAddPagingBannerBottom()
{
! String lPlacement= mProp.getProperty(PROPERTY_STRING_BANNER_PLACEMENT);
return ("bottom".equals(lPlacement) || "both".equals(lPlacement));
}
--- 491,495 ----
protected boolean getAddPagingBannerBottom()
{
! String lPlacement = getProperty(PROPERTY_STRING_BANNER_PLACEMENT);
return ("bottom".equals(lPlacement) || "both".equals(lPlacement));
}
***************
*** 501,505 ****
public String getSaveExcelFilename()
{
! return mProp.getProperty(PROPERTY_STRING_SAVE_EXCEL_FILENAME);
}
--- 501,505 ----
public String getSaveExcelFilename()
{
! return getProperty(PROPERTY_STRING_SAVE_EXCEL_FILENAME);
}
***************
*** 510,514 ****
public String getSaveExcelBanner()
{
! return mProp.getProperty(PROPERTY_STRING_SAVE_EXCEL_BANNER);
}
--- 510,514 ----
public String getSaveExcelBanner()
{
! return getProperty(PROPERTY_STRING_SAVE_EXCEL_BANNER);
}
***************
*** 529,538 ****
{
! Properties lDefaultProperties= new Properties();
try
{
lDefaultProperties.load(this.getClass().getResourceAsStream(mPropertiesFilename));
! mProp= new Properties(lDefaultProperties);
}
catch (Exception ex)
--- 529,538 ----
{
! Properties lDefaultProperties = new Properties();
try
{
lDefaultProperties.load(this.getClass().getResourceAsStream(mPropertiesFilename));
! mProp = new Properties(lDefaultProperties);
}
catch (Exception ex)
***************
*** 541,545 ****
}
! String lUserPropertiesFileName= getPropertiesFilename();
if (lUserPropertiesFileName != null)
--- 541,545 ----
}
! String lUserPropertiesFileName = getPropertiesFilename();
if (lUserPropertiesFileName != null)
***************
*** 548,552 ****
try
{
! FileInputStream lFileInput= new
FileInputStream(lUserPropertiesFileName);
mProp.load(lFileInput);
lFileInput.close();
--- 548,552 ----
try
{
! FileInputStream lFileInput = new
FileInputStream(lUserPropertiesFileName);
mProp.load(lFileInput);
lFileInput.close();
***************
*** 592,596 ****
private boolean getBooleanProperty(String pPropertyName)
{
! return
Boolean.TRUE.toString().equals(mProp.getProperty(pPropertyName));
}
--- 592,596 ----
private boolean getBooleanProperty(String pPropertyName)
{
! return Boolean.TRUE.toString().equals(getProperty(pPropertyName));
}
***************
*** 603,614 ****
private int getIntProperty(String pPropertyName, int pDefault)
{
! int lInt= pDefault;
try
{
! lInt= Integer.parseInt(mProp.getProperty(pPropertyName));
}
catch (NumberFormatException e)
{
// Don't care, use default
}
--- 603,618 ----
private int getIntProperty(String pPropertyName, int pDefault)
{
! int lInt = pDefault;
try
{
! lInt = Integer.parseInt(getProperty(pPropertyName));
}
catch (NumberFormatException e)
{
// Don't care, use default
+ mLog.warn(
+ "Invalid value for \"pPropertyName\" property:
value=\""
+ + getProperty(pPropertyName)
+ + "\"; using default \"pDefault\"");
}
Index: TemplateTag.java
===================================================================
RCS file: /cvsroot/displaytag/display09/src/org/displaytag/tags/TemplateTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TemplateTag.java 21 Jun 2003 12:51:18 -0000 1.1
--- TemplateTag.java 9 Aug 2003 19:54:08 -0000 1.2
***************
*** 28,32 ****
try
{
! JspWriter lOut= pageContext.getOut();
lOut.write(pString);
}
--- 28,32 ----
try
{
! JspWriter lOut = pageContext.getOut();
lOut.write(pString);
}
***************
*** 65,95 ****
{
! String lExpression= pExpression;
// default scope = request
// this is for compatibility with the previous version, probably
default should be PAGE
! int lScope= PageContext.REQUEST_SCOPE;
if (pExpression.startsWith("pageScope."))
{
! lScope= PageContext.PAGE_SCOPE;
! lExpression= lExpression.substring(lExpression.indexOf('.') +
1);
}
else if (pExpression.startsWith("requestScope."))
{
! lScope= PageContext.REQUEST_SCOPE;
! lExpression= lExpression.substring(lExpression.indexOf('.') +
1);
}
else if (pExpression.startsWith("sessionScope."))
{
! lScope= PageContext.SESSION_SCOPE;
! lExpression= lExpression.substring(lExpression.indexOf('.') +
1);
}
else if (pExpression.startsWith("applicationScope."))
{
! lScope= PageContext.APPLICATION_SCOPE;
! lExpression= lExpression.substring(lExpression.indexOf('.') +
1);
}
--- 65,95 ----
{
! String lExpression = pExpression;
// default scope = request
// this is for compatibility with the previous version, probably
default should be PAGE
! int lScope = PageContext.REQUEST_SCOPE;
if (pExpression.startsWith("pageScope."))
{
! lScope = PageContext.PAGE_SCOPE;
! lExpression = lExpression.substring(lExpression.indexOf('.') +
1);
}
else if (pExpression.startsWith("requestScope."))
{
! lScope = PageContext.REQUEST_SCOPE;
! lExpression = lExpression.substring(lExpression.indexOf('.') +
1);
}
else if (pExpression.startsWith("sessionScope."))
{
! lScope = PageContext.SESSION_SCOPE;
! lExpression = lExpression.substring(lExpression.indexOf('.') +
1);
}
else if (pExpression.startsWith("applicationScope."))
{
! lScope = PageContext.APPLICATION_SCOPE;
! lExpression = lExpression.substring(lExpression.indexOf('.') +
1);
}
***************
*** 98,101 ****
}
!
}
--- 98,101 ----
}
!
}
Index: ColumnTag.java
===================================================================
RCS file: /cvsroot/displaytag/display09/src/org/displaytag/tags/ColumnTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ColumnTag.java 21 Jun 2003 12:51:18 -0000 1.1
--- ColumnTag.java 9 Aug 2003 19:54:08 -0000 1.2
***************
*** 19,27 ****
/**
* <p>
! * This tag works hand in hand with the TableTag to display a list of objects. This
describes a column of data in the
* TableTag. There can be any number of columns that make up the list.
* </p>
* <p>
! * This tag does no work itself, it is simply a container of information. The
TableTag does all the work based on
* the information provided in the attributes of this tag.
* <p>
--- 19,27 ----
/**
* <p>
! * This tag works hand in hand with the TableTag to display a list of objects. This
describes a column of data in the
* TableTag. There can be any number of columns that make up the list.
* </p>
* <p>
! * This tag does no work itself, it is simply a container of information. The
TableTag does all the work based on
* the information provided in the attributes of this tag.
* <p>
***************
*** 33,39 ****
/**
! * Field mLog
*/
! private static Log mLog= LogFactory.getLog(ColumnTag.class);
/**
--- 33,39 ----
/**
! * logger
*/
! private static Log mLog = LogFactory.getLog(ColumnTag.class);
/**
***************
*** 42,54 ****
private String mStaticContent;
! /**
! * html pass-through attributes for cells
*/
! private HtmlAttributeMap mAttributeMap= new HtmlAttributeMap();
! /**
* html pass-through attributes for cell headers
*/
! private HtmlAttributeMap mHeaderAttributeMap= new HtmlAttributeMap();
/**
--- 42,54 ----
private String mStaticContent;
! /**
! * html pass-through attributes for cells
*/
! private HtmlAttributeMap mAttributeMap = new HtmlAttributeMap();
! /**
* html pass-through attributes for cell headers
*/
! private HtmlAttributeMap mHeaderAttributeMap = new HtmlAttributeMap();
/**
***************
*** 59,63 ****
private String mProperty;
! /**
* the title displayed for this column. if this is omitted then the property
name is used
* for the title of the column (optional)
--- 59,63 ----
private String mProperty;
! /**
* the title displayed for this column. if this is omitted then the property
name is used
* for the title of the column (optional)
***************
*** 88,92 ****
* well. If this attribute is not included, then no grouping is performed.
(optional)
*/
! private int mGroup= -1;
/**
--- 88,92 ----
* well. If this attribute is not included, then no grouping is performed.
(optional)
*/
! private int mGroup = -1;
/**
***************
*** 186,190 ****
public void setProperty(String pAttributeValue)
{
! mProperty= pAttributeValue;
}
--- 186,190 ----
public void setProperty(String pAttributeValue)
{
! mProperty = pAttributeValue;
}
***************
*** 195,199 ****
public void setTitle(String pAttributeValue)
{
! mTitle= pAttributeValue;
}
--- 195,199 ----
public void setTitle(String pAttributeValue)
{
! mTitle = pAttributeValue;
}
***************
*** 206,210 ****
if (!Boolean.FALSE.toString().equals(pAttributeValue))
{
! mNulls= true;
}
--- 206,210 ----
if (!Boolean.FALSE.toString().equals(pAttributeValue))
{
! mNulls = true;
}
***************
*** 219,223 ****
if (!Boolean.FALSE.toString().equals(pAttributeValue))
{
! mSortable= true;
}
}
--- 219,223 ----
if (!Boolean.FALSE.toString().equals(pAttributeValue))
{
! mSortable = true;
}
}
***************
*** 241,245 ****
if (!"false".equals(pAttributeValue))
{
! mAutolink= true;
}
}
--- 241,245 ----
if (!"false".equals(pAttributeValue))
{
! mAutolink = true;
}
}
***************
*** 253,261 ****
try
{
! mGroup= Integer.parseInt(pAttributeValue);
}
catch (NumberFormatException e)
{
// ignore?
}
}
--- 253,262 ----
try
{
! mGroup = Integer.parseInt(pAttributeValue);
}
catch (NumberFormatException e)
{
// ignore?
+ mLog.warn("Invalid \"group\" attribute: value=\"" +
pAttributeValue + "\"");
}
}
***************
*** 267,271 ****
public void setHref(String pAttributeValue)
{
! mHref= new Href(pAttributeValue);
}
--- 268,272 ----
public void setHref(String pAttributeValue)
{
! mHref = new Href(pAttributeValue);
}
***************
*** 276,280 ****
public void setParamId(String pAttributeValue)
{
! mParamId= pAttributeValue;
}
--- 277,281 ----
public void setParamId(String pAttributeValue)
{
! mParamId = pAttributeValue;
}
***************
*** 285,289 ****
public void setParamName(String pAttributeValue)
{
! mParamName= pAttributeValue;
}
--- 286,290 ----
public void setParamName(String pAttributeValue)
{
! mParamName = pAttributeValue;
}
***************
*** 294,298 ****
public void setParamProperty(String pAttributeValue)
{
! mParamProperty= pAttributeValue;
}
--- 295,299 ----
public void setParamProperty(String pAttributeValue)
{
! mParamProperty = pAttributeValue;
}
***************
*** 303,307 ****
public void setParamScope(String pAttributeValue)
{
! mParamScope= pAttributeValue;
}
--- 304,308 ----
public void setParamScope(String pAttributeValue)
{
! mParamScope = pAttributeValue;
}
***************
*** 312,316 ****
public void setMaxLength(int pAttributeValue)
{
! mMaxLength= pAttributeValue;
}
--- 313,317 ----
public void setMaxLength(int pAttributeValue)
{
! mMaxLength = pAttributeValue;
}
***************
*** 321,325 ****
public void setMaxWords(int pAttributeValue)
{
! mMaxWords= pAttributeValue;
}
--- 322,326 ----
public void setMaxWords(int pAttributeValue)
{
! mMaxWords = pAttributeValue;
}
***************
*** 414,418 ****
public void addClass(String pAttributeValue)
{
! Object lClassAttributes=
mAttributeMap.get(TagConstants.ATTRIBUTE_CLASS);
if (lClassAttributes == null)
--- 415,419 ----
public void addClass(String pAttributeValue)
{
! Object lClassAttributes =
mAttributeMap.get(TagConstants.ATTRIBUTE_CLASS);
if (lClassAttributes == null)
***************
*** 451,455 ****
public void setValue(Object pAttributeValue)
{
! mValue= pAttributeValue;
}
--- 452,456 ----
public void setValue(Object pAttributeValue)
{
! mValue = pAttributeValue;
}
***************
*** 460,464 ****
public void setDoubleQuote(String pAttributeValue)
{
! mDoubleQuote= pAttributeValue;
}
--- 461,465 ----
public void setDoubleQuote(String pAttributeValue)
{
! mDoubleQuote = pAttributeValue;
}
***************
*** 469,473 ****
public void setDecorator(String pAttributeValue)
{
! mDecorator= pAttributeValue;
}
--- 470,474 ----
public void setDecorator(String pAttributeValue)
{
! mDecorator = pAttributeValue;
}
***************
*** 487,491 ****
public void setDecoratorObject(ColumnDecorator pDecorator)
{
! mDecoratorObject= pDecorator;
}
--- 488,492 ----
public void setDecoratorObject(ColumnDecorator pDecorator)
{
! mDecoratorObject = pDecorator;
}
***************
*** 643,647 ****
{
! TableTag lTableTag= (TableTag) findAncestorWithClass(this,
TableTag.class);
if (lTableTag == null)
--- 644,648 ----
{
! TableTag lTableTag = (TableTag) findAncestorWithClass(this,
TableTag.class);
if (lTableTag == null)
***************
*** 654,658 ****
{
! HeaderCell lHeaderCell= new HeaderCell();
lHeaderCell.setHeaderAttributes((HtmlAttributeMap)
mHeaderAttributeMap.clone());
lHeaderCell.setHtmlAttributes((HtmlAttributeMap)
mAttributeMap.clone());
--- 655,659 ----
{
! HeaderCell lHeaderCell = new HeaderCell();
lHeaderCell.setHeaderAttributes((HtmlAttributeMap)
mHeaderAttributeMap.clone());
lHeaderCell.setHtmlAttributes((HtmlAttributeMap)
mAttributeMap.clone());
***************
*** 671,675 ****
{
! Href lColHref= new Href(mHref);
// parameter value is in a different object than the
iterated one
--- 672,676 ----
{
! Href lColHref = new Href(mHref);
// parameter value is in a different object than the
iterated one
***************
*** 678,682 ****
// create a complete string for compatibility
with previous version before expression evaluation.
// this approach is optimized for new
expressions, not for previous property/scope parameters
! StringBuffer lExpression= new StringBuffer();
// append scope
--- 679,683 ----
// create a complete string for compatibility
with previous version before expression evaluation.
// this approach is optimized for new
expressions, not for previous property/scope parameters
! StringBuffer lExpression = new StringBuffer();
// append scope
***************
*** 705,709 ****
// note the value is fixed, not based on any
object created during iteration
// this is here for compatibility with the old
version mainly
! Object lParamValue=
lTableTag.evaluateExpression(lExpression.toString());
// add parameter
--- 706,710 ----
// note the value is fixed, not based on any
object created during iteration
// this is here for compatibility with the old
version mainly
! Object lParamValue =
lTableTag.evaluateExpression(lExpression.toString());
// add parameter
***************
*** 741,761 ****
if (mValue != null)
{
! lCellValue= mValue;
}
else if (getBodyContent() != null)
{
! String lValue= null;
! BodyContent lBodyContent= getBodyContent();
if (lBodyContent != null)
{
! lValue= lBodyContent.getString();
}
if (lValue == null && mNulls)
{
! lValue= "";
}
! lCellValue= lValue;
}
else
--- 742,762 ----
if (mValue != null)
{
! lCellValue = mValue;
}
else if (getBodyContent() != null)
{
! String lValue = null;
! BodyContent lBodyContent = getBodyContent();
if (lBodyContent != null)
{
! lValue = lBodyContent.getString();
}
if (lValue == null && mNulls)
{
! lValue = "";
}
! lCellValue = lValue;
}
else
***************
*** 764,773 ****
throw new JspException("Column tag: you must specify a
property or value attribute, or a body");
}
! lCell= new Cell(lCellValue);
}
else
{
! lCell= Cell.EMPTY_CELL;
}
--- 765,774 ----
throw new JspException("Column tag: you must specify a
property or value attribute, or a body");
}
! lCell = new Cell(lCellValue);
}
else
{
! lCell = Cell.EMPTY_CELL;
}
***************
*** 776,781 ****
mAttributeMap.clear();
mHeaderAttributeMap.clear();
! mStaticContent= null;
! mParamName= null;
return super.doEndTag();
--- 777,782 ----
mAttributeMap.clear();
mHeaderAttributeMap.clear();
! mStaticContent = null;
! mParamName = null;
return super.doEndTag();
***************
*** 819,823 ****
public void setColumnNumber(int pColumnNumber)
{
! mColumnNumber= pColumnNumber;
}
--- 820,824 ----
public void setColumnNumber(int pColumnNumber)
{
! mColumnNumber = pColumnNumber;
}
***************
*** 834,838 ****
* Field mAlreadySorted
*/
! private boolean mAlreadySorted= false;
/**
--- 835,839 ----
* Field mAlreadySorted
*/
! private boolean mAlreadySorted = false;
/**
***************
*** 850,854 ****
public void setAlreadySorted()
{
! mAlreadySorted= true;
}
--- 851,855 ----
public void setAlreadySorted()
{
! mAlreadySorted = true;
}
Index: HtmlTableTag.java
===================================================================
RCS file: /cvsroot/displaytag/display09/src/org/displaytag/tags/HtmlTableTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HtmlTableTag.java 21 Jun 2003 12:51:18 -0000 1.1
--- HtmlTableTag.java 9 Aug 2003 19:54:08 -0000 1.2
***************
*** 13,28 ****
* @version $Revision$ ($Author$)
*/
! public class HtmlTableTag extends TemplateTag
{
/**
! * Field mLog
*/
! private static Log mLog= LogFactory.getLog(HtmlTableTag.class);
/**
* Field mAttributeMap
*/
! private HashMap mAttributeMap= new HtmlAttributeMap();
/**
--- 13,28 ----
* @version $Revision$ ($Author$)
*/
! public abstract class HtmlTableTag extends TemplateTag
{
/**
! * logger
*/
! private static Log mLog = LogFactory.getLog(HtmlTableTag.class);
/**
* Field mAttributeMap
*/
! private HashMap mAttributeMap = new HtmlAttributeMap();
/**
***************
*** 149,155 ****
/**
! *
* @deprecated: use setClass()
! * @param pAttributeValue String attribute value
*/
public void setStyleClass(String pAttributeValue)
--- 149,155 ----
/**
! * set the html class attribute
* @deprecated: use setClass()
! * @param pAttributeValue String CSS class
*/
public void setStyleClass(String pAttributeValue)
***************
*** 189,193 ****
}
! StringBuffer lBuffer= new StringBuffer();
lBuffer.append(TagConstants.TAG_OPEN).append(TagConstants.TABLE_TAG_NAME);
--- 189,193 ----
}
! StringBuffer lBuffer = new StringBuffer();
lBuffer.append(TagConstants.TAG_OPEN).append(TagConstants.TABLE_TAG_NAME);
Index: SetPropertyTag.java
===================================================================
RCS file: /cvsroot/displaytag/display09/src/org/displaytag/tags/SetPropertyTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SetPropertyTag.java 21 Jun 2003 12:51:18 -0000 1.1
--- SetPropertyTag.java 9 Aug 2003 19:54:08 -0000 1.2
***************
*** 18,22 ****
* Field mLog
*/
! private static Log mLog= LogFactory.getLog(SetPropertyTag.class);
/**
--- 18,22 ----
* Field mLog
*/
! private static Log mLog = LogFactory.getLog(SetPropertyTag.class);
/**
***************
*** 36,40 ****
public void setName(String pName)
{
! mName= pName;
}
--- 36,40 ----
public void setName(String pName)
{
! mName = pName;
}
***************
*** 45,49 ****
public void setValue(String pValue)
{
! mValue= pValue;
}
--- 45,49 ----
public void setValue(String pValue)
{
! mValue = pValue;
}
***************
*** 80,84 ****
{
! TableTag lTableTag= (TableTag) findAncestorWithClass(this,
TableTag.class);
if (lTableTag == null)
--- 80,84 ----
{
! TableTag lTableTag = (TableTag) findAncestorWithClass(this,
TableTag.class);
if (lTableTag == null)
Index: TableTag.java
===================================================================
RCS file: /cvsroot/displaytag/display09/src/org/displaytag/tags/TableTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TableTag.java 9 Aug 2003 17:35:16 -0000 1.3
--- TableTag.java 9 Aug 2003 19:54:08 -0000 1.4
***************
*** 80,84 ****
* @version $Revision$ ($Author$)
**/
! public class TableTag extends HtmlTableTag implements TableTagParameters
{
--- 80,84 ----
* @version $Revision$ ($Author$)
**/
! public class TableTag extends HtmlTableTag
{
***************
*** 166,170 ****
/** export type - set in initParameters() **/
! private int mExportType = EXPORT_TYPE_NONE;
/**
--- 166,170 ----
/** export type - set in initParameters() **/
! private int mExportType = TableTagParameters.EXPORT_TYPE_NONE;
/**
***************
*** 384,397 ****
/**
- * set the html class attribute
- * @deprecated: use setClass()
- * @param pAttributeValue String CSS class
- */
- public void setStyleClass(String pAttributeValue)
- {
- setClass(pAttributeValue);
- }
-
- /**
* Returns the properties.
* @return TableProperties
--- 384,387 ----
***************
*** 571,578 ****
RequestHelper lRequestHelper = new RequestHelper((HttpServletRequest)
this.pageContext.getRequest());
! Integer lPageNumberParameter =
lRequestHelper.getIntParameter(encodeParameter(PARAMETER_PAGE));
mPageNumber = (lPageNumberParameter == null) ? 1 :
lPageNumberParameter.intValue();
! Integer lSortColumnParameter =
lRequestHelper.getIntParameter(encodeParameter(PARAMETER_SORT));
int lSortColumn = (lSortColumnParameter == null) ?
mDefaultSortedColumn : lSortColumnParameter.intValue();
mTableModel.setSortedColumnNumber(lSortColumn);
--- 561,570 ----
RequestHelper lRequestHelper = new RequestHelper((HttpServletRequest)
this.pageContext.getRequest());
! Integer lPageNumberParameter =
!
lRequestHelper.getIntParameter(encodeParameter(TableTagParameters.PARAMETER_PAGE));
mPageNumber = (lPageNumberParameter == null) ? 1 :
lPageNumberParameter.intValue();
! Integer lSortColumnParameter =
!
lRequestHelper.getIntParameter(encodeParameter(TableTagParameters.PARAMETER_SORT));
int lSortColumn = (lSortColumnParameter == null) ?
mDefaultSortedColumn : lSortColumnParameter.intValue();
mTableModel.setSortedColumnNumber(lSortColumn);
***************
*** 580,585 ****
mTableModel.setSortFullTable(mSortFullTable);
! Integer lParamOrder =
lRequestHelper.getIntParameter(encodeParameter(PARAMETER_ORDER));
! boolean lOrder = !(new
Integer(VALUE_SORT_DESCENDING).equals(lParamOrder));
mTableModel.setSortOrderAscending(lOrder);
--- 572,577 ----
mTableModel.setSortFullTable(mSortFullTable);
! Integer lParamOrder =
lRequestHelper.getIntParameter(encodeParameter(TableTagParameters.PARAMETER_ORDER));
! boolean lOrder = !(new
Integer(TableTagParameters.VALUE_SORT_DESCENDING).equals(lParamOrder));
mTableModel.setSortOrderAscending(lOrder);
***************
*** 589,606 ****
// save actual sort to href
!
mBaseHref.addParameter(encodeParameter(PARAMETER_PREVIOUSSORT), lSortColumn);
!
mBaseHref.addParameter(encodeParameter(PARAMETER_PREVIOUSORDER), lParamOrder);
// read previous sort from request
! Integer lPreviousSortColumnParameter =
lRequestHelper.getIntParameter(encodeParameter(PARAMETER_SORT));
mPreviousSortColumn = (lPreviousSortColumnParameter == null) ?
-1 : lPreviousSortColumnParameter.intValue();
! Integer lPreviousParamOrder =
lRequestHelper.getIntParameter(encodeParameter(PARAMETER_PREVIOUSORDER));
! mPreviousOrder = !(new
Integer(VALUE_SORT_DESCENDING).equals(lPreviousParamOrder));
}
! Integer lExportTypeParameter =
lRequestHelper.getIntParameter(encodeParameter(PARAMETER_EXPORTTYPE));
! mExportType = (lExportTypeParameter == null) ? EXPORT_TYPE_NONE :
lExportTypeParameter.intValue();
// if list is null check
--- 581,602 ----
// save actual sort to href
!
mBaseHref.addParameter(encodeParameter(TableTagParameters.PARAMETER_PREVIOUSSORT),
lSortColumn);
!
mBaseHref.addParameter(encodeParameter(TableTagParameters.PARAMETER_PREVIOUSORDER),
lParamOrder);
// read previous sort from request
! Integer lPreviousSortColumnParameter =
!
lRequestHelper.getIntParameter(encodeParameter(TableTagParameters.PARAMETER_SORT));
mPreviousSortColumn = (lPreviousSortColumnParameter == null) ?
-1 : lPreviousSortColumnParameter.intValue();
! Integer lPreviousParamOrder =
!
lRequestHelper.getIntParameter(encodeParameter(TableTagParameters.PARAMETER_PREVIOUSORDER));
! mPreviousOrder = !(new
Integer(TableTagParameters.VALUE_SORT_DESCENDING).equals(lPreviousParamOrder));
}
! Integer lExportTypeParameter =
!
lRequestHelper.getIntParameter(encodeParameter(TableTagParameters.PARAMETER_EXPORTTYPE));
! mExportType =
! (lExportTypeParameter == null) ?
TableTagParameters.EXPORT_TYPE_NONE : lExportTypeParameter.intValue();
// if list is null check
***************
*** 685,689 ****
{
mLog.debug(
! "tag body is empty. Manually iterates on collection to
preserve compatibility with 0.8.5 version");
// first row (created in doStartTag)
--- 681,685 ----
{
mLog.debug(
! "tag body is empty. Manually iterates on collection to
preserve compatibility with previous version");
// first row (created in doStartTag)
***************
*** 707,715 ****
}
! TableDecorator lTableDecorator = (TableDecorator)
DecoratorFactory.loadTableDecorator(mDecoratorName);
if (lTableDecorator != null)
{
- // @todo mList is wrong!
lTableDecorator.init(this.pageContext, mList);
mTableModel.setTableDecorator(lTableDecorator);
--- 703,710 ----
}
! TableDecorator lTableDecorator =
DecoratorFactory.loadTableDecorator(mDecoratorName);
if (lTableDecorator != null)
{
lTableDecorator.init(this.pageContext, mList);
mTableModel.setTableDecorator(lTableDecorator);
***************
*** 742,746 ****
int lReturnValue = EVAL_PAGE;
! if (mExportType == EXPORT_TYPE_NONE)
{
lBuffer.append(getHTMLData(lViewableData));
--- 737,741 ----
int lReturnValue = EVAL_PAGE;
! if (mExportType == TableTagParameters.EXPORT_TYPE_NONE)
{
lBuffer.append(getHTMLData(lViewableData));
***************
*** 801,813 ****
{
! case EXPORT_TYPE_CSV :
mLog.debug("export CSV");
lExportView = new CsvView(mTableModel,
lExportFullList);
break;
! case EXPORT_TYPE_EXCEL :
mLog.debug("export EXCEL");
lExportView = new ExcelView(mTableModel,
lExportFullList);
break;
! case EXPORT_TYPE_XML :
mLog.debug("export XML");
lExportView = new XmlView(mTableModel,
lExportFullList);
--- 796,808 ----
{
! case TableTagParameters.EXPORT_TYPE_CSV :
mLog.debug("export CSV");
lExportView = new CsvView(mTableModel,
lExportFullList);
break;
! case TableTagParameters.EXPORT_TYPE_EXCEL :
mLog.debug("export EXCEL");
lExportView = new ExcelView(mTableModel,
lExportFullList);
break;
! case TableTagParameters.EXPORT_TYPE_XML :
mLog.debug("export XML");
lExportView = new XmlView(mTableModel,
lExportFullList);
***************
*** 1114,1118 ****
lHeaderCell.addHeaderClass(
TableTagParameters.CSS_SORTORDERPREFIX
! + (mTableModel.isSortOrderAscending()
? VALUE_SORT_DESCENDING : VALUE_SORT_ASCENDING));
}
--- 1109,1115 ----
lHeaderCell.addHeaderClass(
TableTagParameters.CSS_SORTORDERPREFIX
! + (mTableModel.isSortOrderAscending()
! ?
TableTagParameters.VALUE_SORT_DESCENDING
! :
TableTagParameters.VALUE_SORT_ASCENDING));
}
***************
*** 1131,1145 ****
// add column number as link parameter
! lHref.addParameter(encodeParameter(PARAMETER_SORT),
lHeaderCell.getColumnNumber());
boolean lNowOrderAscending;
if (lHeaderCell.isAlreadySorted() &&
mTableModel.isSortOrderAscending())
{
!
lHref.addParameter(encodeParameter(PARAMETER_ORDER), VALUE_SORT_DESCENDING);
lNowOrderAscending = false;
}
else
{
!
lHref.addParameter(encodeParameter(PARAMETER_ORDER), VALUE_SORT_ASCENDING);
lNowOrderAscending = true;
}
--- 1128,1146 ----
// add column number as link parameter
!
lHref.addParameter(encodeParameter(TableTagParameters.PARAMETER_SORT),
lHeaderCell.getColumnNumber());
boolean lNowOrderAscending;
if (lHeaderCell.isAlreadySorted() &&
mTableModel.isSortOrderAscending())
{
! lHref.addParameter(
!
encodeParameter(TableTagParameters.PARAMETER_ORDER),
!
TableTagParameters.VALUE_SORT_DESCENDING);
lNowOrderAscending = false;
}
else
{
! lHref.addParameter(
!
encodeParameter(TableTagParameters.PARAMETER_ORDER),
!
TableTagParameters.VALUE_SORT_ASCENDING);
lNowOrderAscending = true;
}
***************
*** 1152,1156 ****
|| ((lNowOrderAscending ^
mPreviousOrder)))
{
!
lHref.addParameter(encodeParameter(PARAMETER_PAGE), 1);
}
}
--- 1153,1157 ----
|| ((lNowOrderAscending ^
mPreviousOrder)))
{
!
lHref.addParameter(encodeParameter(TableTagParameters.PARAMETER_PAGE), 1);
}
}
***************
*** 1223,1227 ****
// add page parameter with message format
! lNavigationHref.addParameter(encodeParameter(PARAMETER_PAGE),
"{0,number,#}");
StringBuffer lAll =
--- 1224,1228 ----
// add page parameter with message format
!
lNavigationHref.addParameter(encodeParameter(TableTagParameters.PARAMETER_PAGE),
"{0,number,#}");
StringBuffer lAll =
***************
*** 1248,1252 ****
if (mProp.getAddCsvExport())
{
!
lExportHref.addParameter(encodeParameter(PARAMETER_EXPORTTYPE), EXPORT_TYPE_CSV);
Anchor lATag = new Anchor(lExportHref,
mProp.getExportCsvLabel());
--- 1249,1255 ----
if (mProp.getAddCsvExport())
{
! lExportHref.addParameter(
!
encodeParameter(TableTagParameters.PARAMETER_EXPORTTYPE),
! TableTagParameters.EXPORT_TYPE_CSV);
Anchor lATag = new Anchor(lExportHref,
mProp.getExportCsvLabel());
***************
*** 1260,1264 ****
lFormats.append(mProp.getExportBannerSeparator());
}
!
lExportHref.addParameter(encodeParameter(PARAMETER_EXPORTTYPE), EXPORT_TYPE_EXCEL);
Anchor lATag = new Anchor(lExportHref,
mProp.getExportExcelLabel());
--- 1263,1269 ----
lFormats.append(mProp.getExportBannerSeparator());
}
! lExportHref.addParameter(
!
encodeParameter(TableTagParameters.PARAMETER_EXPORTTYPE),
! TableTagParameters.EXPORT_TYPE_EXCEL);
Anchor lATag = new Anchor(lExportHref,
mProp.getExportExcelLabel());
***************
*** 1272,1276 ****
lFormats.append(mProp.getExportBannerSeparator());
}
!
lExportHref.addParameter(encodeParameter(PARAMETER_EXPORTTYPE), EXPORT_TYPE_XML);
Anchor lATag = new Anchor(lExportHref,
mProp.getExportXmlLabel());
--- 1277,1283 ----
lFormats.append(mProp.getExportBannerSeparator());
}
! lExportHref.addParameter(
!
encodeParameter(TableTagParameters.PARAMETER_EXPORTTYPE),
! TableTagParameters.EXPORT_TYPE_XML);
Anchor lATag = new Anchor(lExportHref,
mProp.getExportXmlLabel());
Index: TableTagParameters.java
===================================================================
RCS file:
/cvsroot/displaytag/display09/src/org/displaytag/tags/TableTagParameters.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TableTagParameters.java 21 Jun 2003 12:51:18 -0000 1.1
--- TableTagParameters.java 9 Aug 2003 19:54:08 -0000 1.2
***************
*** 2,97 ****
/**
* @author fgiust
* @version $Revision$ ($Author$)
*/
! public interface TableTagParameters
{
/**
! * Field PARAMETER_SORT
*/
! static final String PARAMETER_SORT= "s";
/**
! * Field PARAMETER_PREVIOUSSORT
*/
! static final String PARAMETER_PREVIOUSSORT= "xs";
/**
! * Field PARAMETER_PAGE
*/
! static final String PARAMETER_PAGE= "p";
/**
! * Field PARAMETER_ORDER
*/
! static final String PARAMETER_ORDER= "o";
/**
! * Field PARAMETER_PREVIOUSORDER
*/
! static final String PARAMETER_PREVIOUSORDER= "xo";
/**
! * Field PARAMETER_EXPORTTYPE
*/
! static final String PARAMETER_EXPORTTYPE= "e";
/**
! * Field EXPORT_TYPE_NONE
*/
! static final int EXPORT_TYPE_NONE= -1;
/**
! * Field EXPORT_TYPE_CSV
*/
! static final int EXPORT_TYPE_CSV= 1;
/**
! * Field EXPORT_TYPE_EXCEL
*/
! static final int EXPORT_TYPE_EXCEL= 2;
/**
! * Field EXPORT_TYPE_XML
*/
! static final int EXPORT_TYPE_XML= 3;
!
/**
! * Field SORT_AMOUNT_PAGE
*/
! static final String SORT_AMOUNT_PAGE= "page";
!
/**
! * Field SORT_AMOUNT_LIST
*/
! static final String SORT_AMOUNT_LIST= "list";
/**
! * Field VALUE_SORT_DESCENDING
*/
! static final int VALUE_SORT_DESCENDING= 1;
/**
! * Field VALUE_SORT_ASCENDING
*/
! static final int VALUE_SORT_ASCENDING= 2;
/**
! * Field CSS_ODDROW
*/
! static final String CSS_ODDROW= "odd";
/**
! * Field CSS_EVENROW
*/
! static final String CSS_EVENROW= "even";
/**
! * Field CSS_EMPTYLIST
*/
! static final String CSS_EMPTYLIST= "empty";
!
/**
! * Field CSS_EMPTYLIST
*/
! static final String CSS_SORTEDCOLUMN= "sorted";
!
/**
! * Field CSS_EMPTYLIST
*/
! static final String CSS_SORTORDERPREFIX= "order";
!
!
!
}
--- 2,113 ----
/**
+ * <p>Constants for parameter names</p>
* @author fgiust
* @version $Revision$ ($Author$)
*/
! public final class TableTagParameters
{
/**
! * utility class - don't instantiate
*/
! private TableTagParameters()
! {
! }
!
/**
! * name of the parameter specifying the current sorted column index
*/
! public static final String PARAMETER_SORT = "s";
!
/**
! * name of the parameter specifying the previous sorted column index
*/
! public static final String PARAMETER_PREVIOUSSORT = "xs";
!
/**
! * name of the parameter specifying the current page number
*/
! public static final String PARAMETER_PAGE = "p";
!
/**
! * name of the parameter specifying the current sorting order
*/
! public static final String PARAMETER_ORDER = "o";
!
/**
! * name of the parameter specifying the previous sorting order
*/
! public static final String PARAMETER_PREVIOUSORDER = "xo";
/**
! * name of the parameter specifying the export type
*/
! public static final String PARAMETER_EXPORTTYPE = "e";
!
/**
! * export type parameter value = no export
*/
! public static final int EXPORT_TYPE_NONE = -1;
!
/**
! * export type parameter value = cvs export
*/
! public static final int EXPORT_TYPE_CSV = 1;
!
/**
! * export type parameter value = excel export
*/
! public static final int EXPORT_TYPE_EXCEL = 2;
!
/**
! * export type parameter value = xml export
*/
! public static final int EXPORT_TYPE_XML = 3;
!
/**
! * sort only the displayed page
*/
! public static final String SORT_AMOUNT_PAGE = "page";
/**
! * sort the full list
*/
! public static final String SORT_AMOUNT_LIST = "list";
!
/**
! * order parameter value = descending
*/
! public static final int VALUE_SORT_DESCENDING = 1;
/**
! * order parameter value = ascending
*/
! public static final int VALUE_SORT_ASCENDING = 2;
!
/**
! * css class added to odd rows
*/
! public static final String CSS_ODDROW = "odd";
!
/**
! * css class added to even rows
*/
! public static final String CSS_EVENROW = "even";
!
/**
! * css class added to empty tables
*/
! public static final String CSS_EMPTYLIST = "empty";
!
/**
! * css class added to sorted columns
*/
! public static final String CSS_SORTEDCOLUMN = "sorted";
!
! /**
! * prefix for the css class added to sorted column to specify order (0 and 1
is added)
! */
! public static final String CSS_SORTORDERPREFIX = "order";
}
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
displaytag-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/displaytag-devel
