hammant 01/11/05 00:06:48
Modified: apps/db/src/java/org/apache/avalon/db/bcel/actions
BCELCreateTable.java BCELInsert.java
apps/db/src/java/org/apache/avalon/db/bcel/parser
LXSQLParser.java
Log:
Insert one step closer...
Revision Changes Path
1.6 +5 -4
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/actions/BCELCreateTable.java
Index: BCELCreateTable.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/actions/BCELCreateTable.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BCELCreateTable.java 2001/11/05 01:01:27 1.5
+++ BCELCreateTable.java 2001/11/05 08:06:48 1.6
@@ -27,13 +27,13 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class BCELCreateTable extends AbstractBCELAction implements
CreateTable {
private JavaClass mPendingRowClass;
private String mTableName, mTableRowName, mTableRowClassName;
- private Vector mColumns;
+ private Column[] mColumns;
private int mRecordCount;
/**
@@ -50,7 +50,8 @@
mTableName = tableName;
mTableRowName = tableRowName;
mTableRowClassName = tableRowClassName;
- mColumns = columns;
+ mColumns = new Column[columns.size()];
+ columns.toArray(mColumns);
}
@@ -75,7 +76,7 @@
System.out.println("get table, it's parent class and all referenced
classes (crashes here)");
Class rowClass = mBCELParser.makeGeneratedClass(mTableRowClassName,
bytes);
System.out.println("here 1b");
- Table table = new BCELTable(mTableName, (Column[])
mColumns.toArray(), rowClass);
+ Table table = new BCELTable(mTableName, mColumns, rowClass);
mDatabasePersistor.addTable(mTableName, table);
}
1.3 +3 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/actions/BCELInsert.java
Index: BCELInsert.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/actions/BCELInsert.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BCELInsert.java 2001/11/05 01:01:27 1.2
+++ BCELInsert.java 2001/11/05 08:06:48 1.3
@@ -25,7 +25,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class BCELInsert extends AbstractBCELAction implements Insert {
@@ -70,7 +70,8 @@
try {
pendingRow = (AbstractTableRow) rowClass.newInstance();
} catch (Throwable t) {
- throw new RuntimeException("Some problem instantiating "
+ rowClass.getName());
+ throw new RuntimeException("Some problem instantiating "
+ rowClass.getName() + " "
+ + t.getMessage() + " " + t.getClass().getName());
}
for (int x = 0 ; x < subRowsNodes.getLength(); x++) {
if (subRowsNodes.item(x).getNodeName().equals("row")) {
1.9 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/LXSQLParser.java
Index: LXSQLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/LXSQLParser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LXSQLParser.java 2001/11/05 01:01:28 1.8
+++ LXSQLParser.java 2001/11/05 08:06:48 1.9
@@ -74,7 +74,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class LXSQLParser extends BaseBCELParser {
@@ -229,7 +229,7 @@
System.out.println("=tn=" + tableName);
String uniqueTableName = getGeneratedClassName(tableName);
System.out.println("=utn=" + uniqueTableName);
- BCELTable table = (BCELTable)
mDatabasePersistor.getTable(uniqueTableName);
+ BCELTable table = (BCELTable)
mDatabasePersistor.getTable(tableName);
System.out.println("=table=" + table);
Insert action = new BCELInsert(table, doc);
action.setDatabasePersistor(mDatabasePersistor);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
