You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by mi...@apache.org on 2005/06/25 06:57:08 UTC

cvs commit: jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model IAdvancedTableColumnSource.java IAdvancedTableColumn.java

mindbridge    2005/06/24 21:57:08

  Modified:    contrib/src/java/org/apache/tapestry/contrib/table/model/common
                        BasicTableModelWrap.java AbstractTableColumn.java
                        ComponentTableRendererSource.java
                        BlockTableRendererSource.java
               contrib/src/java/org/apache/tapestry/contrib/table/model/simple
                        SimpleTableColumnModel.java SimpleTableModel.java
                        SimpleTableColumn.java
                        SimpleTableColumnFormRendererSource.java
                        SimpleTableState.java SimpleTableSortingState.java
                        SimpleTableColumnRendererSource.java
                        SimpleTablePagingState.java
                        SimpleSetTableDataModel.java
                        SimpleListTableDataModel.java
                        SimpleTableValueRendererSource.java
               contrib/src/java/org/apache/tapestry/contrib/table/model/ognl
                        OgnlTableColumnEvaluator.java
                        ExpressionTableColumn.java
                        ExpressionTableColumnModel.java
               contrib/src/java/org/apache/tapestry/contrib/table/model/sql
                        SqlTableColumnModel.java SqlTableColumn.java
                        SqlTableModel.java
  Added:       contrib/src/java/org/apache/tapestry/contrib/table/model
                        IAdvancedTableColumnSource.java
                        IAdvancedTableColumn.java
  Log:
  Some Table fixes to make it work with 4.0
  
  Revision  Changes    Path
  1.5       +3 -1      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BasicTableModelWrap.java
  
  Index: BasicTableModelWrap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BasicTableModelWrap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BasicTableModelWrap.java	5 Jan 2005 23:17:29 -0000	1.4
  +++ BasicTableModelWrap.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -26,7 +26,9 @@
    */
   public class BasicTableModelWrap extends AbstractTableModel 
   {
  -    private IBasicTableModel m_objBasicTableModel;
  +	private static final long serialVersionUID = 1L;
  +	
  +	private IBasicTableModel m_objBasicTableModel;
       private ITableColumnModel m_objTableColumnModel;
   
       public BasicTableModelWrap(IBasicTableModel objBasicTableModel, ITableColumnModel objColumnModel)
  
  
  
  1.5       +13 -6     jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableColumn.java
  
  Index: AbstractTableColumn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableColumn.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractTableColumn.java	6 Jan 2005 02:17:25 -0000	1.4
  +++ AbstractTableColumn.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -21,7 +21,7 @@
   import org.apache.tapestry.IRender;
   import org.apache.tapestry.IRequestCycle;
   import org.apache.tapestry.components.Block;
  -import org.apache.tapestry.contrib.table.model.ITableColumn;
  +import org.apache.tapestry.contrib.table.model.IAdvancedTableColumn;
   import org.apache.tapestry.contrib.table.model.ITableModelSource;
   import org.apache.tapestry.contrib.table.model.ITableRendererSource;
   import org.apache.tapestry.valid.RenderString;
  @@ -34,19 +34,21 @@
    * @author mindbridge
    * @since 2.3
    */
  -public class AbstractTableColumn implements ITableColumn, Serializable
  +public class AbstractTableColumn implements IAdvancedTableColumn, Serializable
   {
  -    /**
  +	private static final long serialVersionUID = 1L;
  +
  +	/**
        *  The suffix of the name of the Block that will be used as the column renderer
        *  for this column 
        */
  -    public final static String COLUMN_RENDERER_BLOCK_SUFFIX = "ColumnHeader";
  +    public static final String COLUMN_RENDERER_BLOCK_SUFFIX = "ColumnHeader";
   
       /**
        *  The suffix of the name of the Block that will be used as the value renderer 
        *  for this column 
        */
  -    public final static String VALUE_RENDERER_BLOCK_SUFFIX = "ColumnValue";
  +    public static final String VALUE_RENDERER_BLOCK_SUFFIX = "ColumnValue";
       
   	private String m_strColumnName;
   	private boolean m_bSortable;
  @@ -214,16 +216,21 @@
       /**
        *  Use the column name to get the column and value renderer sources 
        *  from the provided component.
  +     *  Use the column and value renderer sources for all columns if necessary.
        *   
        *  @param objSettingsContainer the component from which to get the settings 
        */
       public void loadSettings(IComponent objSettingsContainer)
       {
           IComponent objColumnRendererSource = (IComponent) objSettingsContainer.getComponents().get(getColumnName() + COLUMN_RENDERER_BLOCK_SUFFIX);
  +        if (objColumnRendererSource == null) 
  +        	objColumnRendererSource = (IComponent) objSettingsContainer.getComponents().get(COLUMN_RENDERER_BLOCK_SUFFIX);
           if (objColumnRendererSource != null && objColumnRendererSource instanceof Block)
  -            setColumnRendererSource(new BlockTableRendererSource((Block) objColumnRendererSource));
  +    		setColumnRendererSource(new BlockTableRendererSource((Block) objColumnRendererSource));
   
           IComponent objValueRendererSource = (IComponent) objSettingsContainer.getComponents().get(getColumnName() + VALUE_RENDERER_BLOCK_SUFFIX);
  +        if (objValueRendererSource == null)
  +        	objValueRendererSource = (IComponent) objSettingsContainer.getComponents().get(VALUE_RENDERER_BLOCK_SUFFIX);
           if (objValueRendererSource != null && objValueRendererSource instanceof Block)
               setValueRendererSource(new BlockTableRendererSource((Block) objValueRendererSource));
       }
  
  
  
  1.5       +2 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/common/ComponentTableRendererSource.java
  
  Index: ComponentTableRendererSource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/common/ComponentTableRendererSource.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ComponentTableRendererSource.java	6 Jan 2005 02:17:25 -0000	1.4
  +++ ComponentTableRendererSource.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -29,6 +29,8 @@
    */
   public class ComponentTableRendererSource implements ITableRendererSource
   {
  +	private static final long serialVersionUID = 1L;
  +	
   	private ComponentAddress m_objComponentAddress;
   
   	public ComponentTableRendererSource(ITableRendererListener objComponent)
  
  
  
  1.5       +2 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BlockTableRendererSource.java
  
  Index: BlockTableRendererSource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/common/BlockTableRendererSource.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BlockTableRendererSource.java	6 Jan 2005 02:17:25 -0000	1.4
  +++ BlockTableRendererSource.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -31,6 +31,8 @@
    */
   public class BlockTableRendererSource implements ITableRendererSource
   {
  +	private static final long serialVersionUID = 1L;
  +	
   	private ComponentAddress m_objBlockAddress;
   	private ComponentAddress m_objListenerAddress;
   
  
  
  
  1.5       +2 -1      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnModel.java
  
  Index: SimpleTableColumnModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnModel.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleTableColumnModel.java	6 Jan 2005 02:17:22 -0000	1.4
  +++ SimpleTableColumnModel.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -33,7 +33,8 @@
    */
   public class SimpleTableColumnModel implements ITableColumnModel, Serializable
   {
  -
  +	private static final long serialVersionUID = 1L;
  +	
       private ITableColumn[] m_arrColumns;
       private Map m_mapColumns;
   
  
  
  
  1.5       +2 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableModel.java
  
  Index: SimpleTableModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableModel.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleTableModel.java	6 Jan 2005 02:17:22 -0000	1.4
  +++ SimpleTableModel.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -35,6 +35,8 @@
    */
   public class SimpleTableModel extends AbstractTableModel implements ITableDataModelListener
   {
  +	private static final long serialVersionUID = 1L;
  +	
       private ITableDataModel m_objDataModel = null;
       private Object[] m_arrRows = null;
       private ITableColumnModel m_objColumnModel = null;
  
  
  
  1.6       +4 -1      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java
  
  Index: SimpleTableColumn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SimpleTableColumn.java	23 Feb 2005 20:40:06 -0000	1.5
  +++ SimpleTableColumn.java	25 Jun 2005 04:57:07 -0000	1.6
  @@ -17,7 +17,6 @@
   import java.io.Serializable;
   import java.util.Comparator;
   
  -import org.apache.hivemind.HiveMind;
   import org.apache.tapestry.IComponent;
   import org.apache.tapestry.contrib.table.model.ITableRendererSource;
   import org.apache.tapestry.contrib.table.model.common.AbstractTableColumn;
  @@ -31,6 +30,8 @@
    */
   public class SimpleTableColumn extends AbstractTableColumn
   {
  +	private static final long serialVersionUID = 1L;
  +	
       public static final ITableRendererSource DEFAULT_COLUMN_RENDERER_SOURCE = new SimpleTableColumnRendererSource();
   
       public static final ITableRendererSource FORM_COLUMN_RENDERER_SOURCE = new SimpleTableColumnFormRendererSource();
  @@ -229,6 +230,8 @@
   
       public class DefaultTableComparator implements Comparator, Serializable
       {
  +    	private static final long serialVersionUID = 1L;
  +    	
           public int compare(Object objRow1, Object objRow2)
           {
               Object objValue1 = getColumnValue(objRow1);
  
  
  
  1.5       +2 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnFormRendererSource.java
  
  Index: SimpleTableColumnFormRendererSource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnFormRendererSource.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleTableColumnFormRendererSource.java	6 Jan 2005 02:17:22 -0000	1.4
  +++ SimpleTableColumnFormRendererSource.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -35,6 +35,8 @@
    */
   public class SimpleTableColumnFormRendererSource implements ITableRendererSource
   {
  +	private static final long serialVersionUID = 1L;
  +	
   	private ComponentTableRendererSource m_objComponentRenderer;
   
   	public SimpleTableColumnFormRendererSource()
  
  
  
  1.5       +2 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableState.java
  
  Index: SimpleTableState.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableState.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleTableState.java	6 Jan 2005 02:17:22 -0000	1.4
  +++ SimpleTableState.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -26,6 +26,8 @@
    */
   public class SimpleTableState implements Serializable
   {
  +	private static final long serialVersionUID = 1L;
  +	
   	private ITablePagingState m_objPagingState;
   	private ITableSortingState m_objSortingState;
   
  
  
  
  1.5       +2 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableSortingState.java
  
  Index: SimpleTableSortingState.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableSortingState.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleTableSortingState.java	6 Jan 2005 02:17:22 -0000	1.4
  +++ SimpleTableSortingState.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -27,6 +27,8 @@
   public class SimpleTableSortingState
   	implements ITableSortingState, Serializable
   {
  +	private static final long serialVersionUID = 1L;
  +	
   	private String m_strSortColumn;
   	private boolean m_bSortOrder;
   
  
  
  
  1.5       +2 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnRendererSource.java
  
  Index: SimpleTableColumnRendererSource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnRendererSource.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleTableColumnRendererSource.java	6 Jan 2005 02:17:22 -0000	1.4
  +++ SimpleTableColumnRendererSource.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -35,6 +35,8 @@
    */
   public class SimpleTableColumnRendererSource implements ITableRendererSource
   {
  +	private static final long serialVersionUID = 1L;
  +	
   	private ComponentTableRendererSource m_objComponentRenderer;
   
   	public SimpleTableColumnRendererSource()
  
  
  
  1.5       +3 -1      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTablePagingState.java
  
  Index: SimpleTablePagingState.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTablePagingState.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleTablePagingState.java	6 Jan 2005 02:17:22 -0000	1.4
  +++ SimpleTablePagingState.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -26,7 +26,9 @@
    */
   public class SimpleTablePagingState implements ITablePagingState, Serializable
   {
  -    private final static int DEFAULT_PAGE_SIZE = 10;
  +	private static final long serialVersionUID = 1L;
  +
  +	private static final int DEFAULT_PAGE_SIZE = 10;
   
       private int m_nPageSize;
       private int m_nCurrentPage;
  
  
  
  1.5       +2 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleSetTableDataModel.java
  
  Index: SimpleSetTableDataModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleSetTableDataModel.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleSetTableDataModel.java	6 Jan 2005 02:17:22 -0000	1.4
  +++ SimpleSetTableDataModel.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -30,6 +30,8 @@
    */
   public class SimpleSetTableDataModel extends AbstractTableDataModel implements Serializable
   {
  +	private static final long serialVersionUID = 1L;
  +	
       private Set m_setRows;
   
       public SimpleSetTableDataModel(Set setRows)
  
  
  
  1.5       +2 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleListTableDataModel.java
  
  Index: SimpleListTableDataModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleListTableDataModel.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleListTableDataModel.java	6 Jan 2005 02:17:22 -0000	1.4
  +++ SimpleListTableDataModel.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -33,6 +33,8 @@
    */
   public class SimpleListTableDataModel extends AbstractTableDataModel implements Serializable
   {
  +	private static final long serialVersionUID = 1L;
  +	
       private List m_arrRows;
   
       public SimpleListTableDataModel(Object[] arrRows)
  
  
  
  1.5       +2 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableValueRendererSource.java
  
  Index: SimpleTableValueRendererSource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableValueRendererSource.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleTableValueRendererSource.java	6 Jan 2005 02:17:22 -0000	1.4
  +++ SimpleTableValueRendererSource.java	25 Jun 2005 04:57:07 -0000	1.5
  @@ -34,6 +34,8 @@
    */
   public class SimpleTableValueRendererSource implements ITableRendererSource
   {
  +	private static final long serialVersionUID = 1L;
  +	
       /** 
        *  The representation of null values. This is geared towards HTML, but will
        *  work for some other *ML languages as well. In any case, changing the 
  
  
  
  1.5       +4 -2      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/ognl/OgnlTableColumnEvaluator.java
  
  Index: OgnlTableColumnEvaluator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/ognl/OgnlTableColumnEvaluator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OgnlTableColumnEvaluator.java	18 Apr 2005 17:08:19 -0000	1.4
  +++ OgnlTableColumnEvaluator.java	25 Jun 2005 04:57:08 -0000	1.5
  @@ -25,11 +25,13 @@
    */
   public class OgnlTableColumnEvaluator implements ITableColumnEvaluator
   {
  +	private static final long serialVersionUID = 1L;
  +	
       /** @since 4.0 */
   
       private ExpressionEvaluator _expressionEvaluator;
   
  -    private static final Log LOG = LogFactory.getLog(ExpressionTableColumn.class);
  +    private static final Log LOG = LogFactory.getLog(OgnlTableColumnEvaluator.class);
   
       private String m_strExpression;
   
  @@ -45,7 +47,7 @@
        */
       public synchronized Object getColumnValue(ITableColumn objColumn, Object objRow)
       {
  -        // If no expression is given, then this is dummy column. Return something.
  +        // If no expression is given, then this is a dummy column. Return something.
           if (m_strExpression == null || m_strExpression.equals(""))
               return "";
   
  
  
  
  1.6       +2 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/ognl/ExpressionTableColumn.java
  
  Index: ExpressionTableColumn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/ognl/ExpressionTableColumn.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ExpressionTableColumn.java	18 Apr 2005 17:08:19 -0000	1.5
  +++ ExpressionTableColumn.java	25 Jun 2005 04:57:08 -0000	1.6
  @@ -22,6 +22,8 @@
    */
   public class ExpressionTableColumn extends SimpleTableColumn
   {
  +	private static final long serialVersionUID = 1L;
  +	
       /** @since 4.0 */
   
       public ExpressionTableColumn(String strColumnName, String strExpression,
  
  
  
  1.4       +2 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/ognl/ExpressionTableColumnModel.java
  
  Index: ExpressionTableColumnModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/ognl/ExpressionTableColumnModel.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ExpressionTableColumnModel.java	6 Jan 2005 02:17:33 -0000	1.3
  +++ ExpressionTableColumnModel.java	25 Jun 2005 04:57:08 -0000	1.4
  @@ -23,6 +23,8 @@
    */
   public class ExpressionTableColumnModel extends SimpleTableColumnModel
   {
  +	private static final long serialVersionUID = 1L;
  +	
       /**
        * Constructs a table column model containting OGNL expression columns. <br>
        * The data for the columns is provided in the form of a string array, where the info of each
  
  
  
  1.5       +2 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableColumnModel.java
  
  Index: SqlTableColumnModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableColumnModel.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SqlTableColumnModel.java	6 Jan 2005 02:17:17 -0000	1.4
  +++ SqlTableColumnModel.java	25 Jun 2005 04:57:08 -0000	1.5
  @@ -22,6 +22,8 @@
    */
   public class SqlTableColumnModel extends SimpleTableColumnModel
   {
  +	private static final long serialVersionUID = 1L;
  +	
   	public SqlTableColumnModel(SqlTableColumn[] arrColumns)
   	{
   		super(arrColumns);
  
  
  
  1.5       +1 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableColumn.java
  
  Index: SqlTableColumn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableColumn.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SqlTableColumn.java	6 Jan 2005 02:17:17 -0000	1.4
  +++ SqlTableColumn.java	25 Jun 2005 04:57:08 -0000	1.5
  @@ -27,6 +27,7 @@
    */
   public class SqlTableColumn extends SimpleTableColumn
   {
  +	private static final long serialVersionUID = 1L;
   	private static final Log LOG = LogFactory.getLog(SqlTableColumn.class);
   
   	/**
  
  
  
  1.5       +1 -0      jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableModel.java
  
  Index: SqlTableModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableModel.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SqlTableModel.java	6 Jan 2005 02:17:17 -0000	1.4
  +++ SqlTableModel.java	25 Jun 2005 04:57:08 -0000	1.5
  @@ -56,6 +56,7 @@
    */
   public class SqlTableModel extends AbstractTableModel 
   {
  +	private static final long serialVersionUID = 1L;
   	private static final Log LOG = LogFactory.getLog(SqlTableModel.class);
   
   	private ISqlTableDataSource m_objDataSource;
  
  
  
  1.1                  jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/IAdvancedTableColumnSource.java
  
  Index: IAdvancedTableColumnSource.java
  ===================================================================
  /*
   * Created on Jun 4, 2005
   */
  package org.apache.tapestry.contrib.table.model;
  
  
  public interface IAdvancedTableColumnSource 
  {
      IAdvancedTableColumn generateTableColumn(String strName, String strDisplayName,
      		boolean bSortable, String strExpression);
  }
  
  
  
  1.1                  jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/IAdvancedTableColumn.java
  
  Index: IAdvancedTableColumn.java
  ===================================================================
  package org.apache.tapestry.contrib.table.model;
  
  import org.apache.tapestry.IComponent;
  
  public interface IAdvancedTableColumn extends ITableColumn
  {
  	ITableRendererSource getColumnRendererSource();
  	void setColumnRendererSource(ITableRendererSource columnRendererSource);
  
  	ITableRendererSource getValueRendererSource();
  	void setValueRendererSource(ITableRendererSource valueRendererSource);
  	
  	void loadSettings(IComponent objSettingsContainer);
  }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org