dlr 2002/07/15 11:09:05
Modified: src/java/org/apache/torque/task TorqueSQLExec.java
Log:
o Adjusted imports per changes from Stephen's last patch, and added
new ones for this patch.
o Switched from Hashtable and concretion references to HashMap and
interface references.
o Removed some unnecessary local variables.
Revision Changes Path
1.11 +12 -14
jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueSQLExec.java
Index: TorqueSQLExec.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueSQLExec.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- TorqueSQLExec.java 15 Jul 2002 17:47:28 -0000 1.10
+++ TorqueSQLExec.java 15 Jul 2002 18:09:04 -0000 1.11
@@ -68,9 +68,9 @@
import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
-import java.util.TreeSet;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.Driver;
@@ -479,14 +479,15 @@
throw new BuildException("Cannot open and process the sqldbmap!");
}
- Hashtable databases = new Hashtable();
+ Map databases = new HashMap();
- for (Iterator eachProperty = map.keySet().iterator();
eachProperty.hasNext(); )
+ Iterator eachFileName = map.keySet().iterator();
+ while (eachFileName.hasNext())
{
- String sqlfile = (String) eachProperty.next();
+ String sqlfile = (String) eachFileName.next();
String database = map.getProperty(sqlfile);
- ArrayList files = (ArrayList) databases.get(database);
+ List files = (List) databases.get(database);
if (files == null)
{
@@ -510,13 +511,11 @@
while (eachDatabase.hasNext())
{
String db = (String) eachDatabase.next();
- ArrayList files = (ArrayList) databases.get(db);
-
- Iterator eachFile = files.iterator();
List transactions = new ArrayList();
- while (eachFile.hasNext())
+ eachFileName = ((List) databases.get(db)).iterator();
+ while (eachFileName.hasNext())
{
- String fileName = (String) eachFile.next();
+ String fileName = (String) eachFileName.next();
File file = new File(srcDir, fileName);
if (file.exists())
@@ -614,8 +613,7 @@
}
// Process all transactions
- for (Iterator it = transactions.iterator();
- it.hasNext();)
+ for (Iterator it = transactions.iterator(); it.hasNext(); )
{
((Transaction) it.next()).runTransaction(out);
if (!autocommit)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
