You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/06/28 20:57:53 UTC
svn commit: r958681 - in
/myfaces/extensions/cdi/trunk/jse-modules/message-module:
api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/
impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/
Author: gpetracek
Date: Mon Jun 28 18:57:52 2010
New Revision: 958681
URL: http://svn.apache.org/viewvc?rev=958681&view=rev
Log:
EXTCDI-24 cleanup
Modified:
myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessageHandler.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContextConfig.java
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessageHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessageHandler.java?rev=958681&r1=958680&r2=958681&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessageHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessageHandler.java Mon Jun 28 18:57:52 2010
@@ -20,15 +20,15 @@ package org.apache.myfaces.extensions.cd
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
/**
* @author Gerhard Petracek
*/
public abstract class AbstractMessageHandler implements MessageHandler
{
- private Set<MessageFilter> messageFilters = new HashSet<MessageFilter>();
+ private Set<MessageFilter> messageFilters = new CopyOnWriteArraySet<MessageFilter>();
public void addMessage(MessageContext messageContext, Message message)
{
@@ -44,17 +44,17 @@ public abstract class AbstractMessageHan
{
if (this.messageFilters == null)
{
- this.messageFilters = new HashSet<MessageFilter>();
+ this.messageFilters = new CopyOnWriteArraySet<MessageFilter>();
}
this.messageFilters.addAll(Arrays.asList(messageFilters));
}
- public synchronized Set<MessageFilter> getMessageFilters()
+ public Set<MessageFilter> getMessageFilters()
{
return Collections.unmodifiableSet(this.messageFilters);
}
- private synchronized boolean isMessageAllowed(MessageContext messageContext, Message message)
+ private boolean isMessageAllowed(MessageContext messageContext, Message message)
{
for (MessageFilter messageFilter : this.messageFilters)
{
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java?rev=958681&r1=958680&r2=958681&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java Mon Jun 28 18:57:52 2010
@@ -25,11 +25,11 @@ import org.apache.myfaces.extensions.cdi
import java.io.Serializable;
import java.util.List;
-import java.util.ArrayList;
import java.util.Map;
import java.util.Collections;
import java.util.Locale;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger;
/**
@@ -44,7 +44,7 @@ public class DefaultFormatterFactory imp
transient protected Logger logger = getLogger();
- private List<Formatter> formatters = new ArrayList<Formatter>();
+ private List<Formatter> formatters = new CopyOnWriteArrayList<Formatter>();
private Map<Class<?>, Formatter> formatterCache = null;
private Map<FormatterConfigKey, GenericConfig> formatterConfigs =
new ConcurrentHashMap<FormatterConfigKey, GenericConfig>();
@@ -111,7 +111,7 @@ public class DefaultFormatterFactory imp
return this.formatterConfigs.get(createKey(type, locale));
}
- private synchronized Formatter findFormatterFor(Class<?> type)
+ private Formatter findFormatterFor(Class<?> type)
{
for (Formatter formatter : this.formatters)
{
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContextConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContextConfig.java?rev=958681&r1=958680&r2=958681&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContextConfig.java Mon Jun 28 18:57:52 2010
@@ -30,9 +30,9 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.message.api.GenericConfig;
import org.apache.myfaces.extensions.cdi.message.impl.formatter.FormatterBuilder;
-import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
/**
* @author Gerhard Petracek
@@ -223,7 +223,7 @@ class DefaultMessageContextConfig implem
{
this.messageInterpolator = new DefaultMessageInterpolator();
this.messageResolver = null;
- this.messageHandlers = new HashSet<MessageHandler>();
+ this.messageHandlers = new CopyOnWriteArraySet<MessageHandler>();
this.localeResolver = new DefaultLocaleResolver();
this.formatterFactory = new DefaultFormatterFactory();
}
@@ -247,7 +247,7 @@ class DefaultMessageContextConfig implem
return this.localeResolver;
}
- public synchronized MessageHandler getMessageHandler()
+ public MessageHandler getMessageHandler()
{
return new DefaultCompositeMessageHandler(this.messageHandlers);
}