[hibernate-commits] Hibernate SVN: r10773 - in branches/Branch_3_2/HibernateExt/tools/src: java/org/hibernate/tool/ant testsupport

[hibernate-commits at lists.jboss.org]

Author: max.andersen at jboss.com
Date: 2006-11-08 07:10:08 -0500 (Wed, 08 Nov 2006)
New Revision: 10773

Modified:
   branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JavaFormatterTask.java
   branches/Branch_3_2/HibernateExt/tools/src/testsupport/javaformattest-build.xml
Log:
minor

Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JavaFormatterTask.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JavaFormatterTask.java	2006-11-08 12:03:54 UTC (rev 10772)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/ant/JavaFormatterTask.java	2006-11-08 12:10:08 UTC (rev 10773)
@@ -70,29 +70,36 @@
 		
 		File[] files = getFiles();
 		
+		int success = 0;
+		int failed = 0;
+	
 		if(files.length>0) {
 			
 			JavaFormatter formatter = new JavaFormatter(settings);
-			
 			for (int i = 0; i < files.length; i++) {
 				File file = files[i];			
 				try {
 					boolean ok = formatter.formatFile( file );
 					if(!ok) {
+						failed++;
 						getProject().log(this, "Formatting failed - skipping " + file, Project.MSG_WARN);						
 					} else {
+						success++;
 						getProject().log(this, "Formatted " + file, Project.MSG_VERBOSE);
 					}
 				} catch(ExporterException ee) {
+					failed++;
 					if(failOnError) {
-						throw new BuildException("Formatting failed on " + file, ee);
+						throw new BuildException("Java formatting failed on " + file, ee);
 					} else {
-						getProject().log(this, "Formatting failed on " + file + ", " + ee.getLocalizedMessage(), Project.MSG_ERR);
+						getProject().log(this, "Java formatting failed on " + file + ", " + ee.getLocalizedMessage(), Project.MSG_ERR);
 					}
 				}
-			}
+			}			
 		}
 		
+		getProject().log( this, "Java formatting of " + files.length + " files completed. Skipped " + failed + " file(s).", Project.MSG_INFO );
+		
 	}
 
 	private File[] getFiles() {

Modified: branches/Branch_3_2/HibernateExt/tools/src/testsupport/javaformattest-build.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/testsupport/javaformattest-build.xml	2006-11-08 12:03:54 UTC (rev 10772)
+++ branches/Branch_3_2/HibernateExt/tools/src/testsupport/javaformattest-build.xml	2006-11-08 12:10:08 UTC (rev 10773)
@@ -37,7 +37,7 @@
 	<target name="fileset">		
 		<taskdef name="javaformatter" classname="org.hibernate.tool.ant.JavaFormatterTask" classpathref="tasks.classpath"/>
 				
-		<javaformatter> <!-- config, failonerror, destdir -->
+		<javaformatter> 
 		   <fileset dir="${build.dir}">
 		   	   <include name="formatting/**/*.java"/>
 		   	</fileset>
@@ -47,7 +47,7 @@
 	<target name="configtest">		
 		<taskdef name="javaformatter" classname="org.hibernate.tool.ant.JavaFormatterTask" classpathref="tasks.classpath"/>
 				
-		<javaformatter configurationfile="emptyconfig.properties"> <!-- config, failonerror, destdir -->
+		<javaformatter configurationfile="emptyconfig.properties"> 
 		   <fileset dir="${build.dir}">
 		   	   <include name="formatting/**/*.java"/>
 		   	</fileset>
@@ -57,7 +57,7 @@
 	<target name="noconfigtest">		
 			<taskdef name="javaformatter" classname="org.hibernate.tool.ant.JavaFormatterTask" classpathref="tasks.classpath"/>
 					
-			<javaformatter> <!-- config, failonerror, destdir -->
+			<javaformatter> 
 			   <fileset dir="${build.dir}">
 			   	   <include name="formatting/**/*.java"/>
 			   	</fileset>