Browse Source

Move body of addLine into this class rather than delegating and temporarily commented out markers

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271336 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
915968627a
2 changed files with 20 additions and 14 deletions
  1. +10
    -7
      proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java
  2. +10
    -7
      proposal/myrmidon/src/todo/org/apache/tools/ant/types/Commandline.java

+ 10
- 7
proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java View File

@@ -11,6 +11,7 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import org.apache.avalon.excalibur.util.StringUtil; import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.util.FileUtils;


/** /**
* Commandline objects help handling command lines specifying processes to * Commandline objects help handling command lines specifying processes to
@@ -139,9 +140,11 @@ public class Commandline
public void addLine( final String line ) public void addLine( final String line )
throws TaskException throws TaskException
{ {
final Argument argument = new Argument();
argument.setLine( line );
addArgument( argument );
final String[] parts = FileUtils.translateCommandline( line );
for( int i = 0; i < parts.length; i++ )
{
addArgument( parts[ i ] );
}
} }


/** /**
@@ -150,10 +153,10 @@ public class Commandline
* This marker can be used to locate a position on the commandline - to * This marker can be used to locate a position on the commandline - to
* insert something for example - when all parameters have been set.</p> * insert something for example - when all parameters have been set.</p>
*/ */
public Marker createMarker()
{
return new Marker( this, m_arguments.size() );
}
// public Marker createMarker()
// {
// return new Marker( this, m_arguments.size() );
// }


public int size() public int size()
{ {


+ 10
- 7
proposal/myrmidon/src/todo/org/apache/tools/ant/types/Commandline.java View File

@@ -11,6 +11,7 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import org.apache.avalon.excalibur.util.StringUtil; import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.util.FileUtils;


/** /**
* Commandline objects help handling command lines specifying processes to * Commandline objects help handling command lines specifying processes to
@@ -139,9 +140,11 @@ public class Commandline
public void addLine( final String line ) public void addLine( final String line )
throws TaskException throws TaskException
{ {
final Argument argument = new Argument();
argument.setLine( line );
addArgument( argument );
final String[] parts = FileUtils.translateCommandline( line );
for( int i = 0; i < parts.length; i++ )
{
addArgument( parts[ i ] );
}
} }


/** /**
@@ -150,10 +153,10 @@ public class Commandline
* This marker can be used to locate a position on the commandline - to * This marker can be used to locate a position on the commandline - to
* insert something for example - when all parameters have been set.</p> * insert something for example - when all parameters have been set.</p>
*/ */
public Marker createMarker()
{
return new Marker( this, m_arguments.size() );
}
// public Marker createMarker()
// {
// return new Marker( this, m_arguments.size() );
// }


public int size() public int size()
{ {


Loading…
Cancel
Save