You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/03/11 21:55:35 UTC

svn commit: r385164 [6/32] - in /jakarta/tapestry/trunk: ./ .settings/ annotations/src/java/org/apache/tapestry/annotations/ annotations/src/test/org/apache/tapestry/annotations/ config/ contrib/src/documentation/content/xdocs/tapestry-contrib/Componen...

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableSessionStateManager.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableSessionStateManager.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableSessionStateManager.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableSessionStateManager.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,41 +22,47 @@
 import org.apache.tapestry.contrib.table.model.ITableSessionStateManager;
 
 /**
- * A {@link org.apache.tapestry.contrib.table.model.ITableSessionStateManager}
- * implementation that saves only the paging and sorting state of the table
- * model into the session.
+ * A {@link org.apache.tapestry.contrib.table.model.ITableSessionStateManager} 
+ * implementation that saves only the paging and sorting state of the table model 
+ * into the session.
  * 
  * @author mindbridge
  */
-public class SimpleTableSessionStateManager implements ITableSessionStateManager
+public class SimpleTableSessionStateManager
+	implements ITableSessionStateManager
 {
+	private ITableDataModel m_objDataModel;
+	private ITableColumnModel m_objColumnModel;
 
-    private ITableDataModel m_objDataModel;
-    private ITableColumnModel m_objColumnModel;
-
-    public SimpleTableSessionStateManager(ITableDataModel objDataModel, ITableColumnModel objColumnModel)
-    {
-        m_objDataModel = objDataModel;
-        m_objColumnModel = objColumnModel;
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.table.model.ITableSessionStateManager#getSessionState(ITableModel)
-     */
-    public Serializable getSessionState(ITableModel objModel)
-    {
-        SimpleTableModel objSimpleModel = (SimpleTableModel)objModel;
-        return objSimpleModel.getState();
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.table.model.ITableSessionStateManager#recreateTableModel(Serializable)
-     */
-    public ITableModel recreateTableModel(Serializable objState)
-    {
-        if (objState == null) return null;
-        SimpleTableState objSimpleState = (SimpleTableState)objState;
-        return new SimpleTableModel(m_objDataModel, m_objColumnModel, objSimpleState);
-    }
+	public SimpleTableSessionStateManager(
+		ITableDataModel objDataModel,
+		ITableColumnModel objColumnModel)
+	{
+		m_objDataModel = objDataModel;
+		m_objColumnModel = objColumnModel;
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.table.model.ITableSessionStateManager#getSessionState(ITableModel)
+	 */
+	public Serializable getSessionState(ITableModel objModel)
+	{
+		SimpleTableModel objSimpleModel = (SimpleTableModel) objModel;
+		return objSimpleModel.getState();
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.table.model.ITableSessionStateManager#recreateTableModel(Serializable)
+	 */
+	public ITableModel recreateTableModel(Serializable objState)
+	{
+		if (objState == null)
+			return null;
+		SimpleTableState objSimpleState = (SimpleTableState) objState;
+		return new SimpleTableModel(
+			m_objDataModel,
+			m_objColumnModel,
+			objSimpleState);
+	}
 
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableSortingState.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableSortingState.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableSortingState.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableSortingState.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,60 +19,56 @@
 import org.apache.tapestry.contrib.table.model.ITableSortingState;
 
 /**
- * A minimal implementation of
- * {@link org.apache.tapestry.contrib.table.model.ITableSortingState}.
+ * A minimal implementation of 
+ * {@link org.apache.tapestry.contrib.table.model.ITableSortingState}
  * 
  * @author mindbridge
  */
-public class SimpleTableSortingState implements ITableSortingState, Serializable
+public class SimpleTableSortingState
+	implements ITableSortingState, Serializable
 {
-
-    private static final long serialVersionUID = 1L;
-
-    private String m_strSortColumn;
-    private boolean m_bSortOrder;
-
-    public SimpleTableSortingState()
-    {
-        this(null, ITableSortingState.SORT_ASCENDING);
-    }
-
-    public SimpleTableSortingState(String strSortColumn, boolean bSortOrder)
-    {
-        m_strSortColumn = strSortColumn;
-        m_bSortOrder = bSortOrder;
-    }
-
-    /**
-     * Returns the SortOrder.
-     * 
-     * @return boolean
-     */
-    public boolean getSortOrder()
-    {
-        return m_bSortOrder;
-    }
-
-    /**
-     * Returns the SortColumn.
-     * 
-     * @return int
-     */
-    public String getSortColumn()
-    {
-        return m_strSortColumn;
-    }
-
-    /**
-     * Sets the SortColumn.
-     * 
-     * @param strSortColumn
-     *            The SortColumn to set
-     */
-    public void setSortColumn(String strSortColumn, boolean bSortOrder)
-    {
-        m_strSortColumn = strSortColumn;
-        m_bSortOrder = bSortOrder;
-    }
+	private static final long serialVersionUID = 1L;
+	
+	private String m_strSortColumn;
+	private boolean m_bSortOrder;
+
+	public SimpleTableSortingState()
+	{
+		this(null, ITableSortingState.SORT_ASCENDING); 
+	}
+
+	public SimpleTableSortingState(String strSortColumn, boolean bSortOrder)
+	{
+		m_strSortColumn = strSortColumn; 
+		m_bSortOrder = bSortOrder;
+	}
+	
+	/**
+	 * Returns the SortOrder.
+	 * @return boolean
+	 */
+	public boolean getSortOrder()
+	{
+		return m_bSortOrder;
+	}
+
+	/**
+	 * Returns the SortColumn.
+	 * @return int
+	 */
+	public String getSortColumn()
+	{
+		return m_strSortColumn;
+	}
+
+	/**
+	 * Sets the SortColumn.
+	 * @param strSortColumn The SortColumn to set
+	 */
+	public void setSortColumn(String strSortColumn, boolean bSortOrder)
+	{
+		m_strSortColumn = strSortColumn;
+		m_bSortOrder = bSortOrder;
+	}
 
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableState.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableState.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableState.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableState.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,47 +26,45 @@
  */
 public class SimpleTableState implements Serializable
 {
-
-    private static final long serialVersionUID = 1L;
-
-    private ITablePagingState m_objPagingState;
-    private ITableSortingState m_objSortingState;
-
-    public SimpleTableState()
-    {
-        this(new SimpleTablePagingState(), new SimpleTableSortingState());
-    }
-
-    public SimpleTableState(ITablePagingState objPagingState, ITableSortingState objSortingState)
-    {
-        m_objPagingState = objPagingState;
-        m_objSortingState = objSortingState;
-    }
-
-    public SimpleTableState(int nPageSize, int nCurrentPage, String strSortColumn, boolean bSortOrder)
-    {
-        this(new SimpleTablePagingState(nPageSize, nCurrentPage),
-                new SimpleTableSortingState(strSortColumn, bSortOrder));
-    }
-
-    /**
-     * Returns the pagingState.
-     * 
-     * @return ITablePagingState
-     */
-    public ITablePagingState getPagingState()
-    {
-        return m_objPagingState;
-    }
-
-    /**
-     * Returns the sortingState.
-     * 
-     * @return ITableSortingState
-     */
-    public ITableSortingState getSortingState()
-    {
-        return m_objSortingState;
-    }
+	private static final long serialVersionUID = 1L;
+	
+	private ITablePagingState m_objPagingState;
+	private ITableSortingState m_objSortingState;
+
+	public SimpleTableState()
+	{
+		this(new SimpleTablePagingState(), new SimpleTableSortingState());
+	}
+
+	public SimpleTableState(
+		ITablePagingState objPagingState,
+		ITableSortingState objSortingState)
+	{
+		m_objPagingState = objPagingState;
+		m_objSortingState = objSortingState;
+	}
+
+	public SimpleTableState(int nPageSize, int nCurrentPage, String strSortColumn, boolean bSortOrder) {
+		this(new SimpleTablePagingState(nPageSize, nCurrentPage), 
+				new SimpleTableSortingState(strSortColumn, bSortOrder));
+	}
+	
+	/**
+	 * Returns the pagingState.
+	 * @return ITablePagingState
+	 */
+	public ITablePagingState getPagingState()
+	{
+		return m_objPagingState;
+	}
+
+	/**
+	 * Returns the sortingState.
+	 * @return ITableSortingState
+	 */
+	public ITableSortingState getSortingState()
+	{
+		return m_objSortingState;
+	}
 
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableStateAdaptor.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableStateAdaptor.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableStateAdaptor.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableStateAdaptor.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import org.apache.tapestry.services.DataSqueezer;
 import org.apache.tapestry.util.io.SqueezeAdaptor;
 
-/** @author mindbridge ? */
 public class SimpleTableStateAdaptor implements SqueezeAdaptor
 {
 
@@ -48,7 +47,7 @@
 
     public String squeeze(DataSqueezer squeezer, Object data)
     {
-        SimpleTableState objState = (SimpleTableState)data;
+        SimpleTableState objState = (SimpleTableState) data;
 
         StringBuffer buf = new StringBuffer();
         buf.append(objState.getPagingState().getPageSize());
@@ -56,7 +55,8 @@
         buf.append(objState.getPagingState().getCurrentPage());
         buf.append(":");
         String strSortColumn = objState.getSortingState().getSortColumn();
-        if (strSortColumn == null) strSortColumn = "";
+        if (strSortColumn == null)
+            strSortColumn = "";
         buf.append(strSortColumn);
         buf.append(":");
         buf.append(objState.getSortingState().getSortOrder() ? 'T' : 'F');
@@ -72,7 +72,8 @@
         int nPageSize = Integer.parseInt(strTok.nextToken());
         int nCurrentPage = Integer.parseInt(strTok.nextToken());
         String strSortColumn = strTok.nextToken();
-        if (strSortColumn.equals("")) strSortColumn = null;
+        if (strSortColumn.equals(""))
+            strSortColumn = null;
         boolean bSortOrder = strTok.nextToken().equals("T");
 
         return new SimpleTableState(nPageSize, nCurrentPage, strSortColumn, bSortOrder);

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableValueRendererSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableValueRendererSource.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableValueRendererSource.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableValueRendererSource.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,10 +22,11 @@
 import org.apache.tapestry.valid.RenderString;
 
 /**
- * This is a simple implementation of
- * {@link org.apache.tapestry.contrib.table.model.ITableRendererSource} that
- * returns a standard renderer of a column value. This implementation requires
- * that the column passed is of type SimpleTableColumn
+ * This is a simple implementation of 
+ * {@link org.apache.tapestry.contrib.table.model.ITableRendererSource} 
+ * that returns a standard renderer of a column value.
+ * 
+ * This implementation requires that the column passed is of type SimpleTableColumn
  * 
  * @see org.apache.tapestry.contrib.table.model.common.AbstractTableColumn
  * @author mindbridge
@@ -33,30 +34,31 @@
  */
 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
-     * column's value renderer allows selecting fully custom rendering
-     * behaviour.
-     */
+	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 
+     *  column's value renderer allows selecting fully custom rendering behaviour. 
+     **/ 
     private static final String EMPTY_REPRESENTATION = " ";
 
-    /**
-     * @see org.apache.tapestry.contrib.table.model.ITableRendererSource#getRenderer(IRequestCycle,
-     *      ITableModelSource, ITableColumn, Object)
-     */
-    public IRender getRenderer(IRequestCycle objCycle, ITableModelSource objSource, ITableColumn objColumn,
-            Object objRow)
-    {
-        SimpleTableColumn objSimpleColumn = (SimpleTableColumn)objColumn;
-
-        Object objValue = objSimpleColumn.getColumnValue(objRow);
-        if (objValue == null) return new RenderString(EMPTY_REPRESENTATION, true);
+	/**
+	 * @see org.apache.tapestry.contrib.table.model.ITableRendererSource#getRenderer(IRequestCycle, ITableModelSource, ITableColumn, Object)
+	 */
+	public IRender getRenderer(
+		IRequestCycle objCycle,
+		ITableModelSource objSource,
+		ITableColumn objColumn,
+		Object objRow)
+	{
+		SimpleTableColumn objSimpleColumn = (SimpleTableColumn) objColumn;
+
+		Object objValue = objSimpleColumn.getColumnValue(objRow);
+		if (objValue == null)
+			return new RenderString(EMPTY_REPRESENTATION, true);
 
-        return new RenderString(objValue.toString());
-    }
+		return new RenderString(objValue.toString());
+	}
 
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/ISqlConnectionSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/ISqlConnectionSource.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/ISqlConnectionSource.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/ISqlConnectionSource.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,13 +18,11 @@
 import java.sql.SQLException;
 
 /**
+ * 
  * @author mindbridge
  */
 public interface ISqlConnectionSource
 {
-
-    Connection obtainConnection()
-        throws SQLException;
-
-    void returnConnection(Connection objConnection);
+	Connection obtainConnection() throws SQLException;
+	void returnConnection(Connection objConnection);
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/ISqlTableDataSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/ISqlTableDataSource.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/ISqlTableDataSource.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/ISqlTableDataSource.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,16 +20,15 @@
 import org.apache.tapestry.contrib.table.model.simple.SimpleTableState;
 
 /**
+ * 
  * @author mindbridge
  */
 public interface ISqlTableDataSource
 {
-
-    int getRowCount()
-        throws SQLException;
-
-    ResultSet getCurrentRows(SqlTableColumnModel objColumnModel, SimpleTableState objState)
-        throws SQLException;
-
-    void closeResultSet(ResultSet objResultSet);
+	int getRowCount() throws SQLException;
+	ResultSet getCurrentRows(
+		SqlTableColumnModel objColumnModel,
+		SimpleTableState objState)
+		throws SQLException;
+	void closeResultSet(ResultSet objResultSet);
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/ResultSetIterator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/ResultSetIterator.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/ResultSetIterator.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/ResultSetIterator.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,98 +22,101 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
+ * 
  * @author mindbridge
  */
 public class ResultSetIterator implements Iterator
 {
+	private static final Log LOG = LogFactory.getLog(ResultSetIterator.class);
 
-    private static final Log LOG = LogFactory.getLog(ResultSetIterator.class);
-
-    private ResultSet m_objResultSet;
-    private boolean m_bFetched;
-    private boolean m_bAvailable;
-
-    public ResultSetIterator(ResultSet objResultSet)
-    {
-        m_objResultSet = objResultSet;
-        m_bFetched = false;
-    }
-
-    /**
-     * @see java.util.Iterator#hasNext()
-     */
-    public synchronized boolean hasNext()
-    {
+	private ResultSet m_objResultSet;
+	private boolean m_bFetched;
+	private boolean m_bAvailable;
+
+	public ResultSetIterator(ResultSet objResultSet)
+	{
+		m_objResultSet = objResultSet;
+		m_bFetched = false;
+	}
+
+	/**
+	 * @see java.util.Iterator#hasNext()
+	 */
+	public synchronized boolean hasNext()
+	{
         if (getResultSet() == null) return false;
-
-        if (!m_bFetched)
-        {
-            m_bFetched = true;
-
-            try
-            {
-                m_bAvailable = !getResultSet().isLast();
-            }
-            catch (SQLException e)
-            {
-                LOG.warn("SQLException while testing for end of the ResultSet", e);
-                m_bAvailable = false;
-            }
-
-            if (!m_bAvailable) notifyEnd();
-        }
-
-        return m_bAvailable;
-    }
-
-    /**
-     * @see java.util.Iterator#next()
-     */
-    public synchronized Object next()
-    {
-        ResultSet objResultSet = getResultSet();
-
-        try
-        {
-            if (!objResultSet.next()) return null;
-        }
-        catch (SQLException e)
-        {
-            LOG.warn("SQLException while iterating over the ResultSet", e);
-            return null;
-        }
-
-        m_bFetched = false;
-        return objResultSet;
-    }
-
-    /**
-     * @see java.util.Iterator#remove()
-     */
-    public void remove()
-    {
-        try
-        {
-            getResultSet().deleteRow();
-        }
-        catch (SQLException e)
-        {
-            LOG.error("Cannot delete record", e);
-        }
-    }
-
-    /**
-     * Returns the resultSet.
-     * 
-     * @return ResultSet
-     */
-    public ResultSet getResultSet()
-    {
-        return m_objResultSet;
-    }
-
-    protected void notifyEnd()
-    {
-    }
+        
+		if (!m_bFetched)
+		{
+			m_bFetched = true;
+
+			try
+			{
+				m_bAvailable = !getResultSet().isLast();
+			}
+			catch (SQLException e)
+			{
+				LOG.warn(
+					"SQLException while testing for end of the ResultSet",
+					e);
+				m_bAvailable = false;
+			}
+
+			if (!m_bAvailable)
+				notifyEnd();
+		}
+
+		return m_bAvailable;
+	}
+
+	/**
+	 * @see java.util.Iterator#next()
+	 */
+	public synchronized Object next()
+	{
+		ResultSet objResultSet = getResultSet();
+
+		try
+		{
+			if (!objResultSet.next())
+				return null;
+		}
+		catch (SQLException e)
+		{
+			LOG.warn("SQLException while iterating over the ResultSet", e);
+			return null;
+		}
+
+		m_bFetched = false;
+		return objResultSet;
+	}
+
+	/**
+	 * @see java.util.Iterator#remove()
+	 */
+	public void remove()
+	{
+		try
+		{
+			getResultSet().deleteRow();
+		}
+		catch (SQLException e)
+		{
+			LOG.error("Cannot delete record", e);
+		}
+	}
+
+	/**
+	 * Returns the resultSet.
+	 * @return ResultSet
+	 */
+	public ResultSet getResultSet()
+	{
+		return m_objResultSet;
+	}
+
+	protected void notifyEnd()
+	{
+	}
 
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SimpleSqlConnectionSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SimpleSqlConnectionSource.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SimpleSqlConnectionSource.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SimpleSqlConnectionSource.java Sat Mar 11 12:54:27 2006
@@ -72,4 +72,4 @@
         }
     }
 
-}
+}
\ No newline at end of file

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SimpleSqlTableDataSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SimpleSqlTableDataSource.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SimpleSqlTableDataSource.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SimpleSqlTableDataSource.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,227 +26,240 @@
 import org.apache.tapestry.contrib.table.model.simple.SimpleTableState;
 
 /**
+ * 
  * @author mindbridge
  */
 public class SimpleSqlTableDataSource implements ISqlTableDataSource
 {
+	private static final Log LOG =
+		LogFactory.getLog(SimpleSqlTableDataSource.class);
 
-    private static final Log LOG = LogFactory.getLog(SimpleSqlTableDataSource.class);
+	private ISqlConnectionSource m_objConnSource;
+	private String m_strTableName;
+	private String m_strWhereClause;
+
+	public SimpleSqlTableDataSource(
+		ISqlConnectionSource objConnSource,
+		String strTableName)
+	{
+		this(objConnSource, strTableName, null);
+	}
+
+	public SimpleSqlTableDataSource(
+		ISqlConnectionSource objConnSource,
+		String strTableName,
+		String strWhereClause)
+	{
+		setConnSource(objConnSource);
+		setTableName(strTableName);
+		setWhereClause(strWhereClause);
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.table.model.sql.ISqlTableDataSource#getRowCount()
+	 */
+	public int getRowCount() throws SQLException
+	{
+		String strQuery = generateCountQuery();
+		LOG.trace("Invoking query to count rows: " + strQuery);
+
+		Connection objConn = getConnSource().obtainConnection();
+		try
+		{
+			Statement objStmt = objConn.createStatement();
+			try
+			{
+				ResultSet objRS = objStmt.executeQuery(strQuery);
+				objRS.next();
+				return objRS.getInt(1);
+			}
+			finally
+			{
+				objStmt.close();
+			}
+		}
+		finally
+		{
+			getConnSource().returnConnection(objConn);
+		}
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.table.model.sql.ISqlTableDataSource#getCurrentRows(SqlTableColumnModel, SimpleTableState)
+	 */
+	public ResultSet getCurrentRows(
+		SqlTableColumnModel objColumnModel,
+		SimpleTableState objState)
+		throws SQLException
+	{
+		String strQuery = generateDataQuery(objColumnModel, objState);
+		LOG.trace("Invoking query to load current rows: " + strQuery);
+
+		Connection objConn = getConnSource().obtainConnection();
+		Statement objStmt = objConn.createStatement();
+		return objStmt.executeQuery(strQuery);
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.table.model.sql.ISqlTableDataSource#closeResultSet(ResultSet)
+	 */
+	public void closeResultSet(ResultSet objResultSet)
+	{
+		try
+		{
+			Statement objStmt = objResultSet.getStatement();
+			Connection objConn = objStmt.getConnection();
+			try
+			{
+				objResultSet.close();
+				objStmt.close();
+			}
+			catch (SQLException e)
+			{
+				// ignore
+			}
+			getConnSource().returnConnection(objConn);
+		}
+		catch (SQLException e)
+		{
+			LOG.warn("Error while closing the result set", e);
+		}
+	}
+
+	protected String quoteObjectName(String strObject)
+	{
+		return strObject;
+	}
+
+	/**
+	 * Returns the tableName.
+	 * @return String
+	 */
+	public String getTableName()
+	{
+		return m_strTableName;
+	}
+
+	/**
+	 * Sets the tableName.
+	 * @param tableName The tableName to set
+	 */
+	public void setTableName(String tableName)
+	{
+		m_strTableName = tableName;
+	}
+
+	/**
+	 * Returns the connSource.
+	 * @return ISqlConnectionSource
+	 */
+	public ISqlConnectionSource getConnSource()
+	{
+		return m_objConnSource;
+	}
+
+	/**
+	 * Sets the connSource.
+	 * @param connSource The connSource to set
+	 */
+	public void setConnSource(ISqlConnectionSource connSource)
+	{
+		m_objConnSource = connSource;
+	}
+
+	/**
+	 * Returns the whereClause.
+	 * @return String
+	 */
+	public String getWhereClause()
+	{
+		return m_strWhereClause;
+	}
+
+	/**
+	 * Sets the whereClause.
+	 * @param whereClause The whereClause to set
+	 */
+	public void setWhereClause(String whereClause)
+	{
+		m_strWhereClause = whereClause;
+	}
+
+	protected String generateColumnList(SqlTableColumnModel objColumnModel)
+	{
+		// build the column selection
+		StringBuffer objColumnBuf = new StringBuffer();
+		for (int i = 0; i < objColumnModel.getColumnCount(); i++)
+		{
+			SqlTableColumn objColumn = objColumnModel.getSqlColumn(i);
+			if (i > 0)
+				objColumnBuf.append(", ");
+			objColumnBuf.append(quoteObjectName(objColumn.getColumnName()));
+		}
+
+		return objColumnBuf.toString();
+	}
+
+	protected String generateWhereClause()
+	{
+		String strWhereClause = getWhereClause();
+		if (strWhereClause == null || strWhereClause.equals(""))
+			return "";
+		return "WHERE " + strWhereClause + " ";
+	}
+
+	protected String generateOrderByClause(ITableSortingState objSortingState)
+	{
+		// build the sorting clause
+		StringBuffer objSortingBuf = new StringBuffer();
+		if (objSortingState.getSortColumn() != null)
+		{
+			objSortingBuf.append("ORDER BY ");
+			objSortingBuf.append(objSortingState.getSortColumn());
+			if (objSortingState.getSortOrder()
+				== ITableSortingState.SORT_ASCENDING)
+				objSortingBuf.append(" ASC ");
+			else
+				objSortingBuf.append(" DESC ");
+		}
+
+		return objSortingBuf.toString();
+	}
+
+	protected String generateLimitClause(ITablePagingState objPagingState)
+	{
+		int nPageSize = objPagingState.getPageSize();
+		int nStart = objPagingState.getCurrentPage() * nPageSize;
+		String strPagingBuf = "LIMIT " + nPageSize + " OFFSET " + nStart + " ";
+		return strPagingBuf;
+	}
+
+	protected String generateDataQuery(
+		SqlTableColumnModel objColumnModel,
+		SimpleTableState objState)
+	{
+		String strQuery =
+			"SELECT "
+				+ generateColumnList(objColumnModel)
+				+ " FROM "
+				+ getTableName()
+				+ " "
+				+ generateWhereClause()
+				+ generateOrderByClause(objState.getSortingState())
+				+ generateLimitClause(objState.getPagingState());
+
+		return strQuery;
+	}
+
+	protected String generateCountQuery()
+	{
+		String strQuery =
+			"SELECT COUNT(*) FROM "
+				+ getTableName()
+				+ " "
+				+ generateWhereClause();
 
-    private ISqlConnectionSource m_objConnSource;
-    private String m_strTableName;
-    private String m_strWhereClause;
-
-    public SimpleSqlTableDataSource(ISqlConnectionSource objConnSource, String strTableName)
-    {
-        this(objConnSource, strTableName, null);
-    }
-
-    public SimpleSqlTableDataSource(ISqlConnectionSource objConnSource, String strTableName, String strWhereClause)
-    {
-        setConnSource(objConnSource);
-        setTableName(strTableName);
-        setWhereClause(strWhereClause);
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.table.model.sql.ISqlTableDataSource#getRowCount()
-     */
-    public int getRowCount()
-        throws SQLException
-    {
-        String strQuery = generateCountQuery();
-        LOG.trace("Invoking query to count rows: " + strQuery);
-
-        Connection objConn = getConnSource().obtainConnection();
-        try
-        {
-            Statement objStmt = objConn.createStatement();
-            try
-            {
-                ResultSet objRS = objStmt.executeQuery(strQuery);
-                objRS.next();
-                return objRS.getInt(1);
-            }
-            finally
-            {
-                objStmt.close();
-            }
-        }
-        finally
-        {
-            getConnSource().returnConnection(objConn);
-        }
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.table.model.sql.ISqlTableDataSource#getCurrentRows(SqlTableColumnModel,
-     *      SimpleTableState)
-     */
-    public ResultSet getCurrentRows(SqlTableColumnModel objColumnModel, SimpleTableState objState)
-        throws SQLException
-    {
-        String strQuery = generateDataQuery(objColumnModel, objState);
-        LOG.trace("Invoking query to load current rows: " + strQuery);
-
-        Connection objConn = getConnSource().obtainConnection();
-        Statement objStmt = objConn.createStatement();
-        return objStmt.executeQuery(strQuery);
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.table.model.sql.ISqlTableDataSource#closeResultSet(ResultSet)
-     */
-    public void closeResultSet(ResultSet objResultSet)
-    {
-        try
-        {
-            Statement objStmt = objResultSet.getStatement();
-            Connection objConn = objStmt.getConnection();
-            try
-            {
-                objResultSet.close();
-                objStmt.close();
-            }
-            catch (SQLException e)
-            {
-                // ignore
-            }
-            getConnSource().returnConnection(objConn);
-        }
-        catch (SQLException e)
-        {
-            LOG.warn("Error while closing the result set", e);
-        }
-    }
-
-    protected String quoteObjectName(String strObject)
-    {
-        return strObject;
-    }
-
-    /**
-     * Returns the tableName.
-     * 
-     * @return String
-     */
-    public String getTableName()
-    {
-        return m_strTableName;
-    }
-
-    /**
-     * Sets the tableName.
-     * 
-     * @param tableName
-     *            The tableName to set
-     */
-    public void setTableName(String tableName)
-    {
-        m_strTableName = tableName;
-    }
-
-    /**
-     * Returns the connSource.
-     * 
-     * @return ISqlConnectionSource
-     */
-    public ISqlConnectionSource getConnSource()
-    {
-        return m_objConnSource;
-    }
-
-    /**
-     * Sets the connSource.
-     * 
-     * @param connSource
-     *            The connSource to set
-     */
-    public void setConnSource(ISqlConnectionSource connSource)
-    {
-        m_objConnSource = connSource;
-    }
-
-    /**
-     * Returns the whereClause.
-     * 
-     * @return String
-     */
-    public String getWhereClause()
-    {
-        return m_strWhereClause;
-    }
-
-    /**
-     * Sets the whereClause.
-     * 
-     * @param whereClause
-     *            The whereClause to set
-     */
-    public void setWhereClause(String whereClause)
-    {
-        m_strWhereClause = whereClause;
-    }
-
-    protected String generateColumnList(SqlTableColumnModel objColumnModel)
-    {
-        // build the column selection
-        StringBuffer objColumnBuf = new StringBuffer();
-        for(int i = 0; i < objColumnModel.getColumnCount(); i++)
-        {
-            SqlTableColumn objColumn = objColumnModel.getSqlColumn(i);
-            if (i > 0) objColumnBuf.append(", ");
-            objColumnBuf.append(quoteObjectName(objColumn.getColumnName()));
-        }
-
-        return objColumnBuf.toString();
-    }
-
-    protected String generateWhereClause()
-    {
-        String strWhereClause = getWhereClause();
-        if (strWhereClause == null || strWhereClause.equals("")) return "";
-        return "WHERE " + strWhereClause + " ";
-    }
-
-    protected String generateOrderByClause(ITableSortingState objSortingState)
-    {
-        // build the sorting clause
-        StringBuffer objSortingBuf = new StringBuffer();
-        if (objSortingState.getSortColumn() != null)
-        {
-            objSortingBuf.append("ORDER BY ");
-            objSortingBuf.append(objSortingState.getSortColumn());
-            if (objSortingState.getSortOrder() == ITableSortingState.SORT_ASCENDING)
-                objSortingBuf.append(" ASC ");
-            else objSortingBuf.append(" DESC ");
-        }
-
-        return objSortingBuf.toString();
-    }
-
-    protected String generateLimitClause(ITablePagingState objPagingState)
-    {
-        int nPageSize = objPagingState.getPageSize();
-        int nStart = objPagingState.getCurrentPage() * nPageSize;
-        String strPagingBuf = "LIMIT " + nPageSize + " OFFSET " + nStart + " ";
-        return strPagingBuf;
-    }
-
-    protected String generateDataQuery(SqlTableColumnModel objColumnModel, SimpleTableState objState)
-    {
-        String strQuery = "SELECT " + generateColumnList(objColumnModel) + " FROM " + getTableName() + " "
-                + generateWhereClause() + generateOrderByClause(objState.getSortingState())
-                + generateLimitClause(objState.getPagingState());
-
-        return strQuery;
-    }
-
-    protected String generateCountQuery()
-    {
-        String strQuery = "SELECT COUNT(*) FROM " + getTableName() + " " + generateWhereClause();
-
-        return strQuery;
-    }
+		return strQuery;
+	}
 
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableColumn.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableColumn.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableColumn.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableColumn.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,62 +22,57 @@
 import org.apache.tapestry.contrib.table.model.simple.SimpleTableColumn;
 
 /**
+ * 
  * @author mindbridge
  */
 public class SqlTableColumn extends SimpleTableColumn
 {
+	private static final long serialVersionUID = 1L;
+	private static final Log LOG = LogFactory.getLog(SqlTableColumn.class);
 
-    private static final long serialVersionUID = 1L;
-    private static final Log LOG = LogFactory.getLog(SqlTableColumn.class);
-
-    /**
-     * Creates an SqlTableColumn.
-     * 
-     * @param strSqlField
-     *            the identifying name of the column and the SQL field it refers
-     *            to
-     * @param strDisplayName
-     *            the display name of the column
-     */
-    public SqlTableColumn(String strSqlField, String strDisplayName)
-    {
-        super(strSqlField, strDisplayName);
-    }
-
-    /**
-     * Creates an SqlTableColumn.
-     * 
-     * @param strSqlField
-     *            the identifying name of the column and the SQL field it refers
-     *            to
-     * @param strDisplayName
-     *            the display name of the column
-     * @param bSortable
-     *            whether the column is sortable
-     */
-    public SqlTableColumn(String strSqlField, String strDisplayName, boolean bSortable)
-    {
-        super(strSqlField, strDisplayName, bSortable);
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.table.model.simple.SimpleTableColumn#getColumnValue(Object)
-     */
-    public Object getColumnValue(Object objRow)
-    {
-        try
-        {
-            ResultSet objRS = (ResultSet)objRow;
+	/**
+	 * Creates an SqlTableColumn
+	 * @param strSqlField the identifying name of the column and the SQL field it refers to
+	 * @param strDisplayName the display name of the column
+	 */
+	public SqlTableColumn(String strSqlField, String strDisplayName)
+	{
+		super(strSqlField, strDisplayName);
+	}
+
+	/**
+	 * Creates an SqlTableColumn
+	 * @param strSqlField the identifying name of the column and the SQL field it refers to
+	 * @param strDisplayName the display name of the column
+	 * @param bSortable whether the column is sortable
+	 */
+	public SqlTableColumn(
+		String strSqlField,
+		String strDisplayName,
+		boolean bSortable)
+	{
+		super(strSqlField, strDisplayName, bSortable);
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.table.model.simple.SimpleTableColumn#getColumnValue(Object)
+	 */
+	public Object getColumnValue(Object objRow)
+	{
+		try
+		{
+			ResultSet objRS = (ResultSet) objRow;
             String strColumnName = getColumnName();
-            Object objValue = objRS.getObject(strColumnName);
-            if (objValue == null) objValue = "";
-            return objValue;
-        }
-        catch (SQLException e)
-        {
-            LOG.error("Cannot get the value for column: " + getColumnName(), e);
-            return "";
-        }
-    }
+			Object objValue = objRS.getObject(strColumnName);
+			if (objValue == null)
+				objValue = "";
+			return objValue;
+		}
+		catch (SQLException e)
+		{
+			LOG.error("Cannot get the value for column: " + getColumnName(), e);
+			return "";
+		}
+	}
 
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableColumnModel.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableColumnModel.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableColumnModel.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableColumnModel.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,25 +17,25 @@
 import org.apache.tapestry.contrib.table.model.simple.SimpleTableColumnModel;
 
 /**
+ * 
  * @author mindbridge
  */
 public class SqlTableColumnModel extends SimpleTableColumnModel
 {
-
-    private static final long serialVersionUID = 1L;
-
-    public SqlTableColumnModel(SqlTableColumn[] arrColumns)
-    {
-        super(arrColumns);
-    }
-
-    public SqlTableColumn getSqlColumn(int nColumn)
-    {
-        return (SqlTableColumn)getColumn(nColumn);
-    }
-
-    public SqlTableColumn getSqlColumn(String strColumn)
-    {
-        return (SqlTableColumn)getColumn(strColumn);
-    }
+	private static final long serialVersionUID = 1L;
+	
+	public SqlTableColumnModel(SqlTableColumn[] arrColumns)
+	{
+		super(arrColumns);
+	}
+
+	public SqlTableColumn getSqlColumn(int nColumn)
+	{
+		return (SqlTableColumn) getColumn(nColumn);
+	}
+
+	public SqlTableColumn getSqlColumn(String strColumn)
+	{
+		return (SqlTableColumn) getColumn(strColumn);
+	}
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableModel.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableModel.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableModel.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SqlTableModel.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,111 +26,116 @@
 
 /**
  * An implementation of ITableModel that obtains its data through SQL queries.
- * This is a very efficient model, since it uses SQL to perform the data sorting
- * (through ORDER BY) and obtains only the data on the current page (through
- * LIMIT/OFFSET).
+ * This is a very efficient model, since it uses SQL to perform
+ * the data sorting (through ORDER BY) and obtains only the data
+ * on the current page (through LIMIT/OFFSET). 
  * <p>
  * This object is typically created in the following manner:
- * 
- * <pre>
- * ISqlConnectionSource objConnSrc = new SimpleSqlConnectionSource(&quot;jdbc:postgresql://localhost/testdb&quot;, &quot;testdb&quot;,
- *         &quot;testdb&quot;);
- * 
- * ISqlTableDataSource objDataSrc = new SimpleSqlTableDataSource(objConnSrc, &quot;test_table&quot;);
- * 
- * SqlTableColumnModel objColumnModel = new SqlTableColumnModel(new SqlTableColumn[] {
- *         new SqlTableColumn(&quot;language&quot;, &quot;Language&quot;, true), new SqlTableColumn(&quot;country&quot;, &quot;Country&quot;, true),
- *         new SqlTableColumn(&quot;variant&quot;, &quot;Variant&quot;, true), new SqlTableColumn(&quot;intvalue&quot;, &quot;Integer&quot;, true),
- *         new SqlTableColumn(&quot;floatvalue&quot;, &quot;Float&quot;, true) });
- * 
- * ITableModel objTableModel = new SqlTableModel(objDataSrc, objColumnModel);
- * 
- * return objTableModel;
- * </pre>
- * 
+ * <pre> 
+ *    ISqlConnectionSource objConnSrc = 
+ *        new SimpleSqlConnectionSource("jdbc:postgresql://localhost/testdb", "testdb", "testdb");
+ *
+ *    ISqlTableDataSource objDataSrc = 
+ *        new SimpleSqlTableDataSource(objConnSrc, "test_table");
+ *
+ *    SqlTableColumnModel objColumnModel = 
+ *        new SqlTableColumnModel(new SqlTableColumn[] {
+ *            new SqlTableColumn("language", "Language", true),
+ *            new SqlTableColumn("country", "Country", true),
+ *            new SqlTableColumn("variant", "Variant", true),
+ *            new SqlTableColumn("intvalue", "Integer", true),
+ *            new SqlTableColumn("floatvalue", "Float", true)
+ *        });
+ *
+ *    ITableModel objTableModel = new SqlTableModel(objDataSrc, objColumnModel);
+ *
+ *    return objTableModel;
+ * </pre> 
+ *  
  * @author mindbridge
  */
-public class SqlTableModel extends AbstractTableModel
+public class SqlTableModel extends AbstractTableModel 
 {
+	private static final long serialVersionUID = 1L;
+	private static final Log LOG = LogFactory.getLog(SqlTableModel.class);
 
-    private static final long serialVersionUID = 1L;
-    private static final Log LOG = LogFactory.getLog(SqlTableModel.class);
-
-    private ISqlTableDataSource m_objDataSource;
-    private SqlTableColumnModel m_objColumnModel;
-
-    {
-        try
-        {
-            Class.forName("org.hsqldb.jdbcDriver");
-        }
-        catch (Exception e)
-        {
+	private ISqlTableDataSource m_objDataSource;
+	private SqlTableColumnModel m_objColumnModel;
+    
+    {
+        try {
+            Class.forName ( "org.hsqldb.jdbcDriver" );
+        } catch (Exception e) {
             System.out.println("ERROR: failed to load HSQLDB JDBC driver.");
             e.printStackTrace();
         }
     }
 
-    public SqlTableModel(ISqlTableDataSource objDataSource, SqlTableColumnModel objColumnModel)
-    {
-        this(objDataSource, objColumnModel, new SimpleTableState());
-    }
-
-    public SqlTableModel(ISqlTableDataSource objDataSource, SqlTableColumnModel objColumnModel,
-            SimpleTableState objState)
-    {
+	public SqlTableModel(
+		ISqlTableDataSource objDataSource,
+		SqlTableColumnModel objColumnModel)
+	{
+		this(objDataSource, objColumnModel, new SimpleTableState());
+	}
+
+	public SqlTableModel(
+		ISqlTableDataSource objDataSource,
+		SqlTableColumnModel objColumnModel,
+		SimpleTableState objState)
+	{
         super(objState);
-        m_objDataSource = objDataSource;
-        m_objColumnModel = objColumnModel;
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.table.model.ITableModel#getColumnModel()
-     */
-    public ITableColumnModel getColumnModel()
-    {
-        return m_objColumnModel;
-    }
-
-    public SqlTableColumnModel getSqlColumnModel()
-    {
-        return m_objColumnModel;
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.table.model.ITableModel#getCurrentPageRows()
-     */
-    public Iterator getCurrentPageRows()
-    {
-        try
-        {
-            ResultSet objResultSet = getSqlDataSource().getCurrentRows(getSqlColumnModel(), getState());
-
-            return new ResultSetIterator(objResultSet)
-            {
-
-                protected void notifyEnd()
-                {
-                    getSqlDataSource().closeResultSet(getResultSet());
-                }
-            };
-        }
-        catch (SQLException e)
-        {
-            LOG.error("Cannot get current page rows", e);
-            return new ResultSetIterator(null);
-        }
-    }
-
-    /**
-     * Returns the dataSource.
-     * 
-     * @return ISqlTableDataSource
-     */
-    public ISqlTableDataSource getSqlDataSource()
-    {
-        return m_objDataSource;
-    }
+		m_objDataSource = objDataSource;
+		m_objColumnModel = objColumnModel;
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.table.model.ITableModel#getColumnModel()
+	 */
+	public ITableColumnModel getColumnModel()
+	{
+		return m_objColumnModel;
+	}
+
+	public SqlTableColumnModel getSqlColumnModel()
+	{
+		return m_objColumnModel;
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.table.model.ITableModel#getCurrentPageRows()
+	 */
+	public Iterator getCurrentPageRows()
+	{
+		try
+		{
+			ResultSet objResultSet =
+				getSqlDataSource().getCurrentRows(
+					getSqlColumnModel(),
+					getState());
+
+			return new ResultSetIterator(objResultSet)
+			{
+				protected void notifyEnd()
+				{
+					getSqlDataSource().closeResultSet(getResultSet());
+				}
+			};
+		}
+		catch (SQLException e)
+		{
+			LOG.error("Cannot get current page rows", e);
+			return new ResultSetIterator(null);
+		}
+	}
+
+	/**
+	 * Returns the dataSource.
+	 * @return ISqlTableDataSource
+	 */
+	public ISqlTableDataSource getSqlDataSource()
+	{
+		return m_objDataSource;
+	}
 
     /**
      * @see org.apache.tapestry.contrib.table.model.common.AbstractTableModel#getRowCount()

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/INodeRenderFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/INodeRenderFactory.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/INodeRenderFactory.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/INodeRenderFactory.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,10 +21,8 @@
 /**
  * @author ceco
  */
-public interface INodeRenderFactory
+public interface INodeRenderFactory 
 {
-
-    IRender getRenderByID(Object objUniqueKey, ITreeModelSource objTreeModelSource, IRequestCycle objCycle);
-
-    IRender getRender(Object objValue, ITreeModelSource objTreeModelSource, IRequestCycle objCycle);
-}
+	IRender getRenderByID(Object objUniqueKey, ITreeModelSource objTreeModelSource, IRequestCycle objCycle);	
+	IRender getRender(Object objValue, ITreeModelSource objTreeModelSource, IRequestCycle objCycle);	
+}
\ No newline at end of file

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/ITreeComponent.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/ITreeComponent.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/ITreeComponent.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/ITreeComponent.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,15 +20,10 @@
 
 /**
  * @author ceco
- */
-public interface ITreeComponent
-{
-
-    ComponentAddress getComponentPath();
-
-    ITreeModelSource getTreeModelSource();
-
-    ITreeRowSource getTreeRowSource();
-
-    void resetState();
+  */
+public interface ITreeComponent {
+	ComponentAddress getComponentPath();
+	ITreeModelSource getTreeModelSource();
+	ITreeRowSource getTreeRowSource();
+	void resetState();
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/Tree.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/Tree.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/Tree.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/Tree.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,42 +22,41 @@
 /**
  * @author ceco
  */
-public abstract class Tree extends BaseComponent implements ITreeComponent
-{
+public abstract class Tree extends BaseComponent implements ITreeComponent{
 
-    /**
-     * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getComponentPath()
-     */
-    public ComponentAddress getComponentPath()
-    {
-        return new ComponentAddress(this);
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getTreeModelSource()
-     */
-    public ITreeModelSource getTreeModelSource()
-    {
-        TreeView objTreeView = (TreeView)getComponent("treeView");
-        return objTreeView;
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#resetState()
-     */
-    public void resetState()
-    {
-        TreeView objTreeView = (TreeView)getComponent("treeView");
-        objTreeView.resetState();
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getTreeRowSource()
-     */
-    public ITreeRowSource getTreeRowSource()
-    {
-        TreeDataView objTreeDataView = (TreeDataView)getComponent("treeData");
-        return objTreeDataView;
-    }
+	public Tree() {
+		super();
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getComponentPath()
+	 */
+	public ComponentAddress getComponentPath() {
+		return new ComponentAddress(this);
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getTreeModelSource()
+	 */
+	public ITreeModelSource getTreeModelSource() {
+		TreeView objTreeView = (TreeView)getComponent("treeView");
+		return objTreeView;
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#resetState()
+	 */
+	public void resetState() {
+		TreeView objTreeView = (TreeView)getComponent("treeView");
+		objTreeView.resetState();
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getTreeRowSource()
+	 */
+	public ITreeRowSource getTreeRowSource() {
+		TreeDataView objTreeDataView = (TreeDataView)getComponent("treeData");
+		return objTreeDataView;
+	}
 
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeDataView.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeDataView.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeDataView.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeDataView.java Sat Mar 11 12:54:27 2006
@@ -29,7 +29,6 @@
  */
 public abstract class TreeDataView extends BaseComponent implements ITreeRowSource
 {
-
     private TreeRowObject m_objTreeRowObject = null;
 
     private int m_nTreeDeep = -1;
@@ -51,7 +50,8 @@
     public void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
     {
         // render data
-        Object objExistedTreeModelSource = cycle.getAttribute(ITreeRowSource.TREE_ROW_SOURCE_ATTRIBUTE);
+        Object objExistedTreeModelSource = cycle
+                .getAttribute(ITreeRowSource.TREE_ROW_SOURCE_ATTRIBUTE);
         cycle.setAttribute(ITreeRowSource.TREE_ROW_SOURCE_ATTRIBUTE, this);
 
         TreeView objView = getTreeView();
@@ -62,27 +62,47 @@
         Object objRootUID = objTreeDataModel.getUniqueKey(objRoot, null);
         if (getShowRootNode())
         {
-            walkTree(objRoot, objRootUID, 0, objTreeModel, writer, cycle, TreeRowObject.FIRST_LAST_ROW, new int[0],
+            walkTree(
+                    objRoot,
+                    objRootUID,
+                    0,
+                    objTreeModel,
+                    writer,
+                    cycle,
+                    TreeRowObject.FIRST_LAST_ROW,
+                    new int[0],
                     true);
         }
         else
         {
             boolean bFirst = true;
             int nChildenCount = objTreeModel.getTreeDataModel().getChildCount(objRoot);
-            int nRowPossiotionType = nChildenCount == 1 ? TreeRowObject.FIRST_LAST_ROW : TreeRowObject.FIRST_ROW;
-            for(Iterator iter = objTreeModel.getTreeDataModel().getChildren(objRoot); iter.hasNext();)
+            int nRowPossiotionType = nChildenCount == 1 ? TreeRowObject.FIRST_LAST_ROW
+                    : TreeRowObject.FIRST_ROW;
+            for (Iterator iter = objTreeModel.getTreeDataModel().getChildren(objRoot); iter
+                    .hasNext();)
             {
                 Object objChild = iter.next();
-                Object objChildUID = objTreeModel.getTreeDataModel().getUniqueKey(objChild, objRoot);
+                Object objChildUID = objTreeModel.getTreeDataModel()
+                        .getUniqueKey(objChild, objRoot);
                 boolean bChildLast = !iter.hasNext();
                 if (!bFirst)
                 {
                     if (bChildLast)
                         nRowPossiotionType = TreeRowObject.LAST_ROW;
-                    else nRowPossiotionType = TreeRowObject.MIDDLE_ROW;
+                    else
+                        nRowPossiotionType = TreeRowObject.MIDDLE_ROW;
                 }
 
-                walkTree(objChild, objChildUID, 0, objTreeModel, writer, cycle, nRowPossiotionType, new int[0],
+                walkTree(
+                        objChild,
+                        objChildUID,
+                        0,
+                        objTreeModel,
+                        writer,
+                        cycle,
+                        nRowPossiotionType,
+                        new int[0],
                         bChildLast);
 
                 bFirst = false;
@@ -92,14 +112,15 @@
         cycle.setAttribute(ITreeRowSource.TREE_ROW_SOURCE_ATTRIBUTE, objExistedTreeModelSource);
     }
 
-    public void walkTree(Object objParent, Object objParentUID, int nDepth, ITreeModel objTreeModel,
-            IMarkupWriter writer, IRequestCycle cycle, int nRowPossiotionType, int[] arrConnectImages, boolean bLast)
+    public void walkTree(Object objParent, Object objParentUID, int nDepth,
+            ITreeModel objTreeModel, IMarkupWriter writer, IRequestCycle cycle,
+            int nRowPossiotionType, int[] arrConnectImages, boolean bLast)
     {
         m_nTreeDeep = nDepth;
         int nNumberOfChildren = objTreeModel.getTreeDataModel().getChildCount(objParent);
         boolean bLeaf = (nNumberOfChildren == 0) ? true : false;
-        m_objTreeRowObject = new TreeRowObject(objParent, objParentUID, nDepth, bLeaf, nRowPossiotionType,
-                arrConnectImages);
+        m_objTreeRowObject = new TreeRowObject(objParent, objParentUID, nDepth, bLeaf,
+                nRowPossiotionType, arrConnectImages);
 
         super.renderComponent(writer, cycle);
 
@@ -110,18 +131,31 @@
             System.arraycopy(arrConnectImages, 0, arrConnectImagesNew, 0, arrConnectImages.length);
             if (bLast)
                 arrConnectImagesNew[arrConnectImagesNew.length - 1] = TreeRowObject.EMPTY_CONN_IMG;
-            else arrConnectImagesNew[arrConnectImagesNew.length - 1] = TreeRowObject.LINE_CONN_IMG;
+            else
+                arrConnectImagesNew[arrConnectImagesNew.length - 1] = TreeRowObject.LINE_CONN_IMG;
 
-            for(Iterator iter = objTreeModel.getTreeDataModel().getChildren(objParent); iter.hasNext();)
+            for (Iterator iter = objTreeModel.getTreeDataModel().getChildren(objParent); iter
+                    .hasNext();)
             {
                 Object objChild = iter.next();
-                Object objChildUID = objTreeModel.getTreeDataModel().getUniqueKey(objChild, objParentUID);
+                Object objChildUID = objTreeModel.getTreeDataModel().getUniqueKey(
+                        objChild,
+                        objParentUID);
                 boolean bChildLast = !iter.hasNext();
                 if (bChildLast)
                     nRowPossiotionType = TreeRowObject.LAST_ROW;
-                else nRowPossiotionType = TreeRowObject.MIDDLE_ROW;
-                walkTree(objChild, objChildUID, nDepth + 1, objTreeModel, writer, cycle, nRowPossiotionType,
-                        arrConnectImagesNew, bChildLast);
+                else
+                    nRowPossiotionType = TreeRowObject.MIDDLE_ROW;
+                walkTree(
+                        objChild,
+                        objChildUID,
+                        nDepth + 1,
+                        objTreeModel,
+                        writer,
+                        cycle,
+                        nRowPossiotionType,
+                        arrConnectImagesNew,
+                        bChildLast);
             }
         }
     }
@@ -151,4 +185,4 @@
 
     public abstract boolean getShowRootNode();
 
-}
+}
\ No newline at end of file

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -39,7 +39,6 @@
  */
 public abstract class TreeNodeView extends BaseComponent implements PageDetachListener
 {
-
     private static final Log LOG = LogFactory.getLog(TreeNodeView.class);
 
     private Boolean m_objNodeState;
@@ -54,7 +53,11 @@
 
     private IAsset m_objCloseNodeImage;
 
-    private int m_currentForeachConnectImageValue = TreeRowObject.LINE_CONN_IMG;
+    private int m_CurrentForeachConnectImageValue = TreeRowObject.LINE_CONN_IMG;
+
+    public abstract INodeRenderFactory getNodeRenderFactoryParameter();
+
+    public abstract Boolean getShowNodeImages();
 
     public TreeNodeView()
     {
@@ -68,19 +71,17 @@
         m_objShowNodeImages = null;
         m_objNodeRenderFactory = null;
         m_objMakeNodeDirect = null;
-        m_currentForeachConnectImageValue = TreeRowObject.LINE_CONN_IMG;
+        m_CurrentForeachConnectImageValue = TreeRowObject.LINE_CONN_IMG;
     }
 
-    public abstract INodeRenderFactory getNodeRenderFactoryParameter();
-
-    public abstract Boolean getShowNodeImages();
-
     public IRender getCurrentRenderer()
     {
         INodeRenderFactory objRenderFactory = getNodeRenderFactory();
         ITreeRowSource objTreeRowSource = getTreeRowSource();
-        return objRenderFactory.getRender(objTreeRowSource.getTreeRow().getTreeNode(), getTreeModelSource(), getPage()
-                .getRequestCycle());
+        return objRenderFactory.getRender(
+                objTreeRowSource.getTreeRow().getTreeNode(),
+                getTreeModelSource(),
+                getPage().getRequestCycle());
     }
 
     public Object[] getNodeContext()
@@ -95,27 +96,29 @@
             LOG.debug("getNodeContext objValueUID = " + objValueUID);
         }
 
-        return new Object[] { objValueUID, new Boolean(isNodeOpen()), objModelSourceAddress };
+        return new Object[]
+        { objValueUID, new Boolean(isNodeOpen()), objModelSourceAddress };
     }
 
     /**
-     * Called when a node in the tree is clicked by the user. If the node is
-     * expanded, it will be collapsed, and vice-versa, that is, the tree state
-     * model is retrieved, and it is told to collapse or expand the node.
+     * Called when a node in the tree is clicked by the user. If the node is expanded, it will be
+     * collapsed, and vice-versa, that is, the tree state model is retrieved, and it is told to
+     * collapse or expand the node.
      * 
      * @param cycle
      *            The Tapestry request cycle object.
      */
     public void nodeExpandCollaps(IRequestCycle cycle)
     {
-        Object[] context = cycle.getListenerParameters();
+        Object context[] = cycle.getListenerParameters();
         Object objValueUID = null;
         if (context != null && context.length > 0)
         {
             objValueUID = context[0];
         }
-        ComponentAddress objModelSourceAddress = (ComponentAddress)context[2];
-        ITreeModelSource objTreeModelSource = (ITreeModelSource)objModelSourceAddress.findComponent(cycle);
+        ComponentAddress objModelSourceAddress = (ComponentAddress) context[2];
+        ITreeModelSource objTreeModelSource = (ITreeModelSource) objModelSourceAddress
+                .findComponent(cycle);
         // ITreeModelSource objTreeModelSource = getTreeModelSource();
         ITreeStateModel objStateModel = objTreeModelSource.getTreeModel().getTreeStateModel();
         boolean bState = objStateModel.isUniqueKeyExpanded(objValueUID);
@@ -133,30 +136,30 @@
     }
 
     /**
-     * Called when a node in the tree is selected by the user. the tree state
-     * model is retrieved, and it is told to select the node.
+     * Called when a node in the tree is selected by the user. the tree state model is retrieved,
+     * and it is told to select the node.
      * 
      * @param cycle
      *            The Tapestry request cycle object.
      */
     public void nodeSelect(IRequestCycle cycle)
     {
-        Object[] context = cycle.getListenerParameters();
+        Object context[] = cycle.getListenerParameters();
         Object objValueUID = null;
         if (context != null && context.length > 0)
         {
             objValueUID = context[0];
         }
-        ComponentAddress objModelSourceAddress = (ComponentAddress)context[2];
-        ITreeModelSource objTreeModelSource = (ITreeModelSource)objModelSourceAddress.findComponent(cycle);
+        ComponentAddress objModelSourceAddress = (ComponentAddress) context[2];
+        ITreeModelSource objTreeModelSource = (ITreeModelSource) objModelSourceAddress
+                .findComponent(cycle);
         // ITreeModelSource objTreeModelSource = getTreeModelSource();
         ITreeStateModel objStateModel = objTreeModelSource.getTreeModel().getTreeStateModel();
         Object objSelectedNodeInState = objStateModel.getSelectedNode();
 
         if (objValueUID.equals(objSelectedNodeInState))
         {
-            // do nothing, the selected node in UI is the same as the selected
-            // in
+            // do nothing, the selected node in UI is the same as the selected in
             // state model. The user should use refresh of back button.
             return;
         }
@@ -185,8 +188,8 @@
         ITreeStateListener objListener = objTreeModelSource.getTreeStateListener();
         if (objListener != null)
         {
-            TreeStateEvent objEvent = new TreeStateEvent(nEventUID, objValueUID, objTreeModelSource.getTreeModel()
-                    .getTreeStateModel());
+            TreeStateEvent objEvent = new TreeStateEvent(nEventUID, objValueUID, objTreeModelSource
+                    .getTreeModel().getTreeStateModel());
             objListener.treeStateChanged(objEvent);
         }
 
@@ -236,108 +239,108 @@
         {
             if (isNodeOpen())
             {
-                switch(nRowType)
-                {
-                case TreeRowObject.FIRST_LAST_ROW:
+                switch (nRowType)
                 {
-                    objResult = getAsset("_topLastOpenNodeImage");
-                    break;
-                }
-
-                case TreeRowObject.FIRST_ROW:
-                {
-                    objResult = getAsset("_topOpenNodeImage");
-                    break;
-                }
-
-                case TreeRowObject.MIDDLE_ROW:
-                {
-                    objResult = getAsset("_middleOpenNodeImage");
-                    break;
-                }
-
-                case TreeRowObject.LAST_ROW:
-                {
-                    objResult = getAsset("_bottomOpenNodeImage");
-                    break;
-                }
-
-                default:
-                {
-                    objResult = getAsset("_openNodeImage");
-                    break;
-                }
+                    case TreeRowObject.FIRST_LAST_ROW:
+                    {
+                        objResult = getAsset("_topLastOpenNodeImage");
+                        break;
+                    }
+
+                    case TreeRowObject.FIRST_ROW:
+                    {
+                        objResult = getAsset("_topOpenNodeImage");
+                        break;
+                    }
+
+                    case TreeRowObject.MIDDLE_ROW:
+                    {
+                        objResult = getAsset("_middleOpenNodeImage");
+                        break;
+                    }
+
+                    case TreeRowObject.LAST_ROW:
+                    {
+                        objResult = getAsset("_bottomOpenNodeImage");
+                        break;
+                    }
+
+                    default:
+                    {
+                        objResult = getAsset("_openNodeImage");
+                        break;
+                    }
                 }
             }
             else
             {
-                switch(nRowType)
+                switch (nRowType)
                 {
+                    case TreeRowObject.FIRST_LAST_ROW:
+                    {
+                        objResult = getAsset("_topLastCloseNodeImage");
+                        break;
+                    }
+
+                    case TreeRowObject.FIRST_ROW:
+                    {
+                        objResult = getAsset("_topCloseNodeImage");
+                        break;
+                    }
+
+                    case TreeRowObject.MIDDLE_ROW:
+                    {
+                        objResult = getAsset("_middleCloseNodeImage");
+                        break;
+                    }
+
+                    case TreeRowObject.LAST_ROW:
+                    {
+                        objResult = getAsset("_bottomCloseNodeImage");
+                        break;
+                    }
+
+                    default:
+                    {
+                        objResult = getAsset("_closeNodeImage");
+                        break;
+                    }
+                }
+            }
+        }
+        else
+        {
+            switch (nRowType)
+            {
                 case TreeRowObject.FIRST_LAST_ROW:
                 {
-                    objResult = getAsset("_topLastCloseNodeImage");
+                    objResult = getAsset("_topLineImage");
                     break;
                 }
 
                 case TreeRowObject.FIRST_ROW:
                 {
-                    objResult = getAsset("_topCloseNodeImage");
+                    objResult = getAsset("_topLineImage");
                     break;
                 }
 
                 case TreeRowObject.MIDDLE_ROW:
                 {
-                    objResult = getAsset("_middleCloseNodeImage");
+                    objResult = getAsset("_middleCrossLineImage");
                     break;
                 }
 
                 case TreeRowObject.LAST_ROW:
                 {
-                    objResult = getAsset("_bottomCloseNodeImage");
+                    objResult = getAsset("_bottomLineImage");
                     break;
                 }
 
                 default:
                 {
-                    objResult = getAsset("_closeNodeImage");
+                    objResult = getAsset("_bottomLineImage");
                     break;
                 }
-                }
-            }
-        }
-        else
-        {
-            switch(nRowType)
-            {
-            case TreeRowObject.FIRST_LAST_ROW:
-            {
-                objResult = getAsset("_topLineImage");
-                break;
-            }
-
-            case TreeRowObject.FIRST_ROW:
-            {
-                objResult = getAsset("_topLineImage");
-                break;
-            }
-
-            case TreeRowObject.MIDDLE_ROW:
-            {
-                objResult = getAsset("_middleCrossLineImage");
-                break;
-            }
-
-            case TreeRowObject.LAST_ROW:
-            {
-                objResult = getAsset("_bottomLineImage");
-                break;
-            }
-
-            default:
-            {
-                objResult = getAsset("_bottomLineImage");
-                break;
-            }
             }
 
         }
@@ -405,8 +408,7 @@
     }
 
     /**
-     * @see org.apache.tapestry.AbstractComponent#renderComponent(IMarkupWriter,
-     *      IRequestCycle)
+     * @see org.apache.tapestry.AbstractComponent#renderComponent(IMarkupWriter, IRequestCycle)
      */
     protected void renderComponent(IMarkupWriter arg0, IRequestCycle arg1)
     {
@@ -457,7 +459,8 @@
         if (objTreeRowObject != null)
         {
             nTreeRowDepth = objTreeRowObject.getTreeRowDepth();
-            if (nTreeRowDepth != 0) nTreeRowDepth = nTreeRowDepth - 1;
+            if (nTreeRowDepth != 0)
+                nTreeRowDepth = nTreeRowDepth - 1;
         }
         return "padding-left: " + nTreeRowDepth * 19 + "px";
     }
@@ -468,7 +471,8 @@
         {
             if (isParameterBound("nodeRenderFactory"))
                 m_objNodeRenderFactory = getNodeRenderFactoryParameter();
-            else m_objNodeRenderFactory = new SimpleNodeRenderFactory();
+            else
+                m_objNodeRenderFactory = new SimpleNodeRenderFactory();
         }
         return m_objNodeRenderFactory;
     }
@@ -491,8 +495,12 @@
         ITreeModelSource objTreeModelSource = getTreeModelSource();
         TreeRowObject objTreeRowObject = objTreeRowSource.getTreeRow();
         Object objNodeValueUID = objTreeRowObject.getTreeNodeUID();
-        Object objSelectedNode = objTreeModelSource.getTreeModel().getTreeStateModel().getSelectedNode();
-        if (objNodeValueUID.equals(objSelectedNode)) { return getSelectedNodeID(); }
+        Object objSelectedNode = objTreeModelSource.getTreeModel().getTreeStateModel()
+                .getSelectedNode();
+        if (objNodeValueUID.equals(objSelectedNode))
+        {
+            return getSelectedNodeID();
+        }
         return "";
     }
 
@@ -511,24 +519,28 @@
         if (objTreeRowObject != null)
         {
             Object objNodeValueUID = objTreeRowObject.getTreeNodeUID();
-            Object objSelectedNode = objTreeModelSource.getTreeModel().getTreeStateModel().getSelectedNode();
+            Object objSelectedNode = objTreeModelSource.getTreeModel().getTreeStateModel()
+                    .getSelectedNode();
             bResult = objNodeValueUID.equals(objSelectedNode);
         }
-        if (bResult) { return "selectedNodeViewClass"; }
+        if (bResult)
+        {
+            return "selectedNodeViewClass";
+        }
 
         return "notSelectedNodeViewClass";
     }
 
     public ITreeRowSource getTreeRowSource()
     {
-        ITreeRowSource objSource = (ITreeRowSource)getPage().getRequestCycle().getAttribute(
+        ITreeRowSource objSource = (ITreeRowSource) getPage().getRequestCycle().getAttribute(
                 ITreeRowSource.TREE_ROW_SOURCE_ATTRIBUTE);
         return objSource;
     }
 
     public ITreeModelSource getTreeModelSource()
     {
-        ITreeModelSource objSource = (ITreeModelSource)getPage().getRequestCycle().getAttribute(
+        ITreeModelSource objSource = (ITreeModelSource) getPage().getRequestCycle().getAttribute(
                 ITreeModelSource.TREE_MODEL_SOURCE_ATTRIBUTE);
         return objSource;
     }
@@ -537,7 +549,8 @@
     {
         ITreeRowSource objRowSource = getTreeRowSource();
         int nRowType = objRowSource.getTreeRow().getTreeRowPossiotionType();
-        if (TreeRowObject.MIDDLE_ROW == nRowType) return true;
+        if (TreeRowObject.MIDDLE_ROW == nRowType)
+            return true;
         return false;
     }
 
@@ -564,25 +577,25 @@
     {
         IAsset objResult = null;
         int nConnectImageType = getCurrentForeachConnectImageValue();
-        switch(nConnectImageType)
-        {
-        case TreeRowObject.EMPTY_CONN_IMG:
+        switch (nConnectImageType)
         {
-            objResult = getAsset("_whiteSpaceImage");
-            break;
-        }
+            case TreeRowObject.EMPTY_CONN_IMG:
+            {
+                objResult = getAsset("_whiteSpaceImage");
+                break;
+            }
 
-        case TreeRowObject.LINE_CONN_IMG:
-        {
-            objResult = getAsset("_middleLineImage");
-            break;
-        }
+            case TreeRowObject.LINE_CONN_IMG:
+            {
+                objResult = getAsset("_middleLineImage");
+                break;
+            }
 
-        default:
-        {
-            objResult = getAsset("_whiteSpaceImage");
-            break;
-        }
+            default:
+            {
+                objResult = getAsset("_whiteSpaceImage");
+                break;
+            }
         }
         return objResult;
     }
@@ -592,7 +605,7 @@
      */
     public int getCurrentForeachConnectImageValue()
     {
-        return m_currentForeachConnectImageValue;
+        return m_CurrentForeachConnectImageValue;
     }
 
     /**
@@ -601,6 +614,6 @@
      */
     public void setCurrentForeachConnectImageValue(int currentForeachConnectImageValue)
     {
-        m_currentForeachConnectImageValue = currentForeachConnectImageValue;
+        m_CurrentForeachConnectImageValue = currentForeachConnectImageValue;
     }
-}
+}
\ No newline at end of file

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeView.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeView.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeView.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeView.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -34,8 +34,8 @@
 
 /**
  */
-public abstract class TreeView extends BaseComponent implements PageDetachListener, PageBeginRenderListener,
-        ITreeModelSource
+public abstract class TreeView extends BaseComponent implements PageDetachListener,
+        PageBeginRenderListener, ITreeModelSource
 {
 
     private static final Log LOG = LogFactory.getLog(TreeView.class);
@@ -72,8 +72,7 @@
     }
 
     /**
-     * @see org.apache.tapestry.AbstractComponent#renderComponent(IMarkupWriter,
-     *      IRequestCycle)
+     * @see org.apache.tapestry.AbstractComponent#renderComponent(IMarkupWriter, IRequestCycle)
      */
 
     /**
@@ -89,7 +88,10 @@
      */
     public void pageBeginRender(PageEvent arg0)
     {
-        if (arg0.getRequestCycle().isRewinding()) { return; }
+        if (arg0.getRequestCycle().isRewinding())
+        {
+            return;
+        }
         storeSesion();
     }
 
@@ -186,7 +188,7 @@
                 LOG.debug("TreeView.extractTreeModel() from BINDING");
             }
 
-            m_objTreeModel = (ITreeModel)getTreeModelBinding().getObject();
+            m_objTreeModel = (ITreeModel) getTreeModelBinding().getObject();
         }
 
     }
@@ -214,9 +216,10 @@
         }
         else
         {
-            // String strPath = "treeSessionState";
+            //String strPath = "treeSessionState";
             String strPath = getExtendedId();
-            if (LOG.isDebugEnabled()) LOG.debug("store(): setting state with: " + strPath);
+            if (LOG.isDebugEnabled())
+                LOG.debug("store(): setting state with: " + strPath);
             objHolder.setSessionState(this.getPage(), strPath, objSessionState);
         }
     }
@@ -243,7 +246,8 @@
     {
         if (m_objSessionStoreManager == null && getSessionStoreManagerBinding() != null)
         {
-            m_objSessionStoreManager = (ISessionStoreManager)getSessionStoreManagerBinding().getObject();
+            m_objSessionStoreManager = (ISessionStoreManager) getSessionStoreManagerBinding()
+                    .getObject();
         }
 
         return m_objSessionStoreManager;
@@ -262,7 +266,7 @@
             if (objBinding != null)
             {
                 Object objManager = objBinding.getObject();
-                m_objTreeSessionStateManager = (ITreeSessionStateManager)objManager;
+                m_objTreeSessionStateManager = (ITreeSessionStateManager) objManager;
             }
             else
             {
@@ -338,7 +342,8 @@
      */
     protected void renderComponent(IMarkupWriter arg0, IRequestCycle arg1)
     {
-        Object objExistedTreeModelSource = arg1.getAttribute(ITreeModelSource.TREE_MODEL_SOURCE_ATTRIBUTE);
+        Object objExistedTreeModelSource = arg1
+                .getAttribute(ITreeModelSource.TREE_MODEL_SOURCE_ATTRIBUTE);
         arg1.setAttribute(ITreeModelSource.TREE_MODEL_SOURCE_ATTRIBUTE, this);
 
         super.renderComponent(arg0, arg1);
@@ -354,9 +359,9 @@
         IBinding objBinding = getBinding("treeStateListener");
         if (objBinding != null)
         {
-            objListener = (ITreeStateListener)objBinding.getObject();
+            objListener = (ITreeStateListener) objBinding.getObject();
         }
         return objListener;
     }
 
-}
+}
\ No newline at end of file

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTable.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTable.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTable.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTable.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,42 +24,39 @@
 /**
  * @author ceco
  */
-public abstract class TreeTable extends BaseComponent implements ITreeComponent
-{
+public abstract class TreeTable extends BaseComponent implements ITreeComponent{
 
-    public TreeTable()
-    {
-
-    }
-
-    public ITreeModelSource getTreeModelSource()
-    {
-        return (ITreeModelSource)getComponent("treeView");
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#resetState()
-     */
-    public void resetState()
-    {
-        TreeView objTreeView = (TreeView)getComponent("treeView");
-        objTreeView.resetState();
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getComponentPath()
-     */
-    public ComponentAddress getComponentPath()
-    {
-        return new ComponentAddress(this);
-    }
-
-    /**
-     * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getTreeRowSource()
-     */
-    public ITreeRowSource getTreeRowSource()
-    {
-        TreeTableDataView objTreeDataView = (TreeTableDataView)getComponent("treeTableDataView");
-        return objTreeDataView;
-    }
+	/**
+	 * 
+	 */
+	public TreeTable() {
+		super();
+	}
+
+	public ITreeModelSource getTreeModelSource(){
+		return (ITreeModelSource) getComponent("treeView");
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#resetState()
+	 */
+	public void resetState() {
+		TreeView objTreeView = (TreeView)getComponent("treeView");
+		objTreeView.resetState();
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getComponentPath()
+	 */
+	public ComponentAddress getComponentPath() {
+		return new ComponentAddress(this);
+	}
+
+	/**
+	 * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getTreeRowSource()
+	 */
+	public ITreeRowSource getTreeRowSource() {
+		TreeTableDataView objTreeDataView = (TreeTableDataView)getComponent("treeTableDataView");
+		return objTreeDataView;
+	}
 }



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