Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Nick Burch 2010-01-03 20:56:40 +00:00
parent 9e213d5d78
commit 698c9b1279
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java
View File

@ -47,7 +47,7 @@ public interface DirectoryEntry
* implementations of Entry.
*/
public Iterator getEntries();
public Iterator<Entry> getEntries();
/**
* is this DirectoryEntry empty?

17
src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
View File

@ -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())
{

12
src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
View File

@ -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);
}