diff options
author | Lasse Collin <lasse.collin@tukaani.org> | 2017-04-26 02:23:07 +0300 |
---|---|---|
committer | Lasse Collin <lasse.collin@tukaani.org> | 2017-04-26 02:23:07 +0300 |
commit | b19b8de04194a35e002247c05c990203f665505b (patch) | |
tree | b94da82e6bb95ca5066f75ac510c4fbe430a0682 /src | |
parent | df37d0efd69ea304ecd99c307dba4c56309791d0 (diff) | |
download | xz-java-b19b8de04194a35e002247c05c990203f665505b.tar.gz |
Use generics to silence compiler warnings.
Diffstat (limited to 'src')
-rw-r--r-- | src/org/tukaani/xz/SeekableXZInputStream.java | 13 | ||||
-rw-r--r-- | src/org/tukaani/xz/index/IndexEncoder.java | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/org/tukaani/xz/SeekableXZInputStream.java b/src/org/tukaani/xz/SeekableXZInputStream.java index f929d40..612ee99 100644 --- a/src/org/tukaani/xz/SeekableXZInputStream.java +++ b/src/org/tukaani/xz/SeekableXZInputStream.java @@ -97,7 +97,8 @@ public class SeekableXZInputStream extends SeekableInputStream { * The list is in reverse order: The first element is * the last Stream in the file. */ - private final ArrayList streams = new ArrayList(); + private final ArrayList<IndexDecoder> streams + = new ArrayList<IndexDecoder>(); /** * Bitmask of all Check IDs seen. @@ -438,9 +439,9 @@ public class SeekableXZInputStream extends SeekableInputStream { // Store the relative offsets of the Streams. This way we don't // need to recalculate them in this class when seeking; the // IndexDecoder instances will handle them. - IndexDecoder prev = (IndexDecoder)streams.get(streams.size() - 1); + IndexDecoder prev = streams.get(streams.size() - 1); for (int i = streams.size() - 2; i >= 0; --i) { - IndexDecoder cur = (IndexDecoder)streams.get(i); + IndexDecoder cur = streams.get(i); cur.setOffsets(prev); prev = cur; } @@ -449,7 +450,7 @@ public class SeekableXZInputStream extends SeekableInputStream { // The blockNumber will be left to -1 so that .hasNext() // and .setNext() work to get the first Block when starting // to decompress from the beginning of the file. - IndexDecoder first = (IndexDecoder)streams.get(streams.size() - 1); + IndexDecoder first = streams.get(streams.size() - 1); curBlockInfo = new BlockInfo(first); // queriedBlockInfo needs to be allocated too. The Stream used for @@ -898,7 +899,7 @@ public class SeekableXZInputStream extends SeekableInputStream { // Locate the Stream that contains the target position. IndexDecoder index; for (int i = 0; ; ++i) { - index = (IndexDecoder)streams.get(i); + index = streams.get(i); if (index.hasUncompressedOffset(pos)) break; } @@ -929,7 +930,7 @@ public class SeekableXZInputStream extends SeekableInputStream { // Search the Stream that contains the given Block and then // search the Block from that Stream. for (int i = 0; ; ++i) { - IndexDecoder index = (IndexDecoder)streams.get(i); + IndexDecoder index = streams.get(i); if (index.hasRecord(blockNumber)) { index.setBlockInfo(info, blockNumber); return; diff --git a/src/org/tukaani/xz/index/IndexEncoder.java b/src/org/tukaani/xz/index/IndexEncoder.java index 9db40d1..3028802 100644 --- a/src/org/tukaani/xz/index/IndexEncoder.java +++ b/src/org/tukaani/xz/index/IndexEncoder.java @@ -18,7 +18,8 @@ import org.tukaani.xz.common.EncoderUtil; import org.tukaani.xz.XZIOException; public class IndexEncoder extends IndexBase { - private final ArrayList records = new ArrayList(); + private final ArrayList<IndexRecord> records + = new ArrayList<IndexRecord>(); public IndexEncoder() { super(new XZIOException("XZ Stream or its Index has grown too big")); @@ -41,8 +42,7 @@ public class IndexEncoder extends IndexBase { EncoderUtil.encodeVLI(outChecked, recordCount); // List of Records - for (Iterator i = records.iterator(); i.hasNext(); ) { - IndexRecord record = (IndexRecord)i.next(); + for (IndexRecord record : records) { EncoderUtil.encodeVLI(outChecked, record.unpadded); EncoderUtil.encodeVLI(outChecked, record.uncompressed); } |