Author: rdonkin
Date: Fri Jul 24 19:35:41 2009
New Revision: 797627
URL: http://svn.apache.org/viewvc?rev=797627&view=rev
Log:
JSIEVE-59 Remove action iterator https://issues.apache.org/jira/browse/JSIEVE-59
Modified:
james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailAdapter.java
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterActionsTest.java
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
Modified:
james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java?rev=797627&r1=797626&r2=797627&view=diff
==============================================================================
---
james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java
(original)
+++
james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java
Fri Jul 24 19:35:41 2009
@@ -27,7 +27,6 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
@@ -158,10 +157,8 @@
*/
public void executeActions() throws SieveException
{
- ListIterator actionsIter = getActionsIterator();
- while (actionsIter.hasNext())
- {
- Action action = (Action) actionsIter.next();
+ final List<Action> actions = getActions();
+ for (final Action action: actions) {
getMailetContext().log("Executing action: " + action.toString());
try
{
@@ -189,13 +186,7 @@
{
setActions(computeActions());
}
- /**
- * @see org.apache.jsieve.mail.MailAdapter#getActionsIterator()
- */
- public ListIterator getActionsIterator()
- {
- return getActions().listIterator();
- }
+
/**
* @see org.apache.jsieve.mail.MailAdapter#getHeader(String)
*/
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailAdapter.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailAdapter.java?rev=797627&r1=797626&r2=797627&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailAdapter.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailAdapter.java
Fri Jul 24 19:35:41 2009
@@ -20,7 +20,6 @@
package org.apache.jsieve.mail;
import java.util.List;
-import java.util.ListIterator;
import org.apache.jsieve.SieveContext;
import org.apache.jsieve.exception.InternetAddressException;
@@ -94,16 +93,7 @@
* unmodifiable
*/
public List<Action> getActions();
-
- /**
- * Method getActionIteraror answers an Iterator over the List of Actions
- * accumulated by the receiver. Implementations may elect to supply an
- * unmodifiable iterator.
- *
- * @return <code>ListIterator</code>, not null, possibly unmodifiable
- */
- public ListIterator getActionsIterator();
-
+
/**
* Method getHeader answers a List of all of the headers in the receiver
* whose name is equal to the passed name. If no headers are found an empty
Modified:
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java?rev=797627&r1=797626&r2=797627&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
(original)
+++
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
Fri Jul 24 19:35:41 2009
@@ -25,7 +25,6 @@
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
-import java.util.ListIterator;
import javax.mail.Header;
import javax.mail.Message;
@@ -121,19 +120,6 @@
}
/**
- * Method getActionIteraror answers an Iterator over the List of Actions
- * accumulated by the receiver. Implementations may elect to supply an
- * unmodifiable iterator.
- *
- * @return <code>ListIterator</code>, not null, possibly unmodifiable
- */
- public ListIterator getActionsIterator() {
- final List<Action> unmodifiableActions = getActions();
- final ListIterator result = unmodifiableActions.listIterator();
- return result;
- }
-
- /**
* Resets executed and accumlated actions. An instance may be safely reused
* to check a script once this method has been called.
*/
Modified:
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterActionsTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterActionsTest.java?rev=797627&r1=797626&r2=797627&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterActionsTest.java
(original)
+++
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterActionsTest.java
Fri Jul 24 19:35:41 2009
@@ -85,33 +85,6 @@
.get(1));
}
- public void testGetActionsIterator() {
- ListIterator iterator = adapter.getActionsIterator();
- assertNotNull(iterator);
- assertFalse("No actions", iterator.hasNext());
- adapter.addAction(action);
- iterator = adapter.getActionsIterator();
- assertNotNull(iterator);
- assertTrue("One action", iterator.hasNext());
- assertEquals("One action", action, iterator.next());
- assertFalse("One action", iterator.hasNext());
- adapter.addAction(anotherAction);
- iterator = adapter.getActionsIterator();
- assertNotNull(iterator);
- assertTrue("Two actions", iterator.hasNext());
- assertEquals("Two actions", action, iterator.next());
- assertTrue("Two actions", iterator.hasNext());
- assertEquals("Two actions", anotherAction, iterator.next());
- assertTrue("Two actions", iterator.hasPrevious());
- assertFalse("Two actions", iterator.hasNext());
- try {
- iterator.remove();
- fail("Should not be able to modify collection");
- } catch (UnsupportedOperationException e) {
- // expected
- }
- }
-
public void testGetExecutedActions() throws Exception {
assertNotNull(adapter.getExecutedActions());
assertEquals("No actions executed", 0, adapter.getExecutedActions()
Modified:
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java?rev=797627&r1=797626&r2=797627&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java
(original)
+++
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java
Fri Jul 24 19:35:41 2009
@@ -25,7 +25,6 @@
import java.util.Enumeration;
import java.util.HashSet;
import java.util.List;
-import java.util.ListIterator;
import java.util.Set;
import javax.mail.Header;
@@ -152,9 +151,8 @@
*/
public void executeActions() throws SieveException {
boolean isDebugEnabled = log.isDebugEnabled();
- ListIterator actionsIter = getActionsIterator();
- while (actionsIter.hasNext()) {
- Action action = (Action) actionsIter.next();
+ final List<Action> actions = getActions();
+ for (final Action action:actions) {
if (isDebugEnabled)
log.debug("Executing " + action.toString());
}
@@ -179,13 +177,6 @@
}
/**
- * @see org.apache.jsieve.mail.MailAdapter#getActionsIterator()
- */
- public ListIterator getActionsIterator() {
- return getActions().listIterator();
- }
-
- /**
* @see org.apache.jsieve.mail.MailAdapter#getHeader(String)
*/
public List<String> getHeader(String name) throws SieveMailException {
Modified:
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java?rev=797627&r1=797626&r2=797627&view=diff
==============================================================================
---
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
(original)
+++
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
Fri Jul 24 19:35:41 2009
@@ -20,13 +20,11 @@
package org.apache.jsieve.util.check;
import java.io.IOException;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
-import java.util.ListIterator;
import javax.mail.Header;
import javax.mail.Message;
@@ -123,19 +121,6 @@
}
/**
- * Method getActionIteraror answers an Iterator over the List of Actions
- * accumulated by the receiver. Implementations may elect to supply an
- * unmodifiable iterator.
- *
- * @return <code>ListIterator</code>, not null, possibly unmodifiable
- */
- public ListIterator getActionsIterator() {
- final List<Action> unmodifiableActions = getActions();
- final ListIterator result = unmodifiableActions.listIterator();
- return result;
- }
-
- /**
* Resets executed and accumlated actions. An instance may be safely reused
* to check a script once this method has been called.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
