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/taskdefs Rmic.java
Date Sun, 30 Dec 2001 00:12:55 GMT
donaldp     01/12/29 16:12:55

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
                        Rmic.java
  Log:
  Remove filtering from rmic task because it didn't make much sense to do filtering there
  
  Revision  Changes    Path
  1.16      +10 -47    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
  
  Index: Rmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Rmic.java	23 Dec 2001 14:21:50 -0000	1.15
  +++ Rmic.java	30 Dec 2001 00:12:54 -0000	1.16
  @@ -17,11 +17,9 @@
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.rmic.RmicAdapter;
   import org.apache.tools.ant.taskdefs.rmic.RmicAdapterFactory;
  -import org.apache.tools.ant.types.FilterSetCollection;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
   import org.apache.tools.ant.util.FileNameMapper;
  -import org.apache.tools.ant.util.FileUtils;
   import org.apache.tools.ant.util.SourceFileScanner;
   
   /**
  @@ -63,18 +61,17 @@
   
       private final static String FAIL_MSG
           = "Rmic failed, messages should have been provided.";
  -    private boolean verify = false;
  -    private boolean filtering = false;
  +    private boolean verify;
   
  -    private boolean iiop = false;
  -    private boolean idl = false;
  -    private boolean debug = false;
  -    private boolean includeAntRuntime = true;
  -    private boolean includeJavaRuntime = false;
  +    private boolean iiop;
  +    private boolean idl;
  +    private boolean debug;
  +    private boolean includeAntRuntime;
  +    private boolean includeJavaRuntime;
   
       private ArrayList compileList = new ArrayList();
   
  -    private ClassLoader loader = null;
  +    private ClassLoader loader;
   
       private File baseDir;
       private String classname;
  @@ -162,11 +159,6 @@
           }
       }
   
  -    public void setFiltering( boolean filter )
  -    {
  -        filtering = filter;
  -    }
  -
       /**
        * Indicates that IDL output should be generated. This defaults to false if
        * not set.
  @@ -317,21 +309,6 @@
           return extdirs;
       }
   
  -    /**
  -     * Gets file list to compile.
  -     *
  -     * @return The FileList value
  -     */
  -    public ArrayList getFileList()
  -    {
  -        return compileList;
  -    }
  -
  -    public boolean getFiltering()
  -    {
  -        return filtering;
  -    }
  -
       /*
        * Gets IDL flags.
        */
  @@ -504,7 +481,7 @@
       {
           if( compileClasspath == null )
           {
  -            compileClasspath = new Path( getProject() );
  +            compileClasspath = new Path();
           }
           return compileClasspath.createPath();
       }
  @@ -519,7 +496,7 @@
       {
           if( extdirs == null )
           {
  -            extdirs = new Path( getProject() );
  +            extdirs = new Path();
           }
           return extdirs.createPath();
       }
  @@ -653,12 +630,6 @@
   
       /**
        * Move the generated source file(s) to the base directory
  -     *
  -     * @param baseDir Description of Parameter
  -     * @param sourceBaseFile Description of Parameter
  -     * @param classname Description of Parameter
  -     * @param adapter Description of Parameter
  -     * @exception TaskException Description of Exception
        */
       private void moveGeneratedFile( File baseDir, File sourceBaseFile,
                                       String classname,
  @@ -679,15 +650,7 @@
               File newFile = new File( sourceBaseFile, sourceFileName );
               try
               {
  -                if( filtering )
  -                {
  -                    final FilterSetCollection filters = new FilterSetCollection( getProject().getGlobalFilterSet()
);
  -                    FileUtils.copyFile( oldFile, newFile, filters );
  -                }
  -                else
  -                {
  -                    FileUtil.copyFile( oldFile, newFile );
  -                }
  +                FileUtil.copyFile( oldFile, newFile );
                   oldFile.delete();
               }
               catch( IOException ioe )
  
  
  

--
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