[israfil-mojo commit] r594 - trunk/maven-flex2-plugin/src/main/java/net/israfil/mojo/flex2

[codesite...@google.com]

Author: christianedwardgruber
Date: Mon Jan 14 14:21:06 2008
New Revision: 594

Modified:
trunk/maven-flex2-plugin/src/main/java/net/israfil/mojo/flex2/AbstractFlexMojo.java
trunk/maven-flex2-plugin/src/main/java/net/israfil/mojo/flex2/MXMLCompilerMojo.java

Log:
Factor out invoking the main mxmlc file from parameter setup and put it
at the tail end of parameter finalization, so that it is always the
last parameter.

Modified: trunk/maven-flex2-plugin/src/main/java/net/israfil/mojo/flex2/AbstractFlexMojo.java
==============================================================================
---
trunk/maven-flex2-plugin/src/main/java/net/israfil/mojo/flex2/AbstractFlexMojo.java (original)
+++
trunk/maven-flex2-plugin/src/main/java/net/israfil/mojo/flex2/AbstractFlexMojo.java
Mon Jan 14 14:21:06 2008
@@ -199,7 +199,7 @@
return parameters;
}

- private void finalizeParameters(List parameters) throws
MojoExecutionException, MojoFailureException {
+ protected void finalizeParameters(List parameters) throws
MojoExecutionException, MojoFailureException {
getLog().info("Adding Extra Parameters: " + Arrays.asList(extraParameters));
Iterator extraParmsIter = Arrays.asList(extraParameters).iterator();
while (extraParmsIter.hasNext()) {

Modified: trunk/maven-flex2-plugin/src/main/java/net/israfil/mojo/flex2/MXMLCompilerMojo.java
==============================================================================
---
trunk/maven-flex2-plugin/src/main/java/net/israfil/mojo/flex2/MXMLCompilerMojo.java (original)
+++
trunk/maven-flex2-plugin/src/main/java/net/israfil/mojo/flex2/MXMLCompilerMojo.java
Mon Jan 14 14:21:06 2008
@@ -33,6 +33,8 @@
*/
package net.israfil.mojo.flex2;

+import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;

import org.apache.maven.plugin.MojoExecutionException;
@@ -83,13 +85,18 @@

parameters.add("-compiler.debug=" + debug);

+ return parameters;
+ }
+
+ protected void finalizeParameters(List parameters) throws
MojoExecutionException, MojoFailureException {
+ super.finalizeParameters(parameters);
+
+ // Conclude parameters.
parameters.add("--");

// Add in main mxml file.
parameters.add(mainMxmlFile);

- return parameters;
}
-

}

[codesite...@google.com]