Added Logging to MojoFormatter.

Fixed reveresed scalariform paramter bug.
scala-ide · Jan 14, 2011 · 33e9c11 · 33e9c11
1 parent 7769927
commit 33e9c11
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/scalariform.maven-plugin/src/main/java/org/scalariform/ScalariformMojo.java b/scalariform.maven-plugin/src/main/java/org/scalariform/ScalariformMojo.java
@@ -64,7 +64,7 @@ public class ScalariformMojo extends AbstractMojo {
 
     public void execute() throws MojoExecutionException {
 
-	MojoFormatter.format(baseDir, 
+	MojoFormatter.format(baseDir, this.getLog(),
                              alignParameters, 
                              compactStringConcatenation,
                              doubleIndentClassDeclaration,

diff --git a/scalariform.maven-plugin/src/main/scala/org/scalariform/MojoFormatter.scala b/scalariform.maven-plugin/src/main/scala/org/scalariform/MojoFormatter.scala
@@ -11,6 +11,8 @@ import scala.collection.JavaConversions._
 
 import scala.io.Source
 
+import org.apache.maven.plugin.logging.Log
+
 /**
  * Goal which formats scala source files
  *
@@ -38,10 +40,11 @@ object MojoFormatter {
      findScalaFilesByFile(new File(dirpath), Nil)
   }
 
-  def format(path : String, 
+  def format(path : String,
+             log : Log,
              alignParameters : Boolean,
-             doubleIndentClassDeclaration : Boolean,
              compactStringConcatenation : Boolean,
+             doubleIndentClassDeclaration : Boolean,
              preserveSpaceBeforeArguments : Boolean,
              rewriteArrowSymbols : Boolean,
              spaceBeforeColon : Boolean,
@@ -55,8 +58,12 @@ object MojoFormatter {
       .setPreference(RewriteArrowSymbols, rewriteArrowSymbols)
       .setPreference(SpaceBeforeColon, spaceBeforeColon)
       .setPreference(IndentSpaces, indentSpaces)
+
+    val files = findScalaFiles(path)
+
+    log.info("Formatting " + files.size + " scala files")
 
-    findScalaFiles(path).foreach { file =>
+    files.foreach { file =>
       val original = Source.fromFile(file).mkString
       writeText(file, ScalaFormatter.format(original, preferences))
     }