You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ke...@apache.org on 2006/08/24 16:02:20 UTC
svn commit: r434398 -
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
Author: kenney
Date: Thu Aug 24 07:02:19 2006
New Revision: 434398
URL: http://svn.apache.org/viewvc?rev=434398&view=rev
Log:
Removed ununused / redundant code.
Modified:
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=434398&r1=434397&r2=434398&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Thu Aug 24 07:02:19 2006
@@ -93,15 +93,16 @@
{
MavenProject mavenProject;
- try {
+ try
+ {
mavenProject = builderHelper.getMavenProject( result, createMetadataFile( url, username, password ) );
-
- if( (result != null) && result.hasErrors())
+
+ if ( result.hasErrors() )
{
return;
}
}
- catch (MalformedURLException e)
+ catch ( MalformedURLException e )
{
getLogger().debug( "Error adding project: Malformed URL " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
@@ -118,7 +119,8 @@
{
ProjectGroup projectGroup = buildProjectGroup( mavenProject, result );
- // project groups have the top lvl build definition which is the default build defintion for the sub projects
+ // project groups have the top lvl build definition which is the default build defintion for the sub
+ // projects
if ( projectGroup != null )
{
BuildDefinition bd = new BuildDefinition();
@@ -145,7 +147,7 @@
// jdo complains that Collections.singletonList(bd) is a second class object and fails.
ArrayList arrayList = new ArrayList();
- arrayList.add(bd);
+ arrayList.add( bd );
projectGroup.setBuildDefinitions( arrayList );
@@ -155,14 +157,7 @@
if ( !excludedPackagingTypes.contains( mavenProject.getPackaging() ) )
{
- String defaultGoal = "clean install";
-
- if ( mavenProject.getBuild() != null && mavenProject.getBuild().getDefaultGoal() != null )
- {
- defaultGoal = mavenProject.getBuild().getDefaultGoal();
- }
-
- Project continuumProject = new Project();
+ Project continuumProject = new Project();
builderHelper.mapMavenProjectToContinuumProject( result, mavenProject, continuumProject );