From d45f45768f7bed11a568af50705a7721bd4f36cd Mon Sep 17 00:00:00 2001 From: Jeremy Grelle Date: Wed, 14 Jan 2009 20:50:03 +0000 Subject: [PATCH] SWF-1018 - Update SelectionAware interface to make currentRowSelected a proper JavaBean property --- .../faces/model/ManySelectionTrackingListDataModel.java | 2 +- .../faces/model/OneSelectionTrackingListDataModel.java | 2 +- .../java/org/springframework/faces/model/SelectionAware.java | 2 +- .../faces/model/SelectionTrackingActionListener.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-faces/src/main/java/org/springframework/faces/model/ManySelectionTrackingListDataModel.java b/spring-faces/src/main/java/org/springframework/faces/model/ManySelectionTrackingListDataModel.java index 38557676..aeed1946 100644 --- a/spring-faces/src/main/java/org/springframework/faces/model/ManySelectionTrackingListDataModel.java +++ b/spring-faces/src/main/java/org/springframework/faces/model/ManySelectionTrackingListDataModel.java @@ -53,7 +53,7 @@ public class ManySelectionTrackingListDataModel extends SerializableListDataMode selections.addAll((List) getWrappedData()); } - public void setSelected(boolean rowSelected) { + public void setCurrentRowSelected(boolean rowSelected) { if (!isRowAvailable()) { return; } diff --git a/spring-faces/src/main/java/org/springframework/faces/model/OneSelectionTrackingListDataModel.java b/spring-faces/src/main/java/org/springframework/faces/model/OneSelectionTrackingListDataModel.java index b22a75ec..dbb496ec 100644 --- a/spring-faces/src/main/java/org/springframework/faces/model/OneSelectionTrackingListDataModel.java +++ b/spring-faces/src/main/java/org/springframework/faces/model/OneSelectionTrackingListDataModel.java @@ -63,7 +63,7 @@ public class OneSelectionTrackingListDataModel extends SerializableListDataModel } } - public void setSelected(boolean rowSelected) { + public void setCurrentRowSelected(boolean rowSelected) { if (!isRowAvailable()) { return; } diff --git a/spring-faces/src/main/java/org/springframework/faces/model/SelectionAware.java b/spring-faces/src/main/java/org/springframework/faces/model/SelectionAware.java index f809910a..ccf78ec8 100644 --- a/spring-faces/src/main/java/org/springframework/faces/model/SelectionAware.java +++ b/spring-faces/src/main/java/org/springframework/faces/model/SelectionAware.java @@ -36,7 +36,7 @@ public interface SelectionAware { * Sets whether the row pointed to by the model's current index is selected * @param rowSelected true to select the current row */ - public void setSelected(boolean rowSelected); + public void setCurrentRowSelected(boolean rowSelected); /** * Sets the list of selected row data objects for the model. diff --git a/spring-faces/src/main/java/org/springframework/faces/model/SelectionTrackingActionListener.java b/spring-faces/src/main/java/org/springframework/faces/model/SelectionTrackingActionListener.java index 6e9d1f5c..5ad4e686 100644 --- a/spring-faces/src/main/java/org/springframework/faces/model/SelectionTrackingActionListener.java +++ b/spring-faces/src/main/java/org/springframework/faces/model/SelectionTrackingActionListener.java @@ -64,7 +64,7 @@ public class SelectionTrackingActionListener implements ActionListener { if (valueAccessor != null) { Object value = ReflectionUtils.invokeMethod(valueAccessor, parent); if (value != null && value instanceof SelectionAware) { - ((SelectionAware) value).setSelected(true); + ((SelectionAware) value).setCurrentRowSelected(true); if (logger.isDebugEnabled()) { logger.debug("Row selection has been set on the current SelectionAware data model."); }