Hi Paul,
On 20/08/2009, at 3:16 PM, [email protected] wrote:
Author: pgier
Date: Thu Aug 20 19:16:15 2009
New Revision: 806311
URL: http://svn.apache.org/viewvc?rev=806311&view=rev
Log:
[SUREFIRE-502] Fixing classpath ordering for configured classes/test-
classes directories are used. Removing a couple of unnecessary
@required tags.
Can you add a test case for this fix?
Also...
// Check if we need to add configured classes/test classes
directories here.
// If they are configured, we should remove the default to
avoid conflicts.
- if ( !
project
.getBuild
().getOutputDirectory().equals( classesDirectory.getAbsolutePath() ) )
+ File projectClassesDirectory = new File
( project.getBuild().getOutputDirectory() );
+ if ( ! projectClassesDirectory.equals( classesDirectory ) )
{
-
classpathElements.remove( project.getBuild().getOutputDirectory() );
-
classpathElements.add( classesDirectory.getAbsolutePath() );
+ int indexToReplace =
classpathElements.indexOf( project.getBuild().getOutputDirectory() );
+ if ( indexToReplace != -1 )
+ {
+ classpathElements.remove( indexToReplace );
+ classpathElements.add( indexToReplace,
classesDirectory.getAbsolutePath() );
+ }
+ else
+ {
+ classpathElements.add( 1,
classesDirectory.getAbsolutePath() );
+ }
why at 1 instead of 0?
}
+
+ /*private void replaceListItem( List list, Object item1, Object
item2 )
+ {
+ list.r
+ }*/
Looks like this can be removed.
- Brett
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
