cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Javadoc.java

[conor]

conor       00/06/29 08:45:43

  Modified:    src/main/org/apache/tools/ant/taskdefs Javadoc.java
  Log:
  Oops - make the new Javadoc work under JDK 1.1
  
  Revision  Changes    Path
  1.10      +9 -15     
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Javadoc.java      2000/06/29 15:32:39     1.9
  +++ Javadoc.java      2000/06/29 15:45:41     1.10
  @@ -521,22 +521,16 @@
               
               // add the group arguments
               if (groups.size() != 0) {
  -                String title = null;
  -                String packages = null;
  -                GroupArgument ga = null;
  -                for (int i = 0; i < groups.size(); i++) {
  -                    ga = (GroupArgument)groups.get(i);
  -                    if (ga != null) {
  -                        title = ga.getTitle();
  -                        packages = ga.getPackages();
  +                for (Enumeration e = groups.elements(); e.hasMoreElements(); 
) {
  +                    GroupArgument ga = (GroupArgument)e.nextElement();
  +                    String title = ga.getTitle();
  +                    String packages = ga.getPackages();
  +                    if (title == null || packages == null) {
  +                        throw new BuildException("The title and packages 
must be specified for group elements.");
                       }
  -                    if (title != null) {
  -                        argList.addElement("-group");
  -                        argList.addElement(title);
  -                        if (packages != null) {
  -                            argList.addElement(packages);
  -                        }
  -                    }
  +                    argList.addElement("-group");
  +                    argList.addElement(title);
  +                    argList.addElement(packages);
                   }
               }