Author: bodewig
Date: Sat Aug 6 13:01:16 2011
New Revision: 1154512
URL: http://svn.apache.org/viewvc?rev=1154512&view=rev
Log:
compile without warnings using -Xlint:unchecked
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2Utils.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStreamTest.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
Sat Aug 6 13:01:16 2011
@@ -73,7 +73,8 @@ public class CpioArchiveOutputStream ext
*/
private final short entryFormat;
- private final HashMap names = new HashMap();
+ private final HashMap<String, CpioArchiveEntry> names =
+ new HashMap<String, CpioArchiveEntry>();
private long crc = 0;
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
Sat Aug 6 13:01:16 2011
@@ -259,7 +259,7 @@ public class TarArchiveInputStream exten
private void paxHeaders() throws IOException{
BufferedReader br = new BufferedReader(new InputStreamReader(this,
"UTF-8"));
- Map headers = new HashMap();
+ Map<String, String> headers = new HashMap<String, String>();
// Format is "length keyword=value\n";
while(true){ // get length
int ch;
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
Sat Aug 6 13:01:16 2011
@@ -50,7 +50,7 @@ class Simple8BitZipEncoding implements Z
* A character entity, which is put to the reverse mapping table
* of a simple encoding.
*/
- private static final class Simple8BitChar implements Comparable {
+ private static final class Simple8BitChar implements
Comparable<Simple8BitChar> {
public final char unicode;
public final byte code;
@@ -59,9 +59,7 @@ class Simple8BitZipEncoding implements Z
this.unicode = unicode;
}
- public int compareTo(Object o) {
- Simple8BitChar a = (Simple8BitChar) o;
-
+ public int compareTo(Simple8BitChar a) {
return this.unicode - a.unicode;
}
@@ -90,7 +88,8 @@ class Simple8BitZipEncoding implements Z
*/
public Simple8BitZipEncoding(char[] highChars) {
this.highChars = (char[]) highChars.clone();
- List temp = new ArrayList<Simple8BitChar>(this.highChars.length);
+ List<Simple8BitChar> temp =
+ new ArrayList<Simple8BitChar>(this.highChars.length);
byte code = 127;
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
Sat Aug 6 13:01:16 2011
@@ -360,7 +360,7 @@ public class ZipArchiveEntry extends jav
if (ze instanceof UnparseableExtraFieldData) {
unparseableExtra = (UnparseableExtraFieldData) ze;
} else {
- LinkedHashMap copy = extraFields;
+ LinkedHashMap<ZipShort, ZipExtraField> copy = extraFields;
extraFields = new LinkedHashMap<ZipShort, ZipExtraField>();
extraFields.put(ze.getHeaderId(), ze);
if (copy != null) {
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSet.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
Sat Aug 6 13:01:16 2011
@@ -34,7 +34,7 @@ import org.apache.commons.compress.archi
*/
public final class ChangeSet {
- private final Set changes = new LinkedHashSet();
+ private final Set<Change> changes = new LinkedHashSet<Change>();
/**
* Deletes the file with the filename from the archive.
@@ -157,7 +157,7 @@ public final class ChangeSet {
* are not reflected on this ChangeSet and vice versa.
* @return the changes as a copy
*/
- Set getChanges() {
- return new LinkedHashSet(changes);
+ Set<Change> getChanges() {
+ return new LinkedHashSet<Change>(changes);
}
}
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
Sat Aug 6 13:01:16 2011
@@ -39,7 +39,7 @@ import org.apache.commons.compress.utils
* @Immutable
*/
public class ChangeSetPerformer {
- private final Set changes;
+ private final Set<Change> changes;
/**
* Constructs a ChangeSetPerformer with the changes from this ChangeSet
@@ -68,10 +68,10 @@ public class ChangeSetPerformer {
throws IOException {
ChangeSetResults results = new ChangeSetResults();
- Set workingSet = new LinkedHashSet(changes);
+ Set<Change> workingSet = new LinkedHashSet<Change>(changes);
- for (Iterator it = workingSet.iterator(); it.hasNext();) {
- Change change = (Change) it.next();
+ for (Iterator<Change> it = workingSet.iterator(); it.hasNext();) {
+ Change change = it.next();
if (change.type() == Change.TYPE_ADD && change.isReplaceMode()) {
copyStream(change.getInput(), out, change.getEntry());
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java
Sat Aug 6 13:01:16 2011
@@ -25,9 +25,9 @@ import java.util.List;
* Stores the results of an performed ChangeSet operation.
*/
public class ChangeSetResults {
- private final List addedFromChangeSet = new ArrayList();
- private final List addedFromStream = new ArrayList();
- private final List deleted = new ArrayList();
+ private final List<String> addedFromChangeSet = new ArrayList<String>();
+ private final List<String> addedFromStream = new ArrayList<String>();
+ private final List<String> deleted = new ArrayList<String>();
/**
* Adds the filename of a recently deleted file to the result list.
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2Utils.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2Utils.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2Utils.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2Utils.java
Sat Aug 6 13:01:16 2011
@@ -37,7 +37,8 @@ public abstract class BZip2Utils {
* suffixes are mapped to the empty string, as they should simply be
* removed from the filename when the file is uncompressed.
*/
- private static final Map uncompressSuffix = new HashMap();
+ private static final Map<String, String> uncompressSuffix =
+ new HashMap<String, String>();
static {
uncompressSuffix.put(".tbz2", ".tar");
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java
Sat Aug 6 13:01:16 2011
@@ -32,7 +32,8 @@ public class GzipUtils {
* Map from common filename suffixes to the suffixes that identify gzipped
* versions of those file types. For example: from ".tar" to ".tgz".
*/
- private static final Map compressSuffix = new HashMap();
+ private static final Map<String, String> compressSuffix =
+ new HashMap<String, String>();
/**
* Map from common filename suffixes of gzipped files to the corresponding
@@ -42,7 +43,8 @@ public class GzipUtils {
* These suffixes are mapped to the empty string, as they should simply
* be removed from the filename when the file is uncompressed.
*/
- private static final Map uncompressSuffix = new HashMap();
+ private static final Map<String, String> uncompressSuffix =
+ new HashMap<String, String>();
static {
compressSuffix.put(".tar", ".tgz");
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
Sat Aug 6 13:01:16 2011
@@ -44,7 +44,7 @@ public abstract class AbstractTestCase e
protected File resultDir;
private File archive; // used to delete the archive in tearDown
- protected List archiveList; // Lists the content of the archive as
originally created
+ protected List<String> archiveList; // Lists the content of the archive as
originally created
protected ArchiveStreamFactory factory = new ArchiveStreamFactory();
@@ -139,7 +139,7 @@ public abstract class AbstractTestCase e
OutputStream stream = null;
try {
archive = File.createTempFile("test", "." + archivename);
- archiveList = new ArrayList();
+ archiveList = new ArrayList<String>();
stream = new FileOutputStream(archive);
out = factory.createArchiveOutputStream(archivename, stream);
@@ -198,7 +198,7 @@ public abstract class AbstractTestCase e
protected File createEmptyArchive(String archivename) throws Exception {
ArchiveOutputStream out = null;
OutputStream stream = null;
- archiveList = new ArrayList();
+ archiveList = new ArrayList<String>();
try {
archive = File.createTempFile("empty", "." + archivename);
stream = new FileOutputStream(archive);
@@ -224,7 +224,7 @@ public abstract class AbstractTestCase e
protected File createSingleEntryArchive(String archivename) throws
Exception {
ArchiveOutputStream out = null;
OutputStream stream = null;
- archiveList = new ArrayList();
+ archiveList = new ArrayList<String>();
try {
archive = File.createTempFile("empty", "." + archivename);
stream = new FileOutputStream(archive);
@@ -251,7 +251,7 @@ public abstract class AbstractTestCase e
* a list with expected string filenames
* @throws Exception
*/
- protected void checkArchiveContent(File archive, List expected)
+ protected void checkArchiveContent(File archive, List<String> expected)
throws Exception {
final InputStream is = new FileInputStream(archive);
try {
@@ -270,7 +270,7 @@ public abstract class AbstractTestCase e
* @param expected list of expected entries or <code>null</code> if no
check of names desired
* @throws Exception
*/
- protected void checkArchiveContent(ArchiveInputStream in, List expected)
+ protected void checkArchiveContent(ArchiveInputStream in, List<String>
expected)
throws Exception {
checkArchiveContent(in, expected, true);
}
@@ -284,7 +284,7 @@ public abstract class AbstractTestCase e
* @return returns the created result file if cleanUp = false, or null
otherwise
* @throws Exception
*/
- protected File checkArchiveContent(ArchiveInputStream in, List expected,
boolean cleanUp)
+ protected File checkArchiveContent(ArchiveInputStream in, List<String>
expected, boolean cleanUp)
throws Exception {
File result = File.createTempFile("dir-result", "");
result.delete();
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java
Sat Aug 6 13:01:16 2011
@@ -46,7 +46,7 @@ public class ArchiveReadTests extends Ab
final static ClassLoader classLoader =
ArchiveReadTests.class.getClassLoader();
private File file;
- private static final ArrayList fileList = new ArrayList();
+ private static final ArrayList<String> fileList = new ArrayList<String>();
public ArchiveReadTests(String name) {
super(name);
@@ -93,7 +93,8 @@ public class ArchiveReadTests extends Ab
}
public void testArchive() throws Exception{
- ArrayList expected=(ArrayList) fileList.clone();
+ @SuppressWarnings("unchecked")
+ ArrayList<String> expected= (ArrayList<String>) fileList.clone();
try {
checkArchiveContent(file, expected);
} catch (ArchiveException e) {
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
Sat Aug 6 13:01:16 2011
@@ -87,7 +87,7 @@ public final class CpioTestCase extends
final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream("cpio", is);
- Map result = new HashMap();
+ Map<String, File> result = new HashMap<String, File>();
ArchiveEntry entry = null;
while ((entry = in.getNextEntry()) != null) {
File cpioget = new File(dir, entry.getName());
@@ -99,11 +99,11 @@ public final class CpioTestCase extends
in.close();
is.close();
- File t = (File)result.get("test1.xml");
+ File t = result.get("test1.xml");
assertTrue("Expected " + t.getAbsolutePath() + " to exist",
t.exists());
assertEquals("length of " + t.getAbsolutePath(), file1Length,
t.length());
- t = (File)result.get("test2.xml");
+ t = result.get("test2.xml");
assertTrue("Expected " + t.getAbsolutePath() + " to exist",
t.exists());
assertEquals("length of " + t.getAbsolutePath(), file2Length,
t.length());
}
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java
Sat Aug 6 13:01:16 2011
@@ -48,7 +48,7 @@ public class LongPathTest extends Abstra
private File file;
- private static final ArrayList fileList = new ArrayList();
+ private static final ArrayList<String> fileList = new ArrayList<String>();
private final ArchiveStreamFactory factory = new ArchiveStreamFactory();
@@ -92,7 +92,8 @@ public class LongPathTest extends Abstra
}
public void testArchive() throws Exception {
- ArrayList expected=(ArrayList) fileList.clone();
+ @SuppressWarnings("unchecked")
+ ArrayList<String> expected = (ArrayList<String>) fileList.clone();
String name = file.getName();
if ("minotaur.jar".equals(name) || "minotaur-0.jar".equals(name)){
expected.add("META-INF/");
@@ -118,7 +119,7 @@ public class LongPathTest extends Abstra
// CPIO does not store directories or directory names
expected.clear();
for(int i=0; i < fileList.size(); i++){
- String ent = (String) fileList.get(i);
+ String ent = fileList.get(i);
if (!ent.endsWith("/")){// not a directory
final int lastSlash = ent.lastIndexOf('/');
if (lastSlash >= 0) { // extract path name
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
Sat Aug 6 13:01:16 2011
@@ -66,7 +66,7 @@ public final class ZipTestCase extends A
out.close();
// Unarchive the same
- List results = new ArrayList();
+ List<File> results = new ArrayList<File>();
final InputStream is = new FileInputStream(output);
ArchiveInputStream in = null;
@@ -94,9 +94,9 @@ public final class ZipTestCase extends A
is.close();
assertEquals(results.size(), 2);
- File result = (File)results.get(0);
+ File result = results.get(0);
assertEquals(file1.length(), result.length());
- result = (File)results.get(1);
+ result = results.get(1);
assertEquals(file2.length(), result.length());
}
@@ -168,7 +168,7 @@ public final class ZipTestCase extends A
public void testListAllFilesWithNestedArchive() throws Exception {
final File input = getFile("OSX_ArchiveWithNestedArchive.zip");
- List results = new ArrayList();
+ List<String> results = new ArrayList<String>();
final InputStream is = new FileInputStream(input);
ArchiveInputStream in = null;
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStreamTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStreamTest.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStreamTest.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStreamTest.java
Sat Aug 6 13:01:16 2011
@@ -24,7 +24,7 @@ import org.apache.commons.compress.Abstr
public class ArArchiveInputStreamTest extends AbstractTestCase {
public void testReadLongNamesGNU() throws Exception {
- ArrayList l = new ArrayList();
+ ArrayList<String> l = new ArrayList<String>();
l.add("this_is_a_long_file_name.txt");
checkArchiveContent(getFile("longfile_gnu.ar"), l);
}
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
Sat Aug 6 13:01:16 2011
@@ -34,7 +34,8 @@ public class ZipFileTest extends TestCas
public void testCDOrder() throws Exception {
readOrderTest();
- ArrayList l = Collections.list(zf.getEntries());
+ @SuppressWarnings("unchecked")
+ ArrayList<ZipArchiveEntry> l = Collections.list(zf.getEntries());
assertEntryName(l, 0, "AbstractUnicodeExtraField");
assertEntryName(l, 1, "AsiExtraField");
assertEntryName(l, 2, "ExtraFieldUtils");
@@ -62,7 +63,8 @@ public class ZipFileTest extends TestCas
public void testPhysicalOrder() throws Exception {
readOrderTest();
- ArrayList l = Collections.list(zf.getEntriesInPhysicalOrder());
+ @SuppressWarnings("unchecked")
+ ArrayList<ZipArchiveEntry> l =
Collections.list(zf.getEntriesInPhysicalOrder());
assertEntryName(l, 0, "AbstractUnicodeExtraField");
assertEntryName(l, 1, "AsiExtraField");
assertEntryName(l, 2, "ExtraFieldUtils");
@@ -114,7 +116,8 @@ public class ZipFileTest extends TestCas
zf = new ZipFile(archive);
}
- private static void assertEntryName(ArrayList entries, int index,
+ private static void assertEntryName(ArrayList<ZipArchiveEntry> entries,
+ int index,
String expectedName) {
ZipArchiveEntry ze = (ZipArchiveEntry) entries.get(index);
assertEquals("src/main/java/org/apache/commons/compress/archivers/zip/"
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java?rev=1154512&r1=1154511&r2=1154512&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
Sat Aug 6 13:01:16 2011
@@ -675,7 +675,7 @@ public final class ChangeSetTestCase ext
ais.close();
}
- List expected = new ArrayList();
+ List<String> expected = new ArrayList<String>();
expected.add("test1.xml");
this.checkArchiveContent(temp, expected);
@@ -711,7 +711,7 @@ public final class ChangeSetTestCase ext
if (ais != null)
ais.close();
}
- List expected = new ArrayList();
+ List<String> expected = new ArrayList<String>();
expected.add("test1.xml");
this.checkArchiveContent(temp, expected);
}
@@ -749,7 +749,7 @@ public final class ChangeSetTestCase ext
if (ais != null)
ais.close();
}
- List expected = new ArrayList();
+ List<String> expected = new ArrayList<String>();
expected.add("test1.xml");
this.checkArchiveContent(temp, expected);
}
@@ -793,7 +793,7 @@ public final class ChangeSetTestCase ext
if (ais != null)
ais.close();
}
- List expected = new ArrayList();
+ List<String> expected = new ArrayList<String>();
expected.add("test1.xml");
expected.add("testdata/test.txt");
final ArchiveInputStream in = factory.createArchiveInputStream("tar",
new FileInputStream(temp));
@@ -837,7 +837,7 @@ public final class ChangeSetTestCase ext
if (ais != null)
ais.close();
}
- List expected = new ArrayList();
+ List<String> expected = new ArrayList<String>();
expected.add("test1.xml");
expected.add("testdata/test.txt");
this.checkArchiveContent(temp, expected);
@@ -874,7 +874,7 @@ public final class ChangeSetTestCase ext
ais.close();
}
- List expected = new ArrayList();
+ List<String> expected = new ArrayList<String>();
expected.add("test1.xml");
this.checkArchiveContent(temp, expected);
}
@@ -916,7 +916,7 @@ public final class ChangeSetTestCase ext
if (ais != null)
ais.close();
}
- List expected = new ArrayList();
+ List<String> expected = new ArrayList<String>();
expected.add("test1.xml");
expected.add("test.txt");
this.checkArchiveContent(temp, expected);
