You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2006/01/12 18:18:56 UTC

svn commit: r368415 [4/5] - in /jakarta/tapestry/trunk/contrib/src: java/org/apache/tapestry/contrib/inspector/ java/org/apache/tapestry/contrib/jdbc/ java/org/apache/tapestry/contrib/link/ java/org/apache/tapestry/contrib/palette/ java/org/apache/tape...

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=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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,11 +18,13 @@
 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=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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,16 @@
 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=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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,101 +22,98 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
- * 
  * @author mindbridge
  */
 public class ResultSetIterator implements Iterator
 {
-	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 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()
+    {
         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/SimpleSqlTableDataSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/sql/SimpleSqlTableDataSource.java?rev=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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,240 +26,227 @@
 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 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 static final Log LOG = LogFactory.getLog(SimpleSqlTableDataSource.class);
 
-		return strQuery;
-	}
+    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;
+    }
 
 }

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=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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,57 +22,62 @@
 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);
 
-	/**
-	 * 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;
+    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;
             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=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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,116 +26,111 @@
 
 /**
  * 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("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> 
- *  
+ * 
+ * <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>
+ * 
  * @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 ISqlTableDataSource m_objDataSource;
-	private SqlTableColumnModel m_objColumnModel;
-    
-    {
-        try {
-            Class.forName ( "org.hsqldb.jdbcDriver" );
-        } catch (Exception e) {
+    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)
+        {
             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=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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,8 +21,10 @@
 /**
  * @author ceco
  */
-public interface INodeRenderFactory 
+public interface INodeRenderFactory
 {
-	IRender getRenderByID(Object objUniqueKey, ITreeModelSource objTreeModelSource, IRequestCycle objCycle);	
-	IRender getRender(Object objValue, ITreeModelSource objTreeModelSource, IRequestCycle objCycle);	
-}
\ No newline at end of file
+
+    IRender getRenderByID(Object objUniqueKey, ITreeModelSource objTreeModelSource, IRequestCycle objCycle);
+
+    IRender getRender(Object objValue, ITreeModelSource objTreeModelSource, IRequestCycle objCycle);
+}

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=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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,10 +20,15 @@
 
 /**
  * @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=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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,42 @@
 /**
  * @author ceco
  */
-public abstract class Tree extends BaseComponent implements ITreeComponent{
+public abstract class Tree extends BaseComponent implements ITreeComponent
+{
 
-	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;
-	}
+    /**
+     * @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=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -29,6 +29,7 @@
  */
 public abstract class TreeDataView extends BaseComponent implements ITreeRowSource
 {
+
     private TreeRowObject m_objTreeRowObject = null;
 
     private int m_nTreeDeep = -1;
@@ -50,8 +51,7 @@
     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,47 +62,27 @@
         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;
@@ -112,15 +92,14 @@
         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);
 
@@ -131,31 +110,18 @@
             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);
             }
         }
     }
@@ -185,4 +151,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=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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,6 +39,7 @@
  */
 public abstract class TreeNodeView extends BaseComponent implements PageDetachListener
 {
+
     private static final Log LOG = LogFactory.getLog(TreeNodeView.class);
 
     private Boolean m_objNodeState;
@@ -53,11 +54,7 @@
 
     private IAsset m_objCloseNodeImage;
 
-    private int m_CurrentForeachConnectImageValue = TreeRowObject.LINE_CONN_IMG;
-
-    public abstract INodeRenderFactory getNodeRenderFactoryParameter();
-
-    public abstract Boolean getShowNodeImages();
+    private int m_currentForeachConnectImageValue = TreeRowObject.LINE_CONN_IMG;
 
     public TreeNodeView()
     {
@@ -71,17 +68,19 @@
         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()
@@ -96,29 +95,27 @@
             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);
@@ -136,30 +133,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;
         }
@@ -188,8 +185,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);
         }
 
@@ -239,108 +236,108 @@
         {
             if (isNodeOpen())
             {
-                switch (nRowType)
+                switch(nRowType)
+                {
+                case TreeRowObject.FIRST_LAST_ROW:
                 {
-                    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;
-                    }
+                    objResult = getAsset("_topLastOpenNodeImage");
+                    break;
                 }
-            }
-            else
-            {
-                switch (nRowType)
+
+                case TreeRowObject.FIRST_ROW:
                 {
-                    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;
-                    }
+                    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)
+            else
             {
+                switch(nRowType)
+                {
                 case TreeRowObject.FIRST_LAST_ROW:
                 {
-                    objResult = getAsset("_topLineImage");
+                    objResult = getAsset("_topLastCloseNodeImage");
                     break;
                 }
 
                 case TreeRowObject.FIRST_ROW:
                 {
-                    objResult = getAsset("_topLineImage");
+                    objResult = getAsset("_topCloseNodeImage");
                     break;
                 }
 
                 case TreeRowObject.MIDDLE_ROW:
                 {
-                    objResult = getAsset("_middleCrossLineImage");
+                    objResult = getAsset("_middleCloseNodeImage");
                     break;
                 }
 
                 case TreeRowObject.LAST_ROW:
                 {
-                    objResult = getAsset("_bottomLineImage");
+                    objResult = getAsset("_bottomCloseNodeImage");
                     break;
                 }
 
                 default:
                 {
-                    objResult = getAsset("_bottomLineImage");
+                    objResult = getAsset("_closeNodeImage");
                     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;
+            }
             }
 
         }
@@ -408,7 +405,8 @@
     }
 
     /**
-     * @see org.apache.tapestry.AbstractComponent#renderComponent(IMarkupWriter, IRequestCycle)
+     * @see org.apache.tapestry.AbstractComponent#renderComponent(IMarkupWriter,
+     *      IRequestCycle)
      */
     protected void renderComponent(IMarkupWriter arg0, IRequestCycle arg1)
     {
@@ -459,8 +457,7 @@
         if (objTreeRowObject != null)
         {
             nTreeRowDepth = objTreeRowObject.getTreeRowDepth();
-            if (nTreeRowDepth != 0)
-                nTreeRowDepth = nTreeRowDepth - 1;
+            if (nTreeRowDepth != 0) nTreeRowDepth = nTreeRowDepth - 1;
         }
         return "padding-left: " + nTreeRowDepth * 19 + "px";
     }
@@ -471,8 +468,7 @@
         {
             if (isParameterBound("nodeRenderFactory"))
                 m_objNodeRenderFactory = getNodeRenderFactoryParameter();
-            else
-                m_objNodeRenderFactory = new SimpleNodeRenderFactory();
+            else m_objNodeRenderFactory = new SimpleNodeRenderFactory();
         }
         return m_objNodeRenderFactory;
     }
@@ -495,12 +491,8 @@
         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 "";
     }
 
@@ -519,28 +511,24 @@
         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;
     }
@@ -549,8 +537,7 @@
     {
         ITreeRowSource objRowSource = getTreeRowSource();
         int nRowType = objRowSource.getTreeRow().getTreeRowPossiotionType();
-        if (TreeRowObject.MIDDLE_ROW == nRowType)
-            return true;
+        if (TreeRowObject.MIDDLE_ROW == nRowType) return true;
         return false;
     }
 
@@ -577,25 +564,25 @@
     {
         IAsset objResult = null;
         int nConnectImageType = getCurrentForeachConnectImageValue();
-        switch (nConnectImageType)
+        switch(nConnectImageType)
         {
-            case TreeRowObject.EMPTY_CONN_IMG:
-            {
-                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;
     }
@@ -605,7 +592,7 @@
      */
     public int getCurrentForeachConnectImageValue()
     {
-        return m_CurrentForeachConnectImageValue;
+        return m_currentForeachConnectImageValue;
     }
 
     /**
@@ -614,6 +601,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=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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,7 +72,8 @@
     }
 
     /**
-     * @see org.apache.tapestry.AbstractComponent#renderComponent(IMarkupWriter, IRequestCycle)
+     * @see org.apache.tapestry.AbstractComponent#renderComponent(IMarkupWriter,
+     *      IRequestCycle)
      */
 
     /**
@@ -88,10 +89,7 @@
      */
     public void pageBeginRender(PageEvent arg0)
     {
-        if (arg0.getRequestCycle().isRewinding())
-        {
-            return;
-        }
+        if (arg0.getRequestCycle().isRewinding()) { return; }
         storeSesion();
     }
 
@@ -188,7 +186,7 @@
                 LOG.debug("TreeView.extractTreeModel() from BINDING");
             }
 
-            m_objTreeModel = (ITreeModel) getTreeModelBinding().getObject();
+            m_objTreeModel = (ITreeModel)getTreeModelBinding().getObject();
         }
 
     }
@@ -216,10 +214,9 @@
         }
         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);
         }
     }
@@ -246,8 +243,7 @@
     {
         if (m_objSessionStoreManager == null && getSessionStoreManagerBinding() != null)
         {
-            m_objSessionStoreManager = (ISessionStoreManager) getSessionStoreManagerBinding()
-                    .getObject();
+            m_objSessionStoreManager = (ISessionStoreManager)getSessionStoreManagerBinding().getObject();
         }
 
         return m_objSessionStoreManager;
@@ -266,7 +262,7 @@
             if (objBinding != null)
             {
                 Object objManager = objBinding.getObject();
-                m_objTreeSessionStateManager = (ITreeSessionStateManager) objManager;
+                m_objTreeSessionStateManager = (ITreeSessionStateManager)objManager;
             }
             else
             {
@@ -342,8 +338,7 @@
      */
     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);
@@ -359,9 +354,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=368415&r1=368414&r2=368415&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 Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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,39 +24,42 @@
 /**
  * @author ceco
  */
-public abstract class TreeTable extends BaseComponent implements ITreeComponent{
+public abstract class TreeTable extends BaseComponent implements ITreeComponent
+{
 
-	/**
-	 * 
-	 */
-	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;
-	}
+    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;
+    }
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableColumn.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableColumn.java?rev=368415&r1=368414&r2=368415&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableColumn.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableColumn.java Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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.
@@ -25,22 +25,23 @@
  */
 public class TreeTableColumn extends SimpleTableColumn
 {
-	private static final long serialVersionUID = -8046804468741132535L;
 
-	/**
-	 * @param arg0
-	 * @param arg1
-	 */
-	public TreeTableColumn(String arg0, boolean arg1, ComponentAddress objComponentAddress) {
-		super(arg0, arg1);
-		setValueRendererSource(new TreeTableValueRenderSource(objComponentAddress));
-	}
-
-	/**
-	 * @see org.apache.tapestry.contrib.table.model.common.AbstractTableColumn#getValueRenderer(org.apache.tapestry.IRequestCycle, org.apache.tapestry.contrib.table.model.ITableModelSource, java.lang.Object)
-	 */
-	public IRender getValueRenderer(IRequestCycle arg0, ITableModelSource arg1, Object arg2) {
-		return super.getValueRenderer(arg0, arg1, arg2);
-	}
+    private static final long serialVersionUID = -8046804468741132535L;
+
+    public TreeTableColumn(String arg0, boolean arg1, ComponentAddress objComponentAddress)
+    {
+        super(arg0, arg1);
+        setValueRendererSource(new TreeTableValueRenderSource(objComponentAddress));
+    }
+
+    /**
+     * @see org.apache.tapestry.contrib.table.model.common.AbstractTableColumn#getValueRenderer(org.apache.tapestry.IRequestCycle,
+     *      org.apache.tapestry.contrib.table.model.ITableModelSource,
+     *      java.lang.Object)
+     */
+    public IRender getValueRenderer(IRequestCycle arg0, ITableModelSource arg1, Object arg2)
+    {
+        return super.getValueRenderer(arg0, arg1, arg2);
+    }
 
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.java?rev=368415&r1=368414&r2=368415&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.java Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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.
@@ -38,9 +38,9 @@
 
 /**
  */
-public abstract class TreeTableDataView extends BaseComponent implements ITreeRowSource,
-        PageDetachListener
+public abstract class TreeTableDataView extends BaseComponent implements ITreeRowSource, PageDetachListener
 {
+
     private int m_nTreeDeep = -1;
 
     private TreeRowObject m_objTreeRowObject = null;
@@ -73,7 +73,7 @@
 
     public ITreeModelSource getTreeModelSource()
     {
-        ITreeModelSource objSource = (ITreeModelSource) getPage().getRequestCycle().getAttribute(
+        ITreeModelSource objSource = (ITreeModelSource)getPage().getRequestCycle().getAttribute(
                 ITreeModelSource.TREE_MODEL_SOURCE_ATTRIBUTE);
 
         return objSource == null ? getTreeViewParameter() : objSource;
@@ -94,46 +94,27 @@
             Object objRootUID = objTreeDataModel.getUniqueKey(objRoot, null);
             if (getShowRootNode())
             {
-                walkTree(
-                        arrAllExpandedNodes,
-                        objRoot,
-                        objRootUID,
-                        0,
-                        objTreeModel,
-                        TreeRowObject.FIRST_LAST_ROW,
-                        new int[0],
-                        true);
+                walkTree(arrAllExpandedNodes, objRoot, objRootUID, 0, objTreeModel, TreeRowObject.FIRST_LAST_ROW,
+                        new int[0], true);
             }
             else
             {
                 int nChildenCount = objTreeModel.getTreeDataModel().getChildCount(objRoot);
-                int nRowPossiotionType = nChildenCount == 1 ? TreeRowObject.FIRST_LAST_ROW
-                        : TreeRowObject.FIRST_ROW;
+                int nRowPossiotionType = nChildenCount == 1 ? TreeRowObject.FIRST_LAST_ROW : TreeRowObject.FIRST_ROW;
                 boolean bFirst = true;
-                for (Iterator iter = objTreeModel.getTreeDataModel().getChildren(objRoot); iter
-                        .hasNext();)
+                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(
-                            arrAllExpandedNodes,
-                            objChild,
-                            objChildUID,
-                            0,
-                            objTreeModel,
-                            nRowPossiotionType,
-                            new int[0],
-                            bChildLast);
+                    walkTree(arrAllExpandedNodes, objChild, objChildUID, 0, objTreeModel, nRowPossiotionType,
+                            new int[0], bChildLast);
                     bFirst = false;
                 }
             }
@@ -144,16 +125,15 @@
         return m_arrAllExpandedNodes;
     }
 
-    public void walkTree(ArrayList arrAllExpandedNodes, Object objParent, Object objParentUID,
-            int nDepth, ITreeModel objTreeModel, int nRowPossiotionType, int[] arrConnectImages,
-            boolean bLast)
+    public void walkTree(ArrayList arrAllExpandedNodes, Object objParent, Object objParentUID, int nDepth,
+            ITreeModel objTreeModel, int nRowPossiotionType, int[] arrConnectImages, boolean bLast)
     {
         m_nTreeDeep = nDepth;
 
         int nNumberOfChildren = objTreeModel.getTreeDataModel().getChildCount(objParent);
         boolean bLeaf = (nNumberOfChildren == 0) ? true : false;
-        TreeRowObject objTreeRowObject = new TreeRowObject(objParent, objParentUID, nDepth, bLeaf,
-                nRowPossiotionType, arrConnectImages);
+        TreeRowObject objTreeRowObject = new TreeRowObject(objParent, objParentUID, nDepth, bLeaf, nRowPossiotionType,
+                arrConnectImages);
         arrAllExpandedNodes.add(objTreeRowObject);
 
         boolean bContain = objTreeModel.getTreeStateModel().isUniqueKeyExpanded(objParentUID);
@@ -163,29 +143,18 @@
             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;
             Iterator colChildren = objTreeModel.getTreeDataModel().getChildren(objParent);
-            for (Iterator iter = colChildren; iter.hasNext();)
+            for(Iterator iter = colChildren; 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(
-                        arrAllExpandedNodes,
-                        objChild,
-                        objChildUID,
-                        nDepth + 1,
-                        objTreeModel,
-                        nRowPossiotionType,
-                        arrConnectImagesNew,
-                        bChildLast);
+                else nRowPossiotionType = TreeRowObject.MIDDLE_ROW;
+                walkTree(arrAllExpandedNodes, objChild, objChildUID, nDepth + 1, objTreeModel, nRowPossiotionType,
+                        arrConnectImagesNew, bChildLast);
             }
         }
     }
@@ -201,8 +170,8 @@
     }
 
     /*
-     * public ITableModel getTableModel() { if(m_objTableModel == null){ m_objTableModel =
-     * createTableModel(); } return m_objTableModel; }
+     * public ITableModel getTableModel() { if(m_objTableModel == null){
+     * m_objTableModel = createTableModel(); } return m_objTableModel; }
      */
     public ITableModel getTableModel()
     {
@@ -215,8 +184,7 @@
         Object[] arrAllExpandedNodes = new Object[arrAllNodes.size()];
         arrAllNodes.toArray(arrAllExpandedNodes);
 
-        SimpleTableModel objTableModel = new SimpleTableModel(arrAllExpandedNodes,
-                getTableColunms());
+        SimpleTableModel objTableModel = new SimpleTableModel(arrAllExpandedNodes, getTableColunms());
         objTableModel.getPagingState().setPageSize(getEntriesPerTablePage());
 
         return objTableModel;
@@ -228,8 +196,7 @@
         arrColumnsList.add(new TreeTableColumn("Name", false, null));
 
         List arrTableColunms = getTableColumnsParameter();
-        if (arrTableColunms != null)
-            arrColumnsList.addAll(arrTableColunms);
+        if (arrTableColunms != null) arrColumnsList.addAll(arrTableColunms);
 
         ITableColumn[] arrColumns = new ITableColumn[arrColumnsList.size()];
         arrColumnsList.toArray(arrColumns);
@@ -253,8 +220,8 @@
     {
         SimpleListTableDataModel objDataModel = new SimpleListTableDataModel(generateNodeList());
         SimpleTableColumnModel objColumnModel = new SimpleTableColumnModel(getTableColunms());
-        SimpleTableSessionStateManager objStateManager = new SimpleTableSessionStateManager(
-                objDataModel, objColumnModel);
+        SimpleTableSessionStateManager objStateManager = new SimpleTableSessionStateManager(objDataModel,
+                objColumnModel);
         return objStateManager;
         // return NullTableSessionStateManager.NULL_STATE_MANAGER;
     }
@@ -265,8 +232,7 @@
      */
     protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
     {
-        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);
 
         super.renderComponent(writer, cycle);
@@ -280,8 +246,7 @@
      */
     public void renderBody(IMarkupWriter writer, IRequestCycle cycle)
     {
-        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);
 
         super.renderBody(writer, cycle);
@@ -300,4 +265,4 @@
     }
 
     public abstract boolean getShowRootNode();
-}
\ No newline at end of file
+}

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableNodeViewDelegator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableNodeViewDelegator.java?rev=368415&r1=368414&r2=368415&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableNodeViewDelegator.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableNodeViewDelegator.java Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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.
@@ -23,23 +23,22 @@
 /**
  * @author ceco
  */
-public abstract class TreeTableNodeViewDelegator extends BaseComponent implements ITableRendererListener{
+public abstract class TreeTableNodeViewDelegator extends BaseComponent implements ITableRendererListener
+{
 
-	/**
-	 * 
-	 */
-	public TreeTableNodeViewDelegator() {
-		super();
-	}
-
-	/**
-	 * @see org.apache.tapestry.contrib.table.model.ITableRendererListener#initializeRenderer(org.apache.tapestry.IRequestCycle, org.apache.tapestry.contrib.table.model.ITableModelSource, org.apache.tapestry.contrib.table.model.ITableColumn, java.lang.Object)
-	 */
-	public void initializeRenderer(
-		IRequestCycle arg0,
-		ITableModelSource arg1,
-		ITableColumn arg2,
-		Object arg3) {
-	}
+    public TreeTableNodeViewDelegator()
+    {
+
+    }
+
+    /**
+     * @see org.apache.tapestry.contrib.table.model.ITableRendererListener#initializeRenderer(org.apache.tapestry.IRequestCycle,
+     *      org.apache.tapestry.contrib.table.model.ITableModelSource,
+     *      org.apache.tapestry.contrib.table.model.ITableColumn,
+     *      java.lang.Object)
+     */
+    public void initializeRenderer(IRequestCycle arg0, ITableModelSource arg1, ITableColumn arg2, Object arg3)
+    {
+    }
 
 }

Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java?rev=368415&r1=368414&r2=368415&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableValueRenderSource.java Thu Jan 12 09:18:25 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005 The Apache Software Foundation
+// Copyright 2004, 2005, 2006 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.
@@ -27,53 +27,42 @@
  */
 public class TreeTableValueRenderSource implements ITableRendererSource
 {
-	private static final long serialVersionUID = 3237638859391458116L;
-	
-	private ComponentTableRendererSource m_objComponentRenderer;
-	private ComponentAddress m_objComponentAddress = null;
-
-	public TreeTableValueRenderSource()
-	{
-		m_objComponentRenderer = null;
-	}
-
-	public TreeTableValueRenderSource(ComponentAddress objComponentAddress)
-	{
-		m_objComponentAddress = objComponentAddress;
-	}
-
-	/**
-	 * @see org.apache.tapestry.contrib.table.model.ITableRendererSource#getRenderer(IRequestCycle, ITableModelSource, ITableColumn, Object)
-	 */
-	public IRender getRenderer(
-		IRequestCycle objCycle,
-		ITableModelSource objSource,
-		ITableColumn objColumn,
-		Object objRow)
-	{
-		if (m_objComponentRenderer == null)
-		{
-			synchronized (this)
-			{
-				if (m_objComponentRenderer == null)
-				{
-					
-					ComponentAddress objAddress = m_objComponentAddress;
-					if(m_objComponentAddress == null)
-						objAddress = new ComponentAddress(
-							"contrib:TreeTableNodeViewPage",
-							"treeTableNodeViewDelegator");
-					m_objComponentRenderer =
-						new ComponentTableRendererSource(objAddress);
-				}
-			}
-		}
-
-		return m_objComponentRenderer.getRenderer(
-			objCycle,
-			objSource,
-			objColumn,
-			objRow);
-	}
+
+    private static final long serialVersionUID = 3237638859391458116L;
+
+    private ComponentTableRendererSource m_objComponentRenderer;
+    private ComponentAddress m_objComponentAddress = null;
+
+    public TreeTableValueRenderSource()
+    {
+        m_objComponentRenderer = null;
+    }
+
+    public TreeTableValueRenderSource(ComponentAddress objComponentAddress)
+    {
+        m_objComponentAddress = objComponentAddress;
+    }
+
+    /**
+     * @see org.apache.tapestry.contrib.table.model.ITableRendererSource#getRenderer(IRequestCycle,
+     *      ITableModelSource, ITableColumn, Object)
+     */
+    public IRender getRenderer(IRequestCycle objCycle, ITableModelSource objSource, ITableColumn objColumn,
+            Object objRow)
+    {
+        synchronized(this)
+        {
+            if (m_objComponentRenderer == null)
+            {
+
+                ComponentAddress objAddress = m_objComponentAddress;
+                if (m_objComponentAddress == null)
+                    objAddress = new ComponentAddress("contrib:TreeTableNodeViewPage", "treeTableNodeViewDelegator");
+                m_objComponentRenderer = new ComponentTableRendererSource(objAddress);
+            }
+        }
+
+        return m_objComponentRenderer.getRenderer(objCycle, objSource, objColumn, objRow);
+    }
 
 }



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