Author: rdonkin
Date: Fri Jul 24 16:44:43 2009
New Revision: 797555
URL: http://svn.apache.org/viewvc?rev=797555&view=rev
Log:
JSIEVE-53 Generify https://issues.apache.org/jira/browse/JSIEVE-53
Modified:
james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/ActionDispatcher.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/parser/SieveNode.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/parser/address/SieveAddressBuilder.java
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/XmlOut.java
Modified:
james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/ActionDispatcher.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/ActionDispatcher.java?rev=797555&r1=797554&r2=797555&view=diff
==============================================================================
---
james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/ActionDispatcher.java
(original)
+++
james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/ActionDispatcher.java
Fri Jul 24 16:44:43 2009
@@ -41,7 +41,7 @@
* handle the Action.
* <Action, MailAction>
*/
- private Map/*<Action, MailAction>*/ fieldMailActionMap;
+ private Map<Class, MailAction> fieldMailActionMap;
/**
* Constructor for ActionDispatcher.
@@ -63,7 +63,7 @@
*/
public void execute(final Action anAction, final Mail aMail, final
ActionContext context) throws MessagingException
{
- MailAction mailAction = (MailAction)
getMethodMap().get(anAction.getClass());
+ MailAction mailAction = getMethodMap().get(anAction.getClass());
mailAction.execute(anAction, aMail, context);
}
@@ -71,7 +71,7 @@
* Returns the methodMap.
* @return Map
*/
- public Map getMethodMap()
+ public Map<Class, MailAction> getMethodMap()
{
return fieldMailActionMap;
}
@@ -80,9 +80,9 @@
* Returns a new methodMap.
* @return Map
*/
- private Map defaultMethodMap()
+ private Map<Class, MailAction> defaultMethodMap()
{
- Map/*<Action, MailAction>*/ actionMap = new HashMap/*<Action,
MailAction>*/(4);
+ Map<Class, MailAction> actionMap = new HashMap<Class, MailAction>(4);
actionMap.put(ActionFileInto.class, new FileIntoAction());
actionMap.put(ActionKeep.class, new KeepAction());
actionMap.put(ActionRedirect.class, new RedirectAction());
@@ -94,7 +94,7 @@
* Sets the mail action mail.
* @param mailActionMap <Action, MailAction> not null
*/
- protected void setMethodMap(Map/*<Action, MailAction>*/ mailActionMap)
+ protected void setMethodMap(Map<Class, MailAction> mailActionMap)
{
fieldMailActionMap = mailActionMap;
}
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/parser/SieveNode.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/parser/SieveNode.java?rev=797555&r1=797554&r2=797555&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/parser/SieveNode.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/parser/SieveNode.java
Fri Jul 24 16:44:43 2009
@@ -151,8 +151,8 @@
* Comments are returned in the order of occurance in the script.
* @return collection of strings, not null
*/
- public List getPrecedingComments() {
- final LinkedList results = new LinkedList();
+ public List<String> getPrecedingComments() {
+ final LinkedList<String> results = new LinkedList<String>();
if (firstToken != null) {
Token special = firstToken.specialToken;
while (special != null) {
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/parser/address/SieveAddressBuilder.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/parser/address/SieveAddressBuilder.java?rev=797555&r1=797554&r2=797555&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/parser/address/SieveAddressBuilder.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/parser/address/SieveAddressBuilder.java
Fri Jul 24 16:44:43 2009
@@ -46,12 +46,12 @@
private static final Address[] EMPTY_ADDRESSES = {};
- private final Collection addresses;
+ private final Collection<Address> addresses;
private final Worker worker;
public SieveAddressBuilder() {
- addresses = Collections.synchronizedCollection(new ArrayList());
+ addresses = Collections.synchronizedCollection(new
ArrayList<Address>());
worker = new Worker();
}
@@ -81,8 +81,7 @@
* @return addresses, not null
*/
public Address[] getAddresses() {
- final Address[] results = (Address[]) addresses
- .toArray(EMPTY_ADDRESSES);
+ final Address[] results = (Address[])
addresses.toArray(EMPTY_ADDRESSES);
return results;
}
@@ -99,6 +98,7 @@
root.childrenAccept(this, results);
}
+ @SuppressWarnings("unchecked")
public Object visit(ASTaddr_spec node, Object data) {
final AddressBean address = new AddressBean();
node.childrenAccept(this, address);
Modified:
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/XmlOut.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/XmlOut.java?rev=797555&r1=797554&r2=797555&view=diff
==============================================================================
--- james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/XmlOut.java
(original)
+++ james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/XmlOut.java
Fri Jul 24 16:44:43 2009
@@ -397,10 +397,10 @@
}
- private final List prefixesDefined;
+ private final List<CharSequence> prefixesDefined;
private final Writer writer;
- private final Stack elementNames;
- private final Set currentAttributes = new HashSet();
+ private final Stack<CharSequence> elementNames;
+ private final Set<CharSequence> currentAttributes = new
HashSet<CharSequence>();
boolean elementsWritten = false;
boolean inElement = false;
@@ -408,8 +408,8 @@
public XmlOut(final Writer writer) {
this.writer = writer;
- this.elementNames = new Stack();
- prefixesDefined = new ArrayList();
+ this.elementNames = new Stack<CharSequence>();
+ prefixesDefined = new ArrayList<CharSequence>();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
