Author: dennisl
Date: Thu Jul 31 15:39:57 2008
New Revision: 681524
URL: http://svn.apache.org/viewvc?rev=681524&view=rev
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/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?rev=681524&r1=681523&r2=681524&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 Jul 31 15:39:57 2008
@@ -223,11 +223,11 @@
convertedAbsolutePath = StringUtils.replace( convertedAbsolutePath,
"\\", "/" );
// Strip trailing slash
- if( convertedBasedir.endsWith( "/" ) )
+ if ( convertedBasedir.endsWith( "/" ) )
{
convertedBasedir = convertedBasedir.substring( 0,
convertedBasedir.length() - 1 );
}
- if( convertedAbsolutePath.endsWith( "/" ) )
+ if ( convertedAbsolutePath.endsWith( "/" ) )
{
convertedAbsolutePath = convertedAbsolutePath.substring( 0,
convertedAbsolutePath.length() - 1 );
}
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?rev=681524&r1=681523&r2=681524&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 Jul 31 15:39:57 2008
@@ -980,7 +980,7 @@
}
/**
- * Returns a an Xpp3Dom element (setting).
+ * Returns an Xpp3Dom element (setting).
*
* @param component Xpp3Dom element
* @param name Setting attribute to find
@@ -993,7 +993,7 @@
private String getLibraryUrl( Artifact artifact )
{
- return "jar://" +
convertDriveLetter(artifact.getFile().getAbsolutePath()).replace( '\\', '/' ) +
"!/";
+ return "jar://" + convertDriveLetter(
artifact.getFile().getAbsolutePath() ).replace( '\\', '/' ) + "!/";
}
private Element addDeploymentDescriptor( Element component, String name,
String version, String file )
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?rev=681524&r1=681523&r2=681524&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 Jul 31 15:39:57 2008
@@ -175,7 +175,8 @@
new File( executedProject.getBasedir(),
executedProject.getArtifactId() + ".iml"
).getAbsolutePath();
m.addAttribute( "filepath",
- "$PROJECT_DIR$/" + toRelative(
executedProject.getBasedir().getAbsolutePath(), projectPath ) );
+ "$PROJECT_DIR$/" + toRelative(
executedProject.getBasedir().getAbsolutePath(),
+ projectPath ) );
for ( Iterator i =
executedProject.getCollectedProjects().iterator(); i.hasNext(); )
{
@@ -184,7 +185,8 @@
m = createElement( modules, "module" );
String modulePath = new File( p.getBasedir(),
p.getArtifactId() + ".iml" ).getAbsolutePath();
m.addAttribute( "filepath",
- "$PROJECT_DIR$/" + toRelative(
executedProject.getBasedir().getAbsolutePath(), modulePath ) );
+ "$PROJECT_DIR$/" + toRelative(
executedProject.getBasedir().getAbsolutePath(),
+ modulePath
) );
}
}
else
@@ -193,7 +195,9 @@
String modulePath =
new File( executedProject.getBasedir(),
executedProject.getArtifactId() + ".iml"
).getAbsolutePath();
- m.addAttribute( "filepath", "$PROJECT_DIR$/" + toRelative(
executedProject.getBasedir().getAbsolutePath(), modulePath ) );
+ m.addAttribute( "filepath",
+ "$PROJECT_DIR$/" + toRelative(
executedProject.getBasedir().getAbsolutePath(),
+ modulePath ) );
}
// add any PathMacros we've come across