You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2001/03/19 23:30:03 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/torque TorqueJDBCTransformTask.java
dlr 01/03/19 14:30:03
Modified: src/java/org/apache/turbine/torque
TorqueJDBCTransformTask.java
Log:
Refactored to make use of the List interface.
Revision Changes Path
1.3 +21 -22 jakarta-turbine/src/java/org/apache/turbine/torque/TorqueJDBCTransformTask.java
Index: TorqueJDBCTransformTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/TorqueJDBCTransformTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueJDBCTransformTask.java 2001/03/06 06:13:06 1.2
+++ TorqueJDBCTransformTask.java 2001/03/19 22:30:00 1.3
@@ -68,7 +68,7 @@
* JDBC metadata.
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: TorqueJDBCTransformTask.java,v 1.2 2001/03/06 06:13:06 chrise Exp $
+ * @version $Id: TorqueJDBCTransformTask.java,v 1.3 2001/03/19 22:30:00 dlr Exp $
*/
public class TorqueJDBCTransformTask
{
@@ -209,23 +209,23 @@
// Add Columns.
// TableMap tblMap = dbMap.getTable(curTable);
- Vector columns = getColumns(dbMetaData, curTable);
- Vector primKeys = getPrimaryKeys(dbMetaData, curTable);
- Vector forgnKeys = getForeignKeys(dbMetaData, curTable);
+ List columns = getColumns(dbMetaData, curTable);
+ List primKeys = getPrimaryKeys(dbMetaData, curTable);
+ List forgnKeys = getForeignKeys(dbMetaData, curTable);
// Set the primary keys.
primaryKeys = new Hashtable();
for (int k = 0; k < primKeys.size(); k++)
{
- String curPrimaryKey = (String) primKeys.elementAt(k);
+ String curPrimaryKey = (String) primKeys.get(k);
primaryKeys.put(curPrimaryKey, curPrimaryKey);
}
// Foreign keys for this table.
for (int l = 0; l < forgnKeys.size(); l++)
{
- String curForeignKey = (String) forgnKeys.elementAt(l);
+ String curForeignKey = (String) forgnKeys.get(l);
String foreignKeyTable =
(String) columnTableMap.get(curForeignKey);
System.out.println(curForeignKey + " => " +
@@ -234,7 +234,7 @@
for (int j = 0; j < columns.size(); j++)
{
- Vector v = (Vector) columns.elementAt(j);
+ Vector v = (Vector) columns.get(j);
String name = (String) v.elementAt(0);
int type = ((Integer) v.elementAt(1)).intValue();
int size = ((Integer) v.elementAt(2)).intValue();
@@ -349,23 +349,23 @@
}
/**
- * Retrieves a list of primary key columns for a given table.
+ * Retrieves a list of the columns composing the primary key for a given
+ * table.
*
* @param dbMeta JDBC metadata.
* @param tableName Table from which to retrieve PK information.
- * @return A Vector with a list of PKs for tableName.
+ * @return A list of the primary key parts for <code>tableName</code>.
*/
- public Vector getPrimaryKeys(DatabaseMetaData dbMeta,
- String tableName)
+ public List getPrimaryKeys(DatabaseMetaData dbMeta, String tableName)
throws SQLException
{
- ResultSet primaryKeys = dbMeta.getPrimaryKeys("",null, tableName);
- Vector keys = new Vector();
- while (primaryKeys.next())
+ ResultSet parts = dbMeta.getPrimaryKeys("", null, tableName);
+ List pk = new Vector();
+ while (parts.next())
{
- keys.addElement(primaryKeys.getString(4));
+ pk.add(parts.getString(4));
}
- return keys;
+ return pk;
}
/**
@@ -373,17 +373,16 @@
*
* @param dbMeta JDBC metadata.
* @param tableName Table from which to retrieve FK information.
- * @return A Vector with a list of foreign keys in tableName.
+ * @return A list of foreign keys in <code>tableName</code>.
*/
- public Vector getForeignKeys(DatabaseMetaData dbMeta,
- String tableName)
+ public List getForeignKeys(DatabaseMetaData dbMeta, String tableName)
throws SQLException
{
- ResultSet foreignKeys = dbMeta.getImportedKeys("",null, tableName);
- Vector keys = new Vector();
+ ResultSet foreignKeys = dbMeta.getImportedKeys("", null, tableName);
+ List keys = new Vector();
while (foreignKeys.next())
{
- keys.addElement(foreignKeys.getString(8));
+ keys.add(foreignKeys.getString(8));
}
return keys;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org