maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From denn...@apache.org
Subject svn commit: r524485 - in /maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea: AbstractIdeaMojo.java IdeaModuleMojo.java IdeaMojo.java IdeaProjectMojo.java
Date Sat, 31 Mar 2007 21:39:38 GMT
Author: dennisl
Date: Sat Mar 31 14:39:37 2007
New Revision: 524485

URL: http://svn.apache.org/viewvc?view=rev&rev=524485
Log:
o Fix errors reported by Checkstyle.

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

Modified: maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/AbstractIdeaMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/AbstractIdeaMojo.java?view=diff&rev=524485&r1=524484&r2=524485
==============================================================================
--- 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
Sat Mar 31 14:39:37 2007
@@ -384,8 +384,8 @@
                 }
                 catch ( InvalidVersionSpecificationException e )
                 {
-                    throw new ProjectBuildingException( projectId, "Unable to parse version
'" + d.getVersion() +
-                        "' for dependency '" + d.getManagementKey() + "': " + e.getMessage(),
e );
+                    throw new ProjectBuildingException( projectId, "Unable to parse version
'" + d.getVersion()
+                        + "' for dependency '" + d.getManagementKey() + "': " + e.getMessage(),
e );
                 }
             }
         }

Modified: maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java?view=diff&rev=524485&r1=524484&r2=524485
==============================================================================
--- 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 31 14:39:37 2007
@@ -50,7 +50,7 @@
 import java.util.regex.Pattern;
 
 /**
- * Creates the module (*.iml) files for IntelliJ Idea
+ * Creates the module (*.iml) files for IntelliJ IDEA.
  *
  * @author Edwin Punzalan
  * @goal module
@@ -312,8 +312,8 @@
                 else
                 {
                     getLog().info(
-                        "Not adding resource directory as it has an incompatible target path
or filtering: " +
-                            directory );
+                        "Not adding resource directory as it has an incompatible target path
or filtering: "
+                            + directory );
                 }
             }
 
@@ -328,8 +328,8 @@
                 else
                 {
                     getLog().info(
-                        "Not adding test resource directory as it has an incompatible target
path or filtering: " +
-                            directory );
+                        "Not adding test resource directory as it has an incompatible target
path or filtering: "
+                            + directory );
                 }
             }
 
@@ -781,8 +781,8 @@
                 methodAttribute.addAttribute( "value", "5" );
                 Element uriAttribute = createElement( containerElement, "attribute" );
                 uriAttribute.addAttribute( "name", "URI" );
-                uriAttribute.addAttribute( "value", "/WEB-INF/lib/" + artifact.getArtifactId()
+ "-" +
-                    artifact.getVersion() + ".jar" );
+                uriAttribute.addAttribute( "value", "/WEB-INF/lib/" + artifact.getArtifactId()
+ "-"
+                    + artifact.getVersion() + ".jar" );
             }
             else if ( artifact.getFile() != null )
             {
@@ -790,9 +790,9 @@
                 containerElement.addAttribute( "level", "module" );
                 Element methodAttribute = createElement( containerElement, "attribute" );
                 methodAttribute.addAttribute( "name", "method" );
-                if ( Artifact.SCOPE_PROVIDED.equalsIgnoreCase( artifact.getScope() ) ||
-                    Artifact.SCOPE_SYSTEM.equalsIgnoreCase( artifact.getScope() ) ||
-                    Artifact.SCOPE_TEST.equalsIgnoreCase( artifact.getScope() ) )
+                if ( Artifact.SCOPE_PROVIDED.equalsIgnoreCase( artifact.getScope() )
+                    || Artifact.SCOPE_SYSTEM.equalsIgnoreCase( artifact.getScope() )
+                    || Artifact.SCOPE_TEST.equalsIgnoreCase( artifact.getScope() ) )
                 {
                     // If scope is provided, system or test - do not package.
                     methodAttribute.addAttribute( "value", "0" );

Modified: maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java?view=diff&rev=524485&r1=524484&r2=524485
==============================================================================
--- 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 31 14:39:37 2007
@@ -29,7 +29,7 @@
 
 /**
  * Goal for generating IDEA files from a POM.
- * This plug-in provides the ability to generate IDEA project files (.ipr, .iml and .iws
files) for IDEA
+ * This plug-in provides the ability to generate IDEA project files (.ipr, .iml and .iws
files) for IDEA.
  *
  * @goal idea
  * @execute phase="generate-sources"
@@ -109,7 +109,8 @@
     private String jdkName;
 
     /**
-     * Specify the version of the JDK to use for the project for the purpose of enabled assertions
and 5.0 language features.
+     * Specify the version of the JDK to use for the project for the purpose of
+     * enabled assertions and 5.0 language features.
      * The default value is the specification version of the executing JVM.
      *
      * @parameter expression="${jdkLevel}"

Modified: maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaProjectMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaProjectMojo.java?view=diff&rev=524485&r1=524484&r2=524485
==============================================================================
--- 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 31 14:39:37 2007
@@ -38,7 +38,7 @@
 import java.util.StringTokenizer;
 
 /**
- * Creates the Project files (*.ipr) for IntelliJ Idea
+ * Creates the Project files (*.ipr) for IntelliJ IDEA.
  *
  * @author Edwin Punzalan
  * @goal project
@@ -56,7 +56,8 @@
     private String jdkName;
 
     /**
-     * Specify the version of the JDK to use for the project for the purpose of enabled assertions
and 5.0 language features.
+     * Specify the version of the JDK to use for the project for the purpose of
+     * enabled assertions and 5.0 language features.
      * The default value is the specification version of the executing JVM.
      *
      * @parameter expression="${jdkLevel}"
@@ -172,8 +173,10 @@
             {
                 Element m = createElement( modules, "module" );
                 String projectPath =
-                    new File( executedProject.getBasedir(), executedProject.getArtifactId()
+ ".iml" ).getAbsolutePath();
-                m.addAttribute( "filepath", "$PROJECT_DIR$/" + toRelative( executedProject.getBasedir(),
projectPath ) );
+                    new File( executedProject.getBasedir(),
+                              executedProject.getArtifactId() + ".iml" ).getAbsolutePath();
+                m.addAttribute( "filepath",
+                                "$PROJECT_DIR$/" + toRelative( executedProject.getBasedir(),
projectPath ) );
 
                 for ( Iterator i = executedProject.getCollectedProjects().iterator(); i.hasNext();
)
                 {
@@ -181,14 +184,16 @@
 
                     m = createElement( modules, "module" );
                     String modulePath = new File( p.getBasedir(), p.getArtifactId() + ".iml"
).getAbsolutePath();
-                    m.addAttribute( "filepath", "$PROJECT_DIR$/" + toRelative( executedProject.getBasedir(),
modulePath ) );
+                    m.addAttribute( "filepath",
+                                    "$PROJECT_DIR$/" + toRelative( executedProject.getBasedir(),
modulePath ) );
                 }
             }
             else
             {
                 Element m = createElement( modules, "module" );
                 String modulePath =
-                    new File( executedProject.getBasedir(), executedProject.getArtifactId()
+ ".iml" ).getAbsolutePath();
+                    new File( executedProject.getBasedir(),
+                              executedProject.getArtifactId() + ".iml" ).getAbsolutePath();
                 m.addAttribute( "filepath", "$PROJECT_DIR$/" + toRelative( executedProject.getBasedir(),
modulePath ) );
             }
 



Mime
View raw message