hammant 01/11/11 05:03:45
Modified: apps/db/src/java/org/apache/avalon/db/basic/actions
BasicCreateIndex.java BasicCreateTable.java
BasicCreateView.java
apps/db/src/java/org/apache/avalon/db/basic/data
BasicIndex.java
apps/db/src/java/org/apache/avalon/db/data Index.java
Table.java View.java
apps/db/src/java/org/apache/avalon/db/data/impl
AbstractTable.java AbstractView.java
DefaultColumn.java
apps/db/src/java/org/apache/avalon/db/persistence/inmemory
NoPersistence.java
apps/db/src/java/org/apache/avalon/db/persistence/store
StorePersistence.java
apps/db/src/java/org/apache/avalon/db/services
DatabasePersistor.java
Added: apps/db/src/java/org/apache/avalon/db/basic/actions
BasicCreateQueryable.java
apps/db/src/java/org/apache/avalon/db/data Queryable.java
apps/db/src/java/org/apache/avalon/db/data/impl
AbstractDelegatedQueryable.java
AbstractQueryable.java
Removed: apps/db/src/java/org/apache/avalon/db/basic/actions
BasicCreateRowHolder.java
apps/db/src/java/org/apache/avalon/db/data RowHolder.java
apps/db/src/java/org/apache/avalon/db/data/impl
AbstractDelegatedRowHolder.java
AbstractRowHolder.java
Log:
RowHolder becomes Queryable
Revision Changes Path
1.2 +4 -4
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateIndex.java
Index: BasicCreateIndex.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateIndex.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicCreateIndex.java 2001/11/09 15:03:19 1.1
+++ BasicCreateIndex.java 2001/11/11 13:03:45 1.2
@@ -10,7 +10,7 @@
import org.apache.avalon.db.actions.CreateIndex;
import org.apache.avalon.db.actions.ActionException;
-import org.apache.avalon.db.data.impl.AbstractRowHolder;
+import org.apache.avalon.db.data.impl.AbstractQueryable;
import org.apache.avalon.db.data.Index;
import org.apache.avalon.db.basic.data.BasicIndex;
import org.apache.avalon.db.services.DatabasePersistor;
@@ -23,9 +23,9 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
-public class BasicCreateIndex extends BasicCreateRowHolder implements
CreateIndex {
+public class BasicCreateIndex extends BasicCreateQueryable implements
CreateIndex {
private String mIndexName;
private BasicSelect mBasicSelect;
@@ -57,7 +57,7 @@
NodeList subRootNodes = mLxsql.getChildNodes();
- AbstractRowHolder tableOrView = null; //TODO
+ AbstractQueryable tableOrView = null; //TODO
Index index = new BasicIndex(mIndexName, tableOrView);
mDatabasePersistor.addIndex(mIndexName, index);
1.6 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateTable.java
Index: BasicCreateTable.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateTable.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BasicCreateTable.java 2001/11/09 23:30:46 1.5
+++ BasicCreateTable.java 2001/11/11 13:03:45 1.6
@@ -30,7 +30,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision: 1.7 $
*/
-public class BasicCreateTable extends BasicCreateRowHolder implements
CreateTable {
+public class BasicCreateTable extends BasicCreateQueryable implements
CreateTable {
private String mTableName;
private Column[] mColumns;
1.7 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateView.java
Index: BasicCreateView.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateView.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicCreateView.java 2001/11/09 15:03:19 1.6
+++ BasicCreateView.java 2001/11/11 13:03:45 1.7
@@ -29,9 +29,9 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
-public class BasicCreateView extends BasicCreateRowHolder implements
CreateView {
+public class BasicCreateView extends BasicCreateQueryable implements
CreateView {
private String mViewName;
private BasicSelect mBasicSelect;
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateQueryable.java
Index: BasicCreateQueryable.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.avalon.db.basic.actions;
import org.apache.avalon.db.actions.CreateTable;
import org.apache.avalon.db.actions.ActionException;
import org.apache.avalon.db.actions.impl.AbstractAction;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Table;
import org.apache.avalon.db.data.impl.DefaultColumn;
import org.apache.avalon.db.basic.data.BasicTable;
import org.apache.avalon.db.services.DatabasePersistor;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
import java.util.Vector;
/**
* Class BasicCreateQueryable
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision: 1.1 $
*/
public abstract class BasicCreateQueryable extends AbstractAction implements
CreateTable {
/**
* Method execute
*
*
*/
protected Column[] getColumns(Element lxsql) throws ActionException {
NodeList subRootNodes = lxsql.getChildNodes();
Vector columns = new Vector();
for (int f = 0 ; f < subRootNodes.getLength(); f++) {
if (subRootNodes.item(f).getNodeName().equals("columns")) {
NodeList subColumnsNodes =
subRootNodes.item(f).getChildNodes();
for (int x = 0 ; x < subColumnsNodes.getLength(); x++) {
if
(subColumnsNodes.item(x).getNodeName().equals("column")) {
Node columnNode = subColumnsNodes.item(x);
String fieldName =
columnNode.getAttributes().getNamedItem("name").getNodeValue();
String sqlFieldType =
columnNode.getAttributes().getNamedItem("type").getNodeValue();
String fieldType =
getJavaType(sqlFieldType).toString();
Column column = new DefaultColumn(fieldName,
sqlFieldType, fieldType);
columns.add(column);
} else {
// TODO There should be no other element types
inside <columns>
}
}
} else {
//TODO Only <columns> is supported in <create-table> so far
}
}
Column[] columnsAry = new Column[columns.size()];
columns.toArray(columnsAry);
return columnsAry;
}
}
1.4 +6 -6
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/data/BasicIndex.java
Index: BasicIndex.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/data/BasicIndex.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasicIndex.java 2001/11/11 12:39:37 1.3
+++ BasicIndex.java 2001/11/11 13:03:45 1.4
@@ -7,8 +7,8 @@
*/
package org.apache.avalon.db.basic.data;
-import org.apache.avalon.db.data.impl.AbstractRowHolder;
-import org.apache.avalon.db.data.impl.AbstractDelegatedRowHolder;
+import org.apache.avalon.db.data.impl.AbstractQueryable;
+import org.apache.avalon.db.data.impl.AbstractDelegatedQueryable;
import org.apache.avalon.db.data.Index;
/**
@@ -16,12 +16,12 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
-public class BasicIndex extends AbstractDelegatedRowHolder implements Index {
+public class BasicIndex extends AbstractDelegatedQueryable implements Index {
- public BasicIndex(String indexName, AbstractRowHolder abstractRowHolder)
{
- super(indexName, abstractRowHolder);
+ public BasicIndex(String indexName, AbstractQueryable abstractQueryable)
{
+ super(indexName, abstractQueryable);
}
}
1.4 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/Index.java
Index: Index.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/Index.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Index.java 2001/11/11 12:39:37 1.3
+++ Index.java 2001/11/11 13:03:45 1.4
@@ -15,6 +15,6 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version * $Revision: 1.3 $
+ * @version * $Revision: 1.4 $
*/
-public interface Index extends RowHolder {}
+public interface Index extends Queryable {}
1.4 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/Table.java
Index: Table.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/Table.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Table.java 2001/10/28 23:14:54 1.3
+++ Table.java 2001/11/11 13:03:45 1.4
@@ -15,8 +15,8 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version * $Revision: 1.3 $
+ * @version * $Revision: 1.4 $
*/
-public interface Table extends RowHolder {
+public interface Table extends Queryable {
}
1.3 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/View.java
Index: View.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/View.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- View.java 2001/10/28 20:57:39 1.2
+++ View.java 2001/11/11 13:03:45 1.3
@@ -15,6 +15,6 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version * $Revision: 1.2 $
+ * @version * $Revision: 1.3 $
*/
-public interface View extends RowHolder {}
+public interface View extends Queryable {}
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/Queryable.java
Index: Queryable.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.avalon.db.data;
/**
* Interface Table
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version * $Revision: 1.1 $
*/
public interface Queryable extends Nameable {
Column[] getColumns();
void addRow(Row row);
void addRowListener(RowListener rowListener);
void removeRowListener(RowListener rowListener);
}
1.5 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractTable.java
Index: AbstractTable.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractTable.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractTable.java 2001/11/09 11:16:59 1.4
+++ AbstractTable.java 2001/11/11 13:03:45 1.5
@@ -11,7 +11,7 @@
import org.apache.avalon.db.data.Table;
-import org.apache.avalon.db.data.RowHolder;
+import org.apache.avalon.db.data.Queryable;
import org.apache.avalon.db.data.Column;
import java.util.Vector;
@@ -24,9 +24,9 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
-public abstract class AbstractTable extends AbstractRowHolder implements
Table {
+public abstract class AbstractTable extends AbstractQueryable implements
Table {
private Vector rows = new Vector();
1.3 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractView.java
Index: AbstractView.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractView.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractView.java 2001/11/09 11:41:53 1.2
+++ AbstractView.java 2001/11/11 13:03:45 1.3
@@ -9,7 +9,7 @@
package org.apache.avalon.db.data.impl;
-import org.apache.avalon.db.data.RowHolder;
+import org.apache.avalon.db.data.Queryable;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.View;
@@ -23,9 +23,9 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
-public abstract class AbstractView extends AbstractRowHolder implements View
{
+public abstract class AbstractView extends AbstractQueryable implements View
{
private Vector rows = new Vector();
1.3 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultColumn.java
Index: DefaultColumn.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultColumn.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultColumn.java 2001/10/31 16:06:23 1.2
+++ DefaultColumn.java 2001/11/11 13:03:45 1.3
@@ -11,7 +11,7 @@
import org.apache.avalon.db.data.Table;
-import org.apache.avalon.db.data.RowHolder;
+import org.apache.avalon.db.data.Queryable;
import org.apache.avalon.db.data.Column;
@@ -21,7 +21,7 @@
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @author Gerhard Froehlich <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>*
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class DefaultColumn implements Column {
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractDelegatedQueryable.java
Index: AbstractDelegatedQueryable.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.avalon.db.data.impl;
import org.apache.avalon.db.data.Queryable;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.RowListener;
import java.util.Vector;
import java.util.Iterator;
import java.lang.ref.WeakReference;
/**
* Class AbstractDelegatedQueryable
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision: 1.1 $
*/
public abstract class AbstractDelegatedQueryable extends AbstractNameable
implements Queryable {
private AbstractQueryable mAbstractQueryable;
/**
* Constructor AbstractDelegatedQueryable
*
*
* @param name
* @param columns
*
*/
public AbstractDelegatedQueryable(String indexName, AbstractQueryable
rowAbstractQueryable) {
super(indexName);
mAbstractQueryable = rowAbstractQueryable;
}
/**
* Method getColumns
*
*
* @return
*
*/
public Column[] getColumns() {
return mAbstractQueryable.getColumns();
}
/**
* Method addRow
*
*
* @param row
*
*/
public void addRow(Row row) {
mAbstractQueryable.addRow(row);
}
public void addRowListener(RowListener rowListener) {
mAbstractQueryable.addRowListener(rowListener);
}
public void removeRowListener(RowListener rowListener) {
mAbstractQueryable.removeRowListener(rowListener);
}
}
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractQueryable.java
Index: AbstractQueryable.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.avalon.db.data.impl;
import org.apache.avalon.db.data.Queryable;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.RowListener;
import java.util.Vector;
import java.util.Iterator;
import java.lang.ref.WeakReference;
/**
* Class AbstractQueryable
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision: 1.1 $
*/
public abstract class AbstractQueryable extends AbstractNameable implements
Queryable {
protected Column[] mColumns;
protected Vector mRows = new Vector();
protected Vector mListeners = new Vector();
/**
* Constructor AbstractQueryable
*
*
* @param name
* @param columns
*
*/
public AbstractQueryable(String name, Column[] columns) {
super(name);
mColumns = columns;
}
/**
* Method getColumns
*
*
* @return
*
*/
public Column[] getColumns() {
return mColumns;
}
/**
* Method addRow
*
*
* @param row
*
*/
public void addRow(Row row) {
mRows.add(row);
}
public void addRowListener(RowListener rowListener) {
mListeners.add(new WeakReference(rowListener));
}
public void removeRowListener(RowListener rowListener) {
Iterator it = mListeners.iterator();
while (it.hasNext()) {
WeakReference ref = (WeakReference) it.next();
if (ref.get() == rowListener) {
it.remove();
return;
}
}
}
protected void notifyRowListenersAdded(Row[] rows) {
Iterator it = mListeners.iterator();
while (it.hasNext()) {
WeakReference ref = (WeakReference) it.next();
RowListener listener = (RowListener) ref.get();
if (listener == null) {
it.remove();
} else {
listener.rowsAdded(rows);
}
}
}
protected void notifyRowListenersChanged(Row[] rows) {
Iterator it = mListeners.iterator();
while (it.hasNext()) {
WeakReference ref = (WeakReference) it.next();
RowListener listener = (RowListener) ref.get();
if (listener == null) {
it.remove();
} else {
listener.rowsChanged(rows);
}
}
}
protected void notifyRowListenersDeleted(Row[] rows) {
Iterator it = mListeners.iterator();
while (it.hasNext()) {
WeakReference ref = (WeakReference) it.next();
RowListener listener = (RowListener) ref.get();
if (listener == null) {
it.remove();
} else {
listener.rowsDeleted(rows);
}
}
}
}
1.8 +6 -6
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/persistence/inmemory/NoPersistence.java
Index: NoPersistence.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/persistence/inmemory/NoPersistence.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NoPersistence.java 2001/11/11 12:39:38 1.7
+++ NoPersistence.java 2001/11/11 13:03:45 1.8
@@ -15,7 +15,7 @@
import org.apache.avalon.db.data.Table;
import org.apache.avalon.db.data.View;
import org.apache.avalon.db.data.Index;
-import org.apache.avalon.db.data.RowHolder;
+import org.apache.avalon.db.data.Queryable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.Context;
@@ -37,7 +37,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class NoPersistence extends AbstractLogEnabled
implements DatabasePersistor, Block, Contextualizable, Composable,
Configurable,
@@ -132,11 +132,11 @@
mAddressableObjects.put(indexName, index);
}
- public RowHolder getRowHolder(String rowHolderName) {
- return (RowHolder) mAddressableObjects.get(rowHolderName);
+ public Queryable getQueryable(String queryableName) {
+ return (Queryable) mAddressableObjects.get(queryableName);
}
- public void addRowHolder(String rowHolderName, RowHolder rowHolder) {
- mAddressableObjects.put(rowHolderName, rowHolder);
+ public void addQueryable(String queryableName, Queryable queryable) {
+ mAddressableObjects.put(queryableName, queryable);
}
}
1.7 +4 -4
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/persistence/store/StorePersistence.java
Index: StorePersistence.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/persistence/store/StorePersistence.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StorePersistence.java 2001/11/11 12:39:38 1.6
+++ StorePersistence.java 2001/11/11 13:03:45 1.7
@@ -15,7 +15,7 @@
import org.apache.avalon.db.data.Table;
import org.apache.avalon.db.data.View;
import org.apache.avalon.db.data.Index;
-import org.apache.avalon.db.data.RowHolder;
+import org.apache.avalon.db.data.Queryable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.Context;
@@ -35,7 +35,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class StorePersistence extends AbstractLogEnabled
implements DatabasePersistor, Block, Contextualizable, Composable,
Configurable,
@@ -123,11 +123,11 @@
public void addView(String viewName, View view) {}
public void addIndex(String indexName, Index index) {}
- public RowHolder getRowHolder(String rowHolderName) {
+ public Queryable getQueryable(String queryableName) {
return null;
}
- public void addRowHolder(String rowHolderName, RowHolder rowHolder) {}
+ public void addQueryable(String queryableName, Queryable queryable) {}
}
1.6 +4 -4
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/services/DatabasePersistor.java
Index: DatabasePersistor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/services/DatabasePersistor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DatabasePersistor.java 2001/11/11 12:39:38 1.5
+++ DatabasePersistor.java 2001/11/11 13:03:45 1.6
@@ -13,7 +13,7 @@
import org.apache.avalon.db.data.Table;
import org.apache.avalon.db.data.View;
import org.apache.avalon.db.data.Index;
-import org.apache.avalon.db.data.RowHolder;
+import org.apache.avalon.db.data.Queryable;
/**
@@ -21,7 +21,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version * $Revision: 1.5 $
+ * @version * $Revision: 1.6 $
*/
public interface DatabasePersistor {
@@ -35,7 +35,7 @@
*
*/
Table getTable(String tableName);
- RowHolder getRowHolder(String rowHolderName);
+ Queryable getQueryable(String queryableName);
/**
* Method tableExists
@@ -62,6 +62,6 @@
void addIndex(String indexName, Index index);
- void addRowHolder(String rowHolderName, RowHolder rowHolder);
+ void addQueryable(String queryableName, Queryable queryable);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
