svn commit: r686539 - in /cayenne/main/trunk/framework: cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java

[km...@apache.org]

Author: kmenard
Date: Sat Aug 16 12:09:26 2008
New Revision: 686539

URL: http://svn.apache.org/viewvc?rev=686539&view=rev
Log:
Minor code-cleanups.

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
    cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java?rev=686539&r1=686538&r2=686539&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java Sat Aug 16 12:09:26 2008
@@ -19,9 +19,6 @@
 
 package org.apache.cayenne.tools;
 
-import java.io.File;
-import java.sql.Driver;
-
 import org.apache.cayenne.access.DbGenerator;
 import org.apache.cayenne.conn.DriverDataSource;
 import org.apache.cayenne.dba.DbAdapter;
@@ -33,6 +30,9 @@
 import org.apache.tools.ant.Project;
 import org.xml.sax.InputSource;
 
+import java.io.File;
+import java.sql.Driver;
+
 /**
  * An Ant Task that is a frontend to Cayenne DbGenerator allowing schema generation from
  * DataMap using Ant.
@@ -66,25 +66,10 @@
             adapter = new JdbcAdapter();
         }
 
-        log("connection settings - [driver: "
-                + driver
-                + ", url: "
-                + url
-                + ", username: "
-                + userName
-                + "]", Project.MSG_VERBOSE);
-
-        log("generator options - [dropTables: "
-                + dropTables
-                + ", dropPK: "
-                + dropPK
-                + ", createTables: "
-                + createTables
-                + ", createPK: "
-                + createPK
-                + ", createFK: "
-                + createFK
-                + "]", Project.MSG_VERBOSE);
+        log(String.format("connection settings - [driver: %s, url: %s, username: %s]", driver, url, userName), Project.MSG_VERBOSE);
+
+        log(String.format("generator options - [dropTables: %s, dropPK: %s, createTables: %s, createPK: %s, createFK: %s]",
+                dropTables, dropPK, createTables, createPK, createFK), Project.MSG_VERBOSE);
 
         validateAttributes();
 

Modified: cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java?rev=686539&r1=686538&r2=686539&view=diff
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java (original)
+++ cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java Sat Aug 16 12:09:26 2008
@@ -19,9 +19,6 @@
 
 package org.apache.cayenne.tools;
 
-import java.io.File;
-
-import org.apache.cayenne.gen.ArtifactsGenerationMode;
 import org.apache.cayenne.gen.ClassGenerationAction;
 import org.apache.cayenne.gen.ClassGenerationAction1_1;
 import org.apache.cayenne.gen.ClassGenerator;
@@ -33,6 +30,8 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
 
+import java.io.File;
+
 /**
  * Maven mojo to perform class generation from data map. This class is an Maven
  * adapter to DefaultClassGenerator class.
@@ -220,8 +219,7 @@
 
 	public void execute() throws MojoExecutionException, MojoFailureException {
 		// Create the destination directory if necessary.
-		// TODO: (KJM 11/2/06) The destDir really should be added as a
-		// compilation resource for maven.
+		// TODO: (KJM 11/2/06) The destDir really should be added as a compilation resource for maven.
 		if (!destDir.exists()) {
 			destDir.mkdirs();
 		}