Author: mindbridge
Date: Sun Mar 12 02:39:43 2006
New Revision: 385274
URL: http://svn.apache.org/viewcvs?rev=385274&view=rev
Log:
Modifying the Table component so that it works correctly
even if the data is initialized in pageBeginRender
Added:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/TableActionColumnSort.java
Modified:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.java
Modified:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.java?rev=385274&r1=385273&r2=385274&view=diff
==============================================================================
---
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.java
(original)
+++
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.java
Sun Mar 12 02:39:43 2006
@@ -144,20 +144,8 @@
ComponentAddress objAddr = (ComponentAddress) arrArgs[0];
String strColumnName = (String) arrArgs[1];
- ITableModelSource objSource =
- (ITableModelSource) objAddr.findComponent(objCycle);
- ITableModel objModel = objSource.getTableModel();
-
- ITableSortingState objState = objModel.getSortingState();
- if (strColumnName.equals(objState.getSortColumn()))
- objState.setSortColumn(strColumnName,
!objState.getSortOrder());
- else
- objState.setSortColumn(
- strColumnName,
- ITableSortingState.SORT_ASCENDING);
-
- // ensure that the change is saved
- objSource.fireObservedStateChange();
- }
+ ITableModelSource objSource =
(ITableModelSource)objAddr.findComponent(objCycle);
+ objSource.storeTableAction(new TableActionColumnSort(strColumnName));
+ }
}
Modified:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.java?rev=385274&r1=385273&r2=385274&view=diff
==============================================================================
---
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.java
(original)
+++
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.java
Sun Mar 12 02:39:43 2006
@@ -41,7 +41,6 @@
extends BaseComponent
implements ITableRendererListener
{
-
public abstract ITableColumn getTableColumn();
public abstract void setTableColumn(ITableColumn objColumn);
@@ -121,16 +120,8 @@
public void columnSelected(IRequestCycle objCycle)
{
String strColumnName = getSelectedColumnName();
- ITableSortingState objState = getTableModel().getSortingState();
- if (strColumnName.equals(objState.getSortColumn()))
- objState.setSortColumn(strColumnName,
!objState.getSortOrder());
- else
- objState.setSortColumn(
- strColumnName,
- ITableSortingState.SORT_ASCENDING);
-
- // ensure that the change is saved
- getTableModelSource().fireObservedStateChange();
- }
+ ITableModelSource objSource = getTableModelSource();
+ objSource.storeTableAction(new TableActionColumnSort(strColumnName));
+ }
}
Added:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/TableActionColumnSort.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/TableActionColumnSort.java?rev=385274&view=auto
==============================================================================
---
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/TableActionColumnSort.java
(added)
+++
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/TableActionColumnSort.java
Sun Mar 12 02:39:43 2006
@@ -0,0 +1,45 @@
+// Copyright 2004, 2005 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package org.apache.tapestry.contrib.table.components.inserted;
+
+import org.apache.tapestry.contrib.table.model.ITableAction;
+import org.apache.tapestry.contrib.table.model.ITableModel;
+import org.apache.tapestry.contrib.table.model.ITableSortingState;
+
+
+/**
+ * <p>A table action that configures the table sorting to use a given
column</p>
+ *
+ * @author teo
+ */
+public class TableActionColumnSort implements ITableAction
+{
+ private String m_strColumnName;
+
+ public TableActionColumnSort(String name)
+ {
+ m_strColumnName = name;
+ }
+
+ /**
+ * [EMAIL PROTECTED]
+ */
+ public void executeTableAction(ITableModel objTableModel)
+ {
+ ITableSortingState objState = objTableModel.getSortingState();
+ if (m_strColumnName.equals(objState.getSortColumn()))
+ objState.setSortColumn(m_strColumnName, !objState.getSortOrder());
+ else objState.setSortColumn(m_strColumnName,
ITableSortingState.SORT_ASCENDING);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
