Author: sebb
Date: Sun Aug 21 01:52:25 2011
New Revision: 1159934
URL: http://svn.apache.org/viewvc?rev=1159934&view=rev
Log:
Fix up some raw types
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java?rev=1159934&r1=1159933&r2=1159934&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
Sun Aug 21 01:52:25 2011
@@ -263,7 +263,7 @@ public class ZipFile {
*
* @return all entries as {@link ZipArchiveEntry} instances
*/
- public Enumeration getEntries() {
+ public Enumeration<ZipArchiveEntry> getEntries() {
return Collections.enumeration(entries.keySet());
}
@@ -277,7 +277,7 @@ public class ZipFile {
*
* @since Commons Compress 1.1
*/
- public Enumeration getEntriesInPhysicalOrder() {
+ public Enumeration<ZipArchiveEntry> getEntriesInPhysicalOrder() {
ZipArchiveEntry[] allEntries =
entries.keySet().toArray(new ZipArchiveEntry[0]);
Arrays.sort(allEntries, OFFSET_COMPARATOR);
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=1159934&r1=1159933&r2=1159934&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
Sun Aug 21 01:52:25 2011
@@ -59,7 +59,7 @@ public class ChangeSetResults {
* Returns a list of filenames which has been added from the changeset
* @return the list of filenames
*/
- public List getAddedFromChangeSet() {
+ public List<String> getAddedFromChangeSet() {
return addedFromChangeSet;
}
@@ -67,7 +67,7 @@ public class ChangeSetResults {
* Returns a list of filenames which has been added from the original
stream
* @return the list of filenames
*/
- public List getAddedFromStream() {
+ public List<String> getAddedFromStream() {
return addedFromStream;
}
@@ -75,7 +75,7 @@ public class ChangeSetResults {
* Returns a list of filenames which has been deleted
* @return the list of filenames
*/
- public List getDeleted() {
+ public List<String> getDeleted() {
return deleted;
}
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java?rev=1159934&r1=1159933&r2=1159934&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java
Sun Aug 21 01:52:25 2011
@@ -74,9 +74,9 @@ public final class Lister {
} else {
ZipFile zf = new ZipFile(f, cl.encoding);
try {
- for (Enumeration entries = zf.getEntries();
+ for (Enumeration<ZipArchiveEntry> entries = zf.getEntries();
entries.hasMoreElements(); ) {
- ZipArchiveEntry ze = (ZipArchiveEntry)
entries.nextElement();
+ ZipArchiveEntry ze = entries.nextElement();
list(ze);
if (cl.dir != null) {
InputStream is = zf.getInputStream(ze);
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java?rev=1159934&r1=1159933&r2=1159934&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
Sun Aug 21 01:52:25 2011
@@ -316,9 +316,9 @@ public class UTF8ZipFilesTest extends Ab
try {
zf = new ZipFile(file, encoding, false);
- Enumeration e = zf.getEntries();
+ Enumeration<ZipArchiveEntry> e = zf.getEntries();
while (e.hasMoreElements()) {
- ZipArchiveEntry ze = (ZipArchiveEntry) e.nextElement();
+ ZipArchiveEntry ze = e.nextElement();
if (ze.getName().endsWith("sser.txt")) {
assertUnicodeName(ze, OIL_BARREL_TXT, encoding);
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java?rev=1159934&r1=1159933&r2=1159934&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
Sun Aug 21 01:52:25 2011
@@ -464,12 +464,10 @@ public class Zip64SupportIT {
try {
zf = new ZipFile(f);
int idx = 0;
- for (Enumeration e =
+ for (Enumeration<ZipArchiveEntry> e =
zf.getEntriesInPhysicalOrder();
e.hasMoreElements(); ) {
- ZipArchiveEntry zae =
- (ZipArchiveEntry)
- e.nextElement();
+ ZipArchiveEntry zae =
e.nextElement();
assertEquals(String.valueOf(idx),
zae.getName());
if (idx++ < 2) {
@@ -2393,9 +2391,9 @@ public class Zip64SupportIT {
ZipFile zf = null;
try {
zf = new ZipFile(f);
- Enumeration e = zf.getEntries();
+ Enumeration<ZipArchiveEntry> e = zf.getEntries();
assertTrue(e.hasMoreElements());
- ZipArchiveEntry zae = (ZipArchiveEntry) e.nextElement();
+ ZipArchiveEntry zae = e.nextElement();
assertEquals(expectedName, zae.getName());
assertEquals(FIVE_BILLION, zae.getSize());
byte[] buf = new byte[1024 * 1024];
@@ -2451,8 +2449,8 @@ public class Zip64SupportIT {
try {
zf = new ZipFile(f);
int files = 0;
- for (Enumeration e = zf.getEntries(); e.hasMoreElements(); ) {
- ZipArchiveEntry zae = (ZipArchiveEntry) e.nextElement();
+ for (Enumeration<ZipArchiveEntry> e = zf.getEntries();
e.hasMoreElements(); ) {
+ ZipArchiveEntry zae = e.nextElement();
if (!zae.isDirectory()) {
files++;
assertEquals(0, zae.getSize());
