You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/05/23 17:13:36 UTC

svn commit: r659569 - in /maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata: DefaultArtifact.java transform/MetadataGraphTransformationException.java

Author: jvanzyl
Date: Fri May 23 08:13:35 2008
New Revision: 659569

URL: http://svn.apache.org/viewvc?rev=659569&view=rev
Log:
o remove attachment to existing metadata classes

Modified:
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.java?rev=659569&r1=659568&r2=659569&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.java Fri May 23 08:13:35 2008
@@ -24,7 +24,6 @@
 import java.util.regex.Matcher;
 
 import org.apache.maven.artifact.InvalidArtifactRTException;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.artifact.resolver.metadata.version.ArtifactVersion;
 import org.apache.maven.artifact.resolver.metadata.version.OverConstrainedVersionException;
@@ -60,8 +59,6 @@
 
     private VersionRange versionRange;
 
-    private Map<Object, ArtifactMetadata> metadataMap;
-
     // This is Maven specific. jvz/
     private String classifier;
 
@@ -284,34 +281,6 @@
         }
     }
 
-    public void addMetadata( ArtifactMetadata metadata )
-    {
-        if ( metadataMap == null )
-        {
-            metadataMap = new HashMap<Object, ArtifactMetadata>();
-        }
-
-        ArtifactMetadata m = metadataMap.get( metadata.getKey() );
-        if ( m != null )
-        {
-            m.merge( metadata );
-        }
-        else
-        {
-            metadataMap.put( metadata.getKey(), metadata );
-        }
-    }
-
-    public Collection<ArtifactMetadata> getMetadataList()
-    {
-        if ( metadataMap == null )
-        {
-            return Collections.emptyList();
-        }
-
-        return metadataMap.values();
-    }
-
     // ----------------------------------------------------------------------
     // Object overrides
     // ----------------------------------------------------------------------

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java?rev=659569&r1=659568&r2=659569&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java Fri May 23 08:13:35 2008
@@ -27,5 +27,4 @@
 	{
 		super(message, cause);
 	}
-
 }