[Javaclient-cvs] javaclient/net/sourceforge/javaclient/client/filter TableColumnFilter.java,NONE,1.1 ColumnFilter.java,1.1,1.2 ColumnFilterImpl.java,1.1,1.2 TableFilter.java,1.1,1.2

[Dave S. <rim...@us...>]

Update of /cvsroot/javaclient/javaclient/net/sourceforge/javaclient/client/filter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30706/net/sourceforge/javaclient/client/filter

Modified Files:
	ColumnFilter.java ColumnFilterImpl.java TableFilter.java 
Added Files:
	TableColumnFilter.java 
Log Message:
Added table filter. Not tested and PK loading only has to be done


Index: TableFilter.java
===================================================================
RCS file: /cvsroot/javaclient/javaclient/net/sourceforge/javaclient/client/filter/TableFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TableFilter.java	27 Jul 2004 15:05:36 -0000	1.1
--- TableFilter.java	4 Aug 2004 14:22:41 -0000	1.2
***************
*** 18,22 ****
--- 18,25 ----
  	public void addColumnFilter(String attribute,ColumnFilter filter)
  	{
+ 		modelProxy.addColumnFilter(attribute,filter);
+ 		filter.setWidget(table);
  	}
+ 
  	public void addDblClickListener(Object controller,String method)
  	{

--- NEW FILE: TableColumnFilter.java ---
package net.sourceforge.javaclient.client.filter;

import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Widget;
import org.eclipse.swt.widgets.TableItem;

public class TableColumnFilter extends ColumnFilterImpl
{
	public TableColumnFilter(int aCol)
	{
		col=aCol;
	}
	public void setWidget(Widget aWidget)
	{
		table=(Table)aWidget;
	}
	public void modelToView(Object o,int row)
	{
		table.getItem(row*table.getColumnCount()+col).setText(convertToView(o));	
	}


	private Table table;
	private int col;
}


Index: ColumnFilter.java
===================================================================
RCS file: /cvsroot/javaclient/javaclient/net/sourceforge/javaclient/client/filter/ColumnFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ColumnFilter.java	27 Jul 2004 15:05:36 -0000	1.1
--- ColumnFilter.java	4 Aug 2004 14:22:41 -0000	1.2
***************
*** 3,6 ****
--- 3,7 ----
  import java.beans.PropertyVetoException;
  import net.sourceforge.javaclient.client.proxy.ClientListProxy;
+ import org.eclipse.swt.widgets.Widget;
  
  
***************
*** 9,12 ****
--- 10,14 ----
    public void modelToView(Object o,int row);
  	public void setListProxy(ClientListProxy aModel);
+ 	public void setWidget(Widget w);
  }
  

Index: ColumnFilterImpl.java
===================================================================
RCS file: /cvsroot/javaclient/javaclient/net/sourceforge/javaclient/client/filter/ColumnFilterImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ColumnFilterImpl.java	27 Jul 2004 15:05:36 -0000	1.1
--- ColumnFilterImpl.java	4 Aug 2004 14:22:41 -0000	1.2
***************
*** 3,6 ****
--- 3,7 ----
  import java.beans.PropertyVetoException;
  import net.sourceforge.javaclient.client.proxy.ClientListProxy;
+ import org.eclipse.swt.widgets.Widget;
  
  public class ColumnFilterImpl implements ColumnFilter
***************
*** 10,13 ****
--- 11,17 ----
  	}
  
+ 	public void setWidget(Widget aWidget)
+ 	{
+ 	}
  	public String convertToView(Object o)
  	{