Add in a few bits of Generics to avoid warnings

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

diff --git a/src/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java b/src/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java
index de8bb1f577ad6d7eac05e1e0a729f2a6e3aa159d..8b7119b571536300d4396ea3667107224096ec37 100644 (file)
--- a/src/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java
+++ b/src/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java
@@ -47,7 +47,7 @@ public interface DirectoryEntry
      *         implementations of Entry.
      */
 
-    public Iterator getEntries();
+    public Iterator<Entry> getEntries();
 
     /**
      * is this DirectoryEntry empty?

diff --git a/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java b/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
index 6805e5197b3a23187f26631396a90dd770cc97f7..3621637317bba111c16b58a81535580c275b7f70 100644 (file)
--- a/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
+++ b/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
@@ -41,7 +41,7 @@ public class DirectoryNode
 {
 
     // Map of Entry instances, keyed by their names
-    private Map               _entries;
+    private Map<String,Entry> _entries;
 
     // the POIFSFileSystem we belong to
     private POIFSFileSystem   _filesystem;
@@ -75,12 +75,12 @@ public class DirectoryNode
             });
         }
         _filesystem = filesystem;
-        _entries    = new HashMap();
-        Iterator iter = property.getChildren();
+        _entries    = new HashMap<String, Entry>();
+        Iterator<Property> iter = property.getChildren();
 
         while (iter.hasNext())
         {
-            Property child     = ( Property ) iter.next();
+            Property child     = iter.next();
             Entry    childNode = null;
 
             if (child.isDirectory())
@@ -215,7 +215,7 @@ public class DirectoryNode
      *         implementations of Entry.
      */
 
-    public Iterator getEntries()
+    public Iterator<Entry> getEntries()
     {
         return _entries.values().iterator();
     }
@@ -263,7 +263,7 @@ public class DirectoryNode
 
         if (name != null)
         {
-            rval = ( Entry ) _entries.get(name);
+            rval = _entries.get(name);
         }
         if (rval == null)
         {
@@ -416,8 +416,9 @@ public class DirectoryNode
         List components = new ArrayList();
 
         components.add(getProperty());
-        SortedMap sortedEntries = new TreeMap(_entries);
-        Iterator  iter          = sortedEntries.values().iterator();
+        SortedMap<String,Entry> sortedEntries = 
+               new TreeMap<String,Entry>(_entries);
+        Iterator<Entry> iter = sortedEntries.values().iterator();
 
         while (iter.hasNext())
         {

diff --git a/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java b/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
index 44290db92be2a1ec5fb876d380f4deae750ade33..34e4829de5a36010fb28a133aea9cdfdda1a81bc 100644 (file)
--- a/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
+++ b/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
@@ -123,8 +123,8 @@ public class ExtractorFactory {
        public static POIOLE2TextExtractor createExtractor(DirectoryNode poifsDir, POIFSFileSystem fs) throws IOException {
                // Look for certain entries in the stream, to figure it
                //  out from
-               for(Iterator entries = poifsDir.getEntries(); entries.hasNext(); ) {
-                       Entry entry = (Entry)entries.next();
+               for(Iterator<Entry> entries = poifsDir.getEntries(); entries.hasNext(); ) {
+                       Entry entry = entries.next();
                        
                        if(entry.getName().equals("Workbook")) {
                                return new ExcelExtractor(poifsDir, fs);
@@ -160,9 +160,9 @@ public class ExtractorFactory {
                
                if(ext instanceof ExcelExtractor) {
                        // These are in MBD... under the root
-                       Iterator it = fs.getRoot().getEntries();
+                       Iterator<Entry> it = fs.getRoot().getEntries();
                        while(it.hasNext()) {
-                               Entry entry = (Entry)it.next();
+                               Entry entry = it.next();
                                if(entry.getName().startsWith("MBD")) {
                                        dirs.add(entry);
                                }
@@ -172,9 +172,9 @@ public class ExtractorFactory {
                        try {
                                DirectoryEntry op = (DirectoryEntry)
                                        fs.getRoot().getEntry("ObjectPool");
-                               Iterator it = op.getEntries();
+                               Iterator<Entry> it = op.getEntries();
                                while(it.hasNext()) {
-                                       Entry entry = (Entry)it.next();
+                                       Entry entry = it.next();
                                        if(entry.getName().startsWith("_")) {
                                                dirs.add(entry);
                                        }