sbailliez 02/01/20 09:32:59
Modified: proposal/myrmidon/src/java/org/apache/myrmidon/framework
AbstractContainerTask.java AbstractTypeDef.java
Condition.java LogLevel.java Pattern.java
TypeInstanceTask.java
proposal/myrmidon/src/java/org/apache/myrmidon/converter
AbstractConverter.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
AspectAwareExecutor.java DefaultExecutor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder
ATIProjectBuilder.java DefaultProjectBuilder.java
proposal/myrmidon/src/java/org/apache/antlib/archive
BZip2.java Pack.java
proposal/myrmidon/src/java/org/apache/aut/bzip2
CBZip2InputStream.java CBZip2OutputStream.java
proposal/myrmidon/src/java/org/apache/myrmidon/frontends
CLIMain.java
proposal/myrmidon/src/java/org/apache/antlib/runtime
ConverterDef.java Facility.java Import.java
proposal/myrmidon/src/java/org/apache/antlib/cvslib Cvs.java
CVSPass.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect
DefaultAspectManager.java
proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers
DefaultCommandLauncher.java ExecUtil.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
DefaultConfigurer.java DefaultObjectConfigurer.java
DefaultPropertyConfigurer.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/converter
DefaultConverterRegistry.java
DefaultMasterConverter.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer
DefaultDeployer.java Deployment.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor
DefaultEmbeddor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/model
DefaultProject.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/role
DefaultRoleManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
DefaultTaskContext.java DefaultWorkspace.java
ProjectListenerSupport.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type
DefaultTypeFactory.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/type
DefaultTypeManager.java MultiSourceTypeFactory.java
proposal/myrmidon/src/java/org/apache/aut/nativelib
Environment.java Os.java
proposal/myrmidon/src/java/org/apache/antlib/nativelib
Exec.java LoadEnvironment.java
proposal/myrmidon/src/java/org/apache/antlib/core
LoadProperties.java Property.java
StringToBooleanConverter.java
StringToByteConverter.java
StringToClassConverter.java
StringToDoubleConverter.java
StringToEnumConverter.java
StringToFileConverter.java
StringToFloatConverter.java
StringToIntegerConverter.java
StringToLongConverter.java
StringToShortConverter.java
StringToURLConverter.java
proposal/myrmidon/src/java/org/apache/aut/nativelib/impl
LogOutputStream.java ProcessMonitor.java
proposal/myrmidon/src/java/org/apache/myrmidon/launcher
Main.java
proposal/myrmidon/src/java/org/apache/antlib/selftest
SubElementTest.java
proposal/myrmidon/src/java/org/apache/antlib/xml
TraXLiaison.java XalanLiaison.java
XMLValidateTask.java XSLTParam.java
XSLTProcess.java
Log:
- Fix order of modifiers
- Fix duplicate/unecessary imports
- Fix single if/else and loop without block
Revision Changes Path
1.10 +4 -4
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java
Index: AbstractContainerTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractContainerTask.java 5 Jan 2002 03:04:49 -0000 1.9
+++ AbstractContainerTask.java 20 Jan 2002 17:32:56 -0000 1.10
@@ -9,14 +9,14 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.property.PropertyException;
-import org.apache.avalon.excalibur.property.PropertyUtil;
+
+
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.Context;
+
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.converter.ConverterException;
@@ -33,7 +33,7 @@
extends AbstractTask
implements Composable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( AbstractContainerTask.class );
///For converting own attributes
1.11 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java
Index: AbstractTypeDef.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractTypeDef.java 23 Dec 2001 06:25:36 -0000 1.10
+++ AbstractTypeDef.java 20 Jan 2002 17:32:56 -0000 1.11
@@ -33,7 +33,7 @@
extends AbstractTask
implements Composable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( AbstractTypeDef.class );
private File m_lib;
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java
Index: Condition.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Condition.java 23 Dec 2001 06:25:36 -0000 1.7
+++ Condition.java 20 Jan 2002 17:32:56 -0000 1.8
@@ -23,7 +23,7 @@
public class Condition
implements Component
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( Condition.class );
private String m_condition;
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/LogLevel.java
Index: LogLevel.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/LogLevel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LogLevel.java 13 Jan 2002 04:51:51 -0000 1.1
+++ LogLevel.java 20 Jan 2002 17:32:56 -0000 1.2
@@ -22,7 +22,7 @@
extends Enum
{
//Map for all the levels
- private static final HashMap c_levels = new HashMap();
+ private final static HashMap c_levels = new HashMap();
//standard enums for version of JVM
public final static LogLevel FATAL_ERROR = new LogLevel( "fatalError" );
1.10 +4 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
Index: Pattern.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Pattern.java 23 Dec 2001 06:25:36 -0000 1.9
+++ Pattern.java 20 Jan 2002 17:32:56 -0000 1.10
@@ -19,7 +19,7 @@
public class Pattern
implements DataType
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( Pattern.class );
private String m_value;
@@ -85,7 +85,9 @@
public String toString()
{
String result = "Pattern['" + m_value + "',";
- if( null != m_condition ) result = result + m_condition;
+ if( null != m_condition ) {
+ result = result + m_condition;
+ }
return result + "]";
}
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java
Index: TypeInstanceTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TypeInstanceTask.java 23 Dec 2001 06:25:36 -0000 1.7
+++ TypeInstanceTask.java 20 Jan 2002 17:32:56 -0000 1.8
@@ -30,7 +30,7 @@
extends AbstractContainerTask
implements Configurable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( TypeInstanceTask.class );
private String m_id;
1.7 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/converter/AbstractConverter.java
Index: AbstractConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/converter/AbstractConverter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractConverter.java 29 Dec 2001 21:13:40 -0000 1.6
+++ AbstractConverter.java 20 Jan 2002 17:32:56 -0000 1.7
@@ -19,7 +19,7 @@
public abstract class AbstractConverter
implements Converter
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( AbstractConverter.class );
private final Class m_source;
1.13 +8 -6
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java
Index: AspectAwareExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AspectAwareExecutor.java 30 Dec 2001 06:36:48 -0000 1.12
+++ AspectAwareExecutor.java 20 Jan 2002 17:32:56 -0000 1.13
@@ -26,7 +26,7 @@
public class AspectAwareExecutor
extends DefaultExecutor
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( AspectAwareExecutor.class );
private final static Configuration[] EMPTY_ELEMENTS = new Configuration[
0 ];
@@ -139,12 +139,14 @@
final ArrayList elementList = (ArrayList)elementMap.remove(
names[ i ] );
Parameters parameters = (Parameters)parameterMap.remove( names[
i ] );
- if( null == parameters ) parameters =
Parameters.EMPTY_PARAMETERS;
+ if( null == parameters ) {
+ parameters = Parameters.EMPTY_PARAMETERS;
+ }
Configuration[] elements = null;
- if( null == elementList )
+ if( null == elementList ) {
elements = EMPTY_ELEMENTS;
- else
+ } else
{
elements = (Configuration[])elementList.toArray(
EMPTY_ELEMENTS );
}
@@ -170,9 +172,9 @@
Configuration[] elements = null;
- if( null == elementList )
+ if( null == elementList ) {
elements = EMPTY_ELEMENTS;
- else
+ } else
{
elements = (Configuration[])elementList.toArray(
EMPTY_ELEMENTS );
}
1.18 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
Index: DefaultExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DefaultExecutor.java 1 Jan 2002 06:16:24 -0000 1.17
+++ DefaultExecutor.java 20 Jan 2002 17:32:56 -0000 1.18
@@ -30,7 +30,7 @@
extends AbstractLogEnabled
implements Executor, Composable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultExecutor.class );
private Configurer m_configurer;
1.7 +4 -4
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java
Index: ATIProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ATIProjectBuilder.java 23 Dec 2001 06:25:34 -0000 1.6
+++ ATIProjectBuilder.java 20 Jan 2002 17:32:56 -0000 1.7
@@ -33,7 +33,7 @@
extends DefaultProjectBuilder
implements Parameterizable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( ATIProjectBuilder.class );
private Parameters m_parameters;
@@ -74,11 +74,11 @@
final String target = reactorHandler.getTarget( i );
final String data = reactorHandler.getData( i );
- if( target.equals( "xsl-param" ) )
+ if( target.equals( "xsl-param" ) ) {
handleParameter( data );
- else if( target.equals( "xsl-params" ) )
+ } else if( target.equals( "xsl-params" ) ) {
handleParameters( data, sourceID );
- else if( target.equals( "xsl-stylesheet" ) )
+ } else if( target.equals( "xsl-stylesheet" ) )
{
if( null != transformer )
{
1.26 +7 -6
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DefaultProjectBuilder.java 15 Jan 2002 09:46:03 -0000 1.25
+++ DefaultProjectBuilder.java 20 Jan 2002 17:32:56 -0000 1.26
@@ -17,7 +17,7 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.avalon.framework.CascadingException;
-import org.apache.avalon.framework.ExceptionUtil;
+
import org.apache.avalon.framework.Version;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -40,7 +40,7 @@
extends AbstractLogEnabled
implements ProjectBuilder
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultProjectBuilder.class );
private final static Version VERSION = new Version( 2, 0, 0 );
@@ -263,9 +263,9 @@
}
}
- if( name.equals( "target" ) )
+ if( name.equals( "target" ) ) {
buildTarget( project, element );
- else
+ } else
{
final String message =
REZ.getString( "ant.unknown-toplevel-element.error",
name, element.getLocation() );
@@ -456,9 +456,10 @@
protected boolean validName( final String name )
{
- if( -1 != name.indexOf( "->" ) )
+ if( -1 != name.indexOf( "->" ) ) {
return false;
- else
+ } else {
return true;
+ }
}
}
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java
Index: BZip2.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BZip2.java 20 Jan 2002 02:10:27 -0000 1.2
+++ BZip2.java 20 Jan 2002 17:32:56 -0000 1.3
@@ -22,7 +22,7 @@
public class BZip2
extends Pack
{
- private static final byte[] HEADER = new byte[]{(byte)'B', (byte)'Z'};
+ private final static byte[] HEADER = new byte[]{(byte)'B', (byte)'Z'};
protected OutputStream getPackingStream( OutputStream output )
throws TaskException, IOException
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java
Index: Pack.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Pack.java 19 Jan 2002 07:41:48 -0000 1.1
+++ Pack.java 20 Jan 2002 17:32:56 -0000 1.2
@@ -12,7 +12,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.util.zip.GZIPOutputStream;
+
import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
1.2 +9 -5
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/bzip2/CBZip2InputStream.java
Index: CBZip2InputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/bzip2/CBZip2InputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CBZip2InputStream.java 20 Jan 2002 00:03:04 -0000 1.1
+++ CBZip2InputStream.java 20 Jan 2002 17:32:56 -0000 1.2
@@ -175,8 +175,9 @@
m_blockSize100k = newSize100k;
- if( newSize100k == 0 )
+ if( newSize100k == 0 ) {
return;
+ }
int n = BASE_BLOCK_SIZE * newSize100k;
m_ll8 = new char[ n ];
@@ -302,8 +303,9 @@
{
m_rNToGo = RAND_NUMS[ m_rTPos ];
m_rTPos++;
- if( m_rTPos == 512 )
+ if( m_rTPos == 512 ) {
m_rTPos = 0;
+ }
}
m_rNToGo--;
ch2 ^= (int)( ( m_rNToGo == 1 ) ? 1 : 0 );
@@ -340,8 +342,9 @@
{
m_rNToGo = RAND_NUMS[ m_rTPos ];
m_rTPos++;
- if( m_rTPos == 512 )
+ if( m_rTPos == 512 ) {
m_rTPos = 0;
+ }
}
m_rNToGo--;
z ^= ( ( m_rNToGo == 1 ) ? 1 : 0 );
@@ -464,10 +467,11 @@
int N = 1;
do
{
- if( nextSym == RUNA )
+ if( nextSym == RUNA ) {
s = s + ( 0 + 1 ) * N;
- else if( nextSym == RUNB )
+ } else if( nextSym == RUNB ) {
s = s + ( 1 + 1 ) * N;
+ }
N = N * 2;
if( groupPos == 0 )
1.2 +219 -113
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/bzip2/CBZip2OutputStream.java
Index: CBZip2OutputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/bzip2/CBZip2OutputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CBZip2OutputStream.java 20 Jan 2002 00:03:04 -0000 1.1
+++ CBZip2OutputStream.java 20 Jan 2002 17:32:56 -0000 1.2
@@ -187,8 +187,9 @@
int weight[] = new int[ MAX_ALPHA_SIZE * 2 ];
int parent[] = new int[ MAX_ALPHA_SIZE * 2 ];
- for( i = 0; i < alphaSize; i++ )
+ for( i = 0; i < alphaSize; i++ ) {
weight[ i + 1 ] = ( freq[ i ] == 0 ? 1 : freq[ i ] ) << 8;
+ }
while( true )
{
@@ -217,8 +218,9 @@
heap[ zz ] = tmp;
}
}
- if( !( nHeap < ( MAX_ALPHA_SIZE + 2 ) ) )
+ if( !( nHeap < ( MAX_ALPHA_SIZE + 2 ) ) ) {
panic();
+ }
while( nHeap > 1 )
{
@@ -234,13 +236,16 @@
while( true )
{
yy = zz << 1;
- if( yy > nHeap )
+ if( yy > nHeap ) {
break;
+ }
if( yy < nHeap &&
- weight[ heap[ yy + 1 ] ] < weight[ heap[ yy ] ] )
+ weight[ heap[ yy + 1 ] ] < weight[ heap[ yy ] ]
) {
yy++;
- if( weight[ tmp ] < weight[ heap[ yy ] ] )
+ }
+ if( weight[ tmp ] < weight[ heap[ yy ] ] ) {
break;
+ }
heap[ zz ] = heap[ yy ];
zz = yy;
}
@@ -258,13 +263,16 @@
while( true )
{
yy = zz << 1;
- if( yy > nHeap )
+ if( yy > nHeap ) {
break;
+ }
if( yy < nHeap &&
- weight[ heap[ yy + 1 ] ] < weight[ heap[ yy ] ] )
+ weight[ heap[ yy + 1 ] ] < weight[ heap[ yy ] ]
) {
yy++;
- if( weight[ tmp ] < weight[ heap[ yy ] ] )
+ }
+ if( weight[ tmp ] < weight[ heap[ yy ] ] ) {
break;
+ }
heap[ zz ] = heap[ yy ];
zz = yy;
}
@@ -296,8 +304,9 @@
heap[ zz ] = tmp;
}
}
- if( !( nNodes < ( MAX_ALPHA_SIZE * 2 ) ) )
+ if( !( nNodes < ( MAX_ALPHA_SIZE * 2 ) ) ) {
panic();
+ }
tooLong = false;
for( i = 1; i <= alphaSize; i++ )
@@ -310,12 +319,14 @@
j++;
}
len[ i - 1 ] = (char)j;
- if( j > maxLen )
+ if( j > maxLen ) {
tooLong = true;
+ }
}
- if( !tooLong )
+ if( !tooLong ) {
break;
+ }
for( i = 1; i < alphaSize; i++ )
{
@@ -335,11 +346,13 @@
public void close()
throws IOException
{
- if( closed )
+ if( closed ) {
return;
+ }
- if( runLength > 0 )
+ if( runLength > 0 ) {
writeRun();
+ }
currentChar = -1;
endBlock();
endCompression();
@@ -520,16 +533,18 @@
}
origPtr = -1;
- for( i = 0; i <= last; i++ )
+ for( i = 0; i <= last; i++ ) {
if( zptr[ i ] == 0 )
{
origPtr = i;
break;
}
+ }
;
- if( origPtr == -1 )
+ if( origPtr == -1 ) {
panic();
+ }
}
private void endBlock()
@@ -620,43 +635,49 @@
c1 = block[ i1 + 1 ];
c2 = block[ i2 + 1 ];
- if( c1 != c2 )
+ if( c1 != c2 ) {
return ( c1 > c2 );
+ }
i1++;
i2++;
c1 = block[ i1 + 1 ];
c2 = block[ i2 + 1 ];
- if( c1 != c2 )
+ if( c1 != c2 ) {
return ( c1 > c2 );
+ }
i1++;
i2++;
c1 = block[ i1 + 1 ];
c2 = block[ i2 + 1 ];
- if( c1 != c2 )
+ if( c1 != c2 ) {
return ( c1 > c2 );
+ }
i1++;
i2++;
c1 = block[ i1 + 1 ];
c2 = block[ i2 + 1 ];
- if( c1 != c2 )
+ if( c1 != c2 ) {
return ( c1 > c2 );
+ }
i1++;
i2++;
c1 = block[ i1 + 1 ];
c2 = block[ i2 + 1 ];
- if( c1 != c2 )
+ if( c1 != c2 ) {
return ( c1 > c2 );
+ }
i1++;
i2++;
c1 = block[ i1 + 1 ];
c2 = block[ i2 + 1 ];
- if( c1 != c2 )
+ if( c1 != c2 ) {
return ( c1 > c2 );
+ }
i1++;
i2++;
@@ -666,45 +687,53 @@
{
c1 = block[ i1 + 1 ];
c2 = block[ i2 + 1 ];
- if( c1 != c2 )
+ if( c1 != c2 ) {
return ( c1 > c2 );
+ }
s1 = quadrant[ i1 ];
s2 = quadrant[ i2 ];
- if( s1 != s2 )
+ if( s1 != s2 ) {
return ( s1 > s2 );
+ }
i1++;
i2++;
c1 = block[ i1 + 1 ];
c2 = block[ i2 + 1 ];
- if( c1 != c2 )
+ if( c1 != c2 ) {
return ( c1 > c2 );
+ }
s1 = quadrant[ i1 ];
s2 = quadrant[ i2 ];
- if( s1 != s2 )
+ if( s1 != s2 ) {
return ( s1 > s2 );
+ }
i1++;
i2++;
c1 = block[ i1 + 1 ];
c2 = block[ i2 + 1 ];
- if( c1 != c2 )
+ if( c1 != c2 ) {
return ( c1 > c2 );
+ }
s1 = quadrant[ i1 ];
s2 = quadrant[ i2 ];
- if( s1 != s2 )
+ if( s1 != s2 ) {
return ( s1 > s2 );
+ }
i1++;
i2++;
c1 = block[ i1 + 1 ];
c2 = block[ i2 + 1 ];
- if( c1 != c2 )
+ if( c1 != c2 ) {
return ( c1 > c2 );
+ }
s1 = quadrant[ i1 ];
s2 = quadrant[ i2 ];
- if( s1 != s2 )
+ if( s1 != s2 ) {
return ( s1 > s2 );
+ }
i1++;
i2++;
@@ -742,13 +771,15 @@
makeMaps();
EOB = nInUse + 1;
- for( i = 0; i <= EOB; i++ )
+ for( i = 0; i <= EOB; i++ ) {
mtfFreq[ i ] = 0;
+ }
wr = 0;
zPend = 0;
- for( i = 0; i < nInUse; i++ )
+ for( i = 0; i < nInUse; i++ ) {
yy[ i ] = (char)i;
+ }
for( i = 0; i <= last; i++ )
{
@@ -793,8 +824,9 @@
break;
}
;
- if( zPend < 2 )
+ if( zPend < 2 ) {
break;
+ }
zPend = ( zPend - 2 ) / 2;
}
;
@@ -824,8 +856,9 @@
mtfFreq[ RUNB ]++;
break;
}
- if( zPend < 2 )
+ if( zPend < 2 ) {
break;
+ }
zPend = ( zPend - 2 ) / 2;
}
}
@@ -847,12 +880,13 @@
vec = 0;
for( n = minLen; n <= maxLen; n++ )
{
- for( i = 0; i < alphaSize; i++ )
+ for( i = 0; i < alphaSize; i++ ) {
if( length[ i ] == n )
{
code[ i ] = vec;
vec++;
}
+ }
;
vec <<= 1;
}
@@ -865,8 +899,9 @@
last = -1;
// ch = 0;
- for( int i = 0; i < 256; i++ )
+ for( int i = 0; i < 256; i++ ) {
inUse[ i ] = false;
+ }
/*
* 20 is just a paranoia constant
@@ -910,10 +945,12 @@
* set up the overshoot area for block.
*/
// if (verbosity >= 4) fprintf ( stderr, " sort initialise
...\n" );
- for( i = 0; i < NUM_OVERSHOOT_BYTES; i++ )
+ for( i = 0; i < NUM_OVERSHOOT_BYTES; i++ ) {
block[ last + i + 2 ] = block[ ( i % ( last + 1 ) ) + 1 ];
- for( i = 0; i <= last + NUM_OVERSHOOT_BYTES; i++ )
+ }
+ for( i = 0; i <= last + NUM_OVERSHOOT_BYTES; i++ ) {
quadrant[ i ] = 0;
+ }
block[ 0 ] = (char)( block[ last + 1 ] );
@@ -923,8 +960,9 @@
* Use simpleSort(), since the full sorting mechanism
* has quite a large constant overhead.
*/
- for( i = 0; i <= last; i++ )
+ for( i = 0; i <= last; i++ ) {
zptr[ i ] = i;
+ }
firstAttempt = false;
workDone = workLimit = 0;
simpleSort( 0, last, 0 );
@@ -932,11 +970,13 @@
else
{
numQSorted = 0;
- for( i = 0; i <= 255; i++ )
+ for( i = 0; i <= 255; i++ ) {
bigDone[ i ] = false;
+ }
- for( i = 0; i <= 65536; i++ )
+ for( i = 0; i <= 65536; i++ ) {
ftab[ i ] = 0;
+ }
c1 = block[ 0 ];
for( i = 0; i <= last; i++ )
@@ -946,8 +986,9 @@
c1 = c2;
}
- for( i = 1; i <= 65536; i++ )
+ for( i = 1; i <= 65536; i++ ) {
ftab[ i ] += ftab[ i - 1 ];
+ }
c1 = block[ 1 ];
for( i = 0; i < last; i++ )
@@ -968,13 +1009,15 @@
* Calculate the running order, from smallest to largest
* big bucket.
*/
- for( i = 0; i <= 255; i++ )
+ for( i = 0; i <= 255; i++ ) {
runningOrder[ i ] = i;
+ }
{
int vv;
int h = 1;
- do
+ do {
h = 3 * h + 1;
+ }
while( h <= 256 );
do
{
@@ -989,8 +1032,9 @@
{
runningOrder[ j ] = runningOrder[ j - h ];
j = j - h;
- if( j <= ( h - 1 ) )
+ if( j <= ( h - 1 ) ) {
break;
+ }
}
runningOrder[ j ] = vv;
}
@@ -1026,8 +1070,9 @@
{
qSort3( lo, hi, 2 );
numQSorted += ( hi - lo + 1 );
- if( workDone > workLimit && firstAttempt )
+ if( workDone > workLimit && firstAttempt ) {
return;
+ }
}
ftab[ sb ] |= SETMASK;
}
@@ -1049,28 +1094,32 @@
int bbSize = ( ftab[ ( ss + 1 ) << 8 ] & CLEARMASK ) -
bbStart;
int shifts = 0;
- while( ( bbSize >> shifts ) > 65534 )
+ while( ( bbSize >> shifts ) > 65534 ) {
shifts++;
+ }
for( j = 0; j < bbSize; j++ )
{
int a2update = zptr[ bbStart + j ];
int qVal = ( j >> shifts );
quadrant[ a2update ] = qVal;
- if( a2update < NUM_OVERSHOOT_BYTES )
+ if( a2update < NUM_OVERSHOOT_BYTES ) {
quadrant[ a2update + last + 1 ] = qVal;
+ }
}
- if( !( ( ( bbSize - 1 ) >> shifts ) <= 65535 ) )
+ if( !( ( ( bbSize - 1 ) >> shifts ) <= 65535 ) ) {
panic();
+ }
}
/*
* Now scan this big bucket so as to synthesise the
* sorted order for small buckets [t, ss] for all t != ss.
*/
- for( j = 0; j <= 255; j++ )
+ for( j = 0; j <= 255; j++ ) {
copy[ j ] = ftab[ ( j << 8 ) + ss ] & CLEARMASK;
+ }
for( j = ftab[ ss << 8 ] & CLEARMASK;
j < ( ftab[ ( ss + 1 ) << 8 ] & CLEARMASK ); j++ )
@@ -1083,8 +1132,9 @@
}
}
- for( j = 0; j <= 255; j++ )
+ for( j = 0; j <= 255; j++ ) {
ftab[ ( j << 8 ) + ss ] |= SETMASK;
+ }
}
}
}
@@ -1093,13 +1143,14 @@
{
int i;
nInUse = 0;
- for( i = 0; i < 256; i++ )
+ for( i = 0; i < 256; i++ ) {
if( inUse[ i ] )
{
seqToUnseq[ nInUse ] = (char)i;
unseqToSeq[ i ] = (char)nInUse;
nInUse++;
}
+ }
}
private char med3( char a, char b, char c )
@@ -1117,8 +1168,9 @@
b = c;
c = t;
}
- if( a > b )
+ if( a > b ) {
b = a;
+ }
return b;
}
@@ -1144,8 +1196,9 @@
int hi;
int d;
StackElem[] stack = new StackElem[ QSORT_STACK_SIZE ];
- for( int count = 0; count < QSORT_STACK_SIZE; count++ )
+ for( int count = 0; count < QSORT_STACK_SIZE; count++ ) {
stack[ count ] = new StackElem();
+ }
sp = 0;
@@ -1156,8 +1209,9 @@
while( sp > 0 )
{
- if( sp >= QSORT_STACK_SIZE )
+ if( sp >= QSORT_STACK_SIZE ) {
panic();
+ }
sp--;
lo = stack[ sp ].ll;
@@ -1167,8 +1221,9 @@
if( hi - lo < SMALL_THRESH || d > DEPTH_THRESH )
{
simpleSort( lo, hi, d );
- if( workDone > workLimit && firstAttempt )
+ if( workDone > workLimit && firstAttempt ) {
return;
+ }
continue;
}
@@ -1183,8 +1238,9 @@
{
while( true )
{
- if( unLo > unHi )
+ if( unLo > unHi ) {
break;
+ }
n = ( (int)block[ zptr[ unLo ] + d + 1 ] ) - med;
if( n == 0 )
{
@@ -1197,14 +1253,16 @@
continue;
}
;
- if( n > 0 )
+ if( n > 0 ) {
break;
+ }
unLo++;
}
while( true )
{
- if( unLo > unHi )
+ if( unLo > unHi ) {
break;
+ }
n = ( (int)block[ zptr[ unHi ] + d + 1 ] ) - med;
if( n == 0 )
{
@@ -1217,12 +1275,14 @@
continue;
}
;
- if( n < 0 )
+ if( n < 0 ) {
break;
+ }
unHi--;
}
- if( unLo > unHi )
+ if( unLo > unHi ) {
break;
+ }
int temp = 0;
temp = zptr[ unLo ];
zptr[ unLo ] = zptr[ unHi ];
@@ -1270,8 +1330,9 @@
int i;
int rNToGo = 0;
int rTPos = 0;
- for( i = 0; i < 256; i++ )
+ for( i = 0; i < 256; i++ ) {
inUse[ i ] = false;
+ }
for( i = 0; i <= last; i++ )
{
@@ -1279,8 +1340,9 @@
{
rNToGo = (char)RAND_NUMS[ rTPos ];
rTPos++;
- if( rTPos == 512 )
+ if( rTPos == 512 ) {
rTPos = 0;
+ }
}
rNToGo--;
block[ i + 1 ] ^= ( ( rNToGo == 1 ) ? 1 : 0 );
@@ -1324,26 +1386,30 @@
int nBytes;
alphaSize = nInUse + 2;
- for( t = 0; t < N_GROUPS; t++ )
- for( v = 0; v < alphaSize; v++ )
+ for( t = 0; t < N_GROUPS; t++ ) {
+ for( v = 0; v < alphaSize; v++ ) {
len[ t ][ v ] = (char)GREATER_ICOST;
+ }
+ }
/*
* Decide how many coding tables to use
*/
- if( nMTF <= 0 )
+ if( nMTF <= 0 ) {
panic();
+ }
- if( nMTF < 200 )
+ if( nMTF < 200 ) {
nGroups = 2;
- else if( nMTF < 600 )
+ } else if( nMTF < 600 ) {
nGroups = 3;
- else if( nMTF < 1200 )
+ } else if( nMTF < 1200 ) {
nGroups = 4;
- else if( nMTF < 2400 )
+ } else if( nMTF < 2400 ) {
nGroups = 5;
- else
+ } else {
nGroups = 6;
+ }
{
/*
* Generate an initial set of coding tables
@@ -1374,11 +1440,13 @@
ge--;
}
- for( v = 0; v < alphaSize; v++ )
- if( v >= gs && v <= ge )
+ for( v = 0; v < alphaSize; v++ ) {
+ if( v >= gs && v <= ge ) {
len[ nPart - 1 ][ v ] = (char)LESSER_ICOST;
- else
+ } else {
len[ nPart - 1 ][ v ] = (char)GREATER_ICOST;
+ }
+ }
nPart--;
gs = ge + 1;
@@ -1394,12 +1462,15 @@
*/
for( iter = 0; iter < N_ITERS; iter++ )
{
- for( t = 0; t < nGroups; t++ )
+ for( t = 0; t < nGroups; t++ ) {
fave[ t ] = 0;
+ }
- for( t = 0; t < nGroups; t++ )
- for( v = 0; v < alphaSize; v++ )
+ for( t = 0; t < nGroups; t++ ) {
+ for( v = 0; v < alphaSize; v++ ) {
rfreq[ t ][ v ] = 0;
+ }
+ }
nSelectors = 0;
totc = 0;
@@ -1410,18 +1481,21 @@
/*
* Set group start & end marks.
*/
- if( gs >= nMTF )
+ if( gs >= nMTF ) {
break;
+ }
ge = gs + G_SIZE - 1;
- if( ge >= nMTF )
+ if( ge >= nMTF ) {
ge = nMTF - 1;
+ }
/*
* Calculate the cost of this group as coded
* by each of the coding tables.
*/
- for( t = 0; t < nGroups; t++ )
+ for( t = 0; t < nGroups; t++ ) {
cost[ t ] = 0;
+ }
if( nGroups == 6 )
{
@@ -1454,8 +1528,9 @@
for( i = gs; i <= ge; i++ )
{
short icv = szptr[ i ];
- for( t = 0; t < nGroups; t++ )
+ for( t = 0; t < nGroups; t++ ) {
cost[ t ] += len[ t ][ icv ];
+ }
}
}
@@ -1465,12 +1540,13 @@
*/
bc = 999999999;
bt = -1;
- for( t = 0; t < nGroups; t++ )
+ for( t = 0; t < nGroups; t++ ) {
if( cost[ t ] < bc )
{
bc = cost[ t ];
bt = t;
}
+ }
;
totc += bc;
fave[ bt ]++;
@@ -1480,8 +1556,9 @@
/*
* Increment the symbol frequencies for the selected table.
*/
- for( i = gs; i <= ge; i++ )
+ for( i = gs; i <= ge; i++ ) {
rfreq[ bt ][ szptr[ i ] ]++;
+ }
gs = ge + 1;
}
@@ -1489,18 +1566,21 @@
/*
* Recompute the tables based on the accumulated frequencies.
*/
- for( t = 0; t < nGroups; t++ )
+ for( t = 0; t < nGroups; t++ ) {
hbMakeCodeLengths( len[ t ], rfreq[ t ], alphaSize, 20 );
+ }
}
rfreq = null;
fave = null;
cost = null;
- if( !( nGroups < 8 ) )
+ if( !( nGroups < 8 ) ) {
panic();
- if( !( nSelectors < 32768 && nSelectors <= ( 2 + ( 900000 / G_SIZE )
) ) )
+ }
+ if( !( nSelectors < 32768 && nSelectors <= ( 2 + ( 900000 / G_SIZE )
) ) ) {
panic();
+ }
{
/*
* Compute MTF values for the selectors.
@@ -1509,8 +1589,9 @@
char ll_i;
char tmp2;
char tmp;
- for( i = 0; i < nGroups; i++ )
+ for( i = 0; i < nGroups; i++ ) {
pos[ i ] = (char)i;
+ }
for( i = 0; i < nSelectors; i++ )
{
ll_i = selector[ i ];
@@ -1539,15 +1620,19 @@
maxLen = 0;
for( i = 0; i < alphaSize; i++ )
{
- if( len[ t ][ i ] > maxLen )
+ if( len[ t ][ i ] > maxLen ) {
maxLen = len[ t ][ i ];
- if( len[ t ][ i ] < minLen )
+ }
+ if( len[ t ][ i ] < minLen ) {
minLen = len[ t ][ i ];
+ }
}
- if( maxLen > 20 )
+ if( maxLen > 20 ) {
panic();
- if( minLen < 1 )
+ }
+ if( minLen < 1 ) {
panic();
+ }
hbAssignCodes( code[ t ], len[ t ], minLen, maxLen, alphaSize );
}
{
@@ -1558,25 +1643,33 @@
for( i = 0; i < 16; i++ )
{
inUse16[ i ] = false;
- for( j = 0; j < 16; j++ )
- if( inUse[ i * 16 + j ] )
+ for( j = 0; j < 16; j++ ) {
+ if( inUse[ i * 16 + j ] ) {
inUse16[ i ] = true;
+ }
+ }
}
nBytes = bytesOut;
- for( i = 0; i < 16; i++ )
- if( inUse16[ i ] )
+ for( i = 0; i < 16; i++ ) {
+ if( inUse16[ i ] ) {
bsW( 1, 1 );
- else
+ } else {
bsW( 1, 0 );
+ }
+ }
- for( i = 0; i < 16; i++ )
- if( inUse16[ i ] )
- for( j = 0; j < 16; j++ )
- if( inUse[ i * 16 + j ] )
+ for( i = 0; i < 16; i++ ) {
+ if( inUse16[ i ] ) {
+ for( j = 0; j < 16; j++ ) {
+ if( inUse[ i * 16 + j ] ) {
bsW( 1, 1 );
- else
+ } else {
bsW( 1, 0 );
+ }
+ }
+ }
+ }
}
@@ -1588,8 +1681,9 @@
bsW( 15, nSelectors );
for( i = 0; i < nSelectors; i++ )
{
- for( j = 0; j < selectorMtf[ i ]; j++ )
+ for( j = 0; j < selectorMtf[ i ]; j++ ) {
bsW( 1, 1 );
+ }
bsW( 1, 0 );
}
@@ -1632,11 +1726,13 @@
gs = 0;
while( true )
{
- if( gs >= nMTF )
+ if( gs >= nMTF ) {
break;
+ }
ge = gs + G_SIZE - 1;
- if( ge >= nMTF )
+ if( ge >= nMTF ) {
ge = nMTF - 1;
+ }
for( i = gs; i <= ge; i++ )
{
bsW( len[ selector[ selCtr ] ][ szptr[ i ] ],
@@ -1646,8 +1742,9 @@
gs = ge + 1;
selCtr++;
}
- if( !( selCtr == nSelectors ) )
+ if( !( selCtr == nSelectors ) ) {
panic();
+ }
}
private void simpleSort( int lo, int hi, int d )
@@ -1660,12 +1757,14 @@
int v;
bigN = hi - lo + 1;
- if( bigN < 2 )
+ if( bigN < 2 ) {
return;
+ }
hp = 0;
- while( incs[ hp ] < bigN )
+ while( incs[ hp ] < bigN ) {
hp++;
+ }
hp--;
for( ; hp >= 0; hp-- )
@@ -1678,16 +1777,18 @@
/*
* copy 1
*/
- if( i > hi )
+ if( i > hi ) {
break;
+ }
v = zptr[ i ];
j = i;
while( fullGtU( zptr[ j - h ] + d, v + d ) )
{
zptr[ j ] = zptr[ j - h ];
j = j - h;
- if( j <= ( lo + h - 1 ) )
+ if( j <= ( lo + h - 1 ) ) {
break;
+ }
}
zptr[ j ] = v;
i++;
@@ -1695,16 +1796,18 @@
/*
* copy 2
*/
- if( i > hi )
+ if( i > hi ) {
break;
+ }
v = zptr[ i ];
j = i;
while( fullGtU( zptr[ j - h ] + d, v + d ) )
{
zptr[ j ] = zptr[ j - h ];
j = j - h;
- if( j <= ( lo + h - 1 ) )
+ if( j <= ( lo + h - 1 ) ) {
break;
+ }
}
zptr[ j ] = v;
i++;
@@ -1712,22 +1815,25 @@
/*
* copy 3
*/
- if( i > hi )
+ if( i > hi ) {
break;
+ }
v = zptr[ i ];
j = i;
while( fullGtU( zptr[ j - h ] + d, v + d ) )
{
zptr[ j ] = zptr[ j - h ];
j = j - h;
- if( j <= ( lo + h - 1 ) )
+ if( j <= ( lo + h - 1 ) ) {
break;
+ }
}
zptr[ j ] = v;
i++;
- if( workDone > workLimit && firstAttempt )
+ if( workDone > workLimit && firstAttempt ) {
return;
+ }
}
}
}
1.17 +23 -19
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java
Index: CLIMain.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- CLIMain.java 15 Jan 2002 09:45:17 -0000 1.16
+++ CLIMain.java 20 Jan 2002 17:32:57 -0000 1.17
@@ -50,28 +50,28 @@
public class CLIMain
extends AbstractLogEnabled
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( CLIMain.class );
- private static final String PATTERN = "[%8.8{category}]
%{message}\\n%{throwable}";
+ private final static String PATTERN = "[%8.8{category}]
%{message}\\n%{throwable}";
//defines for the Command Line options
- private static final int HELP_OPT = 'h';
- private static final int QUIET_OPT = 'q';
- private static final int VERBOSE_OPT = 'v';
- private static final int FILE_OPT = 'f';
- private static final int LOG_LEVEL_OPT = 'l';
- private static final int DEFINE_OPT = 'D';
- private static final int BUILDER_PARAM_OPT = 'B';
- private static final int VERSION_OPT = 1;
- private static final int LISTENER_OPT = 2;
- private static final int TASKLIB_DIR_OPT = 5;
- private static final int INCREMENTAL_OPT = 6;
- private static final int HOME_DIR_OPT = 7;
- private static final int DRY_RUN_OPT = 8;
+ private final static int HELP_OPT = 'h';
+ private final static int QUIET_OPT = 'q';
+ private final static int VERBOSE_OPT = 'v';
+ private final static int FILE_OPT = 'f';
+ private final static int LOG_LEVEL_OPT = 'l';
+ private final static int DEFINE_OPT = 'D';
+ private final static int BUILDER_PARAM_OPT = 'B';
+ private final static int VERSION_OPT = 1;
+ private final static int LISTENER_OPT = 2;
+ private final static int TASKLIB_DIR_OPT = 5;
+ private final static int INCREMENTAL_OPT = 6;
+ private final static int HOME_DIR_OPT = 7;
+ private final static int DRY_RUN_OPT = 8;
//incompatable options for info options
- private static final int[] INFO_OPT_INCOMPAT = new int[]
+ private final static int[] INFO_OPT_INCOMPAT = new int[]
{
HELP_OPT, QUIET_OPT, VERBOSE_OPT, FILE_OPT,
LOG_LEVEL_OPT, VERSION_OPT, LISTENER_OPT,
@@ -79,7 +79,7 @@
};
//incompatable options for other logging options
- private static final int[] LOG_OPT_INCOMPAT = new int[]
+ private final static int[] LOG_OPT_INCOMPAT = new int[]
{
QUIET_OPT, VERBOSE_OPT, LOG_LEVEL_OPT
};
@@ -383,7 +383,9 @@
doBuild( workspace, project, m_targets );
- if( !incremental ) break;
+ if( !incremental ) {
+ break;
+ }
final String message = REZ.getString( "repeat.notice" );
System.out.println( message );
@@ -395,7 +397,9 @@
String line = reader.readLine();
- if( line.equalsIgnoreCase( "no" ) ) break;
+ if( line.equalsIgnoreCase( "no" ) ) {
+ break;
+ }
}
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/ConverterDef.java
Index: ConverterDef.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/ConverterDef.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConverterDef.java 23 Dec 2001 14:25:02 -0000 1.3
+++ ConverterDef.java 20 Jan 2002 17:32:57 -0000 1.4
@@ -30,7 +30,7 @@
extends AbstractTask
implements Composable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( ConverterDef.class );
private String m_sourceType;
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java
Index: Facility.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Facility.java 23 Dec 2001 14:25:02 -0000 1.3
+++ Facility.java 20 Jan 2002 17:32:57 -0000 1.4
@@ -32,7 +32,7 @@
extends AbstractContainerTask
implements Composable, Configurable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( Facility.class );
private String m_namespace;
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java
Index: Import.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Import.java 23 Dec 2001 14:25:02 -0000 1.3
+++ Import.java 20 Jan 2002 17:32:57 -0000 1.4
@@ -27,7 +27,7 @@
extends AbstractTask
implements Composable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( Import.class );
private File m_lib;
1.17 +4 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java
Index: Cvs.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Cvs.java 20 Jan 2002 10:09:04 -0000 1.16
+++ Cvs.java 20 Jan 2002 17:32:57 -0000 1.17
@@ -23,7 +23,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Wolfgang Werner</a>
- * @version $Revision: 1.16 $ $Date: 2002/01/20 10:09:04 $
+ * @version $Revision: 1.17 $ $Date: 2002/01/20 17:32:57 $
*/
public class Cvs
extends AbstractTask
@@ -148,7 +148,9 @@
final Execute2 exe = new Execute2();
setupLogger( exe );
- if( m_dest == null ) m_dest = getBaseDirectory();
+ if( m_dest == null ) {
+ m_dest = getBaseDirectory();
+ }
exe.setWorkingDirectory( m_dest );
exe.setCommandline( command.getCommandline() );
1.8 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java
Index: CVSPass.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CVSPass.java 5 Jan 2002 03:17:22 -0000 1.7
+++ CVSPass.java 20 Jan 2002 17:32:57 -0000 1.8
@@ -21,7 +21,7 @@
* CVSLogin Adds an new entry to a CVS password file
*
* @author <a href="[EMAIL PROTECTED]">Jeff Martin</a>
- * @version $Revision: 1.7 $ $Date: 2002/01/05 03:17:22 $
+ * @version $Revision: 1.8 $ $Date: 2002/01/20 17:32:57 $
*/
public class CVSPass
extends AbstractTask
@@ -44,7 +44,7 @@
/**
* Array contain char conversion data
*/
- private static final char[] c_shifts =
+ private final static char[] c_shifts =
{
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
1.10 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java
Index: DefaultAspectManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultAspectManager.java 23 Dec 2001 06:25:34 -0000 1.9
+++ DefaultAspectManager.java 20 Jan 2002 17:32:57 -0000 1.10
@@ -28,7 +28,7 @@
public class DefaultAspectManager
implements AspectManager, Initializable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultAspectManager.class );
private HashMap m_aspectMap = new HashMap();
1.2 +5 -5
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/DefaultCommandLauncher.java
Index: DefaultCommandLauncher.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/DefaultCommandLauncher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultCommandLauncher.java 12 Jan 2002 04:51:08 -0000 1.1
+++ DefaultCommandLauncher.java 20 Jan 2002 17:32:57 -0000 1.2
@@ -11,11 +11,11 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.Properties;
+
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.aut.nativelib.CommandLauncher;
-import org.apache.aut.nativelib.Environment;
+
import org.apache.aut.nativelib.ExecException;
import org.apache.aut.nativelib.ExecMetaData;
@@ -26,15 +26,15 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Haas</a>
- * @version $Revision: 1.1 $ $Date: 2002/01/12 04:51:08 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/20 17:32:57 $
*/
public class DefaultCommandLauncher
implements CommandLauncher
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultCommandLauncher.class );
- private static final Method c_execWithCWD;
+ private final static Method c_execWithCWD;
static
{
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ExecUtil.java
Index: ExecUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ExecUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExecUtil.java 12 Jan 2002 04:51:08 -0000 1.1
+++ ExecUtil.java 20 Jan 2002 17:32:57 -0000 1.2
@@ -20,14 +20,14 @@
* A set of utility functions useful when writing CommandLaunchers.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2002/01/12 04:51:08 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/20 17:32:57 $
*/
class ExecUtil
{
/**
* The file representing the current working directory.
*/
- private static final File c_cwd;
+ private final static File c_cwd;
static
{
1.18 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
Index: DefaultConfigurer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DefaultConfigurer.java 14 Jan 2002 09:31:22 -0000 1.17
+++ DefaultConfigurer.java 20 Jan 2002 17:32:57 -0000 1.18
@@ -34,7 +34,7 @@
extends AbstractLogEnabled
implements Configurer, Composable, LogEnabled
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultConfigurer.class );
///Compile time constant to turn on extreme debugging
1.3 +10 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java
Index: DefaultObjectConfigurer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultObjectConfigurer.java 14 Jan 2002 09:31:22 -0000 1.2
+++ DefaultObjectConfigurer.java 20 Jan 2002 17:32:57 -0000 1.3
@@ -13,19 +13,26 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.*;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collection;
/**
* An object configurer which uses reflection to determine the properties
* of a class.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.2 $ $Date: 2002/01/14 09:31:22 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/20 17:32:57 $
*/
public class DefaultObjectConfigurer
implements ObjectConfigurer
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultObjectConfigurer.class );
private final Class m_class;
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java
Index: DefaultPropertyConfigurer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultPropertyConfigurer.java 14 Jan 2002 09:31:22 -0000 1.1
+++ DefaultPropertyConfigurer.java 20 Jan 2002 17:32:57 -0000 1.2
@@ -19,12 +19,12 @@
* create and set property values.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/01/14 09:31:22 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/20 17:32:57 $
*/
class DefaultPropertyConfigurer
implements PropertyConfigurer
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultPropertyConfigurer.class
);
private final Class m_type;
1.7 +3 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java
Index: DefaultConverterRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultConverterRegistry.java 23 Dec 2001 06:25:35 -0000 1.6
+++ DefaultConverterRegistry.java 20 Jan 2002 17:32:57 -0000 1.7
@@ -23,7 +23,9 @@
public String getConverterName( final String source, final String
destination )
{
final HashMap map = (HashMap)m_mapping.get( source );
- if( null == map ) return null;
+ if( null == map ) {
+ return null;
+ }
return (String)map.get( destination );
}
1.13 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java
Index: DefaultMasterConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultMasterConverter.java 12 Jan 2002 05:53:30 -0000 1.12
+++ DefaultMasterConverter.java 20 Jan 2002 17:32:57 -0000 1.13
@@ -31,7 +31,7 @@
extends AbstractLogEnabled
implements MasterConverter, Composable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultMasterConverter.class );
private final static boolean DEBUG = false;
1.13 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java
Index: DefaultDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultDeployer.java 23 Dec 2001 06:25:35 -0000 1.12
+++ DefaultDeployer.java 20 Jan 2002 17:32:57 -0000 1.13
@@ -51,7 +51,7 @@
extends AbstractLogEnabled
implements Deployer, Initializable, Composable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultDeployer.class );
private final static String TYPE_DESCRIPTOR = "META-INF/ant-types.xml";
1.11 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java
Index: Deployment.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Deployment.java 23 Dec 2001 06:25:35 -0000 1.10
+++ Deployment.java 20 Jan 2002 17:32:57 -0000 1.11
@@ -28,7 +28,7 @@
*/
public class Deployment
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( Deployment.class );
public final static String DESCRIPTOR_NAME =
"META-INF/ant-descriptor.xml";
1.18 +4 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java
Index: DefaultEmbeddor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DefaultEmbeddor.java 30 Dec 2001 06:13:33 -0000 1.17
+++ DefaultEmbeddor.java 20 Jan 2002 17:32:57 -0000 1.18
@@ -46,7 +46,7 @@
extends AbstractLogEnabled
implements Embeddor
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultEmbeddor.class );
private Deployer m_deployer;
@@ -499,7 +499,9 @@
final String filename = files[ i ].getName();
int index = filename.lastIndexOf( '.' );
- if( -1 == index ) index = filename.length();
+ if( -1 == index ) {
+ index = filename.length();
+ }
final String name = filename.substring( 0, index );
1.11 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultProject.java
Index: DefaultProject.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultProject.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultProject.java 23 Dec 2001 06:25:35 -0000 1.10
+++ DefaultProject.java 20 Jan 2002 17:32:57 -0000 1.11
@@ -24,7 +24,7 @@
public class DefaultProject
implements Project
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultProject.class );
///The imports
1.7 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java
Index: DefaultRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultRoleManager.java 23 Dec 2001 06:25:35 -0000 1.6
+++ DefaultRoleManager.java 20 Jan 2002 17:32:58 -0000 1.7
@@ -25,12 +25,12 @@
* Interface to manage roles and mapping to names.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/12/23 06:25:35 $
+ * @version CVS $Revision: 1.7 $ $Date: 2002/01/20 17:32:58 $
*/
public class DefaultRoleManager
implements RoleManager, Initializable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultRoleManager.class );
private final static String ROLE_DESCRIPTOR = "META-INF/ant-roles.xml";
1.8 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java
Index: DefaultTaskContext.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultTaskContext.java 5 Jan 2002 03:03:55 -0000 1.7
+++ DefaultTaskContext.java 20 Jan 2002 17:32:58 -0000 1.8
@@ -28,7 +28,7 @@
extends DefaultContext
implements TaskContext
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultTaskContext.class );
/**
@@ -178,9 +178,9 @@
{
checkPropertyValid( name, value );
- if( CURRENT == scope )
+ if( CURRENT == scope ) {
put( name, value );
- else if( PARENT == scope )
+ } else if( PARENT == scope )
{
if( null == getParent() )
{
1.12 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
Index: DefaultWorkspace.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultWorkspace.java 23 Dec 2001 06:25:35 -0000 1.11
+++ DefaultWorkspace.java 20 Jan 2002 17:32:58 -0000 1.12
@@ -52,7 +52,7 @@
extends AbstractLogEnabled
implements Workspace, Composable, Parameterizable, Initializable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultWorkspace.class );
private Executor m_executor;
1.5 +3 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectListenerSupport.java
Index: ProjectListenerSupport.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectListenerSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProjectListenerSupport.java 23 Dec 2001 06:25:35 -0000 1.4
+++ ProjectListenerSupport.java 20 Jan 2002 17:32:58 -0000 1.5
@@ -50,7 +50,9 @@
}
}
- if( -1 == found ) return;
+ if( -1 == found ) {
+ return;
+ }
final ProjectListener[] listeners = new ProjectListener[
m_listeners.length - 1 ];
System.arraycopy( m_listeners, 0, listeners, 0, found );
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java
Index: DefaultTypeFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultTypeFactory.java 23 Dec 2001 06:25:37 -0000 1.4
+++ DefaultTypeFactory.java 20 Jan 2002 17:32:58 -0000 1.5
@@ -17,12 +17,12 @@
* Create a type instance based on name.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/12/23 06:25:37 $
+ * @version CVS $Revision: 1.5 $ $Date: 2002/01/20 17:32:58 $
*/
public class DefaultTypeFactory
implements TypeFactory
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultTypeFactory.class );
///A Map of shortnames to classnames
1.13 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java
Index: DefaultTypeManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultTypeManager.java 23 Dec 2001 06:25:35 -0000 1.12
+++ DefaultTypeManager.java 20 Jan 2002 17:32:58 -0000 1.13
@@ -22,7 +22,7 @@
public class DefaultTypeManager
implements TypeManager
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( DefaultTypeManager.class );
///Parent type manager to inherit values from.
1.9 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java
Index: MultiSourceTypeFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MultiSourceTypeFactory.java 14 Jan 2002 09:02:23 -0000 1.8
+++ MultiSourceTypeFactory.java 20 Jan 2002 17:32:58 -0000 1.9
@@ -21,7 +21,7 @@
public class MultiSourceTypeFactory
implements TypeFactory
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( MultiSourceTypeFactory.class );
///Parent Selector
1.2 +6 -6
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/Environment.java
Index: Environment.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/Environment.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Environment.java 12 Jan 2002 04:51:07 -0000 1.1
+++ Environment.java 20 Jan 2002 17:32:58 -0000 1.2
@@ -24,16 +24,16 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Haas</a>
- * @version $Revision: 1.1 $ $Date: 2002/01/12 04:51:07 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/20 17:32:58 $
*/
public final class Environment
{
- private static final String[] COMMAND_COM = new String[]{"command.com",
"/c", "set"};
- private static final String[] CMD_EXE = new String[]{"cmd", "/c", "set"};
+ private final static String[] COMMAND_COM = new String[]{"command.com",
"/c", "set"};
+ private final static String[] CMD_EXE = new String[]{"cmd", "/c", "set"};
// Alternatively one could use: /bin/sh -c env
- private static final String[] ENV_CMD = new String[]{"/usr/bin/env"};
- private static final String[] ENV_RAW = new String[]{"env"};
+ private final static String[] ENV_CMD = new String[]{"/usr/bin/env"};
+ private final static String[] ENV_RAW = new String[]{"env"};
private static Properties c_procEnvironment;
@@ -79,7 +79,7 @@
* Get the Property object with all environment variables and
* attempt to load it if it has not already been loaded.
*/
- private synchronized static Properties getEnvironmentVariables()
+ private static synchronized Properties getEnvironmentVariables()
throws IOException, ExecException
{
if( null == c_procEnvironment )
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.java
Index: Os.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Os.java 12 Jan 2002 04:51:07 -0000 1.1
+++ Os.java 20 Jan 2002 17:32:58 -0000 1.2
@@ -20,7 +20,7 @@
*/
public class Os
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( Os.class );
private final static String OS_NAME =
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java
Index: Exec.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Exec.java 20 Jan 2002 02:11:42 -0000 1.3
+++ Exec.java 20 Jan 2002 17:32:58 -0000 1.4
@@ -34,7 +34,7 @@
public class Exec
extends AbstractTask
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( Exec.class );
private long m_timeout;
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java
Index: LoadEnvironment.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoadEnvironment.java 12 Jan 2002 04:52:56 -0000 1.2
+++ LoadEnvironment.java 20 Jan 2002 17:32:58 -0000 1.3
@@ -27,7 +27,7 @@
public class LoadEnvironment
extends AbstractTask
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( LoadEnvironment.class );
private String m_prefix;
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java
Index: LoadProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoadProperties.java 13 Jan 2002 00:02:11 -0000 1.2
+++ LoadProperties.java 20 Jan 2002 17:32:58 -0000 1.3
@@ -26,7 +26,7 @@
public class LoadProperties
extends AbstractContainerTask
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( LoadProperties.class );
private String m_prefix;
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java
Index: Property.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Property.java 13 Jan 2002 00:02:11 -0000 1.4
+++ Property.java 20 Jan 2002 17:32:58 -0000 1.5
@@ -34,7 +34,7 @@
extends AbstractContainerTask
implements Configurable
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( Property.class );
private String m_name;
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java
Index: StringToBooleanConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringToBooleanConverter.java 13 Jan 2002 00:02:11 -0000 1.2
+++ StringToBooleanConverter.java 20 Jan 2002 17:32:58 -0000 1.3
@@ -22,7 +22,7 @@
public class StringToBooleanConverter
extends AbstractConverter
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( StringToBooleanConverter.class
);
public StringToBooleanConverter()
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java
Index: StringToByteConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringToByteConverter.java 13 Jan 2002 00:02:11 -0000 1.4
+++ StringToByteConverter.java 20 Jan 2002 17:32:58 -0000 1.5
@@ -22,7 +22,7 @@
public class StringToByteConverter
extends AbstractConverter
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( StringToByteConverter.class );
public StringToByteConverter()
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java
Index: StringToClassConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringToClassConverter.java 13 Jan 2002 00:02:11 -0000 1.4
+++ StringToClassConverter.java 20 Jan 2002 17:32:58 -0000 1.5
@@ -22,7 +22,7 @@
public class StringToClassConverter
extends AbstractConverter
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( StringToClassConverter.class );
public StringToClassConverter()
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java
Index: StringToDoubleConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringToDoubleConverter.java 13 Jan 2002 00:02:11 -0000 1.4
+++ StringToDoubleConverter.java 20 Jan 2002 17:32:58 -0000 1.5
@@ -22,7 +22,7 @@
public class StringToDoubleConverter
extends AbstractConverter
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( StringToDoubleConverter.class );
public StringToDoubleConverter()
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java
Index: StringToEnumConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StringToEnumConverter.java 13 Jan 2002 00:02:11 -0000 1.3
+++ StringToEnumConverter.java 20 Jan 2002 17:32:58 -0000 1.4
@@ -25,7 +25,7 @@
public class StringToEnumConverter
implements Converter
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( StringToEnumConverter.class );
public Object convert( final Class destination,
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java
Index: StringToFileConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StringToFileConverter.java 13 Jan 2002 00:02:11 -0000 1.3
+++ StringToFileConverter.java 20 Jan 2002 17:32:58 -0000 1.4
@@ -25,7 +25,7 @@
public class StringToFileConverter
extends AbstractConverter
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( StringToFileConverter.class );
public StringToFileConverter()
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java
Index: StringToFloatConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringToFloatConverter.java 13 Jan 2002 00:02:11 -0000 1.4
+++ StringToFloatConverter.java 20 Jan 2002 17:32:58 -0000 1.5
@@ -22,7 +22,7 @@
public class StringToFloatConverter
extends AbstractConverter
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( StringToFloatConverter.class );
public StringToFloatConverter()
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java
Index: StringToIntegerConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringToIntegerConverter.java 13 Jan 2002 00:02:11 -0000 1.4
+++ StringToIntegerConverter.java 20 Jan 2002 17:32:58 -0000 1.5
@@ -22,7 +22,7 @@
public class StringToIntegerConverter
extends AbstractConverter
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( StringToFloatConverter.class );
public StringToIntegerConverter()
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java
Index: StringToLongConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringToLongConverter.java 13 Jan 2002 00:02:11 -0000 1.4
+++ StringToLongConverter.java 20 Jan 2002 17:32:58 -0000 1.5
@@ -22,7 +22,7 @@
public class StringToLongConverter
extends AbstractConverter
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( StringToLongConverter.class );
public StringToLongConverter()
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java
Index: StringToShortConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringToShortConverter.java 13 Jan 2002 00:02:11 -0000 1.4
+++ StringToShortConverter.java 20 Jan 2002 17:32:58 -0000 1.5
@@ -22,7 +22,7 @@
public class StringToShortConverter
extends AbstractConverter
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( StringToShortConverter.class );
public StringToShortConverter()
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java
Index: StringToURLConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringToURLConverter.java 13 Jan 2002 00:02:11 -0000 1.4
+++ StringToURLConverter.java 20 Jan 2002 17:32:58 -0000 1.5
@@ -24,7 +24,7 @@
public class StringToURLConverter
extends AbstractConverter
{
- private static final Resources REZ =
+ private final static Resources REZ =
ResourceManager.getPackageResources( StringToURLConverter.class );
public StringToURLConverter()
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/LogOutputStream.java
Index: LogOutputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/LogOutputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LogOutputStream.java 12 Jan 2002 04:51:08 -0000 1.1
+++ LogOutputStream.java 20 Jan 2002 17:32:59 -0000 1.2
@@ -11,7 +11,7 @@
import java.io.IOException;
import java.io.OutputStream;
import org.apache.aut.nativelib.ExecOutputHandler;
-import org.apache.avalon.framework.logger.Logger;
+
/**
* Logs each line written to this stream to the specified
@@ -19,7 +19,7 @@
* line separators.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2002/01/12 04:51:08 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/20 17:32:59 $
*/
class LogOutputStream
extends OutputStream
1.3 +7 -5
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java
Index: ProcessMonitor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProcessMonitor.java 12 Jan 2002 05:52:27 -0000 1.2
+++ ProcessMonitor.java 20 Jan 2002 17:32:59 -0000 1.3
@@ -21,7 +21,7 @@
* It will also in the future do the same for stdin.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.2 $ $Date: 2002/01/12 05:52:27 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/20 17:32:59 $
*/
class ProcessMonitor
extends AbstractLogEnabled
@@ -32,13 +32,13 @@
private final static int SLEEP_TIME = 5;
//State to indicate process is still running
- private static final int STATE_RUNNING = 0;
+ private final static int STATE_RUNNING = 0;
//State to indicate process shutdown by itself
- private static final int STATE_STOPPED = 1;
+ private final static int STATE_STOPPED = 1;
//State to indicate process was terminated due to timeout
- private static final int STATE_TERMINATED = 2;
+ private final static int STATE_TERMINATED = 2;
/**
* The state of the process monitor and thus
@@ -244,7 +244,9 @@
try
{
final int available = input.available();
- if( 0 >= available ) return;
+ if( 0 >= available ) {
+ return;
+ }
final byte[] data = new byte[ available ];
final int read = input.read( data );
1.12 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/launcher/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/launcher/Main.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Main.java 12 Jan 2002 04:52:10 -0000 1.11
+++ Main.java 20 Jan 2002 17:32:59 -0000 1.12
@@ -28,7 +28,7 @@
* @param args the CLI arguments
* @exception Exception if an error occurs
*/
- public final static void main( final String[] args )
+ public static final void main( final String[] args )
throws Exception
{
try
@@ -69,7 +69,7 @@
}
}
- private final static URL[] buildURLList( final File dir )
+ private static final URL[] buildURLList( final File dir )
throws Exception
{
final ArrayList urlList = new ArrayList();
@@ -109,7 +109,7 @@
/**
* Finds the myrmidon.jar file in the classpath.
*/
- private final static File findInstallDir()
+ private static final File findInstallDir()
throws Exception
{
final String classpath = System.getProperty( "java.class.path" );
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/selftest/SubElementTest.java
Index: SubElementTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/selftest/SubElementTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SubElementTest.java 23 Dec 2001 06:24:52 -0000 1.2
+++ SubElementTest.java 20 Jan 2002 17:32:59 -0000 1.3
@@ -18,7 +18,7 @@
public class SubElementTest
extends AbstractTask
{
- public static final class Beep
+ public final static class Beep
{
public void setMessage( final String string )
{
1.5 +2 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/TraXLiaison.java
Index: TraXLiaison.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/TraXLiaison.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TraXLiaison.java 13 Jan 2002 07:33:23 -0000 1.4
+++ TraXLiaison.java 20 Jan 2002 17:32:59 -0000 1.5
@@ -182,8 +182,9 @@
if( e.getLocator().getSystemId() != null )
{
String url = e.getLocator().getSystemId();
- if( url.startsWith( "file:///" ) )
+ if( url.startsWith( "file:///" ) ) {
url = url.substring( 8 );
+ }
msg.append( url );
}
else
1.3 +2 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XalanLiaison.java
Index: XalanLiaison.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XalanLiaison.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanLiaison.java 23 Dec 2001 06:24:53 -0000 1.2
+++ XalanLiaison.java 20 Jan 2002 17:32:59 -0000 1.3
@@ -38,8 +38,9 @@
public void setOutputtype( String type )
throws Exception
{
- if( !type.equals( "xml" ) )
+ if( !type.equals( "xml" ) ) {
throw new TaskException( "Unsupported output type: " + type );
+ }
}
public void setStylesheet( File stylesheet )
1.14 +6 -6
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java
Index: XMLValidateTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XMLValidateTask.java 20 Jan 2002 09:56:07 -0000 1.13
+++ XMLValidateTask.java 20 Jan 2002 17:32:59 -0000 1.14
@@ -8,12 +8,12 @@
package org.apache.antlib.xml;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+
+
import java.io.FileReader;
import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
+
+
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
@@ -26,13 +26,13 @@
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.PathUtil;
import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
+
import org.xml.sax.InputSource;
import org.xml.sax.Parser;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.SAXParseException;
+
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.ParserAdapter;
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTParam.java
Index: XSLTParam.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTParam.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSLTParam.java 13 Jan 2002 07:33:23 -0000 1.2
+++ XSLTParam.java 20 Jan 2002 17:32:59 -0000 1.3
@@ -7,7 +7,7 @@
*/
package org.apache.antlib.xml;
-import org.apache.myrmidon.api.TaskException;
+
public final class XSLTParam
{
1.14 +4 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XSLTProcess.java 20 Jan 2002 09:56:07 -0000 1.13
+++ XSLTProcess.java 20 Jan 2002 17:32:59 -0000 1.14
@@ -244,8 +244,9 @@
for( int j = 0; j < dirs.length; ++j )
{
list = new File( m_baseDir, dirs[ j ] ).list();
- for( int i = 0; i < list.length; ++i )
+ for( int i = 0; i < list.length; ++i ) {
process( m_baseDir, list[ i ], m_destDir, stylesheet );
+ }
}
}
@@ -470,8 +471,9 @@
catch( Exception ex )
{
getLogger().info( "Failed to process " + inFile );
- if( outFile != null )
+ if( outFile != null ) {
outFile.delete();
+ }
throw new TaskException( "Error", ex );
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
