ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp JakartaRegexpMatcher.java JakartaRegexpRegexp.java Jdk14RegexpMatcher.java Jdk14RegexpRegexp.java
Date Wed, 06 Feb 2002 13:37:13 GMT
donaldp     02/02/06 05:37:13

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/util
                        FileUtils.java
               proposal/myrmidon/src/main/org/apache/tools/ant/util/depend
                        Dependencies.java
               proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp
                        JakartaRegexpMatcher.java JakartaRegexpRegexp.java
                        Jdk14RegexpMatcher.java Jdk14RegexpRegexp.java
  Log:
  Style touchups
  
  Revision  Changes    Path
  1.19      +5 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java
  
  Index: FileUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- FileUtils.java	20 Jan 2002 17:35:01 -0000	1.18
  +++ FileUtils.java	6 Feb 2002 13:37:13 -0000	1.19
  @@ -32,7 +32,7 @@
    * @author duncan@x180.com
    * @author <a href="mailto:conor@apache.org">Conor MacNeill</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  - * @version $Revision: 1.18 $
  + * @version $Revision: 1.19 $
    */
   public class FileUtils
   {
  @@ -385,7 +385,8 @@
        */
       public static String translateFile( final String source )
       {
  -        if( source == null ) {
  +        if( source == null )
  +        {
               return "";
           }
   
  @@ -423,7 +424,8 @@
           throws TaskException
       {
           final ArrayList result = new ArrayList();
  -        if( source == null ) {
  +        if( source == null )
  +        {
               return new String[ 0 ];
           }
   
  
  
  
  1.5       +11 -9     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/depend/Dependencies.java
  
  Index: Dependencies.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/depend/Dependencies.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Dependencies.java	20 Jan 2002 17:35:01 -0000	1.4
  +++ Dependencies.java	6 Feb 2002 13:37:13 -0000	1.5
  @@ -14,13 +14,10 @@
   import java.util.Set;
   import java.util.StringTokenizer;
   import java.util.TreeSet;
  -
  -import org.apache.bcel.classfile.Visitor;
  -import org.apache.bcel.classfile.ConstantPool;
  -import org.apache.bcel.classfile.JavaClass;
   import org.apache.bcel.classfile.ClassParser;
   import org.apache.bcel.classfile.Code;
   import org.apache.bcel.classfile.CodeException;
  +import org.apache.bcel.classfile.Constant;
   import org.apache.bcel.classfile.ConstantClass;
   import org.apache.bcel.classfile.ConstantDouble;
   import org.apache.bcel.classfile.ConstantFieldref;
  @@ -30,7 +27,7 @@
   import org.apache.bcel.classfile.ConstantLong;
   import org.apache.bcel.classfile.ConstantMethodref;
   import org.apache.bcel.classfile.ConstantNameAndType;
  -import org.apache.bcel.classfile.Constant;
  +import org.apache.bcel.classfile.ConstantPool;
   import org.apache.bcel.classfile.ConstantString;
   import org.apache.bcel.classfile.ConstantUtf8;
   import org.apache.bcel.classfile.ConstantValue;
  @@ -39,16 +36,18 @@
   import org.apache.bcel.classfile.Field;
   import org.apache.bcel.classfile.InnerClass;
   import org.apache.bcel.classfile.InnerClasses;
  -import org.apache.bcel.classfile.Method;
  +import org.apache.bcel.classfile.JavaClass;
   import org.apache.bcel.classfile.LineNumber;
   import org.apache.bcel.classfile.LineNumberTable;
   import org.apache.bcel.classfile.LocalVariable;
   import org.apache.bcel.classfile.LocalVariableTable;
  +import org.apache.bcel.classfile.Method;
   import org.apache.bcel.classfile.SourceFile;
   import org.apache.bcel.classfile.StackMap;
   import org.apache.bcel.classfile.StackMapEntry;
   import org.apache.bcel.classfile.Synthetic;
   import org.apache.bcel.classfile.Unknown;
  +import org.apache.bcel.classfile.Visitor;
   
   public class Dependencies implements Visitor
   {
  @@ -96,7 +95,8 @@
               for( int i = o; i < args.length; i++ )
               {
                   String fileName = args[ i ].substring( 0, args[ i ].length() - ".class".length()
);
  -                if( base != null && fileName.startsWith( base ) ) {
  +                if( base != null && fileName.startsWith( base ) )
  +                {
                       fileName = fileName.substring( base.length() );
                   }
                   newSet.add( fileName );
  @@ -128,7 +128,8 @@
                                    public boolean accept( Object object )
                                    {
                                        String fileName = object + ".class";
  -                                     if( base != null ) {
  +                                     if( base != null )
  +                                     {
                                            fileName = base + fileName;
                                        }
                                        return new File( fileName ).exists();
  @@ -213,7 +214,8 @@
   
       public void visitConstantPool( ConstantPool obj )
       {
  -        if( verbose ) {
  +        if( verbose )
  +        {
               System.out.println( "visit ConstantPool" );
           }
           this.constantPool = obj;
  
  
  
  1.6       +6 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java
  
  Index: JakartaRegexpMatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JakartaRegexpMatcher.java	20 Jan 2002 17:35:01 -0000	1.5
  +++ JakartaRegexpMatcher.java	6 Feb 2002 13:37:13 -0000	1.6
  @@ -124,13 +124,16 @@
       {
           int cOptions = RE.MATCH_NORMAL;
   
  -        if( RegexpUtil.hasFlag( options, MATCH_CASE_INSENSITIVE ) ) {
  +        if( RegexpUtil.hasFlag( options, MATCH_CASE_INSENSITIVE ) )
  +        {
               cOptions |= RE.MATCH_CASEINDEPENDENT;
           }
  -        if( RegexpUtil.hasFlag( options, MATCH_MULTILINE ) ) {
  +        if( RegexpUtil.hasFlag( options, MATCH_MULTILINE ) )
  +        {
               cOptions |= RE.MATCH_MULTILINE;
           }
  -        if( RegexpUtil.hasFlag( options, MATCH_SINGLELINE ) ) {
  +        if( RegexpUtil.hasFlag( options, MATCH_SINGLELINE ) )
  +        {
               cOptions |= RE.MATCH_SINGLELINE;
           }
   
  
  
  
  1.6       +2 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
  
  Index: JakartaRegexpRegexp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JakartaRegexpRegexp.java	20 Jan 2002 17:35:01 -0000	1.5
  +++ JakartaRegexpRegexp.java	6 Feb 2002 13:37:13 -0000	1.6
  @@ -71,7 +71,8 @@
       protected int getSubsOptions( int options )
       {
           int subsOptions = RE.REPLACE_FIRSTONLY;
  -        if( RegexpUtil.hasFlag( options, REPLACE_ALL ) ) {
  +        if( RegexpUtil.hasFlag( options, REPLACE_ALL ) )
  +        {
               subsOptions = RE.REPLACE_ALL;
           }
           return subsOptions;
  
  
  
  1.7       +6 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java
  
  Index: Jdk14RegexpMatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Jdk14RegexpMatcher.java	20 Jan 2002 17:35:01 -0000	1.6
  +++ Jdk14RegexpMatcher.java	6 Feb 2002 13:37:13 -0000	1.7
  @@ -148,13 +148,16 @@
       {
           int cOptions = 0;
   
  -        if( RegexpUtil.hasFlag( options, MATCH_CASE_INSENSITIVE ) ) {
  +        if( RegexpUtil.hasFlag( options, MATCH_CASE_INSENSITIVE ) )
  +        {
               cOptions |= Pattern.CASE_INSENSITIVE;
           }
  -        if( RegexpUtil.hasFlag( options, MATCH_MULTILINE ) ) {
  +        if( RegexpUtil.hasFlag( options, MATCH_MULTILINE ) )
  +        {
               cOptions |= Pattern.MULTILINE;
           }
  -        if( RegexpUtil.hasFlag( options, MATCH_SINGLELINE ) ) {
  +        if( RegexpUtil.hasFlag( options, MATCH_SINGLELINE ) )
  +        {
               cOptions |= Pattern.DOTALL;
           }
   
  
  
  
  1.5       +2 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java
  
  Index: Jdk14RegexpRegexp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Jdk14RegexpRegexp.java	20 Jan 2002 17:35:01 -0000	1.4
  +++ Jdk14RegexpRegexp.java	6 Feb 2002 13:37:13 -0000	1.5
  @@ -91,7 +91,8 @@
       protected int getSubsOptions( int options )
       {
           int subsOptions = REPLACE_FIRST;
  -        if( RegexpUtil.hasFlag( options, REPLACE_ALL ) ) {
  +        if( RegexpUtil.hasFlag( options, REPLACE_ALL ) )
  +        {
               subsOptions = REPLACE_ALL;
           }
           return subsOptions;
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message