diff --git a/src/org/ice4j/stack/EventDispatcher.java b/src/org/ice4j/stack/EventDispatcher.java index 50c72a9..1a0209f 100644 --- a/src/org/ice4j/stack/EventDispatcher.java +++ b/src/org/ice4j/stack/EventDispatcher.java @@ -25,7 +25,7 @@ public class EventDispatcher /** * All property change listeners registered so far. */ - private Vector requestListeners + private final Vector requestListeners = new Vector(); /** @@ -140,13 +140,8 @@ public class EventDispatcher = new ArrayList(requestListeners); } - Iterator iterator = listenersCopy.iterator(); - while (iterator.hasNext()) - { - RequestListener target = - (RequestListener) iterator.next(); + for (RequestListener target : listenersCopy) target.requestReceived(evt); - } } synchronized(requestListenersChildren) diff --git a/src/org/ice4j/stack/StunStack.java b/src/org/ice4j/stack/StunStack.java index dc3885a..00cb700 100644 --- a/src/org/ice4j/stack/StunStack.java +++ b/src/org/ice4j/stack/StunStack.java @@ -420,7 +420,7 @@ public class StunStack Enumeration tids = clientTransactions.keys(); while (tids.hasMoreElements()) { - TransactionID item = (TransactionID)tids.nextElement(); + TransactionID item = tids.nextElement(); StunClientTransaction tran = clientTransactions.remove(item); if(tran != null) tran.cancel(); @@ -430,7 +430,7 @@ public class StunStack tids = serverTransactions.keys(); while (tids.hasMoreElements()) { - TransactionID item = (TransactionID)tids.nextElement(); + TransactionID item = tids.nextElement(); StunServerTransaction tran = serverTransactions.remove(item); if(tran != null) tran.expire(); diff --git a/test/org/ice4j/TransactionSupportTests.java b/test/org/ice4j/TransactionSupportTests.java index a4086b4..ed8501d 100644 --- a/test/org/ice4j/TransactionSupportTests.java +++ b/test/org/ice4j/TransactionSupportTests.java @@ -237,7 +237,7 @@ public class TransactionSupportTests extends TestCase Vector reqs = requestCollector .getRequestsForTransaction( bindingRequest.getTransactionID()); - StunMessageEvent evt = ((StunMessageEvent)reqs.get(0)); + StunMessageEvent evt = reqs.get(0); byte[] tid = evt.getMessage().getTransactionID(); StunStack.getInstance().sendResponse( @@ -281,7 +281,7 @@ public class TransactionSupportTests extends TestCase Vector reqs1 = requestCollector .getRequestsForTransaction( bindingRequest.getTransactionID()); - StunMessageEvent evt1 = ((StunMessageEvent)reqs1.get(0)); + StunMessageEvent evt1 = reqs1.get(0); //send a response to make the other guy shut up byte[] tid = evt1.getMessage().getTransactionID(); @@ -299,7 +299,7 @@ public class TransactionSupportTests extends TestCase = requestCollector.getRequestsForTransaction( bindingRequest.getTransactionID()); - StunMessageEvent evt2 = ((StunMessageEvent)reqs2.get(0)); + StunMessageEvent evt2 = reqs2.get(0); assertFalse("Consecutive requests were assigned the same transaction id", Arrays.equals( evt1.getMessage().getTransactionID(), @@ -440,12 +440,8 @@ public class TransactionSupportTests extends TestCase { Vector newVec = new Vector(); - Iterator reqsIter - = receivedRequestsVector.iterator(); - - while(reqsIter.hasNext()) + for (StunMessageEvent evt : receivedRequestsVector) { - StunMessageEvent evt = (StunMessageEvent)reqsIter.next(); Message msg = evt.getMessage(); if( Arrays.equals(tranid, msg.getTransactionID())) newVec.add(evt); diff --git a/test/org/ice4j/attribute/UnknownAttributesAttributeTest.java b/test/org/ice4j/attribute/UnknownAttributesAttributeTest.java index c8ae1c3..c614726 100644 --- a/test/org/ice4j/attribute/UnknownAttributesAttributeTest.java +++ b/test/org/ice4j/attribute/UnknownAttributesAttributeTest.java @@ -226,8 +226,8 @@ public class UnknownAttributesAttributeTest extends TestCase { Iterator iterator = unknownAttributesAttribute.getAttributes(); - actualId1 = ((Character)iterator.next()).charValue(); - actualId2 = ((Character)iterator.next()).charValue();; + actualId1 = iterator.next().charValue(); + actualId2 = iterator.next().charValue();; assertEquals("getAttributes() return value mismatch", expectedId1, actualId1); assertEquals("getAttributes() return value mismatch", expectedId2, actualId2);