You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2009/11/14 00:46:06 UTC
svn commit: r836061 - in
/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury:
artifact/ artifact/api/ artifact/version/ builder/api/
Author: olamy
Date: Fri Nov 13 23:46:06 2009
New Revision: 836061
URL: http://svn.apache.org/viewvc?rev=836061&view=rev
Log:
apply some formatting
Modified:
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ConflictException.java
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/QualityRange.java
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessorException.java
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationException.java
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQueryException.java
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersion.java
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessorException.java
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/MetadataReader.java
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/MetadataReaderException.java
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ConflictException.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ConflictException.java?rev=836061&r1=836060&r2=836061&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ConflictException.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ConflictException.java Fri Nov 13 23:46:06 2009
@@ -31,7 +31,7 @@
*/
public ConflictException()
{
- // TODO Auto-generated constructor stub
+ // nothing
}
/**
@@ -40,7 +40,6 @@
public ConflictException( String message )
{
super( message );
- // TODO Auto-generated constructor stub
}
/**
@@ -49,7 +48,6 @@
public ConflictException( Throwable cause )
{
super( cause );
- // TODO Auto-generated constructor stub
}
/**
@@ -59,7 +57,6 @@
public ConflictException( String message, Throwable cause )
{
super( message, cause );
- // TODO Auto-generated constructor stub
}
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/QualityRange.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/QualityRange.java?rev=836061&r1=836060&r2=836061&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/QualityRange.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/QualityRange.java Fri Nov 13 23:46:06 2009
@@ -70,12 +70,17 @@
public static QualityRange create( boolean releases, boolean snapshots )
{
if ( releases && snapshots )
+ {
return ALL;
+ }
else if ( releases )
+ {
return new QualityRange( Quality.ALPHA_QUALITY, true, Quality.RELEASE_QUALITY, true );
+ }
else if ( snapshots )
+ {
return new QualityRange( Quality.SNAPSHOT_QUALITY, true, Quality.SNAPSHOT_TS_QUALITY, true );
-
+ }
throw new IllegalArgumentException( LANG.getMessage( "quality.no.sn.no.rel" ) );
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessorException.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessorException.java?rev=836061&r1=836060&r2=836061&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessorException.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessorException.java Fri Nov 13 23:46:06 2009
@@ -31,7 +31,7 @@
*/
public ArtifactListProcessorException()
{
- // TODO Auto-generated constructor stub
+ // nothing
}
/**
@@ -40,7 +40,6 @@
public ArtifactListProcessorException( String message )
{
super( message );
- // TODO Auto-generated constructor stub
}
/**
@@ -49,7 +48,6 @@
public ArtifactListProcessorException( Throwable cause )
{
super( cause );
- // TODO Auto-generated constructor stub
}
/**
@@ -59,7 +57,6 @@
public ArtifactListProcessorException( String message, Throwable cause )
{
super( message, cause );
- // TODO Auto-generated constructor stub
}
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationException.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationException.java?rev=836061&r1=836060&r2=836061&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationException.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationException.java Fri Nov 13 23:46:06 2009
@@ -6,6 +6,7 @@
public ConfigurationException()
{
+ // nothing
}
public ConfigurationException( String message )
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java?rev=836061&r1=836060&r2=836061&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java Fri Nov 13 23:46:06 2009
@@ -31,9 +31,12 @@
throws ConfigurationException
{
if ( impl == null || config == null )
+ {
return;
-
+ }
for ( Map.Entry<String, Object> e : config.entrySet() )
+ {
impl.setOption( e.getKey(), e.getValue() );
+ }
}
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQueryException.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQueryException.java?rev=836061&r1=836060&r2=836061&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQueryException.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQueryException.java Fri Nov 13 23:46:06 2009
@@ -31,7 +31,7 @@
*/
public AttributeQueryException()
{
- // TODO Auto-generated constructor stub
+ // nothing
}
/**
@@ -40,7 +40,6 @@
public AttributeQueryException( String message )
{
super( message );
- // TODO Auto-generated constructor stub
}
/**
@@ -49,7 +48,6 @@
public AttributeQueryException( Throwable cause )
{
super( cause );
- // TODO Auto-generated constructor stub
}
/**
@@ -59,7 +57,6 @@
public AttributeQueryException( String message, Throwable cause )
{
super( message, cause );
- // TODO Auto-generated constructor stub
}
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersion.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersion.java?rev=836061&r1=836060&r2=836061&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersion.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersion.java Fri Nov 13 23:46:06 2009
@@ -20,7 +20,7 @@
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.Quality;
-/*
+/**
* Default implementation of artifact versioning.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java?rev=836061&r1=836060&r2=836061&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java Fri Nov 13 23:46:06 2009
@@ -35,10 +35,10 @@
* @param version to test
* @return
*/
- public boolean includes( String version );
+ boolean includes( String version );
/**
* @return true if the range is good old single version, not a true range
*/
- public boolean isSingleton();
+ boolean isSingleton();
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessorException.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessorException.java?rev=836061&r1=836060&r2=836061&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessorException.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessorException.java Fri Nov 13 23:46:06 2009
@@ -32,6 +32,7 @@
*/
public DependencyProcessorException()
{
+ // nothing
}
/**
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/MetadataReader.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/MetadataReader.java?rev=836061&r1=836060&r2=836061&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/MetadataReader.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/MetadataReader.java Fri Nov 13 23:46:06 2009
@@ -40,23 +40,24 @@
* @throws MetadataReaderException
* @throws RepositoryException
*/
- public byte[] readRawData( ArtifactMetadata bmd, String classifier, String type, boolean exempt )
+ byte[] readRawData( ArtifactMetadata bmd, String classifier, String type, boolean exempt )
throws MetadataReaderException;
- public byte[] readRawData( ArtifactMetadata bmd, String classifier, String type )
+ byte[] readRawData( ArtifactMetadata bmd, String classifier, String type )
throws MetadataReaderException;
/**
- * read metadata for the artifact, pointed by bmd. It will return POM bytes regardless of actual bmd type
+ * read metadata for the artifact, pointed by bmd. It will return POM bytes regardless of actual
+ * bmd type
*
* @param bmd metadata to read
* @param exempt - if this read should be exempt from stream verification, default - false
* @return
* @throws MetadataReaderException
*/
- public byte[] readMetadata( ArtifactMetadata bmd, boolean exempt )
+ byte[] readMetadata( ArtifactMetadata bmd, boolean exempt )
throws MetadataReaderException;
- public byte[] readMetadata( ArtifactMetadata bmd )
+ byte[] readMetadata( ArtifactMetadata bmd )
throws MetadataReaderException;
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/MetadataReaderException.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/MetadataReaderException.java?rev=836061&r1=836060&r2=836061&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/MetadataReaderException.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/MetadataReaderException.java Fri Nov 13 23:46:06 2009
@@ -32,6 +32,7 @@
*/
public MetadataReaderException()
{
+ // nothing
}
/**