notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
svn commit: r1276 - development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl
- From: niclas AT netcompartner.com
- To: notify-dpml AT lists.ibiblio.org
- Subject: svn commit: r1276 - development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl
- Date: Thu, 23 Dec 2004 20:00:06 +0100
Author: niclas
Date: Thu Dec 23 20:00:06 2004
New Revision: 1276
Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionFactory.java
Log:
A bug regarding URLs in overrides which couldn't be using the artifact
protocol.
Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionFactory.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionFactory.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionFactory.java
Thu Dec 23 20:00:06 2004
@@ -518,7 +518,8 @@
private URL getTargetOverrideURL( File dir, String path )
throws CompositionException, IOException
{
- if( null == path ) return null;
+ if( null == path )
+ return null;
if( !isaURL( path ) )
{
@@ -595,7 +596,8 @@
}
}
- private File resolveFile( File base, String path ) throws IOException
+ private File resolveFile( File base, String path )
+ throws IOException
{
if( null == path )
{
@@ -608,15 +610,14 @@
}
else
{
- return
- new File(
- base, path ).getCanonicalFile();
+ File f = new File( base, path );
+ return f.getCanonicalFile();
}
}
private boolean isaURL( String path )
{
- return ( path.indexOf( ":/" ) > 0 );
+ return path.indexOf( ":" ) > 2 ;
}
private void pack( StringBuffer buffer, String key, boolean value )
- svn commit: r1276 - development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl, niclas, 12/23/2004
Archive powered by MHonArc 2.6.24.