Author: mindbridge
Date: Sun Oct 23 10:37:12 2005
New Revision: 327816
URL: http://svn.apache.org/viewcvs?rev=327816&view=rev
Log:
[TAPESTRY-702] Fixed. The ultimate crime here was using
caching for static variables. The caching has been removed
as there is context-specific caching in the page source
anyway.
In general the whole code should be refactored
and should use the tools provided by HiveMind,
but that is for the next version.
Modified:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnFormRendererSource.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnRendererSource.java
Modified:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java?rev=327816&r1=327815&r2=327816&view=diff
==============================================================================
---
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java
(original)
+++
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java
Sun Oct 23 10:37:12 2005
@@ -31,6 +31,9 @@
public class SimpleTableColumn extends AbstractTableColumn
{
private static final long serialVersionUID = 1L;
+
+ // TODO: Unify SimpleTableColumnRendererSource and
SimpleTableColumnFormRendererSource
+ // and implement the configuration with HiveMind
public static final ITableRendererSource DEFAULT_COLUMN_RENDERER_SOURCE =
new SimpleTableColumnRendererSource();
Modified:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnFormRendererSource.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnFormRendererSource.java?rev=327816&r1=327815&r2=327816&view=diff
==============================================================================
---
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnFormRendererSource.java
(original)
+++
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnFormRendererSource.java
Sun Oct 23 10:37:12 2005
@@ -37,13 +37,6 @@
{
private static final long serialVersionUID = 1L;
- private ComponentTableRendererSource m_objComponentRenderer;
-
- public SimpleTableColumnFormRendererSource()
- {
- m_objComponentRenderer = null;
- }
-
/**
* @see
org.apache.tapestry.contrib.table.model.ITableRendererSource#getRenderer(IRequestCycle,
ITableModelSource, ITableColumn, Object)
*/
@@ -53,24 +46,15 @@
ITableColumn objColumn,
Object objRow)
{
- if (m_objComponentRenderer == null)
- {
- synchronized (this)
- {
- if (m_objComponentRenderer == null)
- {
- ComponentAddress objAddress =
- new ComponentAddress(
-
objSource.getNamespace(),
- "SimpleTableColumnPage",
-
"tableColumnFormComponent");
- m_objComponentRenderer =
- new
ComponentTableRendererSource(objAddress);
- }
- }
- }
+ ComponentAddress objAddress =
+ new ComponentAddress(
+ objSource.getNamespace(),
+ "SimpleTableColumnPage",
+ "tableColumnFormComponent");
+ ComponentTableRendererSource objComponentRenderer =
+ new ComponentTableRendererSource(objAddress);
- return m_objComponentRenderer.getRenderer(
+ return objComponentRenderer.getRenderer(
objCycle,
objSource,
objColumn,
Modified:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnRendererSource.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnRendererSource.java?rev=327816&r1=327815&r2=327816&view=diff
==============================================================================
---
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnRendererSource.java
(original)
+++
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumnRendererSource.java
Sun Oct 23 10:37:12 2005
@@ -37,11 +37,8 @@
{
private static final long serialVersionUID = 1L;
- private ComponentTableRendererSource m_objComponentRenderer;
-
public SimpleTableColumnRendererSource()
{
- m_objComponentRenderer = null;
}
/**
@@ -53,24 +50,15 @@
ITableColumn objColumn,
Object objRow)
{
- if (m_objComponentRenderer == null)
- {
- synchronized (this)
- {
- if (m_objComponentRenderer == null)
- {
- ComponentAddress objAddress =
- new ComponentAddress(
-
objSource.getNamespace(),
- "SimpleTableColumnPage",
- "tableColumnComponent");
- m_objComponentRenderer =
- new
ComponentTableRendererSource(objAddress);
- }
- }
- }
+ ComponentAddress objAddress =
+ new ComponentAddress(
+ objSource.getNamespace(),
+ "SimpleTableColumnPage",
+ "tableColumnComponent");
+ ComponentTableRendererSource objComponentRenderer =
+ new ComponentTableRendererSource(objAddress);
- return m_objComponentRenderer.getRenderer(
+ return objComponentRenderer.getRenderer(
objCycle,
objSource,
objColumn,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]