froehlich 01/11/29 02:35:44
Modified: apps/db/src/java/org/apache/avalon/db/basic/data
BasicView.java BasicAggregateView.java
Log:
moved parsing logic from SimpleWhereClause and renamed it to
BasicCriteria. Parsing logic now in BasicLXSQLCriteriaHelper.
Revision Changes Path
1.9 +12 -12
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/data/BasicView.java
Index: BasicView.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/data/BasicView.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BasicView.java 2001/11/29 08:46:26 1.8
+++ BasicView.java 2001/11/29 10:35:44 1.9
@@ -14,8 +14,8 @@
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.DataException;
import org.apache.avalon.db.basic.actions.BasicSelectSimple;
-import org.apache.avalon.db.basic.actions.SimpleWhereClause;
-import
org.apache.avalon.db.basic.actions.SimpleWhereClauseMatchingRowCallback;
+import org.apache.avalon.db.basic.actions.BasicCriteria;
+import org.apache.avalon.db.basic.actions.BasicCriteriaMatchingRowCallback;
import java.util.Collection;
import java.util.Iterator;
@@ -25,23 +25,23 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class BasicView extends AbstractView {
- private SimpleWhereClause mSimpleWhereClause;
+ private BasicCriteria mBasicCriteria;
private Queryable mQueryable;
private RowListener mRowListener;
- public BasicView(String name, Column[] columns, Queryable queryable,
SimpleWhereClause whereClause) {
+ public BasicView(String name, Column[] columns, Queryable queryable,
BasicCriteria basicCriteria) {
super(name, columns);
- mSimpleWhereClause = whereClause;
+ mBasicCriteria = basicCriteria;
mQueryable = queryable;
mRowListener = new RowListener() {
public void rowAdded(Queryable queryable, Row row) {
try {
- if(mSimpleWhereClause.testDataRow((BasicRow) row)) {
+ if(mBasicCriteria.testDataRow((BasicRow) row)) {
addRow(row);
}
} catch (DataException de) {
@@ -57,7 +57,7 @@
public void rowChanged(Queryable queryable, Row row) {
try {
boolean exists = rowExists(row);
- if(mSimpleWhereClause.testDataRow((BasicRow) row)) {
+ if(mBasicCriteria.testDataRow((BasicRow) row)) {
if (exists) {
// do nothing
} else {
@@ -76,7 +76,7 @@
}
public void rowsAdded(Queryable queryable, Collection rows) {
- SimpleWhereClauseMatchingRowCallback cb = new
SimpleWhereClauseMatchingRowCallback() {
+ BasicCriteriaMatchingRowCallback cb = new
BasicCriteriaMatchingRowCallback() {
public void rowMatches(BasicRow row, boolean matches) {
if (matches) {
addRow(row);
@@ -86,7 +86,7 @@
}
};
try {
- mSimpleWhereClause.testDataRows(rows.iterator(), cb);
+ mBasicCriteria.testDataRows(rows.iterator(), cb);
} catch (DataException de) {
getLogger().debug("(BasicView) Some exception during
rowsAdded",de);
}
@@ -103,7 +103,7 @@
}
public void rowsChanged(Queryable queryable, Collection rows) {
- SimpleWhereClauseMatchingRowCallback cb = new
SimpleWhereClauseMatchingRowCallback() {
+ BasicCriteriaMatchingRowCallback cb = new
BasicCriteriaMatchingRowCallback() {
public void rowMatches(BasicRow row, boolean matches) {
boolean exists = rowExists(row);
if (matches) {
@@ -122,7 +122,7 @@
}
};
try {
- mSimpleWhereClause.testDataRows(rows.iterator(), cb);
+ mBasicCriteria.testDataRows(rows.iterator(), cb);
} catch (DataException de) {
getLogger().debug("(BasicView) Some exception during
rowsChanged",de);
}
1.3 +12 -12
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/data/BasicAggregateView.java
Index: BasicAggregateView.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/data/BasicAggregateView.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BasicAggregateView.java 2001/11/29 08:46:26 1.2
+++ BasicAggregateView.java 2001/11/29 10:35:44 1.3
@@ -15,8 +15,8 @@
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.DataException;
import org.apache.avalon.db.basic.actions.BasicSelectSimple;
-import org.apache.avalon.db.basic.actions.SimpleWhereClause;
-import
org.apache.avalon.db.basic.actions.SimpleWhereClauseMatchingRowCallback;
+import org.apache.avalon.db.basic.actions.BasicCriteria;
+import org.apache.avalon.db.basic.actions.BasicCriteriaMatchingRowCallback;
import java.util.Collection;
import java.util.Iterator;
@@ -26,23 +26,23 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class BasicAggregateView extends AbstractAggregateView {
- private SimpleWhereClause mSimpleWhereClause;
+ private BasicCriteria mBasicCriteria;
private Queryable mQueryable;
private RowListener mRowListener;
- public BasicAggregateView(String name, Column[] columns, Queryable
queryable, SimpleWhereClause whereClause) {
+ public BasicAggregateView(String name, Column[] columns, Queryable
queryable, BasicCriteria basicCriteria) {
super(name, columns);
- mSimpleWhereClause = whereClause;
+ mBasicCriteria = basicCriteria;
mQueryable = queryable;
mRowListener = new RowListener() {
public void rowAdded(Queryable queryable, Row row) {
try {
- if(mSimpleWhereClause.testDataRow((BasicRow) row)) {
+ if(mBasicCriteria.testDataRow((BasicRow) row)) {
addRow(row);
}
} catch (DataException de) {
@@ -58,7 +58,7 @@
public void rowChanged(Queryable queryable, Row row) {
try {
boolean exists = rowExists(row);
- if(mSimpleWhereClause.testDataRow((BasicRow) row)) {
+ if(mBasicCriteria.testDataRow((BasicRow) row)) {
if (exists) {
// do nothing
} else {
@@ -77,7 +77,7 @@
}
public void rowsAdded(Queryable queryable, Collection rows) {
- SimpleWhereClauseMatchingRowCallback cb = new
SimpleWhereClauseMatchingRowCallback() {
+ BasicCriteriaMatchingRowCallback cb = new
BasicCriteriaMatchingRowCallback() {
public void rowMatches(BasicRow row, boolean matches) {
if (matches) {
addRow(row);
@@ -87,7 +87,7 @@
}
};
try {
- mSimpleWhereClause.testDataRows(rows.iterator(), cb);
+ mBasicCriteria.testDataRows(rows.iterator(), cb);
} catch (DataException de) {
getLogger().debug("(BasicView) Some exception during
rowsAdded",de);
}
@@ -104,7 +104,7 @@
}
public void rowsChanged(Queryable queryable, Collection rows) {
- SimpleWhereClauseMatchingRowCallback cb = new
SimpleWhereClauseMatchingRowCallback() {
+ BasicCriteriaMatchingRowCallback cb = new
BasicCriteriaMatchingRowCallback() {
public void rowMatches(BasicRow row, boolean matches) {
boolean exists = rowExists(row);
if (matches) {
@@ -123,7 +123,7 @@
}
};
try {
- mSimpleWhereClause.testDataRows(rows.iterator(), cb);
+ mBasicCriteria.testDataRows(rows.iterator(), cb);
} catch (DataException de) {
getLogger().debug("(BasicView) Some exception during
rowsChanged",de);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
