Author: epunzalan
Date: Thu Mar 2 17:32:25 2006
New Revision: 382606
URL: http://svn.apache.org/viewcvs?rev=382606&view=rev
Log:
Applied code formatting
Modified:
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/AbstractIdeaMojo.java
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/AbstractIdeaMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/AbstractIdeaMojo.java?rev=382606&r1=382605&r2=382606&view=diff
==============================================================================
---
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/AbstractIdeaMojo.java
(original)
+++
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/AbstractIdeaMojo.java
Thu Mar 2 17:32:25 2006
@@ -91,7 +91,9 @@
*/
protected ArtifactMetadataSource artifactMetadataSource;
- public void initParam( MavenProject project, ArtifactFactory
artifactFactory, ArtifactRepository localRepo, ArtifactResolver
artifactResolver, ArtifactMetadataSource artifactMetadataSource, Log log,
boolean overwrite )
+ public void initParam( MavenProject project, ArtifactFactory
artifactFactory, ArtifactRepository localRepo,
+ ArtifactResolver artifactResolver,
ArtifactMetadataSource artifactMetadataSource, Log log,
+ boolean overwrite )
{
this.project = project;
@@ -237,7 +239,7 @@
}
private Map createManagedVersionMap( ArtifactFactory artifactFactory,
String projectId,
- DependencyManagement
dependencyManagement )
+ DependencyManagement
dependencyManagement )
throws ProjectBuildingException
{
Map map;
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=382606&r1=382605&r2=382606&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
Thu Mar 2 17:32:25 2006
@@ -17,11 +17,11 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.manager.WagonManager;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
@@ -48,11 +48,10 @@
import java.util.Map;
/**
+ * @author Edwin Punzalan
* @goal module
* @execute phase="generate-sources"
* @todo use dom4j or something. Xpp3Dom can't cope properly with entities and
so on
- *
- * @author Edwin Punzalan
*/
public class IdeaModuleMojo
extends AbstractIdeaMojo
@@ -125,9 +124,13 @@
private static Map attemptedDownloads = new HashMap();
public void initParam( MavenProject project, ArtifactFactory
artifactFactory, ArtifactRepository localRepo,
- ArtifactResolver artifactResolver,
ArtifactMetadataSource artifactMetadataSource, Log log, boolean overwrite,
MavenProject executedProject, List reactorProjects, WagonManager wagonManager,
boolean linkModules, boolean useFullNames, boolean useClassifiers, String
sourceClassifier, String javadocClassifier )
+ ArtifactResolver artifactResolver,
ArtifactMetadataSource artifactMetadataSource, Log log,
+ boolean overwrite, MavenProject executedProject,
List reactorProjects,
+ WagonManager wagonManager, boolean linkModules,
boolean useFullNames, boolean useClassifiers,
+ String sourceClassifier, String javadocClassifier )
{
- super.initParam( project, artifactFactory, localRepo,
artifactResolver, artifactMetadataSource, log, overwrite );
+ super.initParam( project, artifactFactory, localRepo,
artifactResolver, artifactMetadataSource, log,
+ overwrite );
this.executedProject = executedProject;
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=382606&r1=382605&r2=382606&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
Thu Mar 2 17:32:25 2006
@@ -16,9 +16,9 @@
* limitations under the License.
*/
+import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.artifact.manager.WagonManager;
import java.util.List;
@@ -135,8 +135,7 @@
{
try
{
- doDependencyResolution( project, artifactFactory,
artifactResolver, localRepo,
- artifactMetadataSource );
+ doDependencyResolution( project, artifactFactory,
artifactResolver, localRepo, artifactMetadataSource );
}
catch ( Exception e )
{
@@ -158,7 +157,9 @@
{
IdeaModuleMojo mojo = new IdeaModuleMojo();
- mojo.initParam( project, artifactFactory, localRepo, artifactResolver,
artifactMetadataSource, getLog(), overwrite, executedProject, reactorProjects,
wagonManager, linkModules, useFullNames, useClassifiers, sourceClassifier,
javadocClassifier );
+ mojo.initParam( project, artifactFactory, localRepo, artifactResolver,
artifactMetadataSource, getLog(),
+ overwrite, executedProject, reactorProjects,
wagonManager, linkModules, useFullNames,
+ useClassifiers, sourceClassifier, javadocClassifier );
mojo.execute();
}
@@ -168,7 +169,8 @@
{
IdeaProjectMojo mojo = new IdeaProjectMojo();
- mojo.initParam( project, artifactFactory, localRepo, artifactResolver,
artifactMetadataSource, getLog(), overwrite, jdkName, jdkLevel,
wildcardResourcePatterns, ideaVersion );
+ mojo.initParam( project, artifactFactory, localRepo, artifactResolver,
artifactMetadataSource, getLog(),
+ overwrite, jdkName, jdkLevel,
wildcardResourcePatterns, ideaVersion );
mojo.execute();
}
@@ -178,7 +180,8 @@
{
IdeaWorkspaceMojo mojo = new IdeaWorkspaceMojo();
- mojo.initParam( project, artifactFactory, localRepo, artifactResolver,
artifactMetadataSource, getLog(), overwrite );
+ mojo.initParam( project, artifactFactory, localRepo, artifactResolver,
artifactMetadataSource, getLog(),
+ overwrite );
mojo.execute();
}
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=382606&r1=382605&r2=382606&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
Thu Mar 2 17:32:25 2006
@@ -16,35 +16,34 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.codehaus.plexus.util.xml.Xpp3DomWriter;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
import java.io.File;
-import java.io.Reader;
import java.io.FileReader;
-import java.io.InputStreamReader;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
import java.util.Iterator;
import java.util.StringTokenizer;
/**
+ * @author Edwin Punzalan
* @goal project
* @execute phase="generate-sources"
* @todo use dom4j or something. Xpp3Dom can't cope properly with entities and
so on
- *
- * @author Edwin Punzalan
*/
public class IdeaProjectMojo
extends AbstractIdeaMojo
@@ -89,9 +88,12 @@
private String ideaVersion;
public void initParam( MavenProject project, ArtifactFactory
artifactFactory, ArtifactRepository localRepo,
- ArtifactResolver artifactResolver,
ArtifactMetadataSource artifactMetadataSource, Log log, boolean overwrite,
String jdkName, String jdkLevel, String wildcardResourcePatterns, String
ideaVersion )
+ ArtifactResolver artifactResolver,
ArtifactMetadataSource artifactMetadataSource, Log log,
+ boolean overwrite, String jdkName, String jdkLevel,
String wildcardResourcePatterns,
+ String ideaVersion )
{
- super.initParam( project, artifactFactory, localRepo,
artifactResolver, artifactMetadataSource, log, overwrite );
+ super.initParam( project, artifactFactory, localRepo,
artifactResolver, artifactMetadataSource, log,
+ overwrite );
this.jdkName = jdkName;
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=382606&r1=382605&r2=382606&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
Thu Mar 2 17:32:25 2006
@@ -31,11 +31,10 @@
import java.io.Reader;
/**
+ * @author Edwin Punzalan
* @goal workspace
* @execute phase="generate-sources"
* @todo use dom4j or something. Xpp3Dom can't cope properly with entities and
so on
- *
- * @author Edwin Punzalan
*/
public class IdeaWorkspaceMojo
extends AbstractIdeaMojo
