Return-Path: Delivered-To: apmail-maven-m2-dev-archive@www.apache.org Received: (qmail 66001 invoked from network); 8 Mar 2005 21:08:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 8 Mar 2005 21:08:12 -0000 Received: (qmail 62880 invoked by uid 500); 8 Mar 2005 21:08:12 -0000 Delivered-To: apmail-maven-m2-dev-archive@maven.apache.org Received: (qmail 62861 invoked by uid 500); 8 Mar 2005 21:08:12 -0000 Mailing-List: contact m2-dev-help@maven.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: "Maven 2 Developers List" Reply-To: "Maven 2 Developers List" Delivered-To: mailing list m2-dev@maven.apache.org Received: (qmail 62848 invoked by uid 500); 8 Mar 2005 21:08:12 -0000 Delivered-To: apmail-maven-components-cvs@apache.org Received: (qmail 62845 invoked by uid 99); 8 Mar 2005 21:08:11 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 08 Mar 2005 13:08:11 -0800 Received: (qmail 65975 invoked by uid 1717); 8 Mar 2005 21:08:10 -0000 Date: 8 Mar 2005 21:08:10 -0000 Message-ID: <20050308210810.65974.qmail@minotaur.apache.org> From: brett@apache.org To: maven-components-cvs@apache.org Subject: cvs commit: maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager DefaultArtifactHandlerManager.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N brett 2005/03/08 13:08:10 Modified: maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager DefaultArtifactHandlerManager.java Log: formatting Revision Changes Path 1.5 +15 -14 maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java Index: DefaultArtifactHandlerManager.java =================================================================== RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DefaultArtifactHandlerManager.java 29 Sep 2004 11:20:38 -0000 1.4 +++ DefaultArtifactHandlerManager.java 8 Mar 2005 21:08:10 -0000 1.5 @@ -1,13 +1,5 @@ package org.apache.maven.artifact.handler.manager; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.handler.ArtifactHandler; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.codehaus.plexus.util.StringUtils; - -import java.util.Map; -import java.util.Set; - /* * Copyright 2001-2004 The Apache Software Foundation. * @@ -24,6 +16,14 @@ * limitations under the License. */ +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.handler.ArtifactHandler; +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.codehaus.plexus.util.StringUtils; + +import java.util.Map; +import java.util.Set; + /** * @author Jason van Zyl * @version $Id: DefaultArtifactHandlerManager.java,v 1.1.1.1 2004/08/09 @@ -34,7 +34,8 @@ { private Map artifactHandlers; - public ArtifactHandler getArtifactHandler( String type ) throws ArtifactHandlerNotFoundException + public ArtifactHandler getArtifactHandler( String type ) + throws ArtifactHandlerNotFoundException { ArtifactHandler handler = (ArtifactHandler) artifactHandlers.get( type ); @@ -68,7 +69,7 @@ } public String localRepositoryPath( Artifact artifact, ArtifactRepository localRepository ) - throws ArtifactHandlerNotFoundException + throws ArtifactHandlerNotFoundException { return localRepository.getBasedir() + "/" + path( artifact ); } @@ -79,16 +80,16 @@ return remoteRepository.getUrl() + "/" + path( artifact ); } - public String path( Artifact artifact ) throws ArtifactHandlerNotFoundException + public String path( Artifact artifact ) + throws ArtifactHandlerNotFoundException { ArtifactHandler handler = getArtifactHandler( artifact.getType() ); - return interpolateLayout( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), handler - .directory(), handler.extension() ); + return interpolateLayout( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), handler.directory(), handler.extension() ); } private String interpolateLayout( String groupId, String artifactId, String version, String directory, - String extension ) + String extension ) { String layout = getLayout();