diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java index 45695c8f3..2e55f81ec 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java @@ -147,17 +147,6 @@ public class Commandline } } - /** - * Return a marker.
- * - * This marker can be used to locate a position on the commandline - to - * insert something for example - when all parameters have been set.
- */ -// public Marker createMarker() -// { -// return new Marker( this, m_arguments.size() ); -// } - public int size() { return getCommandline().length; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Marker.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/Marker.java deleted file mode 100644 index a1a5703a8..000000000 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Marker.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. - */ -package org.apache.tools.ant.types; - -import java.util.ArrayList; - -/** - * Class to keep track of the position of an Argument. - * - *This class is there to support the srcfile and targetfile - * elements of <execon> and <transform> - don't know - * whether there might be additional use cases.
--SB - */ -public class Marker -{ - private int m_realPos = -1; - private int m_position; - private Commandline m_commandline; - - Marker( Commandline commandline, int position ) - { - m_commandline = commandline; - m_position = position; - } - - /** - * Return the number of arguments that preceeded this marker.- * - * The name of the executable - if set - is counted as the very first - * argument.
- * - * @return The Position value - */ - public int getPosition() - { - if( m_realPos == -1 ) - { - m_realPos = ( m_commandline.getExecutable() == null ? 0 : 1 ); - final ArrayList arguments = m_commandline.m_arguments; - for( int i = 0; i < m_position; i++ ) - { - final Argument arg = (Argument)arguments.get( i ); - m_realPos += arg.getParts().length; - } - } - return m_realPos; - } -} diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Commandline.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Commandline.java index 45695c8f3..2e55f81ec 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Commandline.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Commandline.java @@ -147,17 +147,6 @@ public class Commandline } } - /** - * Return a marker.- * - * This marker can be used to locate a position on the commandline - to - * insert something for example - when all parameters have been set.
- */ -// public Marker createMarker() -// { -// return new Marker( this, m_arguments.size() ); -// } - public int size() { return getCommandline().length; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Marker.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Marker.java deleted file mode 100644 index a1a5703a8..000000000 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Marker.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. - */ -package org.apache.tools.ant.types; - -import java.util.ArrayList; - -/** - * Class to keep track of the position of an Argument. - * - *This class is there to support the srcfile and targetfile - * elements of <execon> and <transform> - don't know - * whether there might be additional use cases.
--SB - */ -public class Marker -{ - private int m_realPos = -1; - private int m_position; - private Commandline m_commandline; - - Marker( Commandline commandline, int position ) - { - m_commandline = commandline; - m_position = position; - } - - /** - * Return the number of arguments that preceeded this marker.- * - * The name of the executable - if set - is counted as the very first - * argument.
- * - * @return The Position value - */ - public int getPosition() - { - if( m_realPos == -1 ) - { - m_realPos = ( m_commandline.getExecutable() == null ? 0 : 1 ); - final ArrayList arguments = m_commandline.m_arguments; - for( int i = 0; i < m_position; i++ ) - { - final Argument arg = (Argument)arguments.get( i ); - m_realPos += arg.getParts().length; - } - } - return m_realPos; - } -}