Author: rdonkin
Date: Thu Jul 23 17:43:46 2009
New Revision: 797167
URL: http://svn.apache.org/viewvc?rev=797167&view=rev
Log:
JSIEVE-59 Generification 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/ScriptCheckMailAdapterHeadersTest.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=797167&r1=797166&r2=797167&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
Thu Jul 23 17:43:46 2009
@@ -74,7 +74,7 @@
/**
* List of Actions to perform.
*/
- private List fieldActions;
+ private List<Action> fieldActions;
private final ActionDispatcher dispatcher;
@@ -113,9 +113,9 @@
*
* @return List
*/
- public List getActions()
+ public List<Action> getActions()
{
- List actions = null;
+ List<Action> actions = null;
if (null == (actions = getActionsBasic()))
{
updateActions();
@@ -128,16 +128,16 @@
*
* @return List
*/
- protected List computeActions()
+ protected List<Action> computeActions()
{
- return new ArrayList();
+ return new ArrayList<Action>();
}
/**
* Returns the List of actions.
*
* @return List
*/
- private List getActionsBasic()
+ private List<Action> getActionsBasic()
{
return fieldActions;
}
@@ -175,7 +175,7 @@
*
* @param actions The actions to set
*/
- protected void setActions(List actions)
+ protected void setActions(List<Action> actions)
{
fieldActions = actions;
}
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=797167&r1=797166&r2=797167&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
Thu Jul 23 17:43:46 2009
@@ -77,7 +77,7 @@
* @return <code>List</code> of {...@link Action}'s, not null, possibly
* unmodifiable
*/
- public List getActions();
+ public List<Action> getActions();
/**
* Method getActionIteraror answers an Iterator over the List of Actions
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=797167&r1=797166&r2=797167&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
Thu Jul 23 17:43:46 2009
@@ -127,7 +127,7 @@
* @return <code>ListIterator</code>, not null, possibly unmodifiable
*/
public ListIterator getActionsIterator() {
- final List unmodifiableActions = getActions();
+ final List<Action> unmodifiableActions = getActions();
final ListIterator result = unmodifiableActions.listIterator();
return result;
}
Modified:
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java?rev=797167&r1=797166&r2=797167&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java
(original)
+++
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java
Thu Jul 23 17:43:46 2009
@@ -109,7 +109,7 @@
}
public void testGetMatchingHeader() throws Exception {
- List headers = adapter.getMatchingHeader(FROM);
+ List<String> headers = adapter.getMatchingHeader(FROM);
assertNotNull(headers);
assertEquals("From headers set returned", 1, headers.size());
assertTrue("From headers set returned",
headers.contains(FROM_ADDRESS));
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=797167&r1=797166&r2=797167&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
Thu Jul 23 17:43:46 2009
@@ -64,7 +64,7 @@
/**
* List of Actions to perform.
*/
- private List fieldActions;
+ private List<Action> fieldActions;
/**
* Constructor for SieveMailAdapter.
@@ -107,8 +107,8 @@
*
* @return List
*/
- public List getActions() {
- List actions = null;
+ public List<Action> getActions() {
+ List<Action> actions = null;
if (null == (actions = getActionsBasic())) {
updateActions();
return getActions();
@@ -121,8 +121,8 @@
*
* @return List
*/
- protected List computeActions() {
- return new ArrayList();
+ protected List<Action> computeActions() {
+ return new ArrayList<Action>();
}
/**
@@ -130,7 +130,7 @@
*
* @return List
*/
- private List getActionsBasic() {
+ private List<Action> getActionsBasic() {
return fieldActions;
}
@@ -164,7 +164,7 @@
* @param actions
* The actions to set
*/
- protected void setActions(List actions) {
+ protected void setActions(List<Action> actions) {
fieldActions = actions;
}
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=797167&r1=797166&r2=797167&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
Thu Jul 23 17:43:46 2009
@@ -47,15 +47,15 @@
*/
public class ScriptCheckMailAdapter implements MailAdapter {
- private final List actions;
+ private final List<Action> actions;
- private final List executedActions;
+ private final List<Action> executedActions;
private Message mail = null;
public ScriptCheckMailAdapter() {
- actions = new ArrayList();
- executedActions = new ArrayList();
+ actions = new ArrayList<Action>();
+ executedActions = new ArrayList<Action>();
}
/**
@@ -104,8 +104,8 @@
* @return <code>List</code> of {...@link Action}s, not null. This list is
a
* modifiable copy
*/
- public List getExecutedActions() {
- final ArrayList result = new ArrayList(executedActions);
+ public List<Action> getExecutedActions() {
+ final ArrayList<Action> result = new
ArrayList<Action>(executedActions);
return result;
}
@@ -116,8 +116,8 @@
* @return <code>List</code> of {...@link Action}'s, not null, possibly
* unmodifiable
*/
- public List getActions() {
- final List result = Collections.unmodifiableList(actions);
+ public List<Action> getActions() {
+ final List<Action> result = Collections.unmodifiableList(actions);
return result;
}
@@ -129,7 +129,7 @@
* @return <code>ListIterator</code>, not null, possibly unmodifiable
*/
public ListIterator getActionsIterator() {
- final List unmodifiableActions = getActions();
+ final List<Action> unmodifiableActions = getActions();
final ListIterator result = unmodifiableActions.listIterator();
return result;
}
@@ -152,8 +152,9 @@
* @return <code>List</code> not null, possibly empty
* @throws SieveMailException
*/
- public List getHeader(String name) throws SieveMailException {
- List result = Collections.EMPTY_LIST;
+ @SuppressWarnings("unchecked")
+ public List<String> getHeader(String name) throws SieveMailException {
+ List<String> result = Collections.EMPTY_LIST;
if (mail != null) {
try {
String[] values = mail.getHeader(name);
@@ -175,11 +176,12 @@
* unmodifiable
* @throws SieveMailException
*/
- public List getHeaderNames() throws SieveMailException {
- List results = Collections.EMPTY_LIST;
+ @SuppressWarnings("unchecked")
+ public List<String> getHeaderNames() throws SieveMailException {
+ List<String> results = Collections.EMPTY_LIST;
if (mail != null) {
try {
- results = new ArrayList();
+ results = new ArrayList<String>();
for (final Enumeration en = mail.getAllHeaders(); en
.hasMoreElements();) {
final Header header = (Header) en.nextElement();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
