Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 69352 invoked from network); 13 Jan 2002 11:21:32 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 13 Jan 2002 11:21:32 -0000 Received: (qmail 27479 invoked by uid 97); 13 Jan 2002 11:21:46 -0000 Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org Received: (qmail 27463 invoked by uid 97); 13 Jan 2002 11:21:45 -0000 Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list avalon-cvs@jakarta.apache.org Received: (qmail 27452 invoked by uid 97); 13 Jan 2002 11:21:45 -0000 Date: 13 Jan 2002 11:21:28 -0000 Message-ID: <20020113112128.98294.qmail@icarus.apache.org> From: hammant@apache.org To: jakarta-avalon-cornerstone-cvs@apache.org Subject: cvs commit: jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/data BasicView.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N hammant 02/01/13 03:21:28 Modified: apps/db/src/java/org/apache/avalon/db/basic/data BasicView.java Log: named inner class killed by Larry Revision Changes Path 1.11 +94 -91 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.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- BasicView.java 14 Dec 2001 21:31:52 -0000 1.10 +++ BasicView.java 13 Jan 2002 11:21:28 -0000 1.11 @@ -25,7 +25,7 @@ * * * @author Paul Hammant Paul_Hammant@yahoo.com - * @version $Revision: 1.10 $ + * @version $Revision: 1.11 $ */ public class BasicView extends AbstractView { @@ -38,96 +38,7 @@ mBasicCriteria = basicCriteria; mQueryable = queryable; - mRowListener = new RowListener() { - public void rowAdded(Queryable queryable, Row row) { - try { - if(mBasicCriteria.testDataRow((BasicRow) row)) { - addRow(row); - } - } catch (DataException de) { - getLogger().debug("(BasicView) Some exception during rowAdded",de); - } - } - public void rowDeleted(Queryable queryable, Row row) { - if(rowExists(row)) { - deleteRow(row); - } - } - - public void rowChanged(Queryable queryable, Row row) { - try { - boolean exists = rowExists(row); - if(mBasicCriteria.testDataRow((BasicRow) row)) { - if (exists) { - // do nothing - } else { - deleteRow(row); - } - } else { - if (exists) { - addRow(row); - } else { - // do nothing - } - } - } catch (DataException de) { - getLogger().debug("(BasicView) Some exception during rowChanged",de); - } - } - - public void rowsAdded(Queryable queryable, Collection rows) { - BasicCriteriaMatchingRowCallback cb = new BasicCriteriaMatchingRowCallback() { - public void rowMatches(BasicRow row, boolean matches) { - if (matches) { - addRow(row); - } else { - deleteRow(row); - } - } - }; - try { - mBasicCriteria.testDataRows(rows.iterator(), cb); - } catch (DataException de) { - getLogger().debug("(BasicView) Some exception during rowsAdded",de); - } - } - - public void rowsDeleted(Queryable queryable, Collection rows) { - Iterator it = rows.iterator(); - while (it.hasNext()) { - Row row = (Row) it.next(); - if(rowExists(row)) { - deleteRow(row); - } - } - } - - public void rowsChanged(Queryable queryable, Collection rows) { - BasicCriteriaMatchingRowCallback cb = new BasicCriteriaMatchingRowCallback() { - public void rowMatches(BasicRow row, boolean matches) { - boolean exists = rowExists(row); - if (matches) { - if (exists) { - // do nothing - } else { - addRow(row); - } - } else { - if (exists) { - deleteRow(row); - } else { - // do nothing - } - } - } - }; - try { - mBasicCriteria.testDataRows(rows.iterator(), cb); - } catch (DataException de) { - getLogger().debug("(BasicView) Some exception during rowsChanged",de); - } - } - }; + mRowListener = new BasicViewRowListener(); queryable.addRowListener(mRowListener); Iterator it = queryable.getRows().iterator(); while (it.hasNext()) { @@ -141,5 +52,97 @@ public Queryable getSourceQueryable() { return mQueryable; } + + private class BasicViewRowListener implements RowListener + { + public void rowAdded(Queryable queryable, Row row) { + try { + if(mBasicCriteria.testDataRow((BasicRow) row)) { + addRow(row); + } + } catch (DataException de) { + getLogger().debug("(BasicView) Some exception during rowAdded",de); + } + } + public void rowDeleted(Queryable queryable, Row row) { + if(rowExists(row)) { + deleteRow(row); + } + } + + public void rowChanged(Queryable queryable, Row row) { + try { + boolean exists = rowExists(row); + if(mBasicCriteria.testDataRow((BasicRow) row)) { + if (exists) { + // do nothing + } else { + deleteRow(row); + } + } else { + if (exists) { + addRow(row); + } else { + // do nothing + } + } + } catch (DataException de) { + getLogger().debug("(BasicView) Some exception during rowChanged",de); + } + } + + public void rowsAdded(Queryable queryable, Collection rows) { + BasicCriteriaMatchingRowCallback cb = new BasicCriteriaMatchingRowCallback() { + public void rowMatches(BasicRow row, boolean matches) { + if (matches) { + addRow(row); + } else { + deleteRow(row); + } + } + }; + try { + mBasicCriteria.testDataRows(rows.iterator(), cb); + } catch (DataException de) { + getLogger().debug("(BasicView) Some exception during rowsAdded",de); + } + } + + public void rowsDeleted(Queryable queryable, Collection rows) { + Iterator it = rows.iterator(); + while (it.hasNext()) { + Row row = (Row) it.next(); + if(rowExists(row)) { + deleteRow(row); + } + } + } + + public void rowsChanged(Queryable queryable, Collection rows) { + BasicCriteriaMatchingRowCallback cb = new BasicCriteriaMatchingRowCallback() { + public void rowMatches(BasicRow row, boolean matches) { + boolean exists = rowExists(row); + if (matches) { + if (exists) { + // do nothing + } else { + addRow(row); + } + } else { + if (exists) { + deleteRow(row); + } else { + // do nothing + } + } + } + }; + try { + mBasicCriteria.testDataRows(rows.iterator(), cb); + } catch (DataException de) { + getLogger().debug("(BasicView) Some exception during rowsChanged",de); + } + } + } } -- To unsubscribe, e-mail: For additional commands, e-mail: