You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ma...@apache.org on 2008/02/27 17:20:20 UTC
svn commit: r631632 - in /maven/sandbox/trunk/shared/maven-runtime/src:
main/java/org/apache/maven/shared/runtime/
test/java/org/apache/maven/shared/runtime/
Author: markh
Date: Wed Feb 27 08:20:16 2008
New Revision: 631632
URL: http://svn.apache.org/viewvc?rev=631632&view=rev
Log:
Formatted source
Modified:
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/ClassLoaderHelper.java
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenProjectProperties.java
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java
maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/ClassLoaderHelperTest.java
maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/ClassLoaderHelper.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/ClassLoaderHelper.java?rev=631632&r1=631631&r2=631632&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/ClassLoaderHelper.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/ClassLoaderHelper.java Wed Feb 27 08:20:16 2008
@@ -163,6 +163,7 @@
JarInputStream in = new JarInputStream( url.openStream() );
JarEntry entry;
+
while ( ( entry = in.getNextJarEntry() ) != null )
{
String name = entry.getName();
@@ -222,12 +223,16 @@
private boolean matches( String[] matchTokens, String[] tokens )
{
if ( tokens.length != matchTokens.length )
+ {
return false;
+ }
for ( int i = 0; i < tokens.length; i++ )
{
if ( matchTokens[i] != null && !tokens[i].equals( matchTokens[i] ) )
+ {
return false;
+ }
}
return true;
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java?rev=631632&r1=631631&r2=631632&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java Wed Feb 27 08:20:16 2008
@@ -33,8 +33,8 @@
{
// MavenRuntime methods ---------------------------------------------------
- /*
- * @see org.apache.maven.shared.runtime.MavenRuntime#getProjectProperties(java.lang.ClassLoader)
+ /**
+ * {@inheritDoc}
*/
public List getProjectProperties( ClassLoader classLoader ) throws MavenRuntimeException
{
@@ -45,8 +45,8 @@
return visitor.getProjects();
}
- /*
- * @see org.apache.maven.shared.runtime.MavenRuntime#getProjects(java.lang.ClassLoader)
+ /**
+ * {@inheritDoc}
*/
public List getProjects( ClassLoader classLoader ) throws MavenRuntimeException
{
@@ -57,8 +57,8 @@
return visitor.getProjects();
}
- /*
- * @see org.apache.maven.shared.runtime.MavenRuntime#getSortedProjects(java.lang.ClassLoader)
+ /**
+ * {@inheritDoc}
*/
public List getSortedProjects( ClassLoader classLoader ) throws MavenRuntimeException
{
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenProjectProperties.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenProjectProperties.java?rev=631632&r1=631631&r2=631632&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenProjectProperties.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenProjectProperties.java Wed Feb 27 08:20:16 2008
@@ -74,13 +74,19 @@
public MavenProjectProperties( String groupId, String artifactId, String version )
{
if ( groupId == null )
+ {
throw new IllegalArgumentException( "groupId cannot be null" );
+ }
if ( artifactId == null )
+ {
throw new IllegalArgumentException( "artifactId cannot be null" );
+ }
if ( version == null )
+ {
throw new IllegalArgumentException( "version cannot be null" );
+ }
this.groupId = groupId;
this.artifactId = artifactId;
@@ -121,8 +127,8 @@
// Object methods ---------------------------------------------------------
- /*
- * @see java.lang.Object#hashCode()
+ /**
+ * {@inheritDoc}
*/
public int hashCode()
{
@@ -135,17 +141,21 @@
return hashCode;
}
- /*
- * @see java.lang.Object#equals(java.lang.Object)
+ /**
+ * {@inheritDoc}
*/
public boolean equals( Object object )
{
if ( !( object instanceof MavenProjectProperties ) )
+ {
return false;
+ }
MavenProjectProperties info = (MavenProjectProperties) object;
- return ( groupId.equals( info.getGroupId() ) && artifactId.equals( info.getArtifactId() ) && version.equals( info.getVersion() ) );
+ return groupId.equals( info.getGroupId() )
+ && artifactId.equals( info.getArtifactId() )
+ && version.equals( info.getVersion() );
}
/*
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java?rev=631632&r1=631631&r2=631632&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java Wed Feb 27 08:20:16 2008
@@ -34,7 +34,7 @@
/**
* The Plexus role for this component.
*/
- static String ROLE = MavenRuntime.class.getName();
+ String ROLE = MavenRuntime.class.getName();
// public methods ---------------------------------------------------------
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java?rev=631632&r1=631631&r2=631632&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java Wed Feb 27 08:20:16 2008
@@ -70,8 +70,8 @@
// MavenRuntimeVisitor methods --------------------------------------------
- /*
- * @see org.apache.maven.shared.runtime.MavenRuntimeVisitor#visitProjectProperties(java.io.InputStream)
+ /**
+ * {@inheritDoc}
*/
public void visitProjectProperties( InputStream in ) throws MavenRuntimeException
{
@@ -80,8 +80,8 @@
projects.add( project );
}
- /*
- * @see org.apache.maven.shared.runtime.MavenRuntimeVisitor#visitProjectXML(java.io.InputStream)
+ /**
+ * {@inheritDoc}
*/
public void visitProjectXML( InputStream in ) throws MavenRuntimeException
{
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java?rev=631632&r1=631631&r2=631632&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java Wed Feb 27 08:20:16 2008
@@ -61,16 +61,16 @@
// MavenRuntimeVisitor methods --------------------------------------------
- /*
- * @see org.apache.maven.shared.runtime.MavenRuntimeVisitor#visitProjectProperties(java.io.InputStream)
+ /**
+ * {@inheritDoc}
*/
public void visitProjectProperties( InputStream in ) throws MavenRuntimeException
{
// no-op
}
- /*
- * @see org.apache.maven.shared.runtime.MavenRuntimeVisitor#visitProjectXML(java.io.InputStream)
+ /**
+ * {@inheritDoc}
*/
public void visitProjectXML( InputStream in ) throws MavenRuntimeException
{
Modified: maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/ClassLoaderHelperTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/ClassLoaderHelperTest.java?rev=631632&r1=631631&r2=631632&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/ClassLoaderHelperTest.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/ClassLoaderHelperTest.java Wed Feb 27 08:20:16 2008
@@ -46,8 +46,8 @@
// TestCase methods -------------------------------------------------------
- /*
- * @see junit.framework.TestCase#setUp()
+ /**
+ * {@inheritDoc}
*/
protected void setUp() throws Exception
{
@@ -57,8 +57,8 @@
mockVisitorControl.replay();
}
- /*
- * @see junit.framework.TestCase#tearDown()
+ /**
+ * {@inheritDoc}
*/
protected void tearDown() throws Exception
{
Modified: maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java?rev=631632&r1=631631&r2=631632&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java Wed Feb 27 08:20:16 2008
@@ -52,8 +52,8 @@
// TestCase methods -------------------------------------------------------
- /*
- * @see org.codehaus.plexus.PlexusTestCase#setUp()
+ /**
+ * {@inheritDoc}
*/
protected void setUp() throws Exception
{