From 5a8d3144c20c9c2611e95abdb1f505f22d7fbedd Mon Sep 17 00:00:00 2001 From: Sergey Vladimirov Date: Sun, 10 Jul 2011 18:00:06 +0000 Subject: [PATCH] fix generic warnings git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1144920 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/org/apache/poi/hwpf/HWPFDocument.java | 3 +-- .../apache/poi/hwpf/model/CHPBinTable.java | 6 +++--- .../poi/hwpf/model/CHPFormattedDiskPage.java | 2 +- .../poi/hwpf/model/CachedPropertyNode.java | 4 ++-- .../poi/hwpf/model/FIBFieldHandler.java | 14 ++++++------- .../org/apache/poi/hwpf/model/FSPATable.java | 21 +++++++++---------- .../poi/hwpf/model/FileInformationBlock.java | 8 +++---- .../apache/poi/hwpf/model/PAPBinTable.java | 10 ++++----- .../apache/poi/hwpf/model/SavedByTable.java | 5 ++--- .../apache/poi/hwpf/model/ShapesTable.java | 12 +++++------ .../apache/poi/hwpf/model/TextPieceTable.java | 4 ++-- .../poi/hwpf/model/io/HWPFFileSystem.java | 5 +++-- .../hwpf/sprm/CharacterSprmCompressor.java | 3 ++- .../hwpf/sprm/ParagraphSprmCompressor.java | 2 +- .../hwpf/sprm/ParagraphSprmUncompressor.java | 18 +++++++--------- .../poi/hwpf/sprm/SectionSprmCompressor.java | 3 ++- .../org/apache/poi/hwpf/sprm/SprmUtils.java | 8 +++---- .../poi/hwpf/sprm/TableSprmCompressor.java | 3 ++- .../org/apache/poi/hwpf/usermodel/Range.java | 4 ++-- 19 files changed, 65 insertions(+), 70 deletions(-) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java index 86e38f3467..6901382095 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java @@ -37,7 +37,6 @@ import org.apache.poi.hwpf.model.FontTable; import org.apache.poi.hwpf.model.ListTables; import org.apache.poi.hwpf.model.PAPBinTable; import org.apache.poi.hwpf.model.PicturesTable; -import org.apache.poi.hwpf.model.PropertyNode; import org.apache.poi.hwpf.model.RevisionMarkAuthorTable; import org.apache.poi.hwpf.model.SavedByTable; import org.apache.poi.hwpf.model.SectionTable; @@ -286,7 +285,7 @@ public final class HWPFDocument extends HWPFDocumentCore public Range getOverallRange() { // hack to get the ending cp of the document, Have to revisit this. - PropertyNode p = _tpt.getTextPieces().get(_tpt.getTextPieces().size() - 1); + TextPiece p = _tpt.getTextPieces().get(_tpt.getTextPieces().size() - 1); return new Range(0, p.getEnd(), this); } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java index 097fd58a67..3097e00048 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java @@ -229,7 +229,7 @@ public class CHPBinTable int pageNum = docOffset/POIFSConstants.SMALLER_BIG_BLOCK_SIZE; // get the ending fc - PropertyNode lastRun = (PropertyNode)_textRuns.get(_textRuns.size() - 1); + CHPX lastRun = _textRuns.get(_textRuns.size() - 1); int endingFc = lastRun.getEnd(); endingFc += fcMin; @@ -237,7 +237,7 @@ public class CHPBinTable ArrayList overflow = _textRuns; do { - PropertyNode startingProp = (PropertyNode)overflow.get(0); + CHPX startingProp = overflow.get(0); int start = startingProp.getStart() + fcMin; CHPFormattedDiskPage cfkp = new CHPFormattedDiskPage(); @@ -250,7 +250,7 @@ public class CHPBinTable int end = endingFc; if (overflow != null) { - end = ((PropertyNode)overflow.get(0)).getStart() + fcMin; + end = overflow.get(0).getStart() + fcMin; } byte[] intHolder = new byte[4]; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java b/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java index 5de4e53e98..68615dd4ff 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java @@ -178,7 +178,7 @@ public final class CHPFormattedDiskPage extends FormattedDiskPage CHPX chpx = null; for (int x = 0; x < index; x++) { - chpx = (CHPX)_chpxList.get(x); + chpx = _chpxList.get(x); byte[] grpprl = chpx.getGrpprl(); LittleEndian.putInt( buf, fcOffset, diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CachedPropertyNode.java b/src/scratchpad/src/org/apache/poi/hwpf/model/CachedPropertyNode.java index 51928e6cd5..ebc3a5f2e5 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/CachedPropertyNode.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/CachedPropertyNode.java @@ -24,7 +24,7 @@ import org.apache.poi.hwpf.sprm.SprmBuffer; public final class CachedPropertyNode extends PropertyNode { - protected SoftReference _propCache; + protected SoftReference _propCache; public CachedPropertyNode(int start, int end, SprmBuffer buf) { @@ -33,7 +33,7 @@ public final class CachedPropertyNode protected void fillCache(Object ref) { - _propCache = new SoftReference(ref); + _propCache = new SoftReference(ref); } protected Object getCacheContents() diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java index 52e9bbd51c..8ec2f79fca 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java @@ -17,13 +17,13 @@ package org.apache.poi.hwpf.model; -import java.util.HashSet; -import java.util.HashMap; -import java.util.Arrays; import java.io.IOException; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; import org.apache.poi.hwpf.model.io.HWPFOutputStream; - import org.apache.poi.util.LittleEndian; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; @@ -128,12 +128,12 @@ public final class FIBFieldHandler private static final int FIELD_SIZE = LittleEndian.INT_SIZE * 2; - private HashMap _unknownMap = new HashMap(); + private Map _unknownMap = new HashMap(); private int[] _fields; public FIBFieldHandler(byte[] mainStream, int offset, byte[] tableStream, - HashSet offsetList, boolean areKnown) + HashSet offsetList, boolean areKnown) { int numFields = LittleEndian.getShort(mainStream, offset); offset += LittleEndian.SHORT_SIZE; @@ -208,7 +208,7 @@ public final class FIBFieldHandler for (int x = 0; x < length; x++) { - UnhandledDataStructure ds = (UnhandledDataStructure)_unknownMap.get(Integer.valueOf(x)); + UnhandledDataStructure ds = _unknownMap.get(Integer.valueOf(x)); if (ds != null) { LittleEndian.putInt(mainStream, offset, tableStream.getOffset()); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java index b1578e3869..40a4fb9446 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java @@ -19,7 +19,6 @@ package org.apache.poi.hwpf.model; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -30,11 +29,11 @@ import java.util.Map; */ public final class FSPATable { - private final List _shapes = new ArrayList(); - private final Map _shapeIndexesByPropertyStart = new HashMap(); - private final List _text; + private final List _shapes = new ArrayList(); + private final Map _shapeIndexesByPropertyStart = new HashMap(); + private final List _text; - public FSPATable(byte[] tableStream, int fcPlcspa, int lcbPlcspa, List tpt) + public FSPATable(byte[] tableStream, int fcPlcspa, int lcbPlcspa, List tpt) { _text = tpt; // Will be 0 if no drawing objects in document @@ -54,11 +53,11 @@ public final class FSPATable public FSPA getFspaFromCp(int cp) { - Integer idx = (Integer)_shapeIndexesByPropertyStart.get(Integer.valueOf(cp)); + Integer idx = _shapeIndexesByPropertyStart.get(Integer.valueOf(cp)); if (idx == null) { return null; } - return (FSPA)_shapes.get(idx.intValue()); + return _shapes.get(idx.intValue()); } public FSPA[] getShapes() @@ -72,10 +71,10 @@ public final class FSPATable { StringBuffer buf = new StringBuffer(); buf.append("[FPSA PLC size=").append(_shapes.size()).append("]\n"); - for (Iterator it = _shapeIndexesByPropertyStart.keySet().iterator(); it.hasNext(); ) - { - Integer i = (Integer) it.next(); - FSPA fspa = (FSPA) _shapes.get(((Integer)_shapeIndexesByPropertyStart.get(i)).intValue()); + + for (Map.Entry entry: _shapeIndexesByPropertyStart.entrySet()) { + Integer i = entry.getKey(); + FSPA fspa = _shapes.get((entry.getValue()).intValue()); buf.append(" [FC: ").append(i.toString()).append("] "); buf.append(fspa.toString()); buf.append("\n"); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java index cc00b7391c..8444c69877 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java @@ -17,12 +17,10 @@ package org.apache.poi.hwpf.model; -import java.util.HashSet; import java.io.IOException; +import java.util.HashSet; -import org.apache.poi.hwpf.model.io.*; - - +import org.apache.poi.hwpf.model.io.HWPFOutputStream; import org.apache.poi.hwpf.model.types.FIBAbstractType; /** @@ -57,7 +55,7 @@ public final class FileInformationBlock extends FIBAbstractType public void fillVariableFields(byte[] mainDocument, byte[] tableStream) { - HashSet fieldSet = new HashSet(); + HashSet fieldSet = new HashSet(); fieldSet.add(Integer.valueOf(FIBFieldHandler.STSHF)); fieldSet.add(Integer.valueOf(FIBFieldHandler.CLX)); fieldSet.add(Integer.valueOf(FIBFieldHandler.DOP)); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java index 502e9e6def..8dc28a45a8 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java @@ -186,12 +186,12 @@ public class PAPBinTable public void adjustForInsert(int listIndex, int length) { int size = _paragraphs.size(); - PAPX papx = (PAPX)_paragraphs.get(listIndex); + PAPX papx = _paragraphs.get(listIndex); papx.setEnd(papx.getEnd() + length); for (int x = listIndex + 1; x < size; x++) { - papx = (PAPX)_paragraphs.get(x); + papx = _paragraphs.get(x); papx.setStart(papx.getStart() + length); papx.setEnd(papx.getEnd() + length); } @@ -226,14 +226,14 @@ public class PAPBinTable int pageNum = docOffset/POIFSConstants.SMALLER_BIG_BLOCK_SIZE; // get the ending fc - int endingFc = ((PropertyNode)_paragraphs.get(_paragraphs.size() - 1)).getEnd(); + int endingFc = _paragraphs.get(_paragraphs.size() - 1).getEnd(); endingFc += fcMin; ArrayList overflow = _paragraphs; do { - PropertyNode startingProp = (PropertyNode)overflow.get(0); + PAPX startingProp = overflow.get(0); int start = startingProp.getStart() + fcMin; PAPFormattedDiskPage pfkp = new PAPFormattedDiskPage(_dataStream); @@ -246,7 +246,7 @@ public class PAPBinTable int end = endingFc; if (overflow != null) { - end = ((PropertyNode)overflow.get(0)).getStart() + fcMin; + end = overflow.get(0).getStart() + fcMin; } byte[] intHolder = new byte[4]; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java index f7ffc81db8..91f8c5fb3c 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java @@ -22,11 +22,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.apache.poi.hwpf.model.io.HWPFOutputStream; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.StringUtil; -import org.apache.poi.hwpf.model.io.HWPFOutputStream; - /** * String table containing the history of the last few revisions ("saves") of the document. * Read-only for the time being. @@ -83,7 +82,7 @@ public final class SavedByTable * * @return the list of entries. */ - public List getEntries() + public List getEntries() { return Collections.unmodifiableList(Arrays.asList(entries)); } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ShapesTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ShapesTable.java index 426a24dfec..3d42b8866b 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ShapesTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/ShapesTable.java @@ -23,15 +23,15 @@ import java.util.List; import org.apache.poi.hwpf.usermodel.Shape; public final class ShapesTable { - private List _shapes; - private List _shapesVisibili; //holds visible shapes + private List _shapes; + private List _shapesVisibili; //holds visible shapes public ShapesTable(byte [] tblStream, FileInformationBlock fib) { PlexOfCps binTable = new PlexOfCps(tblStream, fib.getFcPlcspaMom(), fib.getLcbPlcspaMom(), 26); - _shapes = new ArrayList(); - _shapesVisibili = new ArrayList(); + _shapes = new ArrayList(); + _shapesVisibili = new ArrayList(); for(int i = 0; i < binTable.length(); i++) { @@ -44,11 +44,11 @@ public final class ShapesTable { } } - public List getAllShapes() { + public List getAllShapes() { return _shapes; } - public List getVisibleShapes() { + public List getVisibleShapes() { return _shapesVisibili; } } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java index c8e3db2f83..09ab2372f6 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java @@ -70,7 +70,7 @@ public class TextPieceTable implements CharIndexTranslator { // using the PieceDescriptors, build our list of TextPieces. for (int x = 0; x < pieces.length; x++) { int start = pieces[x].getFilePosition(); - PropertyNode node = pieceTable.getProperty(x); + GenericPropertyNode node = pieceTable.getProperty(x); // Grab the start and end, which are in characters int nodeStartChars = node.getStart(); @@ -173,7 +173,7 @@ public class TextPieceTable implements CharIndexTranslator { // Now change all subsequent ones for (int x = listIndex + 1; x < size; x++) { - tp = (TextPiece) _textPieces.get(x); + tp = _textPieces.get(x); tp.setStart(tp.getStart() + length); tp.setEnd(tp.getEnd() + length); } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java b/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java index eb76f503c8..79e9b8d62b 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java @@ -19,10 +19,11 @@ package org.apache.poi.hwpf.model.io; import java.util.HashMap; +import java.util.Map; public final class HWPFFileSystem { - HashMap _streams = new HashMap(); + Map _streams = new HashMap(); public HWPFFileSystem() { @@ -33,7 +34,7 @@ public final class HWPFFileSystem public HWPFOutputStream getStream(String name) { - return (HWPFOutputStream)_streams.get(name); + return _streams.get(name); } } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java index 9f65d0d485..e653827819 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java @@ -18,6 +18,7 @@ package org.apache.poi.hwpf.sprm; import java.util.ArrayList; +import java.util.List; import org.apache.poi.hwpf.usermodel.CharacterProperties; import org.apache.poi.util.LittleEndian; @@ -29,7 +30,7 @@ public final class CharacterSprmCompressor } public static byte[] compressCharacterProperty(CharacterProperties newCHP, CharacterProperties oldCHP) { - ArrayList sprmList = new ArrayList(); + List sprmList = new ArrayList(); int size = 0; if (newCHP.isFRMarkDel() != oldCHP.isFRMarkDel()) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java index 9682847c35..a35842285d 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java @@ -35,7 +35,7 @@ public final class ParagraphSprmCompressor { // page numbers links to Word97-2007BinaryFileFormat(doc)Specification.pdf, accessible from microsoft.com - List sprmList = new ArrayList(); + List sprmList = new ArrayList(); int size = 0; // Page 50 of public specification begins diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java index bce5f59aa2..355dea8374 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java @@ -20,7 +20,8 @@ package org.apache.poi.hwpf.sprm; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.apache.poi.hwpf.usermodel.BorderCode; import org.apache.poi.hwpf.usermodel.DateAndTime; @@ -426,7 +427,7 @@ public final class ParagraphSprmUncompressor int[] tabPositions = pap.getRgdxaTab(); byte[] tabDescriptors = pap.getRgtbd(); - HashMap tabMap = new HashMap(); + Map tabMap = new HashMap(); for (int x = 0; x < tabPositions.length; x++) { tabMap.put(Integer.valueOf(tabPositions[x]), Byte.valueOf(tabDescriptors[x])); @@ -450,20 +451,15 @@ public final class ParagraphSprmUncompressor tabPositions = new int[tabMap.size()]; tabDescriptors = new byte[tabPositions.length]; - ArrayList list = new ArrayList(); - - Iterator keyIT = tabMap.keySet().iterator(); - while (keyIT.hasNext()) - { - list.add(keyIT.next()); - } + + List list = new ArrayList(tabMap.keySet()); Collections.sort(list); for (int x = 0; x < tabPositions.length; x++) { - Integer key = ((Integer)list.get(x)); + Integer key = list.get(x); tabPositions[x] = key.intValue(); - tabDescriptors[x] = ((Byte)tabMap.get(key)).byteValue(); + tabDescriptors[x] = tabMap.get(key).byteValue(); } pap.setRgdxaTab(tabPositions); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java index aa7502a41e..552856bcb6 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java @@ -19,6 +19,7 @@ package org.apache.poi.hwpf.sprm; import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import org.apache.poi.hwpf.usermodel.SectionProperties; import org.apache.poi.util.LittleEndian; @@ -33,7 +34,7 @@ public final class SectionSprmCompressor public static byte[] compressSectionProperty(SectionProperties newSEP) { int size = 0; - ArrayList sprmList = new ArrayList(); + List sprmList = new ArrayList(); if (newSEP.getCnsPgn() != DEFAULT_SEP.getCnsPgn()) { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java index 9f0abda0f9..51bc629dc9 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java @@ -40,7 +40,7 @@ public final class SprmUtils return buf; } - public static int addSpecialSprm(short instruction, byte[] varParam, List list) + public static int addSpecialSprm(short instruction, byte[] varParam, List list) { byte[] sprm = new byte[varParam.length + 4]; System.arraycopy(varParam, 0, sprm, 4, varParam.length); @@ -50,7 +50,7 @@ public final class SprmUtils return sprm.length; } - public static int addSprm(short instruction, int param, byte[] varParam, List list) + public static int addSprm(short instruction, int param, byte[] varParam, List list) { int type = (instruction & 0xe000) >> 13; @@ -96,7 +96,7 @@ public final class SprmUtils return sprm.length; } - public static byte[] getGrpprl(List sprmList, int size) + public static byte[] getGrpprl(List sprmList, int size) { // spit out the final grpprl byte[] grpprl = new byte[size]; @@ -104,7 +104,7 @@ public final class SprmUtils int index = 0; for (; listSize >= 0; listSize--) { - byte[] sprm = (byte[])sprmList.remove(0); + byte[] sprm = sprmList.remove(0); System.arraycopy(sprm, 0, grpprl, index, sprm.length); index += sprm.length; } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java index 195fed5653..995179b070 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java @@ -19,6 +19,7 @@ package org.apache.poi.hwpf.sprm; import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import org.apache.poi.hwpf.usermodel.BorderCode; import org.apache.poi.hwpf.usermodel.TableAutoformatLookSpecifier; @@ -34,7 +35,7 @@ public final class TableSprmCompressor public static byte[] compressTableProperty(TableProperties newTAP) { int size = 0; - ArrayList sprmList = new ArrayList(); + List sprmList = new ArrayList(); if (newTAP.getJc() != 0) { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java index 68bdc127f3..8fd0cfe7d9 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java @@ -998,13 +998,13 @@ public class Range { // TODO -instantiable superclass * @return An int array of length 2. The first int is the start index and * the second int is the end index. */ - private int[] findRange(List rpl, int min, int start, int end) { + private int[] findRange(List> rpl, int min, int start, int end) { int x = min; if ( rpl.size() == min ) return new int[] { min, min }; - PropertyNode node = rpl.get( x ); + PropertyNode node = rpl.get( x ); while (node==null || (node.getEnd() <= start && x < rpl.size() - 1)) { x++; -- 2.39.5