parameterize raw generics

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1749260 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-06-20 03:50:30 +00:00
parent ce8b8ea7ab
commit 57e9abb8d1

View File

@ -63,8 +63,8 @@ public final class TestPOIFSReaderRegistry extends TestCase {
{ {
for (int k = 0; k < names.length; k++) for (int k = 0; k < names.length; k++)
{ {
Iterator listeners = registry.getListeners(paths[ j ], Iterator<POIFSReaderListener> listeners =
names[ k ]); registry.getListeners(paths[ j ], names[ k ]);
assertTrue(!listeners.hasNext()); assertTrue(!listeners.hasNext());
} }
@ -85,8 +85,8 @@ public final class TestPOIFSReaderRegistry extends TestCase {
{ {
if ((j != k) && (k != n)) if ((j != k) && (k != n))
{ {
registry.registerListener(listeners[ j ], paths[ k ], registry.registerListener(
names[ n ]); listeners[ j ], paths[ k ], names[ n ]);
} }
} }
} }
@ -95,8 +95,8 @@ public final class TestPOIFSReaderRegistry extends TestCase {
{ {
for (int n = 0; n < names.length; n++) for (int n = 0; n < names.length; n++)
{ {
Iterator listeners = registry.getListeners(paths[ k ], Iterator<POIFSReaderListener> listeners =
names[ n ]); registry.getListeners(paths[ k ], names[ n ]);
if (k == n) if (k == n)
{ {
@ -104,7 +104,8 @@ public final class TestPOIFSReaderRegistry extends TestCase {
} }
else else
{ {
Set registeredListeners = new HashSet(); Set<POIFSReaderListener> registeredListeners =
new HashSet<POIFSReaderListener>();
while (listeners.hasNext()) while (listeners.hasNext())
{ {
@ -136,9 +137,10 @@ public final class TestPOIFSReaderRegistry extends TestCase {
{ {
for (int n = 0; n < names.length; n++) for (int n = 0; n < names.length; n++)
{ {
Iterator listeners = Iterator<POIFSReaderListener> listeners =
registry.getListeners(paths[ k ], names[ n ]); registry.getListeners(paths[ k ], names[ n ]);
Set registeredListeners = new HashSet(); Set<POIFSReaderListener> registeredListeners =
new HashSet<POIFSReaderListener>();
while (listeners.hasNext()) while (listeners.hasNext())
{ {