You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/06/07 08:03:51 UTC
svn commit: r545079 -
/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Author: carlos
Date: Wed Jun 6 23:03:50 2007
New Revision: 545079
URL: http://svn.apache.org/viewvc?view=rev&rev=545079
Log:
[MECLIPSE-251] Fix missing variable assignations
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?view=diff&rev=545079&r1=545078&r2=545079
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Wed Jun 6 23:03:50 2007
@@ -851,7 +851,7 @@
String projectName = null;
if ( getProjectNameTemplate() != null )
{
- if (isAddVersionToProjectName() || isAddGroupIdToProjectName())
+ if ( isAddVersionToProjectName() || isAddGroupIdToProjectName() )
{
getLog().warn(
"projectNameTemplate definition overrides "
@@ -861,18 +861,19 @@
}
else if ( isAddVersionToProjectName() && isAddGroupIdToProjectName() )
{
- IdeUtils.getProjectName( IdeUtils.PROJECT_NAME_WITH_GROUP_AND_VERSION_TEMPLATE, project );
+ projectName = IdeUtils.getProjectName( IdeUtils.PROJECT_NAME_WITH_GROUP_AND_VERSION_TEMPLATE, project );
}
else if ( isAddVersionToProjectName() )
{
- IdeUtils.getProjectName( IdeUtils.PROJECT_NAME_WITH_VERSION_TEMPLATE, project );
+ projectName = IdeUtils.getProjectName( IdeUtils.PROJECT_NAME_WITH_VERSION_TEMPLATE, project );
}
else if ( isAddGroupIdToProjectName() )
{
- IdeUtils.getProjectName( IdeUtils.PROJECT_NAME_WITH_GROUP_TEMPLATE, project );
- } else
+ projectName = IdeUtils.getProjectName( IdeUtils.PROJECT_NAME_WITH_GROUP_TEMPLATE, project );
+ }
+ else
{
- IdeUtils.getProjectName( IdeUtils.PROJECT_NAME_DEFAULT_TEMPLATE, project );
+ projectName = IdeUtils.getProjectName( IdeUtils.PROJECT_NAME_DEFAULT_TEMPLATE, project );
}
config.setEclipseProjectName( projectName );