You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/05/26 16:30:34 UTC
cvs commit: maven-new/core/src/java/org/apache/maven/artifact/handlers DefaultArtifactHandlerManager.java
jvanzyl 2003/05/26 07:30:34
Modified: core/src/java/org/apache/maven/artifact/handlers
DefaultArtifactHandlerManager.java
Log:
o reformatting while i fix this up a bit.
Revision Changes Path
1.3 +21 -18 maven-new/core/src/java/org/apache/maven/artifact/handlers/DefaultArtifactHandlerManager.java
Index: DefaultArtifactHandlerManager.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/handlers/DefaultArtifactHandlerManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultArtifactHandlerManager.java 25 May 2003 19:04:50 -0000 1.2
+++ DefaultArtifactHandlerManager.java 26 May 2003 14:30:34 -0000 1.3
@@ -68,7 +68,7 @@
import org.apache.maven.artifact.Artifact;
/**
- * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
+ * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
public class DefaultArtifactHandlerManager
@@ -94,21 +94,24 @@
private Properties handlers = null;
/**
- * @param type
- * @return
- */
- public ArtifactHandler getHandler( Artifact artifact ) throws MavenException
+ * @param type
+ * @return
+ */
+ public ArtifactHandler getHandler( Artifact artifact )
+ throws MavenException
{
- String type = artifact.getType();
- if (cachedHandlers.containsKey( type ))
+ String type = artifact.getType();
+ if ( cachedHandlers.containsKey( type ) )
{
return (ArtifactHandler) cachedHandlers.get( type );
}
- String handlerClassname = handlers.getProperty( type );
+
+ String handlerClassname = handlers.getProperty( type );
if ( handlerClassname == null )
{
return defaultHandler;
}
+
Class clazz = null;
try
{
@@ -120,17 +123,18 @@
"ArtifactHandler class: '" + handlerClassname + "' not found";
throw new MavenException( msg, e );
}
+
ArtifactHandler artifactHandler = null;
try
{
- artifactHandler = ( ArtifactHandler ) clazz.newInstance();
+ artifactHandler = (ArtifactHandler) clazz.newInstance();
}
catch ( Exception e )
{
String msg =
"ArtifactHandler : '"
- + handlerClassname
- + "' cannot be instantiated";
+ + handlerClassname
+ + "' cannot be instantiated";
throw new MavenException( msg, e );
}
@@ -143,7 +147,7 @@
*/
public ArtifactHandler setDefaultHandler( ArtifactHandler defaultHandler )
{
- ArtifactHandler previousHandler = this.defaultHandler;
+ ArtifactHandler previousHandler = this.defaultHandler;
this.defaultHandler = defaultHandler;
return previousHandler;
}
@@ -159,7 +163,7 @@
* @throws java.lang.Exception if any error occures
*/
public void initialize() throws Exception
- {
+ {
InputStream inputStream = null;
File configFile = null;
try
@@ -167,18 +171,18 @@
Class clazz = DefaultArtifactHandlerManager.class;
inputStream =
clazz.getResourceAsStream(
- MavenConstants.ARTIFACT_HANDLER_PROPERTIES);
+ MavenConstants.ARTIFACT_HANDLER_PROPERTIES );
handlers = new Properties();
handlers.load( inputStream );
}
- catch (Exception e)
+ catch ( Exception e )
{
String message = "Cannot read global layout.properties file";
throw new MavenException( message, e );
}
finally
{
- if (inputStream != null)
+ if ( inputStream != null )
{
try
{
@@ -190,5 +194,4 @@
}
}
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org