Author: brett Date: Fri Feb 20 05:02:48 2009 New Revision: 746138 URL: http://svn.apache.org/viewvc?rev=746138&view=rev Log: [MNG-3379] reformat
Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=746138&r1=746137&r2=746138&view=diff ============================================================================== --- maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original) +++ maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Fri Feb 20 05:02:48 2009 @@ -19,6 +19,17 @@ * under the License. */ +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.manager.WagonManager; @@ -37,15 +48,10 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.FileUtils; -import java.io.File; -import java.io.IOException; -import java.util.*; -import java.util.HashMap; - -import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor; +import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch; import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue; +import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor; import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; -import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch; public class DefaultArtifactResolver extends AbstractLogEnabled @@ -67,7 +73,7 @@ public DefaultArtifactResolver() { super(); - resolveArtifactPool = new ThreadPoolExecutor(3, 5, 3, TimeUnit.SECONDS, new LinkedBlockingQueue()); + resolveArtifactPool = new ThreadPoolExecutor( 3, 5, 3, TimeUnit.SECONDS, new LinkedBlockingQueue() ); } // ---------------------------------------------------------------------- @@ -303,40 +309,51 @@ throws ArtifactResolutionException, ArtifactNotFoundException { ArtifactResolutionResult artifactResolutionResult; - artifactResolutionResult = artifactCollector.collect( artifacts, originatingArtifact, managedVersions, - localRepository, remoteRepositories, source, filter, - listeners ); - - List resolvedArtifacts = Collections.synchronizedList(new ArrayList()); - List missingArtifacts = Collections.synchronizedList(new ArrayList()); - CountDownLatch latch = new CountDownLatch(artifactResolutionResult.getArtifactResolutionNodes().size()); + artifactResolutionResult = + artifactCollector.collect( artifacts, originatingArtifact, managedVersions, localRepository, + remoteRepositories, source, filter, listeners ); + + List resolvedArtifacts = Collections.synchronizedList( new ArrayList() ); + List missingArtifacts = Collections.synchronizedList( new ArrayList() ); + CountDownLatch latch = new CountDownLatch( artifactResolutionResult.getArtifactResolutionNodes().size() ); Map nodesByGroupId = new HashMap(); for ( Iterator i = artifactResolutionResult.getArtifactResolutionNodes().iterator(); i.hasNext(); ) { ResolutionNode node = (ResolutionNode) i.next(); - List nodes = (List) nodesByGroupId.get(node.getArtifact().getGroupId()); - if (nodes == null) + List nodes = (List) nodesByGroupId.get( node.getArtifact().getGroupId() ); + if ( nodes == null ) { nodes = new ArrayList(); - nodesByGroupId.put(node.getArtifact().getGroupId(), nodes); + nodesByGroupId.put( node.getArtifact().getGroupId(), nodes ); } - nodes.add(node); + nodes.add( node ); } - try { - for (Iterator i = nodesByGroupId.values().iterator(); i.hasNext(); ) + try + { + for ( Iterator i = nodesByGroupId.values().iterator(); i.hasNext(); ) { List nodes = (List) i.next(); - resolveArtifactPool.execute(new ResolveArtifactTask(resolveArtifactPool, latch, nodes, localRepository, resolvedArtifacts, missingArtifacts)); + resolveArtifactPool.execute( new ResolveArtifactTask( resolveArtifactPool, latch, nodes, + localRepository, resolvedArtifacts, + missingArtifacts ) ); } latch.await(); - } catch (InterruptedException e) { - throw new ArtifactResolutionException("Resolution interrupted", null, e); - } catch (RuntimeException ex) { - if (ex.getCause() instanceof ArtifactResolutionException) + } + catch ( InterruptedException e ) + { + throw new ArtifactResolutionException( "Resolution interrupted", null, e ); + } + catch ( RuntimeException ex ) + { + if ( ex.getCause() instanceof ArtifactResolutionException ) + { throw (ArtifactResolutionException) ex.getCause(); + } else + { throw ex; + } } if ( missingArtifacts.size() > 0 ) @@ -377,43 +394,60 @@ remoteRepositories, source, null, listeners ); } - private class ResolveArtifactTask implements Runnable { + private class ResolveArtifactTask + implements Runnable + { private List nodes; + private ArtifactRepository localRepository; + private List resolvedArtifacts; + private List missingArtifacts; + private CountDownLatch latch; + private ThreadPoolExecutor pool; - public ResolveArtifactTask(ThreadPoolExecutor pool, CountDownLatch latch, List nodes, ArtifactRepository localRepository, List resolvedArtifacts, List missingArtifacts) { + public ResolveArtifactTask( ThreadPoolExecutor pool, CountDownLatch latch, List nodes, + ArtifactRepository localRepository, List resolvedArtifacts, List missingArtifacts ) + { this.nodes = nodes; this.localRepository = localRepository; - this.resolvedArtifacts = resolvedArtifacts; + this.resolvedArtifacts = resolvedArtifacts; this.missingArtifacts = missingArtifacts; this.latch = latch; this.pool = pool; } - public void run() { - //getLogger().info("Size of nodes: "+nodes.size()+" on thread: "+Thread.currentThread().getId()); + public void run() + { Iterator i = nodes.iterator(); ResolutionNode node = (ResolutionNode) i.next(); i.remove(); - try { - resolveArtifact(node); - if (i.hasNext()) - pool.execute(new ResolveArtifactTask(pool, latch, nodes, localRepository, resolvedArtifacts, missingArtifacts)); - } catch (ArtifactResolutionException e) { - throw new RuntimeException(e); + try + { + resolveArtifact( node ); + if ( i.hasNext() ) + { + pool.execute( new ResolveArtifactTask( pool, latch, nodes, localRepository, resolvedArtifacts, + missingArtifacts ) ); + } + } + catch ( ArtifactResolutionException e ) + { + throw new RuntimeException( e ); } latch.countDown(); } - private void resolveArtifact(ResolutionNode node) throws ArtifactResolutionException { + private void resolveArtifact( ResolutionNode node ) + throws ArtifactResolutionException + { try - { - resolve( node.getArtifact(), node.getRemoteRepositories(), localRepository ); - resolvedArtifacts.add( node.getArtifact() ); + { + resolve( node.getArtifact(), node.getRemoteRepositories(), localRepository ); + resolvedArtifacts.add( node.getArtifact() ); } catch ( ArtifactNotFoundException anfe ) { Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java?rev=746138&r1=746137&r2=746138&view=diff ============================================================================== --- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java (original) +++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java Fri Feb 20 05:02:48 2009 @@ -19,23 +19,25 @@ * under the License. */ +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; + import org.apache.maven.wagon.WagonConstants; -import org.apache.maven.wagon.resource.Resource; import org.apache.maven.wagon.events.TransferEvent; +import org.apache.maven.wagon.resource.Resource; import org.codehaus.plexus.logging.Logger; -import java.util.*; - /** - * Console download progress meter. Properly handles multiple downloads simultaneously. - * + * Console download progress meter. Properly handles multiple downloads simultaneously. + * * @author <a href="mailto:br...@apache.org">Brett Porter</a> * @version $Id$ */ public class ConsoleDownloadMonitor extends AbstractConsoleDownloadMonitor { - private Map/*<Resource,Integer>*/ downloads; + private Map/* <Resource,Integer> */downloads; public ConsoleDownloadMonitor( Logger logger ) { @@ -67,35 +69,37 @@ public synchronized void transferProgress( TransferEvent transferEvent, byte[] buffer, int length ) { Resource resource = transferEvent.getResource(); - if (!downloads.containsKey(resource)) + if ( !downloads.containsKey( resource ) ) { - downloads.put(resource, new Long(length)); - } else + downloads.put( resource, new Long( length ) ); + } + else { - Long complete = (Long) downloads.get(resource); - complete = new Long(complete.longValue() + length); - downloads.put(resource, complete); + Long complete = (Long) downloads.get( resource ); + complete = new Long( complete.longValue() + length ); + downloads.put( resource, complete ); } - for (Iterator i = downloads.entrySet().iterator(); i.hasNext(); ) + for ( Iterator i = downloads.entrySet().iterator(); i.hasNext(); ) { Map.Entry entry = (Map.Entry) i.next(); - Long complete = (Long)entry.getValue(); - String status = getDownloadStatusForResource(complete.longValue(), ((Resource)entry.getKey()).getContentLength()); - out.print(status); - if (i.hasNext()) + Long complete = (Long) entry.getValue(); + String status = + getDownloadStatusForResource( complete.longValue(), ( (Resource) entry.getKey() ).getContentLength() ); + out.print( status ); + if ( i.hasNext() ) { - out.print(" "); + out.print( " " ); } } - out.print("\r"); + out.print( "\r" ); } - String getDownloadStatusForResource(long progress, long total) + String getDownloadStatusForResource( long progress, long total ) { if ( total >= 1024 ) { - return (progress / 1024 ) + "/" + ( total == WagonConstants.UNKNOWN_LENGTH ? "?" : ( total / 1024 ) + "K"); + return ( progress / 1024 ) + "/" + ( total == WagonConstants.UNKNOWN_LENGTH ? "?" : ( total / 1024 ) + "K" ); } else { @@ -105,8 +109,7 @@ public synchronized void transferCompleted( TransferEvent transferEvent ) { - super.transferCompleted(transferEvent); - downloads.remove(transferEvent.getResource()); + super.transferCompleted( transferEvent ); + downloads.remove( transferEvent.getResource() ); } } - Modified: maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java?rev=746138&r1=746137&r2=746138&view=diff ============================================================================== --- maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java (original) +++ maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java Fri Feb 20 05:02:48 2009 @@ -106,11 +106,11 @@ getWagon().connect( repository ); } - public TransferEventMock(Resource resource, int length) + public TransferEventMock( Resource resource, int length ) throws ConnectionException, AuthenticationException { super( new FileWagon(), resource, TransferEvent.TRANSFER_INITIATED, TransferEvent.REQUEST_GET ); - getResource().setContentLength(length); + getResource().setContentLength( length ); Repository repository = new Repository(); getWagon().connect( repository ); }