You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2001/10/28 21:57:40 UTC
cvs commit: jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/comparators DefaultNameComparator.java
hammant 01/10/28 12:57:40
Modified: apps/db/src/java/org/apache/avalon/db/actions Commit.java
Create.java Delete.java Drop.java Insert.java
Rollback.java Select.java Update.java
apps/db/src/java/org/apache/avalon/db/data Column.java
Index.java Table.java View.java
apps/db/src/java/org/apache/avalon/db/data/comparators
DefaultNameComparator.java
Added: apps/db/src/java/org/apache/avalon/db/actions
CreateTable.java ReadAction.java WriteAction.java
apps/db/src/java/org/apache/avalon/db/data Nameable.java
RowHolder.java
Removed: apps/db/src/java/org/apache/avalon/db/data Namable.java
Log:
More Abstractions
Revision Changes Path
1.2 +2 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Commit.java
Index: Commit.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Commit.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Commit.java 2001/10/28 14:09:19 1.1
+++ Commit.java 2001/10/28 20:57:39 1.2
@@ -15,6 +15,6 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version * $Revision: 1.1 $
+ * @version * $Revision: 1.2 $
*/
-public interface Commit extends Action {}
+public interface Commit extends WriteAction {}
1.2 +2 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Create.java
Index: Create.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Create.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Create.java 2001/10/28 14:09:19 1.1
+++ Create.java 2001/10/28 20:57:39 1.2
@@ -15,6 +15,6 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version * $Revision: 1.1 $
+ * @version * $Revision: 1.2 $
*/
-public interface Create extends Action {}
+public interface Create extends WriteAction {}
1.2 +2 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Delete.java
Index: Delete.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Delete.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Delete.java 2001/10/28 14:09:19 1.1
+++ Delete.java 2001/10/28 20:57:39 1.2
@@ -15,6 +15,6 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version * $Revision: 1.1 $
+ * @version * $Revision: 1.2 $
*/
-public interface Delete extends Action {}
+public interface Delete extends WriteAction {}
1.2 +2 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Drop.java
Index: Drop.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Drop.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Drop.java 2001/10/28 14:09:19 1.1
+++ Drop.java 2001/10/28 20:57:39 1.2
@@ -15,6 +15,6 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version * $Revision: 1.1 $
+ * @version * $Revision: 1.2 $
*/
-public interface Drop extends Action {}
+public interface Drop extends WriteAction {}
1.2 +2 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Insert.java
Index: Insert.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Insert.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Insert.java 2001/10/28 14:09:19 1.1
+++ Insert.java 2001/10/28 20:57:39 1.2
@@ -15,6 +15,6 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version * $Revision: 1.1 $
+ * @version * $Revision: 1.2 $
*/
-public interface Insert extends Action {}
+public interface Insert extends WriteAction {}
1.2 +2 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Rollback.java
Index: Rollback.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Rollback.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Rollback.java 2001/10/28 14:09:19 1.1
+++ Rollback.java 2001/10/28 20:57:39 1.2
@@ -15,6 +15,6 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version * $Revision: 1.1 $
+ * @version * $Revision: 1.2 $
*/
-public interface Rollback extends Action {}
+public interface Rollback extends WriteAction {}
1.2 +2 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Select.java
Index: Select.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Select.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Select.java 2001/10/28 14:09:19 1.1
+++ Select.java 2001/10/28 20:57:39 1.2
@@ -18,9 +18,9 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version * $Revision: 1.1 $
+ * @version * $Revision: 1.2 $
*/
-public interface Select extends Action {
+public interface Select extends ReadAction {
/**
* Method execute
1.2 +2 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Update.java
Index: Update.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Update.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Update.java 2001/10/28 14:09:19 1.1
+++ Update.java 2001/10/28 20:57:39 1.2
@@ -15,6 +15,6 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version * $Revision: 1.1 $
+ * @version * $Revision: 1.2 $
*/
-public interface Update extends Action {}
+public interface Update extends WriteAction {}
1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/CreateTable.java
Index: CreateTable.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.actions;
/**
* Interface Create
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version * $Revision: 1.1 $
*/
public interface CreateTable extends Create {
}
1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/ReadAction.java
Index: ReadAction.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.actions;
/**
* Interface Action
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version * $Revision: 1.1 $
*/
public interface ReadAction extends Action {}
1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/WriteAction.java
Index: WriteAction.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.actions;
/**
* Interface Action
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version * $Revision: 1.1 $
*/
public interface WriteAction extends Action {}
1.2 +6 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/Column.java
Index: Column.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/Column.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Column.java 2001/10/28 14:09:20 1.1
+++ Column.java 2001/10/28 20:57:39 1.2
@@ -15,6 +15,10 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version * $Revision: 1.1 $
+ * @version * $Revision: 1.2 $
*/
-public interface Column extends Namable {}
+public interface Column extends Nameable {
+ int STRINGTYPE = 31;
+ int INTTYPE = 32;
+ int getType();
+}
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Index.java 2001/10/28 14:09:20 1.1
+++ Index.java 2001/10/28 20:57:39 1.2
@@ -15,6 +15,6 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version * $Revision: 1.1 $
+ * @version * $Revision: 1.2 $
*/
-public interface Index extends Namable {}
+public interface Index extends Nameable {}
1.2 +4 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Table.java 2001/10/28 14:09:20 1.1
+++ Table.java 2001/10/28 20:57:39 1.2
@@ -15,6 +15,8 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version * $Revision: 1.1 $
+ * @version * $Revision: 1.2 $
*/
-public interface Table extends Namable {}
+public interface Table extends Nameable {
+ Column[] getColumns();
+}
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- View.java 2001/10/28 14:09:20 1.1
+++ View.java 2001/10/28 20:57:39 1.2
@@ -15,6 +15,6 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version * $Revision: 1.1 $
+ * @version * $Revision: 1.2 $
*/
-public interface View extends Namable {}
+public interface View extends RowHolder {}
1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/Nameable.java
Index: Nameable.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 Nameable
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version * $Revision: 1.1 $
*/
public interface Nameable {
/**
* Method getName
*
*
* @return
*
*/
String getName();
}
1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/RowHolder.java
Index: RowHolder.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:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version * $Revision: 1.1 $
*/
public interface RowHolder extends RowHolder {
}
1.2 +4 -4 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/comparators/DefaultNameComparator.java
Index: DefaultNameComparator.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/comparators/DefaultNameComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultNameComparator.java 2001/10/28 14:09:20 1.1
+++ DefaultNameComparator.java 2001/10/28 20:57:40 1.2
@@ -10,7 +10,7 @@
-import org.apache.avalon.db.data.Namable;
+import org.apache.avalon.db.data.Nameable;
import java.util.Comparator;
@@ -20,7 +20,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class DefaultNameComparator implements Comparator {
@@ -36,8 +36,8 @@
*/
public int compare(Object o1, Object o2) {
- Namable n1 = (Namable) o1;
- Namable n2 = (Namable) o2;
+ Nameable n1 = (Nameable) o1;
+ Nameable n2 = (Nameable) o2;
return n1.getName().compareTo(n2.getName());
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>