ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs JarTest.java
Date Wed, 07 Jan 2004 12:55:52 GMT
bodewig     2004/01/07 04:55:52

  Modified:    src/testcases/org/apache/tools/ant Tag: ANT_16_BRANCH
                        IntrospectionHelperTest.java
               src/testcases/org/apache/tools/ant/taskdefs Tag:
                        ANT_16_BRANCH JarTest.java
  Log:
  Sync with HEAD
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.16.2.1  +7 -7      ant/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java
  
  Index: IntrospectionHelperTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java,v
  retrieving revision 1.16
  retrieving revision 1.16.2.1
  diff -u -r1.16 -r1.16.2.1
  --- IntrospectionHelperTest.java	26 Aug 2003 08:21:02 -0000	1.16
  +++ IntrospectionHelperTest.java	7 Jan 2004 12:55:52 -0000	1.16.2.1
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001,2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001,2003-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -195,9 +195,9 @@
           h.put("fourteen", java.lang.StringBuffer.class);
           h.put("fifteen", java.lang.StringBuffer.class);
           IntrospectionHelper ih = IntrospectionHelper.getHelper(getClass());
  -        Enumeration enum = ih.getNestedElements();
  -        while (enum.hasMoreElements()) {
  -            String name = (String) enum.nextElement();
  +        Enumeration e = ih.getNestedElements();
  +        while (e.hasMoreElements()) {
  +            String name = (String) e.nextElement();
               Class expect = (Class) h.get(name);
               assertNotNull("Support for "+name+" in IntrospectioNHelperTest?",
                             expect);
  @@ -408,9 +408,9 @@
           h.put("name", java.lang.String.class);
   
           IntrospectionHelper ih = IntrospectionHelper.getHelper(getClass());
  -        Enumeration enum = ih.getAttributes();
  -        while (enum.hasMoreElements()) {
  -            String name = (String) enum.nextElement();
  +        Enumeration e = ih.getAttributes();
  +        while (e.hasMoreElements()) {
  +            String name = (String) e.nextElement();
               Class expect = (Class) h.get(name);
               assertNotNull("Support for "+name+" in IntrospectionHelperTest?",
                             expect);
  
  
  
  No                   revision
  No                   revision
  1.22.2.2  +4 -4      ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
  
  Index: JarTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java,v
  retrieving revision 1.22.2.1
  retrieving revision 1.22.2.2
  diff -u -r1.22.2.1 -r1.22.2.2
  --- JarTest.java	3 Dec 2003 22:06:41 -0000	1.22.2.1
  +++ JarTest.java	7 Jan 2004 12:55:52 -0000	1.22.2.2
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -244,10 +244,10 @@
           try {
               executeTarget("testIndexTests");
               archive = new ZipFile(getProject().resolveFile(tempJar));
  -            Enumeration enum = archive.entries();
  +            Enumeration e = archive.entries();
               int numberOfIndexLists = 0;
  -            while (enum.hasMoreElements()) {
  -                ZipEntry ze = (ZipEntry) enum.nextElement();
  +            while (e.hasMoreElements()) {
  +                ZipEntry ze = (ZipEntry) e.nextElement();
                   if (ze.getName().equals("META-INF/INDEX.LIST")) {
                       numberOfIndexLists++;
                   }
  
  
  

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


Mime
View raw message