You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2009/09/10 23:49:54 UTC
svn commit: r813604 [1/2] - in /maven/maven-3/trunk/maven-compat/src:
main/java/org/apache/maven/artifact/
main/java/org/apache/maven/artifact/repository/
main/java/org/apache/maven/artifact/resolver/
main/java/org/apache/maven/artifact/versioning/ mai...
Author: hboutemy
Date: Thu Sep 10 21:49:53 2009
New Revision: 813604
URL: http://svn.apache.org/viewvc?rev=813604&view=rev
Log:
fixed errors reported by Checkstyle
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
maven/maven-3/trunk/maven-compat/src/main/mdo/metadata.mdo
maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Thu Sep 10 21:49:53 2009
@@ -78,14 +78,14 @@
private List<ArtifactVersion> availableVersions;
private Map<Object,ArtifactMetadata> metadataMap;
-
+
private boolean optional;
public DefaultArtifact( String groupId, String artifactId, String version, String scope, String type, String classifier, ArtifactHandler artifactHandler )
{
this( groupId, artifactId, VersionRange.createFromVersion( version ), scope, type, classifier, artifactHandler, false );
}
-
+
public DefaultArtifact( String groupId, String artifactId, VersionRange versionRange, String scope, String type, String classifier, ArtifactHandler artifactHandler )
{
this( groupId, artifactId, versionRange, scope, type, classifier, artifactHandler, false );
@@ -263,7 +263,8 @@
public Collection<ArtifactMetadata> getMetadataList()
{
- if (metadataMap == null) {
+ if ( metadataMap == null )
+ {
return Collections.emptyList();
}
@@ -385,7 +386,7 @@
protected void setBaseVersionInternal( String baseVersion )
{
Matcher m = VERSION_FILE_PATTERN.matcher( baseVersion );
-
+
if ( m.matches() )
{
this.baseVersion = m.group( 1 ) + "-" + SNAPSHOT_VERSION;
@@ -528,7 +529,8 @@
public boolean isSnapshot()
{
- return getBaseVersion() != null && (getBaseVersion().endsWith(SNAPSHOT_VERSION) || getBaseVersion().equals(LATEST_VERSION));
+ return getBaseVersion() != null
+ && ( getBaseVersion().endsWith( SNAPSHOT_VERSION ) || getBaseVersion().equals( LATEST_VERSION ) );
}
public void setResolved( boolean resolved )
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java Thu Sep 10 21:49:53 2009
@@ -82,16 +82,18 @@
public void setUpdatePolicy( String updatePolicy )
{
- if(updatePolicy != null) {
- this.updatePolicy = updatePolicy;
+ if ( updatePolicy != null )
+ {
+ this.updatePolicy = updatePolicy;
}
}
public void setChecksumPolicy( String checksumPolicy )
{
- if(checksumPolicy != null) {
- this.checksumPolicy = checksumPolicy;
- }
+ if ( checksumPolicy != null )
+ {
+ this.checksumPolicy = checksumPolicy;
+ }
}
public boolean isEnabled()
@@ -135,7 +137,7 @@
else if ( updatePolicy.startsWith( UPDATE_POLICY_INTERVAL ) )
{
String s = updatePolicy.substring( UPDATE_POLICY_INTERVAL.length() + 1 );
- int minutes = Integer.valueOf(s);
+ int minutes = Integer.valueOf( s );
Calendar cal = Calendar.getInstance();
cal.add( Calendar.MINUTE, -minutes );
if ( cal.getTime().after( lastModified ) )
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java Thu Sep 10 21:49:53 2009
@@ -86,15 +86,15 @@
String ignoredScope )
{
logger.debug(
- indent + artifact + " (not setting artifactScope to: " + ignoredScope + "; local artifactScope " + artifact.getScope() +
- " wins)" );
+ indent + artifact + " (not setting artifactScope to: " + ignoredScope + "; local artifactScope " + artifact.getScope()
+ + " wins)" );
// TODO: better way than static? this might hide messages in a reactor
if ( !ignoredArtifacts.contains( artifact ) )
{
- logger.warn( "\n\tArtifact " + artifact + " retains local artifactScope '" + artifact.getScope() +
- "' overriding broader artifactScope '" + ignoredScope + "'\n" +
- "\tgiven by a dependency. If this is not intended, modify or remove the local artifactScope.\n" );
+ logger.warn( "\n\tArtifact " + artifact + " retains local artifactScope '" + artifact.getScope()
+ + "' overriding broader artifactScope '" + ignoredScope + "'\n"
+ + "\tgiven by a dependency. If this is not intended, modify or remove the local artifactScope.\n" );
ignoredArtifacts.add( artifact );
}
}
@@ -107,16 +107,16 @@
public void selectVersionFromRange( Artifact artifact )
{
- logger.debug( indent + artifact + " (setting version to: " + artifact.getVersion() + " from range: " +
- artifact.getVersionRange() + ")" );
+ logger.debug( indent + artifact + " (setting version to: " + artifact.getVersion() + " from range: "
+ + artifact.getVersionRange() + ")" );
}
public void restrictRange( Artifact artifact,
Artifact replacement,
VersionRange newRange )
{
- logger.debug( indent + artifact + " (range restricted from: " + artifact.getVersionRange() + " and: " +
- replacement.getVersionRange() + " to: " + newRange + " )" );
+ logger.debug( indent + artifact + " (range restricted from: " + artifact.getVersionRange() + " and: "
+ + replacement.getVersionRange() + " to: " + newRange + " )" );
}
/**
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java Thu Sep 10 21:49:53 2009
@@ -90,13 +90,13 @@
int counter = 0;
- for (Artifact artifact : artifacts) {
- String message = (++counter) + ") " + artifact.getId();
+ for ( Artifact artifact : artifacts )
+ {
+ String message = ( ++counter ) + ") " + artifact.getId();
- buffer.append(constructMissingArtifactMessage(message, " ", artifact.getGroupId(), artifact
- .getArtifactId(), artifact.getVersion(), artifact.getType(), artifact.getClassifier(),
- artifact.getDownloadUrl(), artifact
- .getDependencyTrail()));
+ buffer.append( constructMissingArtifactMessage( message, " ", artifact.getGroupId(),
+ artifact.getArtifactId(), artifact.getVersion(), artifact.getType(), artifact.getClassifier(),
+ artifact.getDownloadUrl(), artifact.getDependencyTrail() ) );
}
buffer.append( "----------\n" );
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java Thu Sep 10 21:49:53 2009
@@ -279,8 +279,8 @@
version = recommendedVersion;
found = true;
}
- else if ( version == null && restriction.getRecommendedVersion() != null &&
- r.containsVersion( restriction.getRecommendedVersion() ) )
+ else if ( version == null && restriction.getRecommendedVersion() != null
+ && r.containsVersion( restriction.getRecommendedVersion() ) )
{
// use this if we can, but prefer the original if possible
version = restriction.getRecommendedVersion();
@@ -320,11 +320,11 @@
boolean done = false;
while ( !done )
{
- if ( res1.getLowerBound() == null || res2.getUpperBound() == null ||
- res1.getLowerBound().compareTo( res2.getUpperBound() ) <= 0 )
+ if ( res1.getLowerBound() == null || res2.getUpperBound() == null
+ || res1.getLowerBound().compareTo( res2.getUpperBound() ) <= 0 )
{
- if ( res1.getUpperBound() == null || res2.getLowerBound() == null ||
- res1.getUpperBound().compareTo( res2.getLowerBound() ) >= 0 )
+ if ( res1.getUpperBound() == null || res2.getLowerBound() == null
+ || res1.getUpperBound().compareTo( res2.getLowerBound() ) >= 0 )
{
ArtifactVersion lower;
ArtifactVersion upper;
@@ -525,10 +525,13 @@
// TODO: could be more efficient by sorting the list and then moving along the restrictions in order?
ArtifactVersion matched = null;
- for (ArtifactVersion version : versions) {
- if (containsVersion(version)) {
+ for ( ArtifactVersion version : versions )
+ {
+ if ( containsVersion( version ) )
+ {
// valid - check if it is greater than the currently matched version
- if (matched == null || version.compareTo(matched) > 0) {
+ if ( matched == null || version.compareTo( matched ) > 0 )
+ {
matched = version;
}
}
@@ -538,8 +541,10 @@
public boolean containsVersion( ArtifactVersion version )
{
- for (Restriction restriction : restrictions) {
- if (restriction.containsVersion(version)) {
+ for ( Restriction restriction : restrictions )
+ {
+ if ( restriction.containsVersion( version ) )
+ {
return true;
}
}
@@ -553,21 +558,22 @@
public boolean equals( Object obj )
{
- if (this == obj){
+ if ( this == obj )
+ {
return true;
}
- if (!(obj instanceof VersionRange ))
+ if ( !( obj instanceof VersionRange ) )
{
return false;
}
VersionRange other = (VersionRange) obj;
-
+
boolean equals =
- recommendedVersion == other.recommendedVersion ||
- ( ( recommendedVersion != null ) && recommendedVersion.equals( other.recommendedVersion ) );
+ recommendedVersion == other.recommendedVersion
+ || ( ( recommendedVersion != null ) && recommendedVersion.equals( other.recommendedVersion ) );
equals &=
- restrictions == other.restrictions ||
- ( ( restrictions != null ) && restrictions.equals( other.restrictions ) );
+ restrictions == other.restrictions
+ || ( ( restrictions != null ) && restrictions.equals( other.restrictions ) );
return equals;
}
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java Thu Sep 10 21:49:53 2009
@@ -28,7 +28,6 @@
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.codehaus.plexus.MutablePlexusContainer;
import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.Logger;
@@ -44,7 +43,7 @@
public class DefaultProfileManager
implements ProfileManager
{
-
+
@Requirement
private Logger logger;
@@ -67,7 +66,7 @@
*/
public DefaultProfileManager( PlexusContainer container )
{
- this( container, null);
+ this( container, null );
}
/**
@@ -89,7 +88,8 @@
this.requestProperties = props;
}
- public Properties getRequestProperties() {
+ public Properties getRequestProperties()
+ {
return requestProperties;
}
@@ -108,8 +108,8 @@
Profile existing = (Profile) profilesById.get( profileId );
if ( existing != null )
{
- logger.warn( "Overriding profile: \'" + profileId + "\' (source: " + existing.getSource() +
- ") with new instance from source: " + profile.getSource() );
+ logger.warn( "Overriding profile: \'" + profileId + "\' (source: " + existing.getSource()
+ + ") with new instance from source: " + profile.getSource() );
}
profilesById.put( profile.getId(), profile );
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java Thu Sep 10 21:49:53 2009
@@ -97,8 +97,8 @@
// 1. we're not processing the plugins in an inheritance-based merge
// 2. the parent's <inherited/> flag is not set
// 3. the parent's <inherited/> flag is set to true
- if ( !handleAsInheritance || ( parentInherited == null ) ||
- Boolean.valueOf( parentInherited ).booleanValue() )
+ if ( !handleAsInheritance || ( parentInherited == null )
+ || Boolean.valueOf( parentInherited ).booleanValue() )
{
Plugin childPlugin = (Plugin) childPlugins.get( parentPlugin.getKey() );
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Thu Sep 10 21:49:53 2009
@@ -155,8 +155,8 @@
appendPath( parentScm.getConnection(), child.getArtifactId(), childPathAdjustment, appendPaths ) );
}
- if ( StringUtils.isEmpty( childScm.getDeveloperConnection() ) &&
- !StringUtils.isEmpty( parentScm.getDeveloperConnection() ) )
+ if ( StringUtils.isEmpty( childScm.getDeveloperConnection() )
+ && !StringUtils.isEmpty( parentScm.getDeveloperConnection() ) )
{
childScm
.setDeveloperConnection( appendPath( parentScm.getDeveloperConnection(), child.getArtifactId(),
@@ -388,8 +388,8 @@
String parentInherited = parentPlugin.getInherited();
- if ( !handleAsInheritance || ( parentInherited == null ) ||
- Boolean.valueOf( parentInherited ).booleanValue() )
+ if ( !handleAsInheritance || ( parentInherited == null )
+ || Boolean.valueOf( parentInherited ).booleanValue() )
{
ReportPlugin assembledPlugin = parentPlugin;
@@ -545,9 +545,8 @@
if ( deps != null )
{
- for ( Iterator<Dependency> it = deps.iterator(); it.hasNext(); )
+ for ( Dependency dependency : deps )
{
- Dependency dependency = it.next();
depsMap.put( dependency.getManagementKey(), dependency );
}
}
@@ -556,9 +555,8 @@
if ( deps != null )
{
- for ( Iterator<Dependency> it = deps.iterator(); it.hasNext(); )
+ for ( Dependency dependency : deps )
{
- Dependency dependency = it.next();
depsMap.put( dependency.getManagementKey(), dependency );
}
}
@@ -753,9 +751,8 @@
private static void mergeExtensionLists( Build childBuild, Build parentBuild )
{
- for ( Iterator i = parentBuild.getExtensions().iterator(); i.hasNext(); )
+ for ( Extension e : parentBuild.getExtensions() )
{
- Extension e = (Extension) i.next();
if ( !childBuild.getExtensions().contains( e ) )
{
childBuild.addExtension( e );
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java Thu Sep 10 21:49:53 2009
@@ -73,7 +73,7 @@
// we can safely assume that we're calculating based on the snapshot policy here if we've made it past the
// release-artifact short circuit above.
ArtifactRepositoryPolicy policy = repository.getSnapshots();
-
+
return isUpdateRequired( artifact, repository, policy );
}
@@ -194,8 +194,8 @@
{
if ( !touchfile.getParentFile().exists() && !touchfile.getParentFile().mkdirs() )
{
- getLogger().debug( "Failed to create directory: " + touchfile.getParent() +
- " for tracking artifact metadata resolution." );
+ getLogger().debug( "Failed to create directory: " + touchfile.getParent()
+ + " for tracking artifact metadata resolution." );
return;
}
@@ -237,8 +237,8 @@
}
catch ( IOException e )
{
- getLogger().debug( "Failed to record lastUpdated information for resolution.\nFile: " +
- touchfile.toString() + "; key: " + key, e );
+ getLogger().debug( "Failed to record lastUpdated information for resolution.\nFile: "
+ + touchfile.toString() + "; key: " + key, e );
}
finally
{
@@ -250,8 +250,8 @@
}
catch ( IOException e )
{
- getLogger().debug( "Error releasing exclusive lock for resolution tracking file: " +
- touchfile, e );
+ getLogger().debug( "Error releasing exclusive lock for resolution tracking file: "
+ + touchfile, e );
}
}
@@ -263,8 +263,8 @@
}
catch ( IOException e )
{
- getLogger().debug( "Error closing FileChannel for resolution tracking file: " +
- touchfile, e );
+ getLogger().debug( "Error closing FileChannel for resolution tracking file: "
+ + touchfile, e );
}
}
}
@@ -314,8 +314,8 @@
}
catch ( IOException e )
{
- getLogger().debug( "Failed to read lastUpdated information.\nFile: " +
- touchfile.toString() + "; key: " + key, e );
+ getLogger().debug( "Failed to read lastUpdated information.\nFile: "
+ + touchfile.toString() + "; key: " + key, e );
}
finally
{
@@ -327,8 +327,8 @@
}
catch ( IOException e )
{
- getLogger().debug( "Error releasing shared lock for resolution tracking file: " +
- touchfile, e );
+ getLogger().debug( "Error releasing shared lock for resolution tracking file: "
+ + touchfile, e );
}
}
@@ -340,8 +340,8 @@
}
catch ( IOException e )
{
- getLogger().debug( "Error closing FileChannel for resolution tracking file: " +
- touchfile, e );
+ getLogger().debug( "Error closing FileChannel for resolution tracking file: "
+ + touchfile, e );
}
}
}
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java Thu Sep 10 21:49:53 2009
@@ -25,17 +25,18 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
-public interface UpdateCheckManager {
+public interface UpdateCheckManager
+{
- String ROLE = UpdateCheckManager.class.getName();
+ String ROLE = UpdateCheckManager.class.getName();
- boolean isUpdateRequired( Artifact artifact, ArtifactRepository repository );
+ boolean isUpdateRequired( Artifact artifact, ArtifactRepository repository );
- void touch( Artifact artifact, ArtifactRepository repository );
+ void touch( Artifact artifact, ArtifactRepository repository );
boolean isUpdateRequired( RepositoryMetadata metadata, ArtifactRepository repository, File file );
- void touch( RepositoryMetadata metadata, ArtifactRepository repository, File file );
+ void touch( RepositoryMetadata metadata, ArtifactRepository repository, File file );
boolean isPomUpdateRequired( Artifact artifact, ArtifactRepository repository );
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java Thu Sep 10 21:49:53 2009
@@ -55,7 +55,8 @@
ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
- for (ArtifactTransformation transform : artifactTransformations) {
+ for ( ArtifactTransformation transform : artifactTransformations )
+ {
transform.transformForResolve( artifact, remoteRepositories, localRepository );
}
}
@@ -64,7 +65,8 @@
ArtifactRepository localRepository )
throws ArtifactInstallationException
{
- for (ArtifactTransformation transform : artifactTransformations) {
+ for ( ArtifactTransformation transform : artifactTransformations )
+ {
transform.transformForInstall( artifact, localRepository );
}
}
@@ -74,7 +76,8 @@
ArtifactRepository localRepository )
throws ArtifactDeploymentException
{
- for (ArtifactTransformation transform : artifactTransformations) {
+ for ( ArtifactTransformation transform : artifactTransformations )
+ {
transform.transformForDeployment( artifact, remoteRepository, localRepository );
}
}
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java Thu Sep 10 21:49:53 2009
@@ -46,7 +46,7 @@
* @author <a href="mailto:mmaczka@interia.pl">Michal Maczka</a>
* @version $Id$
*/
-@Component(role=ArtifactTransformation.class, hint="snapshot")
+@Component(role=ArtifactTransformation.class, hint="snapshot")
public class SnapshotTransformation
extends AbstractVersionTransformation
{
@@ -105,7 +105,7 @@
if ( artifact.isSnapshot() )
{
Snapshot snapshot = new Snapshot();
-
+
snapshot.setTimestamp( getDeploymentTimestamp() );
// we update the build number anyway so that it doesn't get lost. It requires the timestamp to take effect
@@ -117,8 +117,8 @@
}
catch ( RepositoryMetadataResolutionException e )
{
- throw new ArtifactDeploymentException( "Error retrieving previous build number for artifact '" +
- artifact.getDependencyConflictId() + "': " + e.getMessage(), e );
+ throw new ArtifactDeploymentException( "Error retrieving previous build number for artifact '"
+ + artifact.getDependencyConflictId() + "': " + e.getMessage(), e );
}
RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata( artifact, snapshot );
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java Thu Sep 10 21:49:53 2009
@@ -1,5 +1,24 @@
package org.apache.maven.repository.metadata;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -8,7 +27,7 @@
/**
* classpath container that is aware of the classpath scope
- *
+ *
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
*
*/
@@ -16,97 +35,111 @@
implements Iterable<ArtifactMetadata>
{
private List<ArtifactMetadata> classpath;
- private ArtifactScopeEnum scope;
-
- //-------------------------------------------------------------------------------------------
- public ClasspathContainer(ArtifactScopeEnum scope)
- {
- this.scope = ArtifactScopeEnum.checkScope(scope);
- }
- //-------------------------------------------------------------------------------------------
- public ClasspathContainer(
- List<ArtifactMetadata> classpath
- , ArtifactScopeEnum scope
- )
- {
- this(scope);
- this.classpath = classpath;
- }
- //-------------------------------------------------------------------------------------------
- public Iterator<ArtifactMetadata> iterator()
- {
- return classpath == null ? null : classpath.iterator() ;
- }
- //-------------------------------------------------------------------------------------------
- public ClasspathContainer add( ArtifactMetadata md )
- {
- if( classpath == null )
- classpath = new ArrayList<ArtifactMetadata>(16);
-
- classpath.add(md);
-
- return this;
- }
- //-------------------------------------------------------------------------------------------
- public List<ArtifactMetadata> getClasspath()
- {
- return classpath;
- }
- //-------------------------------------------------------------------------------------------
- public MetadataTreeNode getClasspathAsTree()
- throws MetadataResolutionException
- {
- if( classpath == null || classpath.size() < 1 )
- return null;
-
- MetadataTreeNode tree = null;
- MetadataTreeNode parent = null;
- MetadataTreeNode node = null;
-
- for( ArtifactMetadata md : classpath ) {
- node = new MetadataTreeNode( md, parent, md.isResolved(), md.getArtifactScope() );
- if( tree == null ) {
- tree = node;
- }
-
- if( parent != null ) {
- parent.setNChildren(1);
- parent.addChild(0, node);
- }
-
- parent = node;
-
- }
- return tree;
- }
-
- public void setClasspath(List<ArtifactMetadata> classpath)
- {
- this.classpath = classpath;
- }
-
- public ArtifactScopeEnum getScope()
- {
- return scope;
- }
-
- public void setScope(ArtifactScopeEnum scope)
- {
- this.scope = scope;
- }
- //-------------------------------------------------------------------------------------------
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder(256);
- sb.append("[scope="+scope.getScope() );
- if(classpath != null)
- for( ArtifactMetadata md : classpath ) {
- sb.append(": "+md.toString()+'{'+md.getArtifactUri()+'}');
- }
- sb.append(']');
- return sb.toString();
- }
- //-------------------------------------------------------------------------------------------
- //-------------------------------------------------------------------------------------------
+
+ private ArtifactScopeEnum scope;
+
+ // -------------------------------------------------------------------------------------------
+ public ClasspathContainer( ArtifactScopeEnum scope )
+ {
+ this.scope = ArtifactScopeEnum.checkScope( scope );
+ }
+
+ // -------------------------------------------------------------------------------------------
+ public ClasspathContainer( List<ArtifactMetadata> classpath, ArtifactScopeEnum scope )
+ {
+ this( scope );
+ this.classpath = classpath;
+ }
+
+ // -------------------------------------------------------------------------------------------
+ public Iterator<ArtifactMetadata> iterator()
+ {
+ return classpath == null ? null : classpath.iterator();
+ }
+
+ // -------------------------------------------------------------------------------------------
+ public ClasspathContainer add( ArtifactMetadata md )
+ {
+ if ( classpath == null )
+ {
+ classpath = new ArrayList<ArtifactMetadata>( 16 );
+ }
+
+ classpath.add( md );
+
+ return this;
+ }
+
+ // -------------------------------------------------------------------------------------------
+ public List<ArtifactMetadata> getClasspath()
+ {
+ return classpath;
+ }
+
+ // -------------------------------------------------------------------------------------------
+ public MetadataTreeNode getClasspathAsTree()
+ throws MetadataResolutionException
+ {
+ if ( classpath == null || classpath.size() < 1 )
+ {
+ return null;
+ }
+
+ MetadataTreeNode tree = null;
+ MetadataTreeNode parent = null;
+ MetadataTreeNode node = null;
+
+ for ( ArtifactMetadata md : classpath )
+ {
+ node = new MetadataTreeNode( md, parent, md.isResolved(), md.getArtifactScope() );
+ if ( tree == null )
+ {
+ tree = node;
+ }
+
+ if ( parent != null )
+ {
+ parent.setNChildren( 1 );
+ parent.addChild( 0, node );
+ }
+
+ parent = node;
+
+ }
+ return tree;
+ }
+
+ public void setClasspath( List<ArtifactMetadata> classpath )
+ {
+ this.classpath = classpath;
+ }
+
+ public ArtifactScopeEnum getScope()
+ {
+ return scope;
+ }
+
+ public void setScope( ArtifactScopeEnum scope )
+ {
+ this.scope = scope;
+ }
+
+ // -------------------------------------------------------------------------------------------
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder( 256 );
+ sb.append( "[scope=" + scope.getScope() );
+ if ( classpath != null )
+ {
+ for ( ArtifactMetadata md : classpath )
+ {
+ sb.append( ": " + md.toString() + '{' + md.getArtifactUri() + '}' );
+ }
+ }
+ sb.append( ']' );
+ return sb.toString();
+ }
+ // -------------------------------------------------------------------------------------------
+ // -------------------------------------------------------------------------------------------
}
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java Thu Sep 10 21:49:53 2009
@@ -1,5 +1,24 @@
package org.apache.maven.repository.metadata;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
@@ -11,7 +30,7 @@
/**
* default implementation of the metadata classpath transformer
- *
+ *
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
*
*/
@@ -23,44 +42,47 @@
GraphConflictResolver conflictResolver;
//----------------------------------------------------------------------------------------------------
- public ClasspathContainer transform(
- MetadataGraph dirtyGraph
- , ArtifactScopeEnum scope
- , boolean resolve
- )
- throws MetadataGraphTransformationException
- {
- try {
- if( dirtyGraph == null
- || dirtyGraph.isEmpty()
- )
- return null;
-
- MetadataGraph cleanGraph = conflictResolver.resolveConflicts( dirtyGraph, scope );
-
- if( cleanGraph == null
- || cleanGraph.isEmpty()
- )
- return null;
-
- ClasspathContainer cpc = new ClasspathContainer( scope );
- if( cleanGraph.isEmptyEdges() ) {
- // single entry in the classpath, populated from itself
- ArtifactMetadata amd = cleanGraph.getEntry().getMd();
- cpc.add( amd );
- } else {
- ClasspathGraphVisitor v = new ClasspathGraphVisitor( cleanGraph, cpc );
- MetadataGraphVertex entry = cleanGraph.getEntry();
- ArtifactMetadata md = entry.getMd();
- // entry point
- v.visit( entry ); //, md.getVersion(), md.getArtifactUri() );
- }
-
- return cpc;
- } catch (GraphConflictResolutionException e) {
- throw new MetadataGraphTransformationException(e);
- }
- }
+ public ClasspathContainer transform( MetadataGraph dirtyGraph, ArtifactScopeEnum scope, boolean resolve )
+ throws MetadataGraphTransformationException
+ {
+ try
+ {
+ if ( dirtyGraph == null || dirtyGraph.isEmpty() )
+ {
+ return null;
+ }
+
+ MetadataGraph cleanGraph = conflictResolver.resolveConflicts( dirtyGraph, scope );
+
+ if ( cleanGraph == null || cleanGraph.isEmpty() )
+ {
+ return null;
+ }
+
+ ClasspathContainer cpc = new ClasspathContainer( scope );
+ if ( cleanGraph.isEmptyEdges() )
+ {
+ // single entry in the classpath, populated from itself
+ ArtifactMetadata amd = cleanGraph.getEntry().getMd();
+ cpc.add( amd );
+ }
+ else
+ {
+ ClasspathGraphVisitor v = new ClasspathGraphVisitor( cleanGraph, cpc );
+ MetadataGraphVertex entry = cleanGraph.getEntry();
+ ArtifactMetadata md = entry.getMd();
+ // entry point
+ v.visit( entry ); // , md.getVersion(), md.getArtifactUri() );
+ }
+
+ return cpc;
+ }
+ catch ( GraphConflictResolutionException e )
+ {
+ throw new MetadataGraphTransformationException( e );
+ }
+ }
+
//===================================================================================================
/**
* Helper class to traverse graph. Required to make the containing method thread-safe
@@ -68,82 +90,91 @@
*/
private class ClasspathGraphVisitor
{
- MetadataGraph graph;
- ClasspathContainer cpc;
- List<MetadataGraphVertex> visited;
- //-----------------------------------------------------------------------
- protected ClasspathGraphVisitor( MetadataGraph cleanGraph, ClasspathContainer cpc )
- {
- this.cpc = cpc;
- this.graph = cleanGraph;
-
- visited = new ArrayList<MetadataGraphVertex>( cleanGraph.getVertices().size() );
- }
- //-----------------------------------------------------------------------
- protected void visit( MetadataGraphVertex node ) //, String version, String artifactUri )
- {
- ArtifactMetadata md = node.getMd();
- if( visited.contains(node) )
- return;
+ MetadataGraph graph;
+
+ ClasspathContainer cpc;
+
+ List<MetadataGraphVertex> visited;
+
+ // -----------------------------------------------------------------------
+ protected ClasspathGraphVisitor( MetadataGraph cleanGraph, ClasspathContainer cpc )
+ {
+ this.cpc = cpc;
+ this.graph = cleanGraph;
+
+ visited = new ArrayList<MetadataGraphVertex>( cleanGraph.getVertices().size() );
+ }
+
+ // -----------------------------------------------------------------------
+ protected void visit( MetadataGraphVertex node ) // , String version, String artifactUri )
+ {
+ ArtifactMetadata md = node.getMd();
+ if ( visited.contains( node ) )
+ {
+ return;
+ }
- cpc.add( md );
+ cpc.add( md );
//
-// TreeSet<MetadataGraphEdge> deps = new TreeSet<MetadataGraphEdge>(
-// new Comparator<MetadataGraphEdge>()
-// {
-// public int compare( MetadataGraphEdge e1
-// , MetadataGraphEdge e2
-// )
-// {
-// if( e1.getDepth() == e2.getDepth() )
-// {
-// if( e2.getPomOrder() == e1.getPomOrder() )
-// return e1.getTarget().toString().compareTo(e2.getTarget().toString() );
+// TreeSet<MetadataGraphEdge> deps = new TreeSet<MetadataGraphEdge>(
+// new Comparator<MetadataGraphEdge>()
+// {
+// public int compare( MetadataGraphEdge e1
+// , MetadataGraphEdge e2
+// )
+// {
+// if( e1.getDepth() == e2.getDepth() )
+// {
+// if( e2.getPomOrder() == e1.getPomOrder() )
+// return e1.getTarget().toString().compareTo(e2.getTarget().toString() );
//
-// return e2.getPomOrder() - e1.getPomOrder();
-// }
+// return e2.getPomOrder() - e1.getPomOrder();
+// }
//
-// return e2.getDepth() - e1.getDepth();
-// }
-// }
-// );
-
- List<MetadataGraphEdge> exits = graph.getExcidentEdges(node);
-
- if( exits != null && exits.size() > 0)
- {
- MetadataGraphEdge[] sortedExits = exits.toArray( new MetadataGraphEdge[exits.size()] );
- Arrays.sort( sortedExits
- ,
- new Comparator<MetadataGraphEdge>()
- {
- public int compare( MetadataGraphEdge e1
- , MetadataGraphEdge e2
- )
- {
- if( e1.getDepth() == e2.getDepth() )
- {
- if( e2.getPomOrder() == e1.getPomOrder() )
- return e1.getTarget().toString().compareTo(e2.getTarget().toString() );
- return e2.getPomOrder() - e1.getPomOrder();
- }
-
- return e2.getDepth() - e1.getDepth();
- }
- }
- );
-
- for( MetadataGraphEdge e : sortedExits ) {
- MetadataGraphVertex targetNode = e.getTarget();
- targetNode.getMd().setArtifactScope( e.getScope() );
- targetNode.getMd().setWhy( e.getSource().getMd().toString() );
- visit( targetNode );
- }
- }
-
- }
- //-----------------------------------------------------------------------
- //-----------------------------------------------------------------------
+// return e2.getDepth() - e1.getDepth();
+// }
+// }
+// );
+
+ List<MetadataGraphEdge> exits = graph.getExcidentEdges(node);
+
+ if ( exits != null && exits.size() > 0 )
+ {
+ MetadataGraphEdge[] sortedExits = exits.toArray( new MetadataGraphEdge[exits.size()] );
+ Arrays.sort( sortedExits
+ ,
+ new Comparator<MetadataGraphEdge>()
+ {
+ public int compare( MetadataGraphEdge e1
+ , MetadataGraphEdge e2
+ )
+ {
+ if ( e1.getDepth() == e2.getDepth() )
+ {
+ if ( e2.getPomOrder() == e1.getPomOrder() )
+ {
+ return e1.getTarget().toString().compareTo( e2.getTarget().toString() );
+ }
+ return e2.getPomOrder() - e1.getPomOrder();
+ }
+
+ return e2.getDepth() - e1.getDepth();
+ }
+ }
+ );
+
+ for ( MetadataGraphEdge e : sortedExits )
+ {
+ MetadataGraphVertex targetNode = e.getTarget();
+ targetNode.getMd().setArtifactScope( e.getScope() );
+ targetNode.getMd().setWhy( e.getSource().getMd().toString() );
+ visit( targetNode );
+ }
+ }
+
+ }
+ //-----------------------------------------------------------------------
+ //-----------------------------------------------------------------------
}
//----------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java Thu Sep 10 21:49:53 2009
@@ -1,5 +1,24 @@
package org.apache.maven.repository.metadata;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.codehaus.plexus.component.annotations.Component;
@@ -7,44 +26,49 @@
/**
* @author <a href="mailto:oleg@codehaus.org">Oleg Gusakov</a>
- *
+ *
* @version $Id$
*/
-@Component(role=GraphConflictResolutionPolicy.class)
+@Component(role=GraphConflictResolutionPolicy.class)
public class DefaultGraphConflictResolutionPolicy
implements GraphConflictResolutionPolicy
-{
+{
/**
* artifact, closer to the entry point, is selected
*/
- @Configuration(name="closer-first", value="true")
+ @Configuration(name="closer-first", value="true")
private boolean closerFirst = true;
-
+
/**
* newer artifact is selected
*/
- @Configuration(name="newer-first", value="true")
+ @Configuration(name="newer-first", value="true")
private boolean newerFirst = true;
- public MetadataGraphEdge apply(MetadataGraphEdge e1, MetadataGraphEdge e2)
- {
- int depth1 = e1.getDepth();
- int depth2 = e2.getDepth();
-
- if( depth1 == depth2 ) {
- ArtifactVersion v1 = new DefaultArtifactVersion( e1.getVersion() );
- ArtifactVersion v2 = new DefaultArtifactVersion( e2.getVersion() );
-
- if( newerFirst )
- return v1.compareTo(v2) > 0 ? e1 : e2;
-
- return v1.compareTo(v2) > 0 ? e2 : e1;
- }
-
- if( closerFirst )
- return depth1 < depth2 ? e1 : e2;
+ public MetadataGraphEdge apply( MetadataGraphEdge e1, MetadataGraphEdge e2 )
+ {
+ int depth1 = e1.getDepth();
+ int depth2 = e2.getDepth();
+
+ if ( depth1 == depth2 )
+ {
+ ArtifactVersion v1 = new DefaultArtifactVersion( e1.getVersion() );
+ ArtifactVersion v2 = new DefaultArtifactVersion( e2.getVersion() );
+
+ if ( newerFirst )
+ {
+ return v1.compareTo( v2 ) > 0 ? e1 : e2;
+ }
+
+ return v1.compareTo( v2 ) > 0 ? e2 : e1;
+ }
+
+ if ( closerFirst )
+ {
+ return depth1 < depth2 ? e1 : e2;
+ }
- return depth1 < depth2 ? e2 : e1;
- }
+ return depth1 < depth2 ? e2 : e1;
+ }
}
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java Thu Sep 10 21:49:53 2009
@@ -1,5 +1,24 @@
package org.apache.maven.repository.metadata;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -10,35 +29,35 @@
/**
* maven dependency metadata graph
- *
+ *
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
*
*/
public class MetadataGraph
{
- public static int DEFAULT_VERTICES = 32;
- public static int DEFAULT_EDGES = 64;
-
- // flags to indicate the granularity of vertices
- private boolean versionedVertices = false;
- private boolean scopedVertices = false;
- /**
- * the entry point we started building the graph from
- */
+ public static final int DEFAULT_VERTICES = 32;
+ public static final int DEFAULT_EDGES = 64;
+
+ // flags to indicate the granularity of vertices
+ private boolean versionedVertices = false;
+ private boolean scopedVertices = false;
+ /**
+ * the entry point we started building the graph from
+ */
MetadataGraphVertex entry;
-
+
// graph vertices
- TreeSet< MetadataGraphVertex > vertices;
+ TreeSet<MetadataGraphVertex> vertices;
- /**
+ /**
* incident and excident edges per node
*/
Map<MetadataGraphVertex, List<MetadataGraphEdge>> incidentEdges;
Map<MetadataGraphVertex, List<MetadataGraphEdge>> excidentEdges;
-
+
/**
- * null in dirty graph, actual
+ * null in dirty graph, actual
* scope for conflict-resolved graph
*/
ArtifactScopeEnum scope;
@@ -49,11 +68,11 @@
*/
public MetadataGraph( int nVertices )
{
- init( nVertices, 2*nVertices );
+ init( nVertices, 2 * nVertices );
}
public MetadataGraph( int nVertices, int nEdges )
{
- init( nVertices, nEdges );
+ init( nVertices, nEdges );
}
//------------------------------------------------------------------------
/**
@@ -62,14 +81,14 @@
public MetadataGraph( MetadataGraphVertex entry )
throws MetadataResolutionException
{
- checkVertex(entry);
- checkVertices(1);
+ checkVertex( entry );
+ checkVertices( 1 );
- entry.setCompareVersion( versionedVertices );
- entry.setCompareScope( scopedVertices );
+ entry.setCompareVersion( versionedVertices );
+ entry.setCompareScope( scopedVertices );
- vertices.add( entry );
- this.entry = entry;
+ vertices.add( entry );
+ this.entry = entry;
}
//------------------------------------------------------------------------
/**
@@ -78,16 +97,16 @@
public MetadataGraph( MetadataTreeNode tree )
throws MetadataResolutionException
{
- this( tree, false, false );
+ this( tree, false, false );
}
//------------------------------------------------------------------------
/**
* construct graph from a "dirty" tree
- *
+ *
* @param tree "dirty" tree root
* @param versionedVertices true if graph nodes should be versioned (different versions -> different nodes)
* @param scopedVertices true if graph nodes should be versioned and scoped (different versions and/or scopes -> different nodes)
- *
+ *
*/
public MetadataGraph( MetadataTreeNode tree, boolean versionedVertices, boolean scopedVertices )
throws MetadataResolutionException
@@ -97,12 +116,12 @@
throw new MetadataResolutionException( "tree is null" );
}
- setVersionedVertices(versionedVertices);
- setScopedVertices(scopedVertices);
-
+ setVersionedVertices( versionedVertices );
+ setScopedVertices( scopedVertices );
+
this.versionedVertices = scopedVertices || versionedVertices;
this.scopedVertices = scopedVertices;
-
+
int count = countNodes( tree );
init( count, count + ( count / 2 ) );
@@ -114,7 +133,7 @@
, MetadataTreeNode node
, int depth
, int pomOrder
- )
+ )
throws MetadataResolutionException
{
if ( node == null )
@@ -123,20 +142,20 @@
}
MetadataGraphVertex vertex = new MetadataGraphVertex( node.md, versionedVertices, scopedVertices );
- if( ! vertices.contains(vertex) )
+ if ( !vertices.contains( vertex ) )
{
- vertices.add(vertex);
+ vertices.add( vertex );
}
- if( parentVertex != null ) // then create the edge
- {
+ if ( parentVertex != null ) // then create the edge
+ {
ArtifactMetadata md = node.getMd();
MetadataGraphEdge e = new MetadataGraphEdge( md.version, md.resolved, md.artifactScope, md.artifactUri, depth, pomOrder );
- addEdge( parentVertex, vertex, e);
+ addEdge( parentVertex, vertex, e );
}
else
{
- entry = vertex;
+ entry = vertex;
}
MetadataTreeNode[] kids = node.getChildren();
@@ -145,49 +164,57 @@
return;
}
- for( int i = 0; i< kids.length; i++ )
+ for ( int i = 0; i < kids.length; i++ )
{
- MetadataTreeNode n = kids[i];
+ MetadataTreeNode n = kids[i];
processTreeNodes( vertex, n, depth + 1, i );
}
}
//------------------------------------------------------------------------
public MetadataGraphVertex findVertex( ArtifactMetadata md )
{
- if( md == null || vertices == null || vertices.size() < 1 )
- return null;
-
- MetadataGraphVertex v = new MetadataGraphVertex(md);
- v.setCompareVersion(versionedVertices);
- v.setCompareScope(scopedVertices);
-
- for( MetadataGraphVertex gv : vertices )
- {
- if( gv.equals(v) )
- return gv;
- }
-
- return null;
+ if ( md == null || vertices == null || vertices.size() < 1 )
+ {
+ return null;
+ }
+
+ MetadataGraphVertex v = new MetadataGraphVertex( md );
+ v.setCompareVersion( versionedVertices );
+ v.setCompareScope( scopedVertices );
+
+ for ( MetadataGraphVertex gv : vertices )
+ {
+ if ( gv.equals( v ) )
+ {
+ return gv;
+ }
+ }
+
+ return null;
}
//------------------------------------------------------------------------
public MetadataGraphVertex addVertex( ArtifactMetadata md )
{
- if( md == null )
- return null;
-
- checkVertices();
-
- MetadataGraphVertex v = findVertex(md);
- if( v != null)
- return v;
-
- v = new MetadataGraphVertex(md);
-
- v.setCompareVersion(versionedVertices);
- v.setCompareScope(scopedVertices);
+ if ( md == null )
+ {
+ return null;
+ }
+
+ checkVertices();
+
+ MetadataGraphVertex v = findVertex( md );
+ if ( v != null )
+ {
+ return v;
+ }
+
+ v = new MetadataGraphVertex( md );
+
+ v.setCompareVersion( versionedVertices );
+ v.setCompareScope( scopedVertices );
- vertices.add( v );
- return v;
+ vertices.add( v );
+ return v;
}
//------------------------------------------------------------------------
/**
@@ -195,136 +222,164 @@
*/
private void init( int nVertices, int nEdges )
{
- int nV = nVertices;
- if( nVertices < 1 )
- nV = 1;
-
- checkVertices(nV);
-
- int nE = nVertices;
- if( nEdges <= nV )
- nE = 2*nE;
-
- checkEdges(nE);
+ int nV = nVertices;
+ if ( nVertices < 1 )
+ {
+ nV = 1;
+ }
+
+ checkVertices( nV );
+
+ int nE = nVertices;
+ if ( nEdges <= nV )
+ {
+ nE = 2 * nE;
+ }
+
+ checkEdges( nE );
}
private void checkVertices()
{
- checkVertices(DEFAULT_VERTICES);
+ checkVertices( DEFAULT_VERTICES );
}
private void checkVertices( int nVertices )
{
- if( vertices == null )
- vertices = new TreeSet<MetadataGraphVertex>();
+ if ( vertices == null )
+ {
+ vertices = new TreeSet<MetadataGraphVertex>();
+ }
}
private void checkEdges()
{
- int count = DEFAULT_EDGES;
-
- if( vertices != null )
- count = vertices.size() + vertices.size() / 2;
+ int count = DEFAULT_EDGES;
+
+ if ( vertices != null )
+ {
+ count = vertices.size() + vertices.size() / 2;
+ }
- checkEdges( count );
+ checkEdges( count );
}
private void checkEdges( int nEdges )
{
- if( incidentEdges == null )
- incidentEdges = new HashMap<MetadataGraphVertex, List<MetadataGraphEdge>>( nEdges );
- if( excidentEdges == null )
- excidentEdges = new HashMap<MetadataGraphVertex, List<MetadataGraphEdge>>( nEdges );
+ if ( incidentEdges == null )
+ {
+ incidentEdges = new HashMap<MetadataGraphVertex, List<MetadataGraphEdge>>( nEdges );
+ }
+ if ( excidentEdges == null )
+ {
+ excidentEdges = new HashMap<MetadataGraphVertex, List<MetadataGraphEdge>>( nEdges );
+ }
}
//------------------------------------------------------------------------
private static void checkVertex( MetadataGraphVertex v )
throws MetadataResolutionException
{
- if( v == null )
- throw new MetadataResolutionException( "null vertex" );
- if( v.getMd() == null )
- throw new MetadataResolutionException( "vertex without metadata" );
+ if ( v == null )
+ {
+ throw new MetadataResolutionException( "null vertex" );
+ }
+ if ( v.getMd() == null )
+ {
+ throw new MetadataResolutionException( "vertex without metadata" );
+ }
}
//------------------------------------------------------------------------
private static void checkEdge( MetadataGraphEdge e )
throws MetadataResolutionException
{
- if( e == null )
- throw new MetadataResolutionException( "badly formed edge" );
+ if ( e == null )
+ {
+ throw new MetadataResolutionException( "badly formed edge" );
+ }
+ }
+ //------------------------------------------------------------------------
+ public List<MetadataGraphEdge> getEdgesBetween( MetadataGraphVertex vFrom, MetadataGraphVertex vTo )
+ {
+ List<MetadataGraphEdge> edges = getIncidentEdges(vTo);
+ if ( edges == null || edges.isEmpty() )
+ {
+ return null;
+ }
+
+ List<MetadataGraphEdge> res = new ArrayList<MetadataGraphEdge>( edges.size() );
+
+ for ( MetadataGraphEdge e : edges )
+ {
+ if ( e.getSource().equals( vFrom ) )
+ {
+ res.add( e );
+ }
+ }
+
+ return res;
}
//------------------------------------------------------------------------
- public List<MetadataGraphEdge> getEdgesBetween(
- MetadataGraphVertex vFrom
- , MetadataGraphVertex vTo
- )
- {
- List<MetadataGraphEdge> edges = getIncidentEdges(vTo);
- if( edges == null || edges.isEmpty() )
- return null;
-
- List<MetadataGraphEdge> res = new ArrayList<MetadataGraphEdge>( edges.size() );
-
- for( MetadataGraphEdge e : edges )
- {
- if( e.getSource().equals(vFrom) )
- res.add(e);
- }
-
- return res;
- }
- //------------------------------------------------------------------------
- public MetadataGraph addEdge( MetadataGraphVertex vFrom
- , MetadataGraphVertex vTo
- , MetadataGraphEdge e
- )
+ public MetadataGraph addEdge( MetadataGraphVertex vFrom, MetadataGraphVertex vTo, MetadataGraphEdge e )
throws MetadataResolutionException
{
- checkVertex(vFrom);
- checkVertex(vTo);
+ checkVertex( vFrom );
+ checkVertex( vTo );
+
+ checkVertices();
+
+ checkEdge( e );
+ checkEdges();
+
+ e.setSource( vFrom );
+ e.setTarget( vTo );
+
+ vFrom.setCompareVersion( versionedVertices );
+ vFrom.setCompareScope( scopedVertices );
- checkVertices();
-
- checkEdge(e);
- checkEdges();
-
- e.setSource(vFrom);
- e.setTarget(vTo);
-
- vFrom.setCompareVersion(versionedVertices);
- vFrom.setCompareScope(scopedVertices);
-
- List<MetadataGraphEdge> exList = excidentEdges.get(vFrom);
- if( exList == null ) {
- exList = new ArrayList<MetadataGraphEdge>();
- excidentEdges.put( vFrom, exList );
- }
-
- if( !exList.contains(e) )
- exList.add(e);
-
- List<MetadataGraphEdge> inList = incidentEdges.get(vTo);
- if( inList == null ) {
- inList = new ArrayList<MetadataGraphEdge>();
- incidentEdges.put( vTo, inList );
- }
-
- if( !inList.contains(e) )
- inList.add(e);
-
- return this;
+ List<MetadataGraphEdge> exList = excidentEdges.get( vFrom );
+ if ( exList == null )
+ {
+ exList = new ArrayList<MetadataGraphEdge>();
+ excidentEdges.put( vFrom, exList );
+ }
+
+ if ( !exList.contains( e ) )
+ {
+ exList.add( e );
+ }
+
+ List<MetadataGraphEdge> inList = incidentEdges.get( vTo );
+ if ( inList == null )
+ {
+ inList = new ArrayList<MetadataGraphEdge>();
+ incidentEdges.put( vTo, inList );
+ }
+
+ if ( !inList.contains( e ) )
+ {
+ inList.add( e );
+ }
+
+ return this;
}
//------------------------------------------------------------------------
public MetadataGraph removeVertex( MetadataGraphVertex v )
{
- if( vertices!= null && v != null )
- vertices.remove(v);
-
- if( incidentEdges!= null )
- incidentEdges.remove(v);
-
- if( excidentEdges!= null )
- excidentEdges.remove(v);
+ if ( vertices != null && v != null )
+ {
+ vertices.remove( v );
+ }
+
+ if ( incidentEdges != null )
+ {
+ incidentEdges.remove( v );
+ }
+
+ if ( excidentEdges != null )
+ {
+ excidentEdges.remove( v );
+ }
+
+ return this;
- return this;
-
}
//------------------------------------------------------------------------
private static int countNodes( MetadataTreeNode tree )
@@ -363,99 +418,110 @@
{
return vertices;
}
-
- public List<MetadataGraphEdge> getIncidentEdges( MetadataGraphVertex vertex )
- {
- checkEdges();
- return incidentEdges.get(vertex);
- }
-
- public List<MetadataGraphEdge> getExcidentEdges( MetadataGraphVertex vertex )
- {
- checkEdges();
- return excidentEdges.get(vertex);
- }
-
+
+ public List<MetadataGraphEdge> getIncidentEdges( MetadataGraphVertex vertex )
+ {
+ checkEdges();
+ return incidentEdges.get( vertex );
+ }
+
+ public List<MetadataGraphEdge> getExcidentEdges( MetadataGraphVertex vertex )
+ {
+ checkEdges();
+ return excidentEdges.get( vertex );
+ }
+
public boolean isVersionedVertices()
- {
- return versionedVertices;
- }
- public void setVersionedVertices(boolean versionedVertices)
- {
- this.versionedVertices = versionedVertices;
- }
- public boolean isScopedVertices()
- {
- return scopedVertices;
- }
- public void setScopedVertices(boolean scopedVertices)
- {
- this.scopedVertices = scopedVertices;
-
- // scoped graph is versioned by definition
- if( scopedVertices )
- versionedVertices = true;
- }
- public ArtifactScopeEnum getScope()
- {
- return scope;
- }
- public void setScope(ArtifactScopeEnum scope)
- {
- this.scope = scope;
- }
- //------------------------------------------------------------------------
- public boolean isEmpty()
- {
- return
- entry == null
- || vertices == null
- || vertices.isEmpty()
- ;
- }
- //------------------------------------------------------------------------
- public boolean isEmptyEdges()
- {
- return
- isEmpty()
- || incidentEdges == null
- || incidentEdges.isEmpty()
- ;
- }
- //------------------------------------------------------------------------
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder(512);
- if( isEmpty() )
- return "empty";
- for( MetadataGraphVertex v : vertices )
- {
- sb.append("Vertex: "+v.getMd().toString()+ "\n");
- List<MetadataGraphEdge> ins = getIncidentEdges(v);
- if( ins != null )
- for( MetadataGraphEdge e : ins )
- {
- sb.append(" from : "+e.toString()+"\n");
- }
- else
- sb.append(" no entries\n");
-
- List<MetadataGraphEdge> outs = getExcidentEdges(v);
- if( outs != null )
- for( MetadataGraphEdge e : outs )
- {
- sb.append(" to : "+e.toString()+ "\n");
- }
- else
- sb.append(" no exit\n");
-
- sb.append("-------------------------------------------------\n");
- }
- sb.append("=============================================================\n");
- return sb.toString();
- }
-
+ {
+ return versionedVertices;
+ }
+
+ public void setVersionedVertices( boolean versionedVertices )
+ {
+ this.versionedVertices = versionedVertices;
+ }
+
+ public boolean isScopedVertices()
+ {
+ return scopedVertices;
+ }
+
+ public void setScopedVertices( boolean scopedVertices )
+ {
+ this.scopedVertices = scopedVertices;
+
+ // scoped graph is versioned by definition
+ if ( scopedVertices )
+ {
+ versionedVertices = true;
+ }
+ }
+
+ public ArtifactScopeEnum getScope()
+ {
+ return scope;
+ }
+
+ public void setScope( ArtifactScopeEnum scope )
+ {
+ this.scope = scope;
+ }
+
+ // ------------------------------------------------------------------------
+ public boolean isEmpty()
+ {
+ return entry == null || vertices == null || vertices.isEmpty();
+ }
+
+ //------------------------------------------------------------------------
+ public boolean isEmptyEdges()
+ {
+ return isEmpty() || incidentEdges == null || incidentEdges.isEmpty();
+ }
+ //------------------------------------------------------------------------
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder( 512 );
+ if ( isEmpty() )
+ {
+ return "empty";
+ }
+ for ( MetadataGraphVertex v : vertices )
+ {
+ sb.append( "Vertex: " + v.getMd().toString() + "\n" );
+ List<MetadataGraphEdge> ins = getIncidentEdges( v );
+ if ( ins != null )
+ {
+ for ( MetadataGraphEdge e : ins )
+ {
+ sb.append( " from : " + e.toString() + "\n" );
+ }
+ }
+ else
+ {
+ sb.append( " no entries\n" );
+ }
+
+ List<MetadataGraphEdge> outs = getExcidentEdges( v );
+ if ( outs != null )
+ {
+ for ( MetadataGraphEdge e : outs )
+ {
+ sb.append( " to : " + e.toString() + "\n" );
+ }
+ }
+ else
+ {
+ sb.append( " no exit\n" );
+ }
+
+ sb.append( "-------------------------------------------------\n" );
+ }
+ sb.append( "=============================================================\n" );
+ return sb.toString();
+ }
+
//------------------------------------------------------------------------
//------------------------------------------------------------------------
}
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java?rev=813604&r1=813603&r2=813604&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java Thu Sep 10 21:49:53 2009
@@ -1,10 +1,29 @@
package org.apache.maven.repository.metadata;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.artifact.ArtifactScopeEnum;
/**
* metadata graph vertice - just a wrapper around artifact's metadata
- *
+ *
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
*/
public class MetadataGraphVertex
@@ -15,16 +34,16 @@
// indications to use these in comparrison
private boolean compareVersion = false;
private boolean compareScope = false;
-
- public MetadataGraphVertex( ArtifactMetadata md )
+
+ public MetadataGraphVertex( ArtifactMetadata md )
{
super();
this.md = md;
}
-
- public MetadataGraphVertex( ArtifactMetadata md, boolean compareVersion, boolean compareScope )
+
+ public MetadataGraphVertex( ArtifactMetadata md, boolean compareVersion, boolean compareScope )
{
- this(md);
+ this( md );
this.compareVersion = compareVersion;
this.compareScope = compareScope;
}
@@ -38,125 +57,160 @@
{
this.md = md;
}
- //---------------------------------------------------------------------
+
+ // ---------------------------------------------------------------------
public boolean isCompareVersion()
- {
- return compareVersion;
- }
-
- public void setCompareVersion(boolean compareVersion)
- {
- this.compareVersion = compareVersion;
- }
-
- public boolean isCompareScope()
- {
- return compareScope;
- }
-
- public void setCompareScope(boolean compareScope)
- {
- this.compareScope = compareScope;
- }
-
- //---------------------------------------------------------------------
- @Override
- public String toString()
- {
- return "["+ (md == null ? "no metadata" : md.toString()) + "]";
- }
- //---------------------------------------------------------------------
- private static int compareStrings( String s1, String s2 )
- {
- if( s1 == null && s2 == null )
- return 0;
-
- if( s1 == null && s2 != null )
- return -1;
-
- if( s1 != null && s2 == null )
- return 1;
-
- return s1.compareTo(s2);
- }
- //---------------------------------------------------------------------
- public int compareTo(MetadataGraphVertex vertex)
- {
- if( vertex == null || vertex.getMd() == null )
- return 1;
-
- ArtifactMetadata vmd = vertex.getMd();
-
- if( vmd == null )
- {
- if( md == null )
- return 0;
- else
- return 1;
- }
-
- int g = compareStrings( md.groupId, vmd.groupId );
-
- if( g == 0 )
- {
- int a = compareStrings( md.artifactId, vmd.artifactId );
- if( a == 0 )
- {
- if( compareVersion )
- {
- int v = compareStrings( md.version, vmd.version );
- if( v == 0) {
- if( compareScope ) {
- String s1 = ArtifactScopeEnum.checkScope( md.artifactScope).getScope();
- String s2 = ArtifactScopeEnum.checkScope(vmd.artifactScope).getScope();
- return s1.compareTo(s2);
- }
- else
- return 0;
- }
- else
- return v;
- }
- else
- return 0;
- }
- else
- return a;
- }
-
- return g;
- }
- //---------------------------------------------------------------------
- @Override
- public boolean equals(Object vo)
- {
- if( vo == null || !(vo instanceof MetadataGraphVertex) )
- return false;
- return compareTo( (MetadataGraphVertex)vo ) == 0;
- }
- //---------------------------------------------------------------------
-
- @Override
- public int hashCode()
- {
- if( md == null )
- return super.hashCode();
- StringBuilder hashString = new StringBuilder(128);
- hashString.append( md.groupId+"|" );
- hashString.append( md.artifactId+"|" );
-
- if( compareVersion )
- hashString.append(md.version + "|");
-
- if( compareScope )
- hashString.append(md.getArtifactScope() + "|");
-
- return hashString.toString().hashCode();
-
-// BASE64Encoder b64 = new BASE64Encoder();
-// return b64.encode( hashString.toString().getBytes() ).hashCode();
- }
-
- //---------------------------------------------------------------------
- //---------------------------------------------------------------------
+ {
+ return compareVersion;
+ }
+
+ public void setCompareVersion( boolean compareVersion )
+ {
+ this.compareVersion = compareVersion;
+ }
+
+ public boolean isCompareScope()
+ {
+ return compareScope;
+ }
+
+ public void setCompareScope( boolean compareScope )
+ {
+ this.compareScope = compareScope;
+ }
+
+ // ---------------------------------------------------------------------
+ @Override
+ public String toString()
+ {
+ return "[" + ( md == null ? "no metadata" : md.toString() ) + "]";
+ }
+
+ // ---------------------------------------------------------------------
+ private static int compareStrings( String s1, String s2 )
+ {
+ if ( s1 == null && s2 == null )
+ {
+ return 0;
+ }
+
+ if ( s1 == null && s2 != null )
+ {
+ return -1;
+ }
+
+ if ( s1 != null && s2 == null )
+ {
+ return 1;
+ }
+
+ return s1.compareTo( s2 );
+ }
+
+ // ---------------------------------------------------------------------
+ public int compareTo( MetadataGraphVertex vertex )
+ {
+ if ( vertex == null || vertex.getMd() == null )
+ {
+ return 1;
+ }
+
+ ArtifactMetadata vmd = vertex.getMd();
+
+ if ( vmd == null )
+ {
+ if ( md == null )
+ {
+ return 0;
+ }
+ else
+ {
+ return 1;
+ }
+ }
+
+ int g = compareStrings( md.groupId, vmd.groupId );
+
+ if ( g == 0 )
+ {
+ int a = compareStrings( md.artifactId, vmd.artifactId );
+ if ( a == 0 )
+ {
+ if ( compareVersion )
+ {
+ int v = compareStrings( md.version, vmd.version );
+ if ( v == 0 )
+ {
+ if ( compareScope )
+ {
+ String s1 = ArtifactScopeEnum.checkScope( md.artifactScope ).getScope();
+ String s2 = ArtifactScopeEnum.checkScope( vmd.artifactScope ).getScope();
+ return s1.compareTo( s2 );
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ else
+ {
+ return v;
+ }
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ else
+ {
+ return a;
+ }
+ }
+
+ return g;
+ }
+
+ // ---------------------------------------------------------------------
+ @Override
+ public boolean equals( Object vo )
+ {
+ if ( vo == null || !( vo instanceof MetadataGraphVertex ) )
+ {
+ return false;
+ }
+ return compareTo( (MetadataGraphVertex) vo ) == 0;
+ }
+
+ // ---------------------------------------------------------------------
+
+ @Override
+ public int hashCode()
+ {
+ if ( md == null )
+ {
+ return super.hashCode();
+ }
+ StringBuilder hashString = new StringBuilder( 128 );
+ hashString.append( md.groupId + "|" );
+ hashString.append( md.artifactId + "|" );
+
+ if ( compareVersion )
+ {
+ hashString.append( md.version + "|" );
+ }
+
+ if ( compareScope )
+ {
+ hashString.append( md.getArtifactScope() + "|" );
+ }
+
+ return hashString.toString().hashCode();
+
+ // BASE64Encoder b64 = new BASE64Encoder();
+ // return b64.encode( hashString.toString().getBytes() ).hashCode();
+ }
+
+ // ---------------------------------------------------------------------
+ // ---------------------------------------------------------------------
}