svn commit: r383129 - in /maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea: IdeaModuleMojo.java IdeaMojo.java IdeaProjectMojo.java IdeaWorkspaceMojo.java

[epunzalan]

Author: epunzalan
Date: Sat Mar  4 07:06:52 2006
New Revision: 383129

URL: http://svn.apache.org/viewcvs?rev=383129&view=rev
Log:
Fixed a bug that makes idea:idea perform dependencyResolution four times for 
each project

Modified:
    
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java
    
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
    
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaProjectMojo.java
    
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaWorkspaceMojo.java

Modified: 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java?rev=383129&r1=383128&r2=383129&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java
 Sat Mar  4 07:06:52 2006
@@ -208,6 +208,12 @@
             throw new MojoExecutionException( "Unable to build project 
dependencies.", e );
         }
 
+        rewriteModule();
+    }
+
+    public void rewriteModule()
+        throws MojoExecutionException
+    {
         File moduleFile = new File( project.getBasedir(), 
project.getArtifactId() + ".iml" );
         try
         {

Modified: 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java?rev=383129&r1=383128&r2=383129&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
 Sat Mar  4 07:06:52 2006
@@ -193,7 +193,7 @@
                         overwrite, executedProject, reactorProjects, 
wagonManager, linkModules, useFullNames,
                         useClassifiers, sourceClassifier, javadocClassifier, 
libraries, macros, exclude );
 
-        mojo.execute();
+        mojo.rewriteModule();
     }
 
     private void rewriteProject( Set macros )
@@ -204,7 +204,7 @@
         mojo.initParam( project, artifactFactory, localRepo, artifactResolver, 
artifactMetadataSource, getLog(),
                         overwrite, jdkName, jdkLevel, 
wildcardResourcePatterns, ideaVersion, macros );
 
-        mojo.execute();
+        mojo.rewriteProject();
     }
 
     private void rewriteWorkspace()
@@ -215,7 +215,7 @@
         mojo.initParam( project, artifactFactory, localRepo, artifactResolver, 
artifactMetadataSource, getLog(),
                         overwrite );
 
-        mojo.execute();
+        mojo.rewriteWorkspace();
     }
 
     public void setProject( MavenProject project )

Modified: 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaProjectMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaProjectMojo.java?rev=383129&r1=383128&r2=383129&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaProjectMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaProjectMojo.java
 Sat Mar  4 07:06:52 2006
@@ -126,6 +126,12 @@
             throw new MojoExecutionException( "Unable to build project 
dependencies.", e );
         }
 
+        rewriteProject();
+    }
+
+    public void rewriteProject()
+        throws MojoExecutionException
+    {
         File projectFile = new File( project.getBasedir(), 
project.getArtifactId() + ".ipr" );
         try
         {
@@ -203,7 +209,7 @@
             }
 
             // add any PathMacros we've come across
-            if ( macros != null )
+            if ( macros != null && module.getChildren( "UsedPathMacros" 
).length > 0 )
             {
                 Xpp3Dom usedPathMacros = module.getChildren( "UsedPathMacros" 
)[0];
                 removeOldElements( usedPathMacros, "macro" );

Modified: 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaWorkspaceMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaWorkspaceMojo.java?rev=383129&r1=383128&r2=383129&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaWorkspaceMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaWorkspaceMojo.java
 Sat Mar  4 07:06:52 2006
@@ -56,6 +56,12 @@
             throw new MojoExecutionException( "Unable to build project 
dependencies.", e );
         }
 
+        rewriteWorkspace();
+    }
+
+    public void rewriteWorkspace()
+        throws MojoExecutionException
+    {
         File workspaceFile = new File( project.getBasedir(), 
project.getArtifactId() + ".iws" );
 
         FileWriter writer = null;