diff options
| author | Dominik Stadler <centic@apache.org> | 2017-09-26 08:26:05 +0000 |
|---|---|---|
| committer | Dominik Stadler <centic@apache.org> | 2017-09-26 08:26:05 +0000 |
| commit | a745ce2c4e33e2af1724befd4e3d8ba977ad4665 (patch) | |
| tree | 9bfd80c979ea7d2c22009b4fe35dc1ea972270c2 /src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java | |
| parent | 8f324b99fac1733933645289a08b159f63ae5e94 (diff) | |
| download | poi-a745ce2c4e33e2af1724befd4e3d8ba977ad4665.tar.gz poi-a745ce2c4e33e2af1724befd4e3d8ba977ad4665.zip | |
Replace deprecated CellReference class and some other warnings fixed
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1809714 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java')
| -rw-r--r-- | src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java index 3c4385ab60..c52d4c8baf 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java @@ -42,7 +42,7 @@ import org.apache.poi.hssf.record.FtCfSubRecord; import org.apache.poi.hssf.record.FtPioGrbitSubRecord; import org.apache.poi.hssf.record.NoteRecord; import org.apache.poi.hssf.record.ObjRecord; -import org.apache.poi.hssf.util.CellReference; +import org.apache.poi.ss.util.CellReference; import org.apache.poi.poifs.filesystem.DirectoryEntry; import org.apache.poi.poifs.filesystem.DirectoryNode; import org.apache.poi.ss.usermodel.Chart; @@ -119,7 +119,7 @@ public final class HSSFPatriarch implements HSSFShapeContainer, Drawing<HSSFShap */ protected void preSerialize(){ Map<Integer, NoteRecord> tailRecords = _boundAggregate.getTailRecords(); - /** + /* * contains coordinates of comments we iterate over */ Set<String> coordinates = new HashSet<>(tailRecords.size()); @@ -392,8 +392,7 @@ public final class HSSFPatriarch implements HSSFShapeContainer, Drawing<HSSFShap */ public int countOfAllChildren() { int count = _shapes.size(); - for (Iterator<HSSFShape> iterator = _shapes.iterator(); iterator.hasNext(); ) { - HSSFShape shape = iterator.next(); + for (HSSFShape shape : _shapes) { count += shape.countOfAllChildren(); } return count; @@ -450,8 +449,7 @@ public final class HSSFPatriarch implements HSSFShapeContainer, Drawing<HSSFShap return false; } - for (Iterator<EscherProperty> it = optRecord.getEscherProperties().iterator(); it.hasNext(); ) { - EscherProperty prop = it.next(); + for (EscherProperty prop : optRecord.getEscherProperties()) { if (prop.getPropertyNumber() == 896 && prop.isComplex()) { EscherComplexProperty cp = (EscherComplexProperty) prop; String str = StringUtil.getFromUnicodeLE(cp.getComplexData()); |