From 52c6fd587c6f187a2fe730da8c0c0bf789100101 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Mon, 28 Apr 2014 14:03:18 +0000 Subject: [PATCH] Fix generics warnings git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1590642 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/hpsf/MutablePropertySet.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/java/org/apache/poi/hpsf/MutablePropertySet.java b/src/java/org/apache/poi/hpsf/MutablePropertySet.java index 304141113..832779207 100644 --- a/src/java/org/apache/poi/hpsf/MutablePropertySet.java +++ b/src/java/org/apache/poi/hpsf/MutablePropertySet.java @@ -24,9 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.UnsupportedEncodingException; -import java.util.Iterator; import java.util.LinkedList; -import java.util.ListIterator; import org.apache.poi.poifs.filesystem.DirectoryEntry; import org.apache.poi.poifs.filesystem.Entry; @@ -89,10 +87,10 @@ public class MutablePropertySet extends PropertySet setClassID(ps.getClassID()); clearSections(); if (sections == null) - sections = new LinkedList(); - for (final Iterator i = ps.getSections().iterator(); i.hasNext();) + sections = new LinkedList
(); + for (final Section section : ps.getSections()) { - final MutableSection s = new MutableSection((Section) (i.next())); + final MutableSection s = new MutableSection(section); addSection(s); } } @@ -182,7 +180,7 @@ public class MutablePropertySet extends PropertySet public void addSection(final Section section) { if (sections == null) - sections = new LinkedList(); + sections = new LinkedList
(); sections.add(section); } @@ -217,9 +215,9 @@ public class MutablePropertySet extends PropertySet * section's offset relative to the beginning of the stream. */ offset += nrSections * (ClassID.LENGTH + LittleEndian.INT_SIZE); final int sectionsBegin = offset; - for (final ListIterator i = sections.listIterator(); i.hasNext();) + for (final Section section : sections) { - final MutableSection s = (MutableSection) i.next(); + final MutableSection s = (MutableSection)section; final ClassID formatID = s.getFormatID(); if (formatID == null) throw new NoFormatIDException(); @@ -241,9 +239,9 @@ public class MutablePropertySet extends PropertySet /* Write the sections themselves. */ offset = sectionsBegin; - for (final ListIterator i = sections.listIterator(); i.hasNext();) + for (final Section section : sections) { - final MutableSection s = (MutableSection) i.next(); + final MutableSection s = (MutableSection)section; offset += s.write(out); }