Fix generics and use of deprecated field

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719125 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/buildutil/Txt2Html.java b/java/org/apache/tomcat/buildutil/Txt2Html.java
index 24b8f1d..b8b974b 100644 (file)
--- a/java/org/apache/tomcat/buildutil/Txt2Html.java
+++ b/java/org/apache/tomcat/buildutil/Txt2Html.java
@@ -81,10 +81,10 @@ public class Txt2Html
         int count = 0;
         
         // Step through each file and convert.
-        Iterator iter = filesets.iterator();
+        Iterator<FileSet> iter = filesets.iterator();
         while( iter.hasNext() ) {
-            FileSet fs = (FileSet)iter.next();
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            FileSet fs = iter.next();
+            DirectoryScanner ds = fs.getDirectoryScanner(getProject());
             File basedir = ds.getBasedir();
             String[] files = ds.getIncludedFiles();
             for( int i = 0; i < files.length; i++ ) {