sebb        2005/02/22 15:39:09

  Modified:    src/jorphan/org/apache/commons/cli/avalon Tag: rel-2_0
                        CLArgsParser.java
  Log:
  Hopefully finally sorted 2-arg options with leading - in value
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.6   +3 -10     
jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/Attic/CLArgsParser.java
  
  Index: CLArgsParser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/Attic/CLArgsParser.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- CLArgsParser.java 22 Feb 2005 14:28:15 -0000      1.1.2.5
  +++ CLArgsParser.java 22 Feb 2005 23:39:09 -0000      1.1.2.6
  @@ -49,12 +49,10 @@
       private static final int STATE_NO_OPTIONS = 4;
       private static final int STATE_OPTION_MODE = 5;
   
  +     // Values for creating tokens
       private static final int TOKEN_SEPARATOR = 0;
       private static final int TOKEN_STRING = 1;
   
  -    private static final char[] ARG2_SEPARATORS = // Used to find the end of 
the second argument
  -            new char[]{(char)0 };
  -
       private static final char[] ARG_SEPARATORS =
               new char[]{(char)0, '='};
   
  @@ -714,12 +712,7 @@
                   final StringBuffer sb = new StringBuffer();
   
                   m_ch = getChar();
  -                if( '-' == m_ch )
  -                {
  -                    m_lastChar = m_ch;
  -                }
  -
  -                while( !isSeparator( m_ch, ARG2_SEPARATORS ) )
  +                while( !isSeparator( m_ch, NULL_SEPARATORS ) )
                   {
                       sb.append( m_ch );
                       m_ch = getChar();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to