ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers CompilerAdapter.java CompilerAdapterFactory.java Gcj.java Javac12.java Javac13.java JavacExternal.java Jikes.java Jvc.java Kjc.java Sj.java
Date Fri, 13 May 2005 16:58:55 GMT
peterreilly    2005/05/13 09:58:55

  Modified:    src/main/org/apache/tools/ant/taskdefs/compilers
                        CompilerAdapter.java CompilerAdapterFactory.java
                        Gcj.java Javac12.java Javac13.java
                        JavacExternal.java Jikes.java Jvc.java Kjc.java
                        Sj.java
  Log:
  checkstyle - mostly javadoc
  
  Revision  Changes    Path
  1.13      +3 -1      ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java
  
  Index: CompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- CompilerAdapter.java	9 Mar 2004 16:48:13 -0000	1.12
  +++ CompilerAdapter.java	13 May 2005 16:58:55 -0000	1.13
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2001-2004 The Apache Software Foundation
  + * Copyright  2001-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -37,6 +37,7 @@
   
       /**
        * Sets the compiler attributes, which are stored in the Javac task.
  +     * @param attributes the compiler attributes
        */
       void setJavac(Javac attributes);
   
  @@ -44,6 +45,7 @@
        * Executes the task.
        *
        * @return has the compilation been successful
  +     * @throws BuildException on error
        */
       boolean execute() throws BuildException;
   }
  
  
  
  1.30      +3 -1      ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java
  
  Index: CompilerAdapterFactory.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- CompilerAdapterFactory.java	30 Mar 2005 08:35:43 -0000	1.29
  +++ CompilerAdapterFactory.java	13 May 2005 16:58:55 -0000	1.30
  @@ -27,7 +27,7 @@
    *
    * @since Ant 1.3
    */
  -public class CompilerAdapterFactory {
  +public final class CompilerAdapterFactory {
       private static final String MODERN_COMPILER = "com.sun.tools.javac.Main";
   
       /** This is a singleton -- can't create instances!! */
  @@ -55,6 +55,7 @@
        * @param compilerType either the name of the desired compiler, or the
        * full classname of the compiler's adapter.
        * @param task a task to log through.
  +     * @return the compiler adapter
        * @throws BuildException if the compiler type could not be resolved into
        * a compiler adapter.
        */
  @@ -145,6 +146,7 @@
                       return true;
                   }
               } catch (ClassNotFoundException cnfe2) {
  +                // Ignore Exception
               }
           }
           return false;
  
  
  
  1.25      +7 -1      ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
  
  Index: Gcj.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Gcj.java	27 Apr 2005 09:51:14 -0000	1.24
  +++ Gcj.java	13 May 2005 16:58:55 -0000	1.25
  @@ -33,6 +33,8 @@
   
       /**
        * Performs a compile using the gcj compiler.
  +     * @return true if the compilation succeeded
  +     * @throws BuildException on error
        */
       public boolean execute() throws BuildException {
           Commandline cmd;
  @@ -46,6 +48,10 @@
               executeExternalCompile(cmd.getCommandline(), firstFileName) == 0;
       }
   
  +    /**
  +     * Set up the gcj commandline.
  +     * @return the command line
  +     */
       protected Commandline setupGCJCommand() {
           Commandline cmd = new Commandline();
           Path classpath = new Path(project);
  @@ -113,7 +119,7 @@
       /**
        * Whether any of the arguments given via <compilerarg>
        * implies that compilation to native code is requested.
  -     *
  +     * @return true if compilation to native code is requested
        * @since Ant 1.6.2
        */
       public boolean isNativeBuild() {
  
  
  
  1.18      +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
  
  Index: Javac12.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Javac12.java	9 Mar 2004 16:48:13 -0000	1.17
  +++ Javac12.java	13 May 2005 16:58:55 -0000	1.18
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2001-2002,2004 The Apache Software Foundation
  + * Copyright  2001-2002,2004-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -37,7 +37,7 @@
   
       /**
        * Run the compilation.
  -     *
  +     * @return true if the compiler ran with a zero exit result (ok)
        * @exception BuildException if the compilation has problems.
        */
       public boolean execute() throws BuildException {
  
  
  
  1.18      +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
  
  Index: Javac13.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Javac13.java	9 Mar 2004 16:48:13 -0000	1.17
  +++ Javac13.java	13 May 2005 16:58:55 -0000	1.18
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2001-2002,2004 The Apache Software Foundation
  + * Copyright  2001-2002,2004-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -39,7 +39,7 @@
   
       /**
        * Run the compilation.
  -     *
  +     * @return true if the compiler ran with a zero exit result (ok)
        * @exception BuildException if the compilation has problems.
        */
       public boolean execute() throws BuildException {
  
  
  
  1.19      +2 -0      ant/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
  
  Index: JavacExternal.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- JavacExternal.java	13 Jan 2005 09:25:28 -0000	1.18
  +++ JavacExternal.java	13 May 2005 16:58:55 -0000	1.19
  @@ -36,6 +36,8 @@
   
       /**
        * Performs a compile using the Javac externally.
  +     * @return true if the compilation succeeded
  +     * @throws BuildException on error
        */
       public boolean execute() throws BuildException {
           attributes.log("Using external javac compiler", Project.MSG_VERBOSE);
  
  
  
  1.33      +4 -2      ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Jikes.java	17 Mar 2005 09:59:36 -0000	1.32
  +++ Jikes.java	13 May 2005 16:58:55 -0000	1.33
  @@ -39,7 +39,9 @@
        * there is no option in jikes and I don't understand
        * what they should do.
        *
  -     * It has been successfully tested with jikes >1.10
  +     * It has been successfully tested with jikes >1.10.
  +     * @return true if the compilation succeeded
  +     * @throws BuildException on error
        */
       public boolean execute() throws BuildException {
           attributes.log("Using jikes compiler", Project.MSG_VERBOSE);
  @@ -88,7 +90,7 @@
           String exec = getJavac().getExecutable();
           cmd.setExecutable(exec == null ? "jikes" : exec);
   
  -        if (deprecation == true) {
  +        if (deprecation) {
               cmd.createArgument().setValue("-deprecation");
           }
   
  
  
  
  1.23      +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
  
  Index: Jvc.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Jvc.java	21 Dec 2004 15:49:39 -0000	1.22
  +++ Jvc.java	13 May 2005 16:58:55 -0000	1.23
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2001-2004 The Apache Software Foundation
  + * Copyright  2001-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -33,7 +33,7 @@
   
       /**
        * Run the compilation.
  -     *
  +     * @return true if the compiler ran with a zero exit result (ok)
        * @exception BuildException if the compilation has problems.
        */
       public boolean execute() throws BuildException {
  
  
  
  1.21      +3 -2      ant/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java
  
  Index: Kjc.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Kjc.java	2 Feb 2005 13:01:52 -0000	1.20
  +++ Kjc.java	13 May 2005 16:58:55 -0000	1.21
  @@ -34,7 +34,7 @@
   
       /**
        * Run the compilation.
  -     *
  +     * @return true if the compilation succeeded
        * @exception BuildException if the compilation has problems.
        */
       public boolean execute() throws BuildException {
  @@ -48,6 +48,7 @@
   
       /**
        * setup kjc command arguments.
  +     * @return the command line
        */
       protected Commandline setupKjcCommand() {
           Commandline cmd = new Commandline();
  @@ -55,7 +56,7 @@
           // generate classpath, because kjc doesn't support sourcepath.
           Path classpath = getCompileClasspath();
   
  -        if (deprecation == true) {
  +        if (deprecation) {
               cmd.createArgument().setValue("-deprecation");
           }
   
  
  
  
  1.14      +2 -0      ant/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java
  
  Index: Sj.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Sj.java	24 Feb 2005 20:18:22 -0000	1.13
  +++ Sj.java	13 May 2005 16:58:55 -0000	1.14
  @@ -31,6 +31,8 @@
   
       /**
        * Performs a compile using the sj compiler from Symantec.
  +     * @return true if the compilation succeeded
  +     * @throws BuildException on error
        */
       public boolean execute() throws BuildException {
           attributes.log("Using symantec java compiler", Project.MSG_VERBOSE);
  
  
  

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


Mime
View raw message