CVS: Tapestry/contrib/src/net/sf/tapestry/contrib/table/components/inserted SimpleTableColumnComponent.java,1.11,1.12

Update of /cvsroot/tapestry/Tapestry/contrib/src/net/sf/tapestry/contrib/table/components/inserted
In directory sc8-pr-cvs1:/tmp/cvs-serv6509/contrib/src/net/sf/tapestry/contrib/table/components/inserted

Modified Files:
	SimpleTableColumnComponent.java 
Log Message:


Index: SimpleTableColumnComponent.java
===================================================================
RCS file: /cvsroot/tapestry/Tapestry/contrib/src/net/sf/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SimpleTableColumnComponent.java	27 Nov 2002 17:58:51 -0000	1.11
--- SimpleTableColumnComponent.java	23 Dec 2002 12:40:28 -0000	1.12
***************
*** 6,13 ****
  import net.sf.tapestry.IRequestCycle;
  import net.sf.tapestry.contrib.table.components.TableColumns;
  import net.sf.tapestry.contrib.table.model.ITableModel;
  import net.sf.tapestry.contrib.table.model.ITableModelSource;
  import net.sf.tapestry.contrib.table.model.ITableSortingState;
- import net.sf.tapestry.contrib.table.model.simple.ISimpleTableColumnRenderer;
  import net.sf.tapestry.contrib.table.model.simple.SimpleTableColumn;
  import net.sf.tapestry.event.PageDetachListener;
--- 6,14 ----
  import net.sf.tapestry.IRequestCycle;
  import net.sf.tapestry.contrib.table.components.TableColumns;
+ import net.sf.tapestry.contrib.table.model.ITableColumn;
  import net.sf.tapestry.contrib.table.model.ITableModel;
  import net.sf.tapestry.contrib.table.model.ITableModelSource;
+ import net.sf.tapestry.contrib.table.model.ITableRendererListener;
  import net.sf.tapestry.contrib.table.model.ITableSortingState;
  import net.sf.tapestry.contrib.table.model.simple.SimpleTableColumn;
  import net.sf.tapestry.event.PageDetachListener;
***************
*** 17,28 ****
   * @version $Id$
   * @author mindbridge
-  *
   */
  public class SimpleTableColumnComponent
  	extends BaseComponent
! 	implements ISimpleTableColumnRenderer, PageDetachListener
  {
  	// transient
! 	private SimpleTableColumn m_objColumn;
  	private ITableModelSource m_objModelSource;
  
--- 18,28 ----
   * @version $Id$
   * @author mindbridge
   */
  public class SimpleTableColumnComponent
  	extends BaseComponent
! 	implements ITableRendererListener, PageDetachListener
  {
  	// transient
! 	private ITableColumn m_objColumn;
  	private ITableModelSource m_objModelSource;
  
***************
*** 55,68 ****
  	}
  
! 	/**
! 	 * @see net.sf.tapestry.contrib.table.model.simple.ISimpleTableColumnRenderer#initializeColumnRenderer(SimpleTableColumn, ITableModelSource)
! 	 */
! 	public void initializeColumnRenderer(
! 		SimpleTableColumn objColumn,
! 		ITableModelSource objSource)
! 	{
! 		m_objColumn = objColumn;
! 		m_objModelSource = objSource;
! 	}
  
  	public ITableModel getTableModel()
--- 55,70 ----
  	}
  
!     /**
!      * @see net.sf.tapestry.contrib.table.model.ITableRendererListener#initRenderer(IRequestCycle, ITableModelSource, ITableColumn, Object)
!      */
!     public void initializeRenderer(
!         IRequestCycle objCycle,
!         ITableModelSource objSource,
!         ITableColumn objColumn,
!         Object objRow)
!     {
!         m_objModelSource = objSource;
!         m_objColumn = objColumn;
!     }
  
  	public ITableModel getTableModel()
***************
*** 78,82 ****
  	public String getDisplayName()
  	{
! 		return m_objColumn.getDisplayName();
  	}
  
--- 80,88 ----
  	public String getDisplayName()
  	{
!         if (m_objColumn instanceof SimpleTableColumn) {
!             SimpleTableColumn objSimpleColumn = (SimpleTableColumn) m_objColumn;
!     		return objSimpleColumn.getDisplayName();
!         }
!         return m_objColumn.getColumnName();
  	}
  



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf