Author: jvanzyl
Date: Fri May 15 19:38:50 2009
New Revision: 775299
URL: http://svn.apache.org/viewvc?rev=775299&view=rev
Log:
o formatting
Modified:
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
Modified:
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java?rev=775299&r1=775298&r2=775299&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
(original)
+++
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
Fri May 15 19:38:50 2009
@@ -34,123 +34,67 @@
@Requirement
private ArtifactHandlerManager artifactHandlerManager;
- public DefaultArtifactFactory()
- {
- }
-
- public Artifact createArtifact( String groupId,
- String artifactId,
- String version,
- String scope,
- String type )
+ public Artifact createArtifact( String groupId, String artifactId, String
version, String scope, String type )
{
return createArtifact( groupId, artifactId, version, scope, type,
null, null );
}
- public Artifact createArtifactWithClassifier( String groupId,
- String artifactId,
- String version,
- String type,
- String classifier )
+ public Artifact createArtifactWithClassifier( String groupId, String
artifactId, String version, String type, String classifier )
{
return createArtifact( groupId, artifactId, version, null, type,
classifier, null );
}
- public Artifact createDependencyArtifact( String groupId,
- String artifactId,
- VersionRange versionRange,
- String type,
- String classifier,
- String scope )
+ public Artifact createDependencyArtifact( String groupId, String
artifactId, VersionRange versionRange, String type, String classifier, String
scope )
{
return createArtifact( groupId, artifactId, versionRange, type,
classifier, scope, null );
}
- public Artifact createDependencyArtifact( String groupId,
- String artifactId,
- VersionRange versionRange,
- String type,
- String classifier,
- String scope,
- boolean optional )
+ public Artifact createDependencyArtifact( String groupId, String
artifactId, VersionRange versionRange, String type, String classifier, String
scope, boolean optional )
{
return createArtifact( groupId, artifactId, versionRange, type,
classifier, scope, null, optional );
}
- public Artifact createDependencyArtifact( String groupId,
- String artifactId,
- VersionRange versionRange,
- String type,
- String classifier,
- String scope,
- String inheritedScope )
+ public Artifact createDependencyArtifact( String groupId, String
artifactId, VersionRange versionRange, String type, String classifier, String
scope, String inheritedScope )
{
return createArtifact( groupId, artifactId, versionRange, type,
classifier, scope, inheritedScope );
}
- public Artifact createDependencyArtifact( String groupId,
- String artifactId,
- VersionRange versionRange,
- String type,
- String classifier,
- String scope,
- String inheritedScope,
- boolean optional )
+ public Artifact createDependencyArtifact( String groupId, String
artifactId, VersionRange versionRange, String type, String classifier, String
scope, String inheritedScope, boolean optional )
{
return createArtifact( groupId, artifactId, versionRange, type,
classifier, scope, inheritedScope, optional );
}
- public Artifact createBuildArtifact( String groupId,
- String artifactId,
- String version,
- String packaging )
+ public Artifact createBuildArtifact( String groupId, String artifactId,
String version, String packaging )
{
return createArtifact( groupId, artifactId, version, null, packaging,
null, null );
}
- public Artifact createProjectArtifact( String groupId,
- String artifactId,
- String version )
+ public Artifact createProjectArtifact( String groupId, String artifactId,
String version )
{
return createProjectArtifact( groupId, artifactId, version, null );
}
- public Artifact createParentArtifact( String groupId,
- String artifactId,
- String version )
+ public Artifact createParentArtifact( String groupId, String artifactId,
String version )
{
return createProjectArtifact( groupId, artifactId, version );
}
- public Artifact createPluginArtifact( String groupId,
- String artifactId,
- VersionRange versionRange )
+ public Artifact createPluginArtifact( String groupId, String artifactId,
VersionRange versionRange )
{
return createArtifact( groupId, artifactId, versionRange,
"maven-plugin", null, Artifact.SCOPE_RUNTIME, null );
}
- public Artifact createProjectArtifact( String groupId,
- String artifactId,
- String version,
- String scope )
+ public Artifact createProjectArtifact( String groupId, String artifactId,
String version, String scope )
{
return createArtifact( groupId, artifactId, version, scope, "pom" );
}
- public Artifact createExtensionArtifact( String groupId,
- String artifactId,
- VersionRange versionRange )
+ public Artifact createExtensionArtifact( String groupId, String
artifactId, VersionRange versionRange )
{
return createArtifact( groupId, artifactId, versionRange, "jar", null,
Artifact.SCOPE_RUNTIME, null );
}
- private Artifact createArtifact( String groupId,
- String artifactId,
- String version,
- String scope,
- String type,
- String classifier,
- String inheritedScope )
+ private Artifact createArtifact( String groupId, String artifactId, String
version, String scope, String type, String classifier, String inheritedScope )
{
VersionRange versionRange = null;
if ( version != null )
@@ -160,25 +104,12 @@
return createArtifact( groupId, artifactId, versionRange, type,
classifier, scope, inheritedScope );
}
- private Artifact createArtifact( String groupId,
- String artifactId,
- VersionRange versionRange,
- String type,
- String classifier,
- String scope,
- String inheritedScope )
+ private Artifact createArtifact( String groupId, String artifactId,
VersionRange versionRange, String type, String classifier, String scope, String
inheritedScope )
{
return createArtifact( groupId, artifactId, versionRange, type,
classifier, scope, inheritedScope, false );
}
- private Artifact createArtifact( String groupId,
- String artifactId,
- VersionRange versionRange,
- String type,
- String classifier,
- String scope,
- String inheritedScope,
- boolean optional )
+ private Artifact createArtifact( String groupId, String artifactId,
VersionRange versionRange, String type, String classifier, String scope, String
inheritedScope, boolean optional )
{
String desiredScope = Artifact.SCOPE_RUNTIME;
