You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/04/08 22:47:10 UTC
svn commit: r932100 - in /maven/maven-3/trunk:
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
maven-core/src/main/mdo/metadata.mdo
Author: bentmann
Date: Thu Apr 8 20:47:10 2010
New Revision: 932100
URL: http://svn.apache.org/viewvc?rev=932100&view=rev
Log:
o Used generated clone() methods
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
maven/maven-3/trunk/maven-core/src/main/mdo/metadata.mdo
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java?rev=932100&r1=932099&r2=932100&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java Thu Apr 8 20:47:10 2010
@@ -1,7 +1,5 @@
package org.apache.maven.artifact.repository.metadata;
-import java.util.ArrayList;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -29,78 +27,13 @@ import java.util.ArrayList;
class MetadataUtils
{
- // TODO: Kill this class once MODELLO-191 is released
-
public static Metadata cloneMetadata( Metadata src )
{
if ( src == null )
{
return null;
}
-
- Metadata target = new Metadata();
-
- target.setGroupId( src.getGroupId() );
- target.setArtifactId( src.getArtifactId() );
- target.setVersion( src.getVersion() );
- target.setVersioning( cloneVersioning( src.getVersioning() ) );
-
- for ( Plugin plugin : src.getPlugins() )
- {
- target.addPlugin( clonePlugin( plugin ) );
- }
-
- return target;
- }
-
- public static Plugin clonePlugin( Plugin src )
- {
- if ( src == null )
- {
- return null;
- }
-
- Plugin target = new Plugin();
-
- target.setArtifactId( src.getArtifactId() );
- target.setName( src.getName() );
- target.setPrefix( src.getPrefix() );
-
- return target;
- }
-
- public static Versioning cloneVersioning( Versioning src )
- {
- if ( src == null )
- {
- return null;
- }
-
- Versioning target = new Versioning();
-
- target.setLastUpdated( src.getLastUpdated() );
- target.setLatest( src.getLatest() );
- target.setRelease( src.getRelease() );
- target.setSnapshot( cloneSnapshot( src.getSnapshot() ) );
- target.setVersions( new ArrayList<String>( src.getVersions() ) );
-
- return target;
- }
-
- public static Snapshot cloneSnapshot( Snapshot src )
- {
- if ( src == null )
- {
- return null;
- }
-
- Snapshot target = new Snapshot();
-
- target.setBuildNumber( src.getBuildNumber() );
- target.setLocalCopy( src.isLocalCopy() );
- target.setTimestamp( src.getTimestamp() );
-
- return target;
+ return src.clone();
}
}
Modified: maven/maven-3/trunk/maven-core/src/main/mdo/metadata.mdo
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/mdo/metadata.mdo?rev=932100&r1=932099&r2=932100&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/mdo/metadata.mdo (original)
+++ maven/maven-3/trunk/maven-core/src/main/mdo/metadata.mdo Thu Apr 8 20:47:10 2010
@@ -31,7 +31,7 @@ under the License.
</default>
</defaults>
<classes>
- <class rootElement="true">
+ <class rootElement="true" java.clone="deep">
<name>Metadata</name>
<version>1.0.0</version>
<fields>
@@ -201,7 +201,7 @@ under the License.
</codeSegment>
</codeSegments>
</class>
- <class>
+ <class java.clone="deep">
<name>Versioning</name>
<version>1.0.0</version>
<description>Versioning information for an artifact</description>
@@ -262,7 +262,7 @@ under the License.
</codeSegment>
</codeSegments>
</class>
- <class>
+ <class java.clone="deep">
<name>Snapshot</name>
<version>1.0.0</version>
<description>Snapshot data for the current version</description>
@@ -288,7 +288,7 @@ under the License.
</field>
</fields>
</class>
- <class>
+ <class java.clone="deep">
<name>Plugin</name>
<version>1.0.0</version>
<description>Mapping information for a single plugin within this group</description>