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 2011/03/27 16:36:44 UTC
svn commit: r1085945 [3/3] - in /myfaces/extensions/cdi/trunk:
component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/
core/api/src/mai...
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/system/CodiJsf2SystemEventListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/system/CodiJsf2SystemEventListener.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/system/CodiJsf2SystemEventListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/system/CodiJsf2SystemEventListener.java Sun Mar 27 14:36:40 2011
@@ -37,6 +37,9 @@ public class CodiJsf2SystemEventListener
{
private final boolean deactivated;
+ /**
+ * Constructor which checks the activation of the listener
+ */
public CodiJsf2SystemEventListener()
{
this.deactivated = !isActivated();
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/AccessScopeAwareNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/AccessScopeAwareNavigationHandler.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/AccessScopeAwareNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/AccessScopeAwareNavigationHandler.java Sun Mar 27 14:36:40 2011
@@ -29,6 +29,10 @@ import javax.faces.context.FacesContext;
public class AccessScopeAwareNavigationHandler extends
org.apache.myfaces.extensions.cdi.jsf.impl.navigation.AccessScopeAwareNavigationHandler
{
+ /**
+ * Constructor for wrapping the given {@link NavigationHandler}
+ * @param navigationHandler navigation-handler which should be wrapped
+ */
public AccessScopeAwareNavigationHandler(NavigationHandler navigationHandler)
{
super(navigationHandler);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java Sun Mar 27 14:36:40 2011
@@ -43,6 +43,10 @@ public class CodiNavigationHandler exten
private final boolean deactivated;
private final boolean addViewConfigsAsNavigationCase;
+ /**
+ * Constructor for wrapping the given {@link NavigationHandler}
+ * @param navigationHandler navigation-handler which should be wrapped
+ */
public CodiNavigationHandler(NavigationHandler navigationHandler)
{
this.wrapped = navigationHandler;
@@ -58,6 +62,9 @@ public class CodiNavigationHandler exten
}
}
+ /**
+ * {@inheritDoc}
+ */
public void handleNavigation(FacesContext context, String fromAction, String outcome)
{
if(this.deactivated || isUnhandledExceptionQueued(context)
@@ -86,6 +93,9 @@ public class CodiNavigationHandler exten
return new AccessScopeAwareNavigationHandler(viewConfigAwareNavigationHandler);
}
+ /**
+ * {@inheritDoc}
+ */
public NavigationCase getNavigationCase(FacesContext context, String action, String outcome)
{
if (this.wrapped instanceof ConfigurableNavigationHandler)
@@ -96,6 +106,9 @@ public class CodiNavigationHandler exten
return null;
}
+ /**
+ * {@inheritDoc}
+ */
public Map<String, Set<NavigationCase>> getNavigationCases()
{
Map<String, Set<NavigationCase>> result = null;
@@ -118,6 +131,9 @@ public class CodiNavigationHandler exten
return new NavigationCaseMapWrapper(result);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/NavigationCaseMapWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/NavigationCaseMapWrapper.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/NavigationCaseMapWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/NavigationCaseMapWrapper.java Sun Mar 27 14:36:40 2011
@@ -46,6 +46,10 @@ class NavigationCaseMapWrapper implement
private Map<String, Set<NavigationCase>> wrappedNavigationCaseMap;
private final Map<String, Set<NavigationCase>> viewConfigBasedNavigationCaseCache;
+ /**
+ * Constructor for wrapping the given navigation-cases
+ * @param navigationCases current navigation-cases
+ */
public NavigationCaseMapWrapper(Map<String, Set<NavigationCase>> navigationCases)
{
this.wrappedNavigationCaseMap = navigationCases;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/request/DefaultRequestTypeResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/request/DefaultRequestTypeResolver.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/request/DefaultRequestTypeResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/request/DefaultRequestTypeResolver.java Sun Mar 27 14:36:40 2011
@@ -34,6 +34,9 @@ public class DefaultRequestTypeResolver
{
private static final long serialVersionUID = 3341790605524604799L;
+ /**
+ * {@inheritDoc}
+ */
@Override
protected RequestTypeResolver createDefaultRequestTypeResolver()
{
@@ -50,11 +53,17 @@ public class DefaultRequestTypeResolver
this.partialRequest = facesContext.getPartialViewContext().isPartialRequest();
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isPartialRequest()
{
return this.partialRequest;
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isPostRequest()
{
return this.postRequest;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/CodiRenderKitFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/CodiRenderKitFactory.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/CodiRenderKitFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/CodiRenderKitFactory.java Sun Mar 27 14:36:40 2011
@@ -45,6 +45,10 @@ public class CodiRenderKitFactory extend
private volatile Boolean initialized;
private final boolean deactivated;
+ /**
+ * Constructor for wrapping the given {@link RenderKitFactory}
+ * @param wrapped render-kit-factory which will be wrapped
+ */
public CodiRenderKitFactory(RenderKitFactory wrapped)
{
this.wrapped = wrapped;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java Sun Mar 27 14:36:40 2011
@@ -42,6 +42,10 @@ public class RedirectedConversationAware
private boolean sessionInvalidated = false;
+ /**
+ * Constructor for wrapping the given {@link ExternalContext}
+ * @param wrapped external-context which should be wrapped
+ */
public RedirectedConversationAwareExternalContext(ExternalContext wrapped)
{
this.wrapped = wrapped;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/mapped/MappedJsf2ScopeExtension.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/mapped/MappedJsf2ScopeExtension.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/mapped/MappedJsf2ScopeExtension.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/mapped/MappedJsf2ScopeExtension.java Sun Mar 27 14:36:40 2011
@@ -44,6 +44,9 @@ public class MappedJsf2ScopeExtension im
private Map<Class<? extends Annotation>, Class<? extends Annotation>> mappedJsfScopes
= new HashMap<Class<? extends Annotation>, Class<? extends Annotation>>();
+ /**
+ * Default constructor which initializes the scope mapping
+ */
public MappedJsf2ScopeExtension()
{
this.mappedJsfScopes.put(javax.faces.bean.ApplicationScoped.class,
@@ -133,6 +136,9 @@ public class MappedJsf2ScopeExtension im
return false;
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
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=1085945&r1=1085944&r2=1085945&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 Sun Mar 27 14:36:40 2011
@@ -30,6 +30,9 @@ public abstract class AbstractMessageHan
{
private Set<MessageFilter> messageFilters = new CopyOnWriteArraySet<MessageFilter>();
+ /**
+ * {@inheritDoc}
+ */
public void addMessage(MessageContext messageContext, Message message)
{
if (isMessageAllowed(messageContext, message))
@@ -40,11 +43,17 @@ public abstract class AbstractMessageHan
protected abstract void processMessage(MessageContext messageContext, Message message);
+ /**
+ * {@inheritDoc}
+ */
public void addMessageFilter(MessageFilter... messageFilters)
{
this.messageFilters.addAll(Arrays.asList(messageFilters));
}
+ /**
+ * {@inheritDoc}
+ */
public Set<MessageFilter> getMessageFilters()
{
return Collections.unmodifiableSet(this.messageFilters);
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/CompositeMessageHandler.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/CompositeMessageHandler.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/CompositeMessageHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/CompositeMessageHandler.java Sun Mar 27 14:36:40 2011
@@ -28,5 +28,9 @@ import java.util.List;
*/
public interface CompositeMessageHandler extends MessageHandler
{
+ /**
+ * Returns the registered {@link MessageHandler}s for adjusting them
+ * @return currently registered message-handlers
+ */
List<MessageHandler> getMessageHandlers();
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/MessageContextConfig.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/MessageContextConfig.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/MessageContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/MessageContextConfig.java Sun Mar 27 14:36:40 2011
@@ -124,6 +124,10 @@ public interface MessageContextConfig ex
*/
MessageContextBuilder reset();
+ /**
+ * @deprecated
+ * @return the instance of the current message context builder
+ */
@Deprecated //currently not implemented
MessageContextBuilder clear();
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/MessageFilter.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/MessageFilter.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/MessageFilter.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/MessageFilter.java Sun Mar 27 14:36:40 2011
@@ -25,5 +25,11 @@ package org.apache.myfaces.extensions.cd
*/
public interface MessageFilter
{
+ /**
+ * Allows to analyze and block the given {@link Message}
+ * @param messageContext current message-context
+ * @param message current message
+ * @return false if the given message should be blocked, true otherwise
+ */
boolean processMessage(MessageContext messageContext, Message message);
}
\ No newline at end of file
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/payload/MessagePayloadKey.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/payload/MessagePayloadKey.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/payload/MessagePayloadKey.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/payload/MessagePayloadKey.java Sun Mar 27 14:36:40 2011
@@ -32,5 +32,9 @@ import java.lang.annotation.Target;
@Retention(RUNTIME)
public @interface MessagePayloadKey
{
+ /**
+ * Type-safe identifier
+ * @return identifier for the message-payload
+ */
Class value();
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/CompositeMessageInterpolator.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/CompositeMessageInterpolator.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/CompositeMessageInterpolator.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/CompositeMessageInterpolator.java Sun Mar 27 14:36:40 2011
@@ -31,11 +31,18 @@ public class CompositeMessageInterpolato
private static final long serialVersionUID = 7138747032627702804L;
private MessageInterpolator[] messageInterpolators;
+ /**
+ * Wraps the given {@link MessageInterpolator}s
+ * @param messageInterpolators current message-interpolators
+ */
public CompositeMessageInterpolator(MessageInterpolator... messageInterpolators)
{
this.messageInterpolators = messageInterpolators;
}
+ /**
+ * {@inheritDoc}
+ */
public String interpolate(MessageContext messageContext, String messageDescriptor, Serializable... arguments)
{
String result = messageDescriptor;
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultArgumentFilter.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/DefaultArgumentFilter.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultArgumentFilter.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultArgumentFilter.java Sun Mar 27 14:36:40 2011
@@ -27,11 +27,17 @@ public class DefaultArgumentFilter imple
{
private static final long serialVersionUID = -2599667995355691782L;
+ /**
+ * {@inheritDoc}
+ */
public boolean isArgumentAllowed(String expression, Object value)
{
return value != null && !isUnresolvedArgument(expression, value);
}
+ /**
+ * {@inheritDoc}
+ */
public String getDefaultValue(String expression)
{
return '{' + expression + '}';
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultLocaleResolver.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/DefaultLocaleResolver.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultLocaleResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultLocaleResolver.java Sun Mar 27 14:36:40 2011
@@ -30,6 +30,9 @@ class DefaultLocaleResolver implements L
{
private static final long serialVersionUID = 2075618472090834156L;
+ /**
+ * {@inheritDoc}
+ */
public Locale getLocale()
{
return Locale.getDefault();
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageBuilder.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/DefaultMessageBuilder.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageBuilder.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageBuilder.java Sun Mar 27 14:36:40 2011
@@ -65,6 +65,11 @@ class DefaultMessageBuilder implements M
{
}
+ /**
+ * Constructor for creating the builder which uses the given {@link MessageContext} and {@link MessageFactory}
+ * @param messageContext current message-context
+ * @param messageFactory current message-factory
+ */
public DefaultMessageBuilder(MessageContext messageContext, MessageFactory messageFactory)
{
reset();
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageFactory.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/DefaultMessageFactory.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageFactory.java Sun Mar 27 14:36:40 2011
@@ -29,6 +29,9 @@ class DefaultMessageFactory implements M
{
private static final long serialVersionUID = 721557343207858857L;
+ /**
+ * {@inheritDoc}
+ */
public Message create(String messageDescriptor, MessagePayload messagePayload)
{
return new DefaultMessage(messageDescriptor, messagePayload);
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageInterpolator.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/DefaultMessageInterpolator.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageInterpolator.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageInterpolator.java Sun Mar 27 14:36:40 2011
@@ -30,6 +30,9 @@ class DefaultMessageInterpolator impleme
{
private static final long serialVersionUID = -8854087197813424812L;
+ /**
+ * {@inheritDoc}
+ */
public String interpolate(MessageContext messageContext, String messageDescriptor, Serializable... arguments)
{
return messageDescriptor;
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/ELAwareMessageInterpolator.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/ELAwareMessageInterpolator.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/ELAwareMessageInterpolator.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/ELAwareMessageInterpolator.java Sun Mar 27 14:36:40 2011
@@ -45,11 +45,23 @@ public class ELAwareMessageInterpolator
private ELProvider elProvider;
private ArgumentFilter argumentFilter;
+ /**
+ * Constructor for creating an {@link org.apache.myfaces.extensions.cdi.message.api.MessageInterpolator}
+ * which uses the given {@link ELProvider} for interpolating el-expressions in a message.
+ * @param elProvider el-provider which should be used
+ */
public ELAwareMessageInterpolator(ELProvider elProvider)
{
this(elProvider, null);
}
+ /**
+ * Constructor for creating an {@link org.apache.myfaces.extensions.cdi.message.api.MessageInterpolator}
+ * which uses the given {@link ELProvider} for interpolating el-expressions in a message and
+ * allows to filter arguments of the message.
+ * @param elProvider el-provider which should be used
+ * @param argumentFilter argument-filter which should be used
+ */
public ELAwareMessageInterpolator(ELProvider elProvider, ArgumentFilter argumentFilter)
{
this.elProvider = elProvider;
@@ -64,6 +76,9 @@ public class ELAwareMessageInterpolator
}
}
+ /**
+ * {@inheritDoc}
+ */
public String interpolate(MessageContext messageContext, String messageDescriptor, Serializable... arguments)
{
List<NamedArgument> namedArguments = addNamedArguments(arguments);
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArgumentBuilder.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/NamedArgumentBuilder.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArgumentBuilder.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArgumentBuilder.java Sun Mar 27 14:36:40 2011
@@ -35,12 +35,22 @@ public class NamedArgumentBuilder
{
}
+ /**
+ * Allows to add further arguments which are mapped to a name.
+ * @param name name of the argument
+ * @param value value of the argument
+ * @return the current instance of the builder
+ */
public NamedArgumentBuilder add(String name, Serializable value)
{
this.parameters.add(new DefaultNamedArgument(name, value));
return this;
}
+ /**
+ * Creates an array of {@link NamedArgument}s for the stored arguments
+ * @return array of the added arguments
+ */
public NamedArgument[] create()
{
return this.parameters.toArray(new NamedArgument[this.parameters.size()]);
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArgumentMessageInterpolator.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/NamedArgumentMessageInterpolator.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArgumentMessageInterpolator.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArgumentMessageInterpolator.java Sun Mar 27 14:36:40 2011
@@ -34,6 +34,9 @@ public class NamedArgumentMessageInterpo
{
private static final long serialVersionUID = -8511553781756269753L;
+ /**
+ * {@inheritDoc}
+ */
public String interpolate(MessageContext messageContext, String messageText, Serializable... arguments)
{
NamedArgument[] namedArguments = extractNamedArguments(arguments);
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArguments.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/NamedArguments.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArguments.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArguments.java Sun Mar 27 14:36:40 2011
@@ -36,6 +36,11 @@ public final class NamedArguments
{
}
+ /**
+ * Converts the given arguments to an array
+ * @param arguments current arguments
+ * @return current arguments as array
+ */
public static Serializable[] convert(Map<String, Serializable> arguments)
{
if (arguments == null || arguments.size() == 0)
@@ -52,6 +57,12 @@ public final class NamedArguments
return namedArgumentBuilder.create();
}
+ /**
+ * Helper for creating named arguments easily
+ * @param name name of the argument
+ * @param value value of the argument
+ * @return named-argument-builder which provides a fluent API for adding more named arguments
+ */
public static NamedArgumentBuilder add(String name, Serializable value)
{
return new NamedArguments().getNamedArgumentBuilder().add(name, value);
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NumberedArgumentAwareMessageInterpolator.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/NumberedArgumentAwareMessageInterpolator.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NumberedArgumentAwareMessageInterpolator.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NumberedArgumentAwareMessageInterpolator.java Sun Mar 27 14:36:40 2011
@@ -35,6 +35,9 @@ public class NumberedArgumentAwareMessag
{
private static final long serialVersionUID = 8699632465559596371L;
+ /**
+ * {@inheritDoc}
+ */
public String interpolate(MessageContext messageContext, String messageDescriptor, Serializable... arguments)
{
Serializable[] numberedArguments = extractNumberedArguments(arguments);
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/SimpleMessageBuilder.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/SimpleMessageBuilder.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/SimpleMessageBuilder.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/SimpleMessageBuilder.java Sun Mar 27 14:36:40 2011
@@ -43,16 +43,30 @@ public class SimpleMessageBuilder extend
super(messageContext, null);
}
+ /**
+ * Creates a new {@link Message}
+ * @return a new message
+ */
public static MessageBuilder message()
{
return new SimpleMessageBuilder();
}
+ /**
+ * Creates a new {@link MessageBuilder} for the given {@link MessageContext}
+ * @param messageContext current message-context
+ * @return a new message
+ */
public static MessageBuilder message(MessageContext messageContext)
{
return new SimpleMessageBuilder(messageContext);
}
+ /**
+ * Creates a new {@link MessageBuilder} which uses the given {@link MessageFactory}
+ * @param messageFactory current message-factory
+ * @return a new message
+ */
public static MessageBuilder message(MessageFactory messageFactory)
{
SimpleMessageBuilder messageBuilder = new SimpleMessageBuilder();
@@ -60,6 +74,9 @@ public class SimpleMessageBuilder extend
return messageBuilder;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Message add()
{
@@ -72,6 +89,9 @@ public class SimpleMessageBuilder extend
return super.add();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public String toText()
{
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/DefaultNumberFormatter.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/formatter/DefaultNumberFormatter.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/DefaultNumberFormatter.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/DefaultNumberFormatter.java Sun Mar 27 14:36:40 2011
@@ -48,16 +48,25 @@ class DefaultNumberFormatter implements
{
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isResponsibleFor(Class<?> type)
{
return Number.class.isAssignableFrom(type);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isStateless()
{
return false;
}
+ /**
+ * {@inheritDoc}
+ */
public String format(MessageContext messageContext, Number valueToFormat)
{
Locale locale = messageContext.getLocale();
@@ -184,6 +193,9 @@ class DefaultNumberFormatter implements
return format;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean equals(Object o)
{
@@ -237,6 +249,9 @@ class DefaultNumberFormatter implements
return true;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public int hashCode()
{
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/FormatterBuilder.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/formatter/FormatterBuilder.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/FormatterBuilder.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/FormatterBuilder.java Sun Mar 27 14:36:40 2011
@@ -25,10 +25,18 @@ import org.apache.myfaces.extensions.cdi
*/
public class FormatterBuilder
{
+ /**
+ * Constructor which prevents the instantiation of this class
+ */
private FormatterBuilder()
{
}
+ /**
+ * Internal helper for creating a {@link Formatter} for the given type
+ * @param type current type
+ * @return default formatter mapped to the given type
+ */
public static Formatter createFormatter(Class<?> type)
{
if (Number.class.isAssignableFrom(type))
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/ToStringFormatter.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/formatter/ToStringFormatter.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/ToStringFormatter.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/ToStringFormatter.java Sun Mar 27 14:36:40 2011
@@ -40,16 +40,25 @@ class ToStringFormatter implements Forma
this.responsibleFor = type;
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isResponsibleFor(Class<?> type)
{
return type.isAssignableFrom(this.responsibleFor);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isStateless()
{
return true;
}
+ /**
+ * {@inheritDoc}
+ */
public String format(MessageContext messageContext, Object valueToFormat)
{
if(valueToFormat instanceof Localizable)
@@ -59,12 +68,18 @@ class ToStringFormatter implements Forma
return valueToFormat != null ? valueToFormat.toString() : "";
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public int hashCode()
{
return getClass().getName().hashCode();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean equals(Object target)
{
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/spi/ELProvider.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/spi/ELProvider.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/spi/ELProvider.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/spi/ELProvider.java Sun Mar 27 14:36:40 2011
@@ -23,13 +23,28 @@ import javax.el.ExpressionFactory;
import java.io.Serializable;
/**
+ * Decouples codi from an el-implementation which provides a simple-el-context e.g. like juel
+ *
* @author Gerhard Petracek
*/
public interface ELProvider extends Serializable
{
+ /**
+ * Creates an {@link ExpressionFactory}
+ * @return a new expression-factory
+ */
ExpressionFactory createExpressionFactory();
+ /**
+ * Create a {@link SimpleELContext}
+ * @param elResolver current el-resolver
+ * @return a new simple-el-context
+ */
SimpleELContext createELContext(ELResolver elResolver);
+ /**
+ * Creates an {@link ELResolver}
+ * @return a new el-resolver
+ */
ELResolver createELResolver();
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/spi/SimpleELContext.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/spi/SimpleELContext.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/spi/SimpleELContext.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/spi/SimpleELContext.java Sun Mar 27 14:36:40 2011
@@ -26,5 +26,11 @@ import javax.el.ValueExpression;
*/
public abstract class SimpleELContext extends ELContext
{
- public abstract ValueExpression setVariable(String variable, ValueExpression valueExpression);
+ /**
+ * Allows to map a variable to a {@link ValueExpression}
+ * @param variableName name of the variable
+ * @param valueExpression current value-expression
+ * @return the value-expression mapped to the variable
+ */
+ public abstract ValueExpression setVariable(String variableName, ValueExpression valueExpression);
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/LanguageManager.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/LanguageManager.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/LanguageManager.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/LanguageManager.java Sun Mar 27 14:36:40 2011
@@ -25,5 +25,11 @@ import org.apache.myfaces.extensions.cdi
*/
public interface LanguageManager
{
+ /**
+ * Calculates the script-language-name for the given {@link Language} definition.
+ * The name will be used for the {@link javax.script.ScriptEngineManager#getEngineByName}
+ * @param languageType language-type which will be mapped to the name of the language
+ * @return name of the script-language
+ */
String getLanguageName(Class<? extends Language> languageType);
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptLanguage.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptLanguage.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptLanguage.java Sun Mar 27 14:36:40 2011
@@ -38,5 +38,9 @@ import static java.lang.annotation.Eleme
@Documented
public @interface ScriptLanguage
{
+ /**
+ * {@link Language} which defines the script-language
+ * @return target script-language
+ */
@Nonbinding Class<? extends Language> value();
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/language/Language.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/language/Language.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/language/Language.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/language/Language.java Sun Mar 27 14:36:40 2011
@@ -23,5 +23,9 @@ package org.apache.myfaces.extensions.cd
*/
public interface Language
{
+ /**
+ * Name of the language which will be used for the {@link javax.script.ScriptEngineManager#getEngineByName}
+ * @return name of the script-language
+ */
String getName();
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultLanguageManager.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultLanguageManager.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultLanguageManager.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultLanguageManager.java Sun Mar 27 14:36:40 2011
@@ -46,6 +46,9 @@ public class DefaultLanguageManager impl
{
}
+ /**
+ * {@inheritDoc}
+ */
public String getLanguageName(Class<? extends Language> languageType)
{
Language language = this.languageCache.get(languageType);
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptExecutor.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptExecutor.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptExecutor.java Sun Mar 27 14:36:40 2011
@@ -36,6 +36,10 @@ public class DefaultScriptExecutor imple
{
private ScriptEngine scriptEngine;
+ /**
+ * Constructor which creates the executor which is awae of the current script-engine
+ * @param scriptEngine script-engine which should be used
+ */
public DefaultScriptExecutor(ScriptEngine scriptEngine)
{
this.scriptEngine = scriptEngine;
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/AbstractLanguageBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/AbstractLanguageBean.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/AbstractLanguageBean.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/AbstractLanguageBean.java Sun Mar 27 14:36:40 2011
@@ -29,6 +29,9 @@ public abstract class AbstractLanguageBe
{
}
+ /**
+ * {@inheritDoc}
+ */
public String getName()
{
return getAlternativeNames()[0];
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/BeanShellLanguageBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/BeanShellLanguageBean.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/BeanShellLanguageBean.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/BeanShellLanguageBean.java Sun Mar 27 14:36:40 2011
@@ -33,11 +33,17 @@ public class BeanShellLanguageBean exten
{
}
+ /**
+ * {@inheritDoc}
+ */
public Class<? extends Language> getId()
{
return Java.class;
}
+ /**
+ * {@inheritDoc}
+ */
public String[] getAlternativeNames()
{
return new String[] {"BeanShell", "java"};
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/FreeMarkerLanguageBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/FreeMarkerLanguageBean.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/FreeMarkerLanguageBean.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/FreeMarkerLanguageBean.java Sun Mar 27 14:36:40 2011
@@ -33,11 +33,17 @@ public class FreeMarkerLanguageBean exte
{
}
+ /**
+ * {@inheritDoc}
+ */
public Class<? extends Language> getId()
{
return FreeMarker.class;
}
+ /**
+ * {@inheritDoc}
+ */
public String[] getAlternativeNames()
{
return new String[] {"FreeMarker", "freemarker", "fm"};
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/GroovyLanguageBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/GroovyLanguageBean.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/GroovyLanguageBean.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/GroovyLanguageBean.java Sun Mar 27 14:36:40 2011
@@ -33,11 +33,17 @@ public class GroovyLanguageBean extends
{
}
+ /**
+ * {@inheritDoc}
+ */
public Class<? extends Language> getId()
{
return Groovy.class;
}
+ /**
+ * {@inheritDoc}
+ */
public String[] getAlternativeNames()
{
return new String[] {"Groovy", "groovy", "gr"};
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/JRubyLanguageBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/JRubyLanguageBean.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/JRubyLanguageBean.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/JRubyLanguageBean.java Sun Mar 27 14:36:40 2011
@@ -33,11 +33,17 @@ public class JRubyLanguageBean extends A
{
}
+ /**
+ * {@inheritDoc}
+ */
public Class<? extends Language> getId()
{
return Ruby.class;
}
+ /**
+ * {@inheritDoc}
+ */
public String[] getAlternativeNames()
{
return new String[] {"jruby", "ruby"};
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/JavaScriptLanguageBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/JavaScriptLanguageBean.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/JavaScriptLanguageBean.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/JavaScriptLanguageBean.java Sun Mar 27 14:36:40 2011
@@ -33,11 +33,17 @@ public class JavaScriptLanguageBean exte
{
}
+ /**
+ * {@inheritDoc}
+ */
public Class<? extends Language> getId()
{
return JavaScript.class;
}
+ /**
+ * {@inheritDoc}
+ */
public String[] getAlternativeNames()
{
return new String[] {"JavaScript", "javascript", "js"};
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/JythonLanguageBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/JythonLanguageBean.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/JythonLanguageBean.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/language/JythonLanguageBean.java Sun Mar 27 14:36:40 2011
@@ -33,11 +33,17 @@ public class JythonLanguageBean extends
{
}
+ /**
+ * {@inheritDoc}
+ */
public Class<? extends Language> getId()
{
return Python.class;
}
+ /**
+ * {@inheritDoc}
+ */
public String[] getAlternativeNames()
{
return new String[] {"jython", "py"};
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/spi/ExternalExpressionInterpreter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/spi/ExternalExpressionInterpreter.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/spi/ExternalExpressionInterpreter.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/spi/ExternalExpressionInterpreter.java Sun Mar 27 14:36:40 2011
@@ -23,5 +23,10 @@ package org.apache.myfaces.extensions.cd
*/
public interface ExternalExpressionInterpreter
{
+ /**
+ * Allows to modify the script before it gets evaluated
+ * @param sourceScript current script
+ * @return script which will be evaluated
+ */
String transform(String sourceScript);
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ArgumentAwareScriptHelperMap.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ArgumentAwareScriptHelperMap.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ArgumentAwareScriptHelperMap.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ArgumentAwareScriptHelperMap.java Sun Mar 27 14:36:40 2011
@@ -32,7 +32,7 @@ class ArgumentAwareScriptHelperMap exten
//HashMap due to Serializable warning in checkstyle rules
private HashMap<String, Object> arguments = new HashMap<String, Object>();
- public ArgumentAwareScriptHelperMap(String language, String arguments)
+ ArgumentAwareScriptHelperMap(String language, String arguments)
{
this.language = language;
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/DefaultExternalExpressionInterpreter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/DefaultExternalExpressionInterpreter.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/DefaultExternalExpressionInterpreter.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/DefaultExternalExpressionInterpreter.java Sun Mar 27 14:36:40 2011
@@ -28,6 +28,9 @@ import javax.enterprise.inject.Typed;
@Typed()
class DefaultExternalExpressionInterpreter implements ExternalExpressionInterpreter
{
+ /**
+ * {@inheritDoc}
+ */
public String transform(String sourceScript)
{
return sourceScript;
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptingUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptingUtils.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptingUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptingUtils.java Sun Mar 27 14:36:40 2011
@@ -35,6 +35,10 @@ public class ScriptingUtils
private static ThreadLocal<ScriptEngineManager> scriptEngineManagerCache = new ThreadLocal<ScriptEngineManager>();
+ /**
+ * Resolves the current {@link ScriptEngineManager}
+ * @return the current script-engine-manager
+ */
public static ScriptEngineManager getCurrentScriptEngineManager()
{
ScriptEngineManager scriptEngineManager = scriptEngineManagerCache.get();
@@ -48,11 +52,19 @@ public class ScriptingUtils
return scriptEngineManager;
}
+ /**
+ * Creates a new el helper map
+ * @return a new el helper
+ */
public static UnmodifiableMap<String, Object> createExpressionLanguageHelper()
{
return new ExpressionLanguageSelectionMap();
}
+ /**
+ * Resolves an {@link ExternalExpressionInterpreter}
+ * @return a scoped custom bean or a new instance of the default implementation
+ */
public static ExternalExpressionInterpreter resolveExternalExpressionInterpreter()
{
ExternalExpressionInterpreter externalExpressionInterpreter =
Modified: myfaces/extensions/cdi/trunk/test-modules/owb-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeansTestContainer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/owb-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeansTestContainer.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/owb-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeansTestContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/owb-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/StandaloneOpenWebBeansTestContainer.java Sun Mar 27 14:36:40 2011
@@ -25,6 +25,9 @@ import org.apache.webbeans.cditest.CdiTe
*/
public class StandaloneOpenWebBeansTestContainer extends AbstractOpenWebBeansTestContainer
{
+ /**
+ * Constructor which initializes the {@link org.apache.webbeans.cditest.CdiTestContainer}
+ */
public StandaloneOpenWebBeansTestContainer()
{
this.testContainer = CdiTestContainerLoader.getCdiContainer();