You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/11/20 18:17:25 UTC
svn commit: r719293 -
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
Author: sisbell
Date: Thu Nov 20 09:17:23 2008
New Revision: 719293
URL: http://svn.apache.org/viewvc?rev=719293&view=rev
Log:
Simplified nested if-rules for model container action.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=719293&r1=719292&r2=719293&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java Thu Nov 20 09:17:23 2008
@@ -176,35 +176,18 @@
}
ArtifactModelContainer c = (ArtifactModelContainer) modelContainer;
- if ( c.groupId.equals( groupId ) && c.artifactId.equals( artifactId ) )
+ if ( c.groupId.equals( groupId ) && c.artifactId.equals( artifactId ) && c.type.equals( type ) )
{
if ( c.version.equals( version ) )
{
- if ( c.type.equals( type ) )
- {
- return ModelContainerAction.JOIN;
- }
- else
- {
- return ModelContainerAction.NOP;
- }
+ return ModelContainerAction.JOIN;
}
else
{
- if ( c.type.equals( type ) )
- {
- return ModelContainerAction.DELETE;
- }
- else
- {
- return ModelContainerAction.NOP;
- }
+ return ModelContainerAction.DELETE;
}
}
- else
- {
- return ModelContainerAction.NOP;
- }
+ return ModelContainerAction.NOP;
}
public ModelContainer createNewInstance( List<ModelProperty> modelProperties )