[Ant-contrib-developers] CVS: cpptasks/src/net/sf/antcontrib/cpptasks/compiler AbstractCompiler.java,1.3,1.4 AbstractLinker.java,1.8,1.9 AbstractProcessor.java,1.3,1.4

[Curt A. <ca...@us...>]

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler
In directory usw-pr-cvs1:/tmp/cvs-serv8718/net/sf/antcontrib/cpptasks/compiler

Modified Files:
	AbstractCompiler.java AbstractLinker.java 
	AbstractProcessor.java 
Log Message:
JDK 1.1 fixes, removed a few unused methods

Index: AbstractCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractCompiler.java	17 Mar 2002 01:56:40 -0000	1.3
--- AbstractCompiler.java	17 Mar 2002 05:10:27 -0000	1.4
***************
*** 119,148 ****
  
  
-     /**
-      * Returns a Linker instance for the specified name
-      *
-      * @param name a known name or a full class name
-      * @return instance of linker or null
-      *
-      */
-     public static net.sf.antcontrib.cpptasks.compiler.Compiler
-         getImplementation(String name) {
-         if(name.equals("msvc")) {
-           return DevStudioCCompiler.getInstance();
-         }
-         if(name.equals("gcc")) {
-           return GccCCompiler.getInstance();
-         }
-         Processor processor = AbstractProcessor.getImplementationFromClassName(name);
-         if(processor == null || processor instanceof net.sf.antcontrib.cpptasks.compiler.Compiler) {
-           return (net.sf.antcontrib.cpptasks.compiler.Compiler) processor;
-         }
-         net.sf.antcontrib.cpptasks.compiler.Compiler[] compilers =
-           processor.getCompilers();
-         if(compilers.length > 0) {
-           return compilers[0];
-         }
-         return null;
-     }
  
  
--- 119,122 ----

Index: AbstractLinker.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AbstractLinker.java	17 Mar 2002 01:56:40 -0000	1.8
--- AbstractLinker.java	17 Mar 2002 05:10:27 -0000	1.9
***************
*** 93,129 ****
      }
  
-     /**
-      * Locates a library from its basename, and a search path.
-      *
-      * <p>This implementation looks in each directory of the search path in
-      * turn.  It looks for a static library first, then a shared library.
-      * It calls {@link #usesStaticLibs} and {@link #usesSharedLibs} to
-      * determine which types of libraries to look for.
-      *
-      */
-     public File findLibrary(String[] searchPath, String baseName)
-     {
-         for ( int i = 0; i < searchPath.length; i++ ) {
-             String path = searchPath[i];
- 
-             // Look for static lib
-             if ( usesStaticLibs() ) {
-                 File file = new File(path + File.separatorChar + scheme.getStaticLibraryName(baseName));
-                 if ( file.isFile() ) {
-                     return file;
-                 }
-             }
- 
-             // Look for shared lib
-             if ( usesSharedLibs() ) {
-                 File file = new File(path + File.separatorChar + scheme.getSharedLibraryName(baseName));
-                 if ( file.isFile() ) {
-                     return file;
-                 }
-             }
-         }
- 
-         return null;
-     }
  
  
--- 93,96 ----
***************
*** 151,177 ****
  
      /**
-      * Determines if a file should be ignored when using this linker.  This
-      * implementation ignores static libraries if !{@link #usesStaticLibs},
-      * and ignores shared libraries if !{@link #usesSharedLibs} is false.
-      * Does not ignore any other files.
-      *
-      * @deprecated
-      */
-     public boolean ignoreFile(File file)
-     {
-         if ( ! usesStaticLibs() && scheme.isStaticLibraryName(file.getName()) ) {
-             // Ignore static libs
-             return true;
-         }
-         if ( ! usesSharedLibs() && scheme.isSharedLibraryName(file.getName()) ) {
-             // Ignore shared libs
-             return true;
-         }
- 
-         // Don't ignore any other files
-         return false;
-     }
- 
-     /**
       * Returns true if this linker can use static libraries.  This implementation
       * returns true.
--- 118,121 ----
***************
*** 213,235 ****
  
  
-     /**
-      * Returns a Linker instance for the specified name
-      *
-      * @param name a known name or a full class name
-      * @return instance of linker or null
-      *
-      */
-     public static Linker getImplementation(String name) {
-         if(name.equals("msvc")) {
-           return DevStudioLinker.getInstance();
-         }
-         if(name.equals("gcc")) {
-           return GccLinker.getInstance();
-         }
-         Processor processor =  AbstractProcessor.getImplementationFromClassName(name);
-         if(processor == null || processor instanceof Linker) {
-             return (Linker) processor;
-         }
-         return processor.getLinker(null);
-      }
  }
--- 157,159 ----

Index: AbstractProcessor.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractProcessor.java	17 Mar 2002 01:56:40 -0000	1.3
--- AbstractProcessor.java	17 Mar 2002 05:10:27 -0000	1.4
***************
*** 66,70 ****
  import net.sf.antcontrib.cpptasks.DependencyInfo;
  import net.sf.antcontrib.cpptasks.compiler.Processor;
- import java.lang.reflect.Method;
  
  
--- 66,69 ----
***************
*** 169,188 ****
  
  
-     protected static Processor getImplementationFromClassName(String className) {
-       Object proc = null;
-       try {
-         Class implClass = AbstractProcessor.class.getClassLoader().loadClass(className);
-         try {
-           Method getInstance = implClass.getMethod("getInstance", new Class[0]);
-           proc = getInstance.invoke(null, new Object[0]);
-         }
-         catch(Exception ex) {
-           proc = implClass.newInstance();
-         }
-       }
-       catch(Exception ex) {
-       }
-       return (Processor) proc;
-     }
  
  }
--- 168,171 ----