You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2017/09/17 12:29:47 UTC
[myfaces-trinidad] 04/12: TRINIDAD-1620 remove the new API members
from this branch
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.12.1.2-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad.git
commit e6282227298a3881b421b08636ef5ad7fb734d57
Author: Andrew Robinson <ar...@apache.org>
AuthorDate: Wed Jan 13 23:32:23 2010 +0000
TRINIDAD-1620 remove the new API members from this branch
---
.../myfaces/trinidad/component/UIXCollection.java | 55 ---
.../myfaces/trinidad/model/CollectionModel.java | 148 -------
.../trinidad/model/CollectionModelDecorator.java | 474 ++++++++++-----------
.../apache/myfaces/trinidad/model/RowKeyIndex.java | 43 --
4 files changed, 227 insertions(+), 493 deletions(-)
diff --git a/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java b/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
index 902ad22..05b76e6 100644
--- a/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
+++ b/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
@@ -328,61 +328,6 @@ public abstract class UIXCollection extends UIXComponentBase
return getCollectionModel().isRowAvailable();
}
- /**
- * Check for an available row by row key.
- * @param rowKey the row key for the row to check.
- * @return true if a value exists; false otherwise.
- */
- public final boolean isRowAvailable(Object rowKey)
- {
- return getCollectionModel().isRowAvailable(rowKey);
- }
-
- /**
- * Get row data by row key.
- * @param rowKey the row key for the row to get data.
- * @return row data
- */
- public final Object getRowData(Object rowKey)
- {
- return getCollectionModel().getRowData(rowKey);
- }
-
- /**
- * Check if a range of rows is available starting from the current position
- * @param rowCount number of rows to check
- * @return true if all rows in range are available
- */
- public final boolean areRowsAvailable(int rowCount)
- {
- return getCollectionModel().areRowsAvailable(rowCount);
- }
-
- /**
- * Check if a range of rows is available from a starting index without
- * requiring the client to iterate over the rows
- * @param startIndex the starting index for the range
- * @param rowCount number of rows to check
- * @return true if all rows in range are available
- */
- public final boolean areRowsAvailable(int startIndex, int rowCount)
- {
- return getCollectionModel().areRowsAvailable(startIndex, rowCount);
- }
-
- /**
- * Check if a range of rows is available from a starting row key without
- * requiring the client to iterate over the rows
- * @param startRowKey the starting row key for the range
- * @param rowCount number of rows to check
- * @return true if all rows in range are available
- */
- public final boolean areRowsAvailable(Object startRowKey, int rowCount)
- {
- return getCollectionModel().areRowsAvailable(startRowKey, rowCount);
- }
-
-
/**
* Gets the total number of rows in this table.
diff --git a/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/CollectionModel.java b/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/CollectionModel.java
index b30ca01..72eec48 100644
--- a/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/CollectionModel.java
+++ b/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/CollectionModel.java
@@ -94,30 +94,6 @@ public abstract class CollectionModel extends DataModel
}
/**
- * Check for an available row by row key.
- * This method makes the given row current and calls
- * {@link #isRowAvailable()}.
- * Finally, the row that was current before this method was called
- * is made current again.
- * @see CollectionModel#isRowAvailable()
- * @param rowKey the row key for the row to check.
- * @return true if data for the row exists otherwise return false
- */
- public boolean isRowAvailable(Object rowKey)
- {
- Object oldKey = getRowKey();
- try
- {
- setRowKey(rowKey);
- return isRowAvailable();
- }
- finally
- {
- setRowKey(oldKey);
- }
- }
-
- /**
* Gets the rowData at the given index.
* This method makes the given row current and calls
* {@link #getRowData()}.
@@ -142,30 +118,6 @@ public abstract class CollectionModel extends DataModel
}
/**
- * Gets the rowData at the given row key.
- * This method makes the given row current and calls
- * {@link #getRowData()}.
- * Finally, the row that was current before this method was called
- * is made current again.
- * @see CollectionModel#getRowData()
- * @param rowKey the row key of the row to get data from.
- * @return the data for the given row.
- */
- public Object getRowData(Object rowKey)
- {
- Object oldKey = getRowKey();
- try
- {
- setRowKey(rowKey);
- return getRowData();
- }
- finally
- {
- setRowKey(oldKey);
- }
- }
-
- /**
* Return true if this collection is sortable by the given property.
* This implementation always returns false;
*/
@@ -198,111 +150,12 @@ public abstract class CollectionModel extends DataModel
{
}
- /**
- * Check if a range of rows is available from a starting index.
- * The current row does not change after this call
- * @param startIndex the starting index for the range
- * @param rowsToCheck number of rows to check. If rowsToCheck < 0 set
- * startIndex = startIndex - abs(rowsToCheck) + 1. This
- * allows for checking for row availability from the end position. For example
- * to check for availability of n rows from the end, call
- * isRangeAvailable(getRowCount()-1, -n)
- * @return true if rows are available otherwise return <code>false</code>
- */
- public boolean areRowsAvailable(int startIndex, int rowsToCheck)
- {
- int oldIndex = getRowIndex();
- try
- {
- if (rowsToCheck < 0)
- {
- rowsToCheck = Math.abs(rowsToCheck);
- startIndex = startIndex - rowsToCheck + 1;
- }
- setRowIndex(startIndex);
- return areRowsAvailable(rowsToCheck);
- }
- finally
- {
- setRowIndex(oldIndex);
- }
- }
-
- /**
- * Check if a range of rows is available from a starting row key
- * This method makes the row with the given row key current and calls
- * {@link #areRowsAvailable(rowsToCheck)}.
- * The current row does not change after this call
- * @see CollectionModel#areRowsAvailable(int).
- * @param startRowKey the starting row key for the range
- * @param rowsToCheck number of rows to check
- * @return true if rows are available otherwise return false
- */
- public boolean areRowsAvailable(Object startRowKey, int rowsToCheck)
- {
- Object oldKey = getRowKey();
- try
- {
- setRowKey(startRowKey);
- return areRowsAvailable(rowsToCheck);
- }
- finally
- {
- setRowKey(oldKey);
- }
- }
-
- /**
- * Check if a range of rows is available starting from the
- * current row. This implementation checks the start and end rows in the range
- * for availability. If the number of requested rows is greater than the total
- * row count, this implementation checks for available rows up to the row count.
- * The current row does not change after this call
- * @param rowsToCheck number of rows to check
- * @return true rows are available otherwise return false
- */
- public boolean areRowsAvailable(int rowsToCheck)
- {
- int startIndex = getRowIndex();
-
- if (startIndex < 0 || rowsToCheck <= 0)
- return false;
-
-
- long count = getRowCount();
- if (count != -1)
- {
- if (startIndex >= count)
- return false;
-
- if (startIndex + rowsToCheck > count)
- rowsToCheck = (int)count - startIndex;
- }
- int last = startIndex + rowsToCheck - 1;
-
- try
- {
- // check start index
- if (!isRowAvailable())
- return false;
-
- // check end index
- setRowIndex(last);
- return isRowAvailable();
- }
- finally
- {
- setRowIndex(startIndex);
- }
- }
-
//
// Below is the default implemenation for the LocalRowKeyIndex interface.
//
/**
* Check if a range of rows is locally available starting from a row index.
- * @see CollectionModel#areRowsAvailable(int, int)
* @param startIndex starting row index to check
* @param rowsToCheck number of rows to check
* @return default implementation returns <code>false</code>
@@ -315,7 +168,6 @@ public abstract class CollectionModel extends DataModel
/**
* Check if a range of rows is locally available starting from a row key.
- * @see CollectionModel#areRowsAvailable(Object, int)
* @param startRowKey starting row key to check
* @param rowsToCheck number of rows to check
* @return default implementation returns <code>false</code>
diff --git a/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/CollectionModelDecorator.java b/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/CollectionModelDecorator.java
index b70d979..38732ca 100644
--- a/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/CollectionModelDecorator.java
+++ b/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/CollectionModelDecorator.java
@@ -1,247 +1,227 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.myfaces.trinidad.model;
-
-import java.util.List;
-
-/**
- * <p>
- * Used by anybody who wants to wrap the <code>CollectionModel</code> class.
- * </p>
- * <p>
- * This class simply delegates all the CollectionModel functionalities to the wrapped class.
- * </p>
- * The wrapped CollectionModel is returned by the <code>getCollectionModel</code> method. And that
- * method needs to be overriden by the subclasses.
- * @see #getCollectionModel
- */
-public abstract class CollectionModelDecorator
- extends CollectionModel
-{
- public Object getRowKey()
- {
- return getCollectionModel().getRowKey();
- }
-
- public void setRowKey(Object key)
- {
- getCollectionModel().setRowKey(key);
- }
-
- public boolean isRowAvailable(int rowIndex)
- {
- return getCollectionModel().isRowAvailable(rowIndex);
- }
-
- public boolean isRowAvailable(Object rowKey)
- {
- return getCollectionModel().isRowAvailable(rowKey);
- }
-
- public Object getRowData(int rowIndex)
- {
- return getCollectionModel().getRowData(rowIndex);
- }
-
- public boolean isSortable(String property)
- {
- return getCollectionModel().isSortable(property);
- }
-
- public List<SortCriterion> getSortCriteria()
- {
- return getCollectionModel().getSortCriteria();
- }
-
- public void setSortCriteria(List<SortCriterion> criteria)
- {
- getCollectionModel().setSortCriteria(criteria);
- }
-
- public boolean areRowsAvailable(int startIndex, int rowCount)
- {
- return getCollectionModel().areRowsAvailable(startIndex, rowCount);
- }
-
- public boolean areRowsAvailable(Object startRowKey, int rowCount)
- {
- return getCollectionModel().areRowsAvailable(startRowKey, rowCount);
- }
-
- public boolean areRowsAvailable(int rowCount)
- {
- return getCollectionModel().areRowsAvailable(rowCount);
- }
-
- //
- // below are the LocalRowKeyIndex APIs
- //
-
- public boolean areRowsLocallyAvailable(int startIndex, int rowCount)
- {
- return getCollectionModel().areRowsLocallyAvailable(startIndex, rowCount);
- }
-
- public boolean areRowsLocallyAvailable(Object startRowKey, int rowCount)
- {
- return getCollectionModel().areRowsLocallyAvailable(startRowKey, rowCount);
- }
-
- public boolean areRowsLocallyAvailable(int rowCount)
- {
- return getCollectionModel().areRowsLocallyAvailable(rowCount);
- }
-
- public boolean isRowLocallyAvailable(int rowIndex)
- {
- return getCollectionModel().isRowLocallyAvailable(rowIndex);
- }
-
- public boolean isRowLocallyAvailable(Object rowKey)
- {
- return getCollectionModel().isRowLocallyAvailable(rowKey);
- }
-
- public int getEstimatedRowCount()
- {
- return getCollectionModel().getEstimatedRowCount();
- }
-
- public LocalRowKeyIndex.Confidence getEstimatedRowCountConfidence()
- {
- return getCollectionModel().getEstimatedRowCountConfidence();
- }
-
- /**
- * clear all rows from the local cache
- */
- public void clearLocalCache()
- {
- getCollectionModel().clearLocalCache();
- }
-
- /**
- * Clear the requested range of rows from the local cache
- * @param startingIndex starting row index for the range to clear
- * @param rowsToClear number of rows to clear from the cache
- */
- public void clearCachedRows(int startingIndex, int rowsToClear)
- {
- getCollectionModel().clearCachedRows(startingIndex, rowsToClear);
- }
-
- /**
- * Clear the requested range of rows from the local cache
- * @param startingRowKey starting row key for the range to clear
- * @param rowsToClear number of rows to clear from the cache
- */
- public void clearCachedRows(Object startingRowKey, int rowsToClear)
- {
- getCollectionModel().clearCachedRows(startingRowKey, rowsToClear);
- }
-
- /**
- * Clear a row from the local cache by row index
- * @param index row index for the row to clear from the cache
- */
- public void clearCachedRow(int index)
- {
- getCollectionModel().clearCachedRow(index);
- }
-
- /**
- * Clear a row from the local cache by row key
- * @param rowKey row key for the row to clear from the cache
- */
- public void clearCachedRow(Object rowKey)
- {
- getCollectionModel().clearCachedRow(rowKey);
- }
-
- /**
- * Indicates the caching strategy supported by the model
- * @see LocalCachingStrategy
- * @return caching strategy supported by the model
- */
- public LocalRowKeyIndex.LocalCachingStrategy getCachingStrategy()
- {
- return getCollectionModel().getCachingStrategy();
- }
-
- //
- // below are the DataModel public APIs
- //
- public boolean isRowAvailable()
- {
- return getCollectionModel().isRowAvailable();
- }
-
- public int getRowCount()
- {
- return getCollectionModel().getRowCount();
- }
-
- public Object getRowData()
- {
- return getCollectionModel().getRowData();
- }
-
- public int getRowIndex()
- {
- return getCollectionModel().getRowIndex();
- }
-
- public void setRowIndex(int i)
- {
- getCollectionModel().setRowIndex(i);
- }
-
- public Object getWrappedData()
- {
- return getCollectionModel().getWrappedData();
- }
-
- public void setWrappedData(Object object)
- {
- getCollectionModel().setWrappedData(object);
- }
-
- public void addDataModelListener(javax.faces.model.DataModelListener listener)
- {
- getCollectionModel().addDataModelListener(listener);
- }
-
- public javax.faces.model.DataModelListener[] getDataModelListeners()
- {
- return getCollectionModel().getDataModelListeners();
- }
-
- public void removeDataModelListener(javax.faces.model.DataModelListener listener)
- {
- getCollectionModel().removeDataModelListener(listener);
- }
-
- /**
- * This method returns the wrapped <code>CollectionModel</code>.
- *
- * @return the wrapped CollectionModel
- */
- protected abstract CollectionModel getCollectionModel();
-}
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.myfaces.trinidad.model;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Used by anybody who wants to wrap the <code>CollectionModel</code> class.
+ * </p>
+ * <p>
+ * This class simply delegates all the CollectionModel functionalities to the wrapped class.
+ * </p>
+ * The wrapped CollectionModel is returned by the <code>getCollectionModel</code> method. And that
+ * method needs to be overriden by the subclasses.
+ * @see #getCollectionModel
+ */
+public abstract class CollectionModelDecorator
+ extends CollectionModel
+{
+ public Object getRowKey()
+ {
+ return getCollectionModel().getRowKey();
+ }
+
+ public void setRowKey(Object key)
+ {
+ getCollectionModel().setRowKey(key);
+ }
+
+ public boolean isRowAvailable(int rowIndex)
+ {
+ return getCollectionModel().isRowAvailable(rowIndex);
+ }
+
+ public Object getRowData(int rowIndex)
+ {
+ return getCollectionModel().getRowData(rowIndex);
+ }
+
+ public boolean isSortable(String property)
+ {
+ return getCollectionModel().isSortable(property);
+ }
+
+ public List<SortCriterion> getSortCriteria()
+ {
+ return getCollectionModel().getSortCriteria();
+ }
+
+ public void setSortCriteria(List<SortCriterion> criteria)
+ {
+ getCollectionModel().setSortCriteria(criteria);
+ }
+
+ //
+ // below are the LocalRowKeyIndex APIs
+ //
+
+ public boolean areRowsLocallyAvailable(int startIndex, int rowCount)
+ {
+ return getCollectionModel().areRowsLocallyAvailable(startIndex, rowCount);
+ }
+
+ public boolean areRowsLocallyAvailable(Object startRowKey, int rowCount)
+ {
+ return getCollectionModel().areRowsLocallyAvailable(startRowKey, rowCount);
+ }
+
+ public boolean areRowsLocallyAvailable(int rowCount)
+ {
+ return getCollectionModel().areRowsLocallyAvailable(rowCount);
+ }
+
+ public boolean isRowLocallyAvailable(int rowIndex)
+ {
+ return getCollectionModel().isRowLocallyAvailable(rowIndex);
+ }
+
+ public boolean isRowLocallyAvailable(Object rowKey)
+ {
+ return getCollectionModel().isRowLocallyAvailable(rowKey);
+ }
+
+ public int getEstimatedRowCount()
+ {
+ return getCollectionModel().getEstimatedRowCount();
+ }
+
+ public LocalRowKeyIndex.Confidence getEstimatedRowCountConfidence()
+ {
+ return getCollectionModel().getEstimatedRowCountConfidence();
+ }
+
+ /**
+ * clear all rows from the local cache
+ */
+ public void clearLocalCache()
+ {
+ getCollectionModel().clearLocalCache();
+ }
+
+ /**
+ * Clear the requested range of rows from the local cache
+ * @param startingIndex starting row index for the range to clear
+ * @param rowsToClear number of rows to clear from the cache
+ */
+ public void clearCachedRows(int startingIndex, int rowsToClear)
+ {
+ getCollectionModel().clearCachedRows(startingIndex, rowsToClear);
+ }
+
+ /**
+ * Clear the requested range of rows from the local cache
+ * @param startingRowKey starting row key for the range to clear
+ * @param rowsToClear number of rows to clear from the cache
+ */
+ public void clearCachedRows(Object startingRowKey, int rowsToClear)
+ {
+ getCollectionModel().clearCachedRows(startingRowKey, rowsToClear);
+ }
+
+ /**
+ * Clear a row from the local cache by row index
+ * @param index row index for the row to clear from the cache
+ */
+ public void clearCachedRow(int index)
+ {
+ getCollectionModel().clearCachedRow(index);
+ }
+
+ /**
+ * Clear a row from the local cache by row key
+ * @param rowKey row key for the row to clear from the cache
+ */
+ public void clearCachedRow(Object rowKey)
+ {
+ getCollectionModel().clearCachedRow(rowKey);
+ }
+
+ /**
+ * Indicates the caching strategy supported by the model
+ * @see LocalCachingStrategy
+ * @return caching strategy supported by the model
+ */
+ public LocalRowKeyIndex.LocalCachingStrategy getCachingStrategy()
+ {
+ return getCollectionModel().getCachingStrategy();
+ }
+
+ //
+ // below are the DataModel public APIs
+ //
+ public boolean isRowAvailable()
+ {
+ return getCollectionModel().isRowAvailable();
+ }
+
+ public int getRowCount()
+ {
+ return getCollectionModel().getRowCount();
+ }
+
+ public Object getRowData()
+ {
+ return getCollectionModel().getRowData();
+ }
+
+ public int getRowIndex()
+ {
+ return getCollectionModel().getRowIndex();
+ }
+
+ public void setRowIndex(int i)
+ {
+ getCollectionModel().setRowIndex(i);
+ }
+
+ public Object getWrappedData()
+ {
+ return getCollectionModel().getWrappedData();
+ }
+
+ public void setWrappedData(Object object)
+ {
+ getCollectionModel().setWrappedData(object);
+ }
+
+ public void addDataModelListener(javax.faces.model.DataModelListener listener)
+ {
+ getCollectionModel().addDataModelListener(listener);
+ }
+
+ public javax.faces.model.DataModelListener[] getDataModelListeners()
+ {
+ return getCollectionModel().getDataModelListeners();
+ }
+
+ public void removeDataModelListener(javax.faces.model.DataModelListener listener)
+ {
+ getCollectionModel().removeDataModelListener(listener);
+ }
+
+ /**
+ * This method returns the wrapped <code>CollectionModel</code>.
+ *
+ * @return the wrapped CollectionModel
+ */
+ protected abstract CollectionModel getCollectionModel();
+}
+
diff --git a/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeyIndex.java b/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeyIndex.java
index b3b88ab..bda1217 100644
--- a/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeyIndex.java
+++ b/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeyIndex.java
@@ -94,47 +94,4 @@ public interface RowKeyIndex
* @return null if the current value has been cleared.
*/
public Object getRowData(int rowIndex);
-
-
- /**
- * Check for an available row by row key.
- * @param rowKey the row key for the row to check.
- * @return true if a value exists; false otherwise.
- */
- public boolean isRowAvailable(Object rowKey);
-
-
- /**
- * Get row data by row key.
- * @param rowKey the row key for the row to get data.
- * @return row data
- */
- public Object getRowData(Object rowKey);
-
-
- /**
- * Check if a range of rows is available starting from the current position
- * @param rowsToCheck number of rows to check
- * @return true if all rows in range are available
- */
- public boolean areRowsAvailable(int rowsToCheck);
-
- /**
- * Check if a range of rows is available from a starting index without
- * requiring the client to iterate over the rows
- * @param startIndex the starting index for the range
- * @param rowsToCheck number of rows to check
- * @return true if all rows in range are available
- */
- public boolean areRowsAvailable(int startIndex, int rowsToCheck) ;
-
-
- /**
- * Check if a range of rows is available from a starting row key without
- * requiring the client to iterate over the rows
- * @param startRowKey the starting row key for the range
- * @param rowsToCheck number of rows to check
- * @return true if all rows in range are available
- */
- public boolean areRowsAvailable(Object startRowKey, int rowsToCheck) ;
}
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.