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/08 23:29:53 UTC
svn commit: r1079585 [2/2] - 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/projectstage/
jee...
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/EditableWindowContextManager.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/EditableWindowContextManager.java?rev=1079585&r1=1079584&r2=1079585&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/EditableWindowContextManager.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/EditableWindowContextManager.java Tue Mar 8 22:29:51 2011
@@ -27,8 +27,21 @@ import java.util.Collection;
*/
public interface EditableWindowContextManager extends WindowContextManager
{
+ /**
+ * Activates the {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext} with has
+ * the given window-id. If there is no
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext}
+ * which has the given id a new context will be created automatically.
+ * @param windowContextId window-id
+ * @return true if the context was created successfully, false otherwise
+ */
boolean activateWindowContext(String windowContextId);
+ /**
+ * Activates the given {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext}
+ * @param windowContext window-context which has to be activated
+ * @return true if the context was created successfully, false otherwise
+ */
boolean activateWindowContext(EditableWindowContext windowContext);
/*
@@ -39,21 +52,66 @@ public interface EditableWindowContextMa
void resetWindowContext(EditableWindowContext windowContext);
*/
+ /**
+ * Restarts all conversations of the current
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext}
+ */
void restartConversations();
+ /**
+ * Restarts all conversations of the
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext}
+ * with the given window-id
+ * @param windowContextId current window-id
+ */
void restartConversations(String windowContextId);
+ /**
+ * Restarts all conversations of the given
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext}
+ * @param windowContext window-context which will be restarted (the conversations of it)
+ */
void restartConversations(EditableWindowContext windowContext);
+ /**
+ * Closes all conversations of the current
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext}
+ */
void closeCurrentWindowContext();
+ /**
+ * Closes all conversations of the
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext}
+ * with the given window-id
+ * @param windowContextId current window-id
+ */
void closeWindowContext(String windowContextId);
+ /**
+ * Closes all conversations of the given
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext}
+ * @param windowContext window-context which will be closed (the conversations of it)
+ */
void closeWindowContext(EditableWindowContext windowContext);
+ /**
+ * Exposes all {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext} instances for
+ * the current user(-session)
+ * @return all window-contexts available in the current user(-session)
+ */
Collection<EditableWindowContext> getWindowContexts();
+ /**
+ * Closes all {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext} of the current
+ * user(-session)
+ */
void closeAllWindowContexts();
+ /**
+ * Evaluates if the {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext} with the
+ * given window-id is currently active
+ * @param windowContextId current window-id
+ * @return true if the window-context with the given id is active, false otherwise
+ */
boolean isWindowContextActive(String windowContextId);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java?rev=1079585&r1=1079584&r2=1079585&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java Tue Mar 8 22:29:51 2011
@@ -77,6 +77,11 @@ public abstract class ConversationUtils
// prevent instantiation
}
+ /**
+ * Calculates the conversation-group for a given {@link Bean}
+ * @param bean current bean
+ * @return class which represents the conversation-group
+ */
public static Class getConversationGroup(Bean<?> bean)
{
Class<? extends Annotation> scopeType = bean.getScope();
@@ -112,6 +117,15 @@ public abstract class ConversationUtils
}
//TODO
+
+ /**
+ * Tries to resolve the window-id via {@link WindowHandler}, request-parameters, request-map, component
+ * @param windowHandler current window-handler
+ * @param requestParameterSupported flag which indicates if it is allowed to restore the id from the request-params
+ * @param allowUnknownWindowIds flag which indicates if it is allowed to use id's which haven't been created for
+ * the current user
+ * @return restored window-id, null otherwise
+ */
public static String resolveWindowContextId(WindowHandler windowHandler,
boolean requestParameterSupported,
boolean allowUnknownWindowIds)
@@ -223,12 +237,21 @@ public abstract class ConversationUtils
return (String) requestMap.get(WindowContextManager.WINDOW_CONTEXT_ID_PARAMETER_KEY);
}
+ /**
+ * Stores the view-id of the current {@link FacesContext} as prev. view-id e.g. before a navigation occurs
+ * @param facesContext current faces-context
+ */
public static void storeCurrentViewIdAsOldViewId(FacesContext facesContext
/*TODO add window context as parameter and test it in combination with redirects*/)
{
storeCurrentViewIdAsOldViewId(facesContext, getWindowContextManager());
}
+ /**
+ * Stores the view-id of the current {@link FacesContext} as prev. view-id e.g. before a navigation occurs
+ * @param facesContext current faces-context
+ * @param windowContextManager current window-context-manager
+ */
public static void storeCurrentViewIdAsOldViewId(
FacesContext facesContext, WindowContextManager windowContextManager)
{
@@ -236,32 +259,60 @@ public abstract class ConversationUtils
windowContextManager.getCurrentWindowContext().setAttribute(OLD_VIEW_ID_KEY, oldViewId);
}
+ /**
+ * Stores the view-id of the current {@link FacesContext} as next view-id e.g. after a navigation occurred
+ * @param facesContext current faces-context
+ */
public static void storeCurrentViewIdAsNewViewId(FacesContext facesContext)
{
storeCurrentViewIdAsNewViewId(facesContext, getWindowContextManager().getCurrentWindowContext());
}
+ /**
+ * Stores the view-id of the current {@link FacesContext} as next view-id e.g. after a navigation occurred
+ * @param facesContext current faces-context
+ * @param windowContext current window-context
+ */
public static void storeCurrentViewIdAsNewViewId(FacesContext facesContext, WindowContext windowContext)
{
String newViewId = facesContext.getViewRoot().getViewId();
storeViewIdAsNewViewId(windowContext, newViewId);
}
+ /**
+ * Stores the given view-id as next view-id e.g. after a navigation occurred
+ * @param windowContext current window-context
+ * @param newViewId next view-id
+ */
public static void storeViewIdAsNewViewId(WindowContext windowContext, String newViewId)
{
windowContext.setAttribute(NEW_VIEW_ID_KEY, newViewId);
}
+ /**
+ * Exposes the prev. view-id.
+ * @return prev. view-id
+ */
public static String getOldViewId()
{
return getWindowContextManager().getCurrentWindowContext().getAttribute(OLD_VIEW_ID_KEY, String.class);
}
+ /**
+ * Exposes the next view-id.
+ * @return next view-id
+ */
public static String getNewViewId()
{
return getWindowContextManager().getCurrentWindowContext().getAttribute(NEW_VIEW_ID_KEY, String.class);
}
+ /**
+ * Resolves {@link WindowContextIdHolderComponent} which is responsible for storing the window-id in case of a
+ * server-side window-handler.
+ * @param facesContext current faces-context
+ * @return window-id holder which has been found, null otherwise
+ */
public static WindowContextIdHolderComponent getWindowContextIdHolderComponent(FacesContext facesContext)
{
UIViewRoot uiViewRoot = facesContext.getViewRoot();
@@ -316,6 +367,14 @@ public abstract class ConversationUtils
return new WindowContextIdHolderComponent(conversationManager.getCurrentWindowContext().getId());
}
+ /**
+ * Triggers a redirect via the {@link ExternalContext} or the current {@link WindowHandler}, resets caches and
+ * prevents {@link javax.faces.application.FacesMessage}s
+ * @param externalContext current external-context
+ * @param url target URL
+ * @param windowHandler current window-handler
+ * @throws IOException in case of a failed redirect
+ */
public static void sendRedirect(ExternalContext externalContext,
String url,
WindowHandler windowHandler) throws IOException
@@ -379,27 +438,52 @@ public abstract class ConversationUtils
externalContext.getRequestMap().put(REDIRECT_PERFORMED_KEY, Boolean.TRUE);
}
+ /**
+ * Resolves the current {@link WindowHandler}
+ * @return current window-handler
+ */
public static WindowHandler getWindowHandler()
{
return CodiUtils.getContextualReferenceByClass(WindowHandler.class);
}
+ /**
+ * Resolves the current {@link WindowContextManager}
+ * @return current window-context-manager
+ */
public static WindowContextManager getWindowContextManager()
{
return RequestCache.getWindowContextManager();
}
+ /**
+ * Allows to remove a window-id which has been created for a user(-session)
+ * @param externalContext current external-context
+ * @param windowContextId window-id to remove
+ * @return true if it was a known window-id, false otherwise
+ */
public static boolean removeExistingWindowId(ExternalContext externalContext, String windowContextId)
{
return getEditableWindowIdSet(externalContext).remove(windowContextId);
}
+ /**
+ * Exposes an unmodifiable representation of the active window-ids
+ * which have been generated and stored for the current user
+ * @param externalContext current external-context
+ * @return active window-ids
+ */
public static Set<String> getExistingWindowIdSet(ExternalContext externalContext)
{
Set<String> existingWindowIdSet = getEditableWindowIdSet(externalContext);
return Collections.unmodifiableSet(existingWindowIdSet);
}
+ /**
+ * Allows to store the given window-id as active window-id
+ * @param externalContext current external-context
+ * @param windowContextId window-id
+ */
public static void storeCreatedWindowContextId(ExternalContext externalContext, String windowContextId)
{
getEditableWindowIdSet(externalContext).add(windowContextId);
@@ -420,6 +504,11 @@ public abstract class ConversationUtils
return existingWindowIdSet;
}
+ /**
+ * Allows to cleanup empty or inactive {@link WindowContext}s which saves memory
+ * @param windowContextManager current window-context-manager
+ * @return true if 1-n instances were destroyed, false otherwise
+ */
public static boolean cleanupInactiveWindowContexts(EditableWindowContextManager windowContextManager)
{
Collection<EditableWindowContext> windowContexts = windowContextManager.getWindowContexts();
@@ -436,6 +525,13 @@ public abstract class ConversationUtils
return windowContexts.size() < count;
}
+ /**
+ * Maps the given conversation-group-key to a scope-annotation
+ * @param beanManager current bean-manager
+ * @param conversationGroupKey current conversation-group key
+ * @param qualifiers current qualifiers
+ * @return annotation-class of the scope
+ */
public static Class<? extends Annotation> convertToScope(
BeanManager beanManager, Class conversationGroupKey, Annotation... qualifiers)
{
@@ -496,6 +592,10 @@ public abstract class ConversationUtils
return false;
}
+ /**
+ * Performs the cleanup of inactive and empty {@link WindowContext}s (if permitted) and resets caches
+ * @param facesContext current faces-context
+ */
//don't move it to an observer due to an unpredictable invocation order
public static void postRenderCleanup(FacesContext facesContext)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/RequestCache.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/RequestCache.java?rev=1079585&r1=1079584&r2=1079585&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/RequestCache.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/RequestCache.java Tue Mar 8 22:29:51 2011
@@ -50,6 +50,9 @@ public class RequestCache
{
}
+ /**
+ * Resets all caches
+ */
public static void resetCache()
{
windowContextManagerCache.set(null);
@@ -64,12 +67,19 @@ public class RequestCache
resetConversationCache();
}
+ /**
+ * Resets conversation caches only
+ */
public static void resetConversationCache()
{
conversationCache.set(null);
conversationCache.remove();
}
+ /**
+ * Exposes the cached {@link WindowContextManager}. If there isn't a cached instance a new one will be created.
+ * @return current window-context-manager
+ */
public static WindowContextManager getWindowContextManager()
{
WindowContextManager windowContextManager = windowContextManagerCache.get();
@@ -83,6 +93,10 @@ public class RequestCache
return windowContextManager;
}
+ /**
+ * Exposes the cached {@link BeanEntryFactory}. If there isn't a cached instance a new one will be created.
+ * @return current bean-entry-factory
+ */
public static BeanEntryFactory getBeanEntryFactory()
{
BeanEntryFactory beanEntryFactory = beanEntryFactoryCache.get();
@@ -96,21 +110,40 @@ public class RequestCache
return beanEntryFactory;
}
+ /**
+ * Exposes the cached {@link WindowContext}
+ * @return cached window-context or null if there is no instance
+ */
public static WindowContext getCurrentWindowContext()
{
return windowContextCache.get();
}
+ /**
+ * Caches the current {@link WindowContext}
+ * @param windowContext current window-context
+ */
public static void setCurrentWindowContext(WindowContext windowContext)
{
windowContextCache.set(windowContext);
}
+ /**
+ * Exposes the cached {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.Conversation}
+ * for the given {@link ConversationKey}
+ * @param conversationKey current conversation-key
+ * @return cached conversation for the given key or null if there is no conversation with the given key
+ */
public static EditableConversation getConversation(ConversationKey conversationKey)
{
return getConversationCache().get(conversationKey);
}
+ /**
+ * Caches the given {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.Conversation}
+ * @param conversationKey key of the conversation
+ * @param conversation current conversation
+ */
public static void setConversation(ConversationKey conversationKey, EditableConversation conversation)
{
getConversationCache().put(conversationKey, conversation);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextWrapper.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/request/CodiFacesContextWrapper.java?rev=1079585&r1=1079584&r2=1079585&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextWrapper.java Tue Mar 8 22:29:51 2011
@@ -58,6 +58,10 @@ class CodiFacesContextWrapper extends Fa
setCurrentInstance(this);
}
+ /**
+ * Performs dependency injection manually (if permitted)
+ * {@inheritDoc}
+ */
@Override
public Application getApplication()
{
@@ -66,6 +70,10 @@ class CodiFacesContextWrapper extends Fa
this.advancedQualifierRequiredForDependencyInjection);
}
+ /**
+ * Broadcasts the {@link org.apache.myfaces.extensions.cdi.jsf.api.listener.request.AfterFacesRequest} event
+ * {@inheritDoc}
+ */
@Override
public void release()
{
@@ -104,12 +112,20 @@ class CodiFacesContextWrapper extends Fa
}
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public ExternalContext getExternalContext()
{
return this.wrappedExternalContext;
}
+ /**
+ * Adds the {@link FacesMessage} also to a request scoped list to allow to preserve them later on
+ * (in case of redirects)
+ * {@inheritDoc}
+ */
@Override
public void addMessage(String componentId, FacesMessage facesMessage)
{
@@ -131,6 +147,9 @@ class CodiFacesContextWrapper extends Fa
facesMessageEntryList.add(new FacesMessageEntry(componentId, facesMessage));
}
+ /**
+ * {@inheritDoc}
+ */
public FacesContext getWrapped()
{
return this.wrappedFacesContext;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/InjectionAwareApplicationWrapper.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/request/InjectionAwareApplicationWrapper.java?rev=1079585&r1=1079584&r2=1079585&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/InjectionAwareApplicationWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/InjectionAwareApplicationWrapper.java Tue Mar 8 22:29:51 2011
@@ -20,6 +20,7 @@ package org.apache.myfaces.extensions.cd
import static org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils.injectFields;
+import javax.enterprise.inject.Typed;
import javax.faces.application.ApplicationWrapper;
import javax.faces.application.Application;
import javax.faces.convert.Converter;
@@ -31,24 +32,32 @@ import javax.faces.validator.Validator;
* @author Gerhard Petracek
* @see org.apache.myfaces.extensions.cdi.jsf.impl.listener.phase.RestoreInjectionPointsObserver
*/
+@Typed()
class InjectionAwareApplicationWrapper extends ApplicationWrapper
{
private Application wrapped;
private boolean advancedQualifierRequiredForDependencyInjection;
- protected InjectionAwareApplicationWrapper(Application wrapped,
- boolean advancedQualifierRequiredForDependencyInjection)
+ InjectionAwareApplicationWrapper(Application wrapped,
+ boolean advancedQualifierRequiredForDependencyInjection)
{
this.wrapped = wrapped;
this.advancedQualifierRequiredForDependencyInjection = advancedQualifierRequiredForDependencyInjection;
}
+ /**
+ * {@inheritDoc}
+ */
public Application getWrapped()
{
return this.wrapped;
}
+ /**
+ * Performs dependency injection manually (if permitted).
+ * {@inheritDoc}
+ */
@Override
public Converter createConverter(String converterId)
{
@@ -56,6 +65,10 @@ class InjectionAwareApplicationWrapper e
this.advancedQualifierRequiredForDependencyInjection);
}
+ /**
+ * Performs dependency injection manually (if permitted).
+ * {@inheritDoc}
+ */
@Override
public Converter createConverter(Class targetClass)
{
@@ -63,6 +76,10 @@ class InjectionAwareApplicationWrapper e
this.advancedQualifierRequiredForDependencyInjection);
}
+ /**
+ * Performs dependency injection manually (if permitted).
+ * {@inheritDoc}
+ */
@Override
public Validator createValidator(String validatorId)
{
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=1079585&r1=1079584&r2=1079585&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 Tue Mar 8 22:29:51 2011
@@ -110,30 +110,47 @@ class NavigationCaseMapWrapper implement
return parameters;
}
+ /**
+ * @return the final size (might be a combination of the configured navigation cases (via XML) and the
+ * {@link org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig}s
+ */
public int size()
{
return this.wrappedNavigationCaseMap.size() +
this.viewConfigBasedNavigationCaseCache.size();
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isEmpty()
{
return this.wrappedNavigationCaseMap.isEmpty() &&
this.viewConfigBasedNavigationCaseCache.isEmpty();
}
+ /**
+ * {@inheritDoc}
+ */
public boolean containsKey(Object key)
{
return this.wrappedNavigationCaseMap.containsKey(key) ||
this.viewConfigBasedNavigationCaseCache.containsKey(key);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean containsValue(Object value)
{
return this.wrappedNavigationCaseMap.containsValue(value) ||
this.viewConfigBasedNavigationCaseCache.containsValue(value);
}
+ /**
+ * XML configuration overrules {@link org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig}s
+ * {@inheritDoc}
+ */
public Set<NavigationCase> get(Object key)
{
Set<NavigationCase> result = this.wrappedNavigationCaseMap.get(key);
@@ -145,26 +162,42 @@ class NavigationCaseMapWrapper implement
return result;
}
+ /**
+ * {@inheritDoc}
+ */
public Set<NavigationCase> put(String key, Set<NavigationCase> value)
{
return this.wrappedNavigationCaseMap.put(key, value);
}
+ /**
+ * {@inheritDoc}
+ */
public Set<NavigationCase> remove(Object key)
{
return this.wrappedNavigationCaseMap.remove(key);
}
+ /**
+ * {@inheritDoc}
+ */
public void putAll(Map<? extends String, ? extends Set<NavigationCase>> m)
{
this.wrappedNavigationCaseMap.putAll(m);
}
+ /**
+ * {@inheritDoc}
+ */
public void clear()
{
this.wrappedNavigationCaseMap.clear();
}
+ /**
+ * @return a combination of navigation-cases configured via XML and
+ * {@link org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig}s
+ */
public Set<String> keySet()
{
Set<String> result = new HashSet<String>();
@@ -173,6 +206,10 @@ class NavigationCaseMapWrapper implement
return result;
}
+ /**
+ * @return a combination of navigation-cases configured via XML and
+ * {@link org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig}s
+ */
public Collection<Set<NavigationCase>> values()
{
Collection<Set<NavigationCase>> result = new HashSet<Set<NavigationCase>>();
@@ -182,6 +219,10 @@ class NavigationCaseMapWrapper implement
return result;
}
+ /**
+ * @return a combination of navigation-cases configured via XML and
+ * {@link org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig}s
+ */
public Set<Entry<String, Set<NavigationCase>>> entrySet()
{
Set<Entry<String, Set<NavigationCase>>> result = new HashSet<Entry<String, Set<NavigationCase>>>();
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=1079585&r1=1079584&r2=1079585&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 Tue Mar 8 22:29:51 2011
@@ -47,11 +47,18 @@ public class RedirectedConversationAware
this.wrapped = wrapped;
}
+ /**
+ * {@inheritDoc}
+ */
public ExternalContext getWrapped()
{
return this.wrapped;
}
+ /**
+ * Adds the current window-id to the URL (if permitted)
+ * {@inheritDoc}
+ */
public String encodeActionURL(String s)
{
lazyInit();
@@ -64,6 +71,11 @@ public class RedirectedConversationAware
return this.wrapped.encodeActionURL(s);
}
+ /**
+ * Triggers a redirect which is aware of the current window and preserves the
+ * {@link javax.faces.application.FacesMessage}s.
+ * {@inheritDoc}
+ */
@Override
public void redirect(String url)
throws IOException
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/mapped/Jsf2BeanWrapper.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/Jsf2BeanWrapper.java?rev=1079585&r1=1079584&r2=1079585&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/mapped/Jsf2BeanWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/mapped/Jsf2BeanWrapper.java Tue Mar 8 22:29:51 2011
@@ -40,9 +40,9 @@ class Jsf2BeanWrapper implements Annotat
private Map<Class<? extends Annotation>, Annotation> annotations;
private Set<Annotation> annotationSet; //TODO
- public Jsf2BeanWrapper(AnnotatedType wrapped,
- Class<? extends Annotation> cdiScopeAnnotation,
- Class<? extends Annotation> jsf2ScopeAnnotation)
+ Jsf2BeanWrapper(AnnotatedType wrapped,
+ Class<? extends Annotation> cdiScopeAnnotation,
+ Class<? extends Annotation> jsf2ScopeAnnotation)
{
this.wrapped = wrapped;
Set<Annotation> originalAnnotationSet = wrapped.getAnnotations();
@@ -67,46 +67,73 @@ class Jsf2BeanWrapper implements Annotat
this.annotationSet.addAll(this.annotations.values());
}
+ /**
+ * {@inheritDoc}
+ */
public Class getJavaClass()
{
return wrapped.getJavaClass();
}
+ /**
+ * {@inheritDoc}
+ */
public Set getConstructors()
{
return wrapped.getConstructors();
}
+ /**
+ * {@inheritDoc}
+ */
public Set getMethods()
{
return wrapped.getMethods();
}
+ /**
+ * {@inheritDoc}
+ */
public Set getFields()
{
return wrapped.getFields();
}
+ /**
+ * {@inheritDoc}
+ */
public Type getBaseType()
{
return wrapped.getBaseType();
}
+ /**
+ * {@inheritDoc}
+ */
public Set<Type> getTypeClosure()
{
return wrapped.getTypeClosure();
}
+ /**
+ * {@inheritDoc}
+ */
public <T extends Annotation> T getAnnotation(Class<T> targetClass)
{
return (T)this.annotations.get(targetClass);
}
+ /**
+ * {@inheritDoc}
+ */
public Set<Annotation> getAnnotations()
{
return this.annotationSet;
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isAnnotationPresent(Class<? extends Annotation> targetClass)
{
return this.annotations.containsKey(targetClass);
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessage.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/AbstractMessage.java?rev=1079585&r1=1079584&r2=1079585&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessage.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessage.java Tue Mar 8 22:29:51 2011
@@ -78,6 +78,9 @@ public abstract class AbstractMessage im
this.arguments = null;
}
+ /**
+ * {@inheritDoc}
+ */
public Message addArgument(Serializable... arguments)
{
for (Serializable currentArgument : arguments)
@@ -197,11 +200,17 @@ public abstract class AbstractMessage im
this.arguments.add(argument);
}
+ /**
+ * {@inheritDoc}
+ */
public String getDescriptor()
{
return this.messageDescriptor;
}
+ /**
+ * {@inheritDoc}
+ */
public Serializable[] getArguments()
{
if (this.namedArguments == null && this.arguments == null)
@@ -226,6 +235,10 @@ public abstract class AbstractMessage im
return mergedArguments.toArray(new Serializable[mergedArguments.size()]);
}
+ /**
+ * Allows to add {@link MessagePayload} to the current {@link Message}
+ * @param payload payload-instance which should be added
+ */
public void addPayload(MessagePayload payload)
{
Class key = payload.getClass();
@@ -237,11 +250,17 @@ public abstract class AbstractMessage im
addPayload(key, payload);
}
+ /**
+ * {@inheritDoc}
+ */
public Map<Class, MessagePayload> getPayload()
{
return Collections.unmodifiableMap(this.messagePayload);
}
+ /**
+ * {@inheritDoc}
+ */
public Message addPayload(Class key, MessagePayload payload)
{
if (this.messagePayload.containsKey(key))
@@ -252,12 +271,18 @@ public abstract class AbstractMessage im
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public Message setMessageContextConfig(MessageContextConfig messageContextConfig)
{
this.messageContextConfig = messageContextConfig;
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextConfig getMessageContextConfig()
{
return this.messageContextConfig;
@@ -280,6 +305,9 @@ public abstract class AbstractMessage im
* generated
*/
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean equals(Object o)
{
@@ -315,6 +343,9 @@ public abstract class AbstractMessage im
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/DefaultCompositeMessageHandler.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/DefaultCompositeMessageHandler.java?rev=1079585&r1=1079584&r2=1079585&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultCompositeMessageHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultCompositeMessageHandler.java Tue Mar 8 22:29:51 2011
@@ -49,6 +49,9 @@ class DefaultCompositeMessageHandler imp
}
}
+ /**
+ * {@inheritDoc}
+ */
public void addMessage(MessageContext messageContext, Message message)
{
for (MessageHandler messageHandler : this.messageHandlers)
@@ -57,6 +60,9 @@ class DefaultCompositeMessageHandler imp
}
}
+ /**
+ * {@inheritDoc}
+ */
public void addMessageFilter(MessageFilter... messageFilters)
{
for (MessageHandler messageHandler : this.messageHandlers)
@@ -65,6 +71,9 @@ class DefaultCompositeMessageHandler imp
}
}
+ /**
+ * {@inheritDoc}
+ */
public Set<MessageFilter> getMessageFilters()
{
Set<MessageFilter> result = new HashSet<MessageFilter>();
@@ -75,6 +84,9 @@ class DefaultCompositeMessageHandler imp
return Collections.unmodifiableSet(result);
}
+ /**
+ * {@inheritDoc}
+ */
public void removeMessage(Message message)
{
for (MessageHandler messageHandler : this.messageHandlers)
@@ -83,6 +95,9 @@ class DefaultCompositeMessageHandler imp
}
}
+ /**
+ * {@inheritDoc}
+ */
public void removeAllMessages()
{
for (MessageHandler messageHandler : this.messageHandlers)
@@ -91,6 +106,9 @@ class DefaultCompositeMessageHandler imp
}
}
+ /**
+ * {@inheritDoc}
+ */
public List<Message> getMessages()
{
List<Message> result = new ArrayList<Message>();
@@ -109,6 +127,9 @@ class DefaultCompositeMessageHandler imp
return result;
}
+ /**
+ * {@inheritDoc}
+ */
public List<MessageHandler> getMessageHandlers()
{
return Collections.unmodifiableList(this.messageHandlers);
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessage.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/DefaultMessage.java?rev=1079585&r1=1079584&r2=1079585&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessage.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessage.java Tue Mar 8 22:29:51 2011
@@ -64,6 +64,9 @@ public class DefaultMessage extends Abst
super(messageDescriptor, severity, namedArguments);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public String toString()
{
@@ -74,6 +77,9 @@ public class DefaultMessage extends Abst
return toString(new DefaultMessageContext());
}
+ /**
+ * {@inheritDoc}
+ */
public String toString(MessageContext messageContext)
{
return messageContext.message()
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=1079585&r1=1079584&r2=1079585&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 Tue Mar 8 22:29:51 2011
@@ -80,6 +80,9 @@ class DefaultMessageBuilder implements M
}
}
+ /**
+ * {@inheritDoc}
+ */
public MessageBuilder payload(MessagePayload... messagePayload)
{
Class key;
@@ -96,12 +99,18 @@ class DefaultMessageBuilder implements M
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageBuilder text(String messageDescriptor)
{
this.messageDescriptor = messageDescriptor;
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageBuilder argument(Serializable... arguments)
{
for (Serializable argument : arguments)
@@ -119,12 +128,18 @@ class DefaultMessageBuilder implements M
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageBuilder namedArgument(String name, Serializable value)
{
this.namedArguments.add(new DefaultNamedArgument(name, value));
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public Message add()
{
Message result = create();
@@ -204,6 +219,9 @@ class DefaultMessageBuilder implements M
this.namedArguments = new HashSet<NamedArgument>();
}
+ /**
+ * {@inheritDoc}
+ */
public Message create()
{
Message result = buildMessage();
@@ -211,6 +229,9 @@ class DefaultMessageBuilder implements M
return result;
}
+ /**
+ * {@inheritDoc}
+ */
public String toText()
{
Message baseMessage = buildMessage();
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContext.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/DefaultMessageContext.java?rev=1079585&r1=1079584&r2=1079585&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContext.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContext.java Tue Mar 8 22:29:51 2011
@@ -46,16 +46,33 @@ public class DefaultMessageContext imple
{
}
+ /**
+ * Creates a {@link MessageContext} for the given {@link MessageContextConfig}
+ * @param config current message-context-config
+ * @return created message-context
+ */
public static MessageContext create(MessageContextConfig config)
{
return new DefaultMessageContext(config);
}
+ /**
+ * Creates a {@link MessageContext} which is aware of the given {@link MessageFactory}
+ * @param messageFactory current message-factory
+ * @return created message-context
+ */
public static MessageContext create(MessageFactory messageFactory)
{
return new DefaultMessageContext(messageFactory);
}
+ /**
+ * Creates a {@link MessageContext} for the given {@link MessageContextConfig}
+ * which is aware of the given {@link MessageFactory}
+ * @param config current message-context-config
+ * @param messageFactory current message-factory
+ * @return created message-context
+ */
public static MessageContext create(MessageContextConfig config, MessageFactory messageFactory)
{
return new DefaultMessageContext(config, messageFactory);
@@ -77,62 +94,98 @@ public class DefaultMessageContext imple
this.messageFactory = messageFactory;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageBuilder message()
{
return new DefaultMessageBuilder(this, this.messageFactory);
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextConfig config()
{
return config;
}
+ /**
+ * {@inheritDoc}
+ */
public <T extends MessageContext> T typed(Class<T> contextType)
{
//noinspection unchecked
return (T) this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContext cloneContext()
{
return config().use().create();
}
+ /**
+ * {@inheritDoc}
+ */
public void addMessage(Message message)
{
addMessage(this, message);
}
+ /**
+ * {@inheritDoc}
+ */
public void addMessage(MessageContext messageContext, Message message)
{
config().getMessageHandler().addMessage(messageContext, message);
}
+ /**
+ * {@inheritDoc}
+ */
public void addMessageFilter(MessageFilter... messageFilters)
{
config().getMessageHandler().addMessageFilter(messageFilters);
}
+ /**
+ * {@inheritDoc}
+ */
public Set<MessageFilter> getMessageFilters()
{
return config().getMessageHandler().getMessageFilters();
}
+ /**
+ * {@inheritDoc}
+ */
public void removeMessage(Message message)
{
config().getMessageHandler().removeMessage(message);
}
+ /**
+ * {@inheritDoc}
+ */
public void removeAllMessages()
{
config().getMessageHandler().removeAllMessages();
}
+ /**
+ * {@inheritDoc}
+ */
public List<Message> getMessages()
{
return config().getMessageHandler().getMessages();
}
+ /**
+ * {@inheritDoc}
+ */
public Locale getLocale()
{
return config().getLocaleResolver().getLocale();
@@ -142,6 +195,9 @@ public class DefaultMessageContext imple
* generated
*/
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean equals(Object o)
{
@@ -165,6 +221,9 @@ public class DefaultMessageContext imple
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/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=1079585&r1=1079584&r2=1079585&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 Tue Mar 8 22:29:51 2011
@@ -70,6 +70,9 @@ class DefaultMessageContextConfig implem
this.formatterFactory = messageContextConfigTemplate.getFormatterFactory();
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder use()
{
return new MessageContextBuilder()
@@ -77,66 +80,99 @@ class DefaultMessageContextConfig implem
private DefaultMessageContextConfig newMessageContextConfig =
new DefaultMessageContextConfig(DefaultMessageContextConfig.this);
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder messageInterpolator(MessageInterpolator messageInterpolator)
{
newMessageContextConfig.setMessageInterpolator(messageInterpolator);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder messageResolver(MessageResolver messageResolver)
{
newMessageContextConfig.setMessageResolver(messageResolver);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder addFormatter(Formatter formatter)
{
newMessageContextConfig.addNewFormatter(formatter);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder addFormatterConfig(Class<?> type, GenericConfig config)
{
newMessageContextConfig.addNewFormatterConfig(type, config, Locale.getDefault());
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder addFormatterConfig(Class<?> type, GenericConfig config, Locale locale)
{
addNewFormatterConfig(type, config.addProperty(Locale.class.toString(), locale), locale);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder formatterFactory(FormatterFactory formatterFactory)
{
newMessageContextConfig.setFormatterFactory(formatterFactory);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder addMessageHandler(MessageHandler messageHandler)
{
newMessageContextConfig.addNewMessageHandler(messageHandler);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder localeResolver(LocaleResolver localeResolver)
{
newMessageContextConfig.setLocaleResolver(localeResolver);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder reset()
{
newMessageContextConfig.resetMessageContextConfig();
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder clear()
{
newMessageContextConfig.clearMessageContextConfig();
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContext create()
{
return new DefaultMessageContext(this.newMessageContextConfig);
@@ -144,71 +180,106 @@ class DefaultMessageContextConfig implem
};
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder change()
{
return new MessageContextBuilder()
{
-
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder messageInterpolator(MessageInterpolator messageInterpolator)
{
setMessageInterpolator(messageInterpolator);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder messageResolver(MessageResolver messageResolver)
{
setMessageResolver(messageResolver);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder addFormatter(Formatter formatter)
{
addNewFormatter(formatter);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder addFormatterConfig(Class<?> type, GenericConfig config)
{
addNewFormatterConfig(type, config, Locale.getDefault());
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder addFormatterConfig(Class<?> type, GenericConfig config, Locale locale)
{
addNewFormatterConfig(type, config.addProperty(Locale.class.toString(), locale), locale);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder formatterFactory(FormatterFactory formatterFactory)
{
setFormatterFactory(formatterFactory);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder addMessageHandler(MessageHandler messageHandler)
{
addNewMessageHandler(messageHandler);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder localeResolver(LocaleResolver localeResolver)
{
setLocaleResolver(localeResolver);
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder reset()
{
resetMessageContextConfig();
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder clear()
{
clearMessageContextConfig();
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContext create()
{
return new DefaultMessageContext(DefaultMessageContextConfig.this);
@@ -229,26 +300,41 @@ class DefaultMessageContextConfig implem
{
}
+ /**
+ * {@inheritDoc}
+ */
public MessageInterpolator getMessageInterpolator()
{
return this.messageInterpolator;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageResolver getMessageResolver()
{
return this.messageResolver;
}
+ /**
+ * {@inheritDoc}
+ */
public LocaleResolver getLocaleResolver()
{
return this.localeResolver;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageHandler getMessageHandler()
{
return new DefaultCompositeMessageHandler(this.messageHandlers);
}
+ /**
+ * {@inheritDoc}
+ */
public FormatterFactory getFormatterFactory()
{
return this.formatterFactory;
@@ -289,6 +375,9 @@ class DefaultMessageContextConfig implem
this.formatterFactory = formatterFactory;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public String toString()
{
@@ -359,6 +448,10 @@ class DefaultMessageContextConfig implem
/*
* generated
*/
+
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean equals(Object o)
{
@@ -399,6 +492,9 @@ class DefaultMessageContextConfig implem
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/UnmodifiableMessageContext.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/UnmodifiableMessageContext.java?rev=1079585&r1=1079584&r2=1079585&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/UnmodifiableMessageContext.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/UnmodifiableMessageContext.java Tue Mar 8 22:29:51 2011
@@ -41,11 +41,17 @@ class UnmodifiableMessageContext impleme
this.messageContext = messageContext;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextConfig config()
{
return new UnmodifiableMessageContextConfig(messageContext.config());
}
+ /**
+ * {@inheritDoc}
+ */
public <T extends MessageContext> T typed(Class<T> contextType)
{
throw new IllegalStateException(UnmodifiableMessageContext.class.getName() +
@@ -75,51 +81,81 @@ class UnmodifiableMessageContext impleme
* generated
*/
+ /**
+ * {@inheritDoc}
+ */
public MessageBuilder message()
{
return messageContext.message();
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContext cloneContext()
{
return messageContext.cloneContext();
}
+ /**
+ * {@inheritDoc}
+ */
public void addMessage(Message message)
{
messageContext.addMessage(messageContext, message);
}
+ /**
+ * {@inheritDoc}
+ */
public Locale getLocale()
{
return messageContext.getLocale();
}
+ /**
+ * {@inheritDoc}
+ */
public void addMessage(MessageContext messageContext, Message message)
{
this.messageContext.addMessage(messageContext, message);
}
+ /**
+ * {@inheritDoc}
+ */
public void addMessageFilter(MessageFilter... messageFilters)
{
messageContext.addMessageFilter(messageFilters);
}
+ /**
+ * {@inheritDoc}
+ */
public Set<MessageFilter> getMessageFilters()
{
return messageContext.getMessageFilters();
}
+ /**
+ * {@inheritDoc}
+ */
public void removeMessage(Message message)
{
messageContext.removeMessage(message);
}
+ /**
+ * {@inheritDoc}
+ */
public void removeAllMessages()
{
messageContext.removeAllMessages();
}
+ /**
+ * {@inheritDoc}
+ */
public List<Message> getMessages()
{
return messageContext.getMessages();
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/UnmodifiableMessageContextConfig.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/UnmodifiableMessageContextConfig.java?rev=1079585&r1=1079584&r2=1079585&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/UnmodifiableMessageContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/UnmodifiableMessageContextConfig.java Tue Mar 8 22:29:51 2011
@@ -40,6 +40,9 @@ class UnmodifiableMessageContextConfig i
this.messageContextConfig = messageContextConfig;
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder use()
{
//it's ok to delegate - the call of #use creates a new instance of the context - the old context is untouched
@@ -47,6 +50,9 @@ class UnmodifiableMessageContextConfig i
}
+ /**
+ * {@inheritDoc}
+ */
public MessageContextBuilder change()
{
throw new IllegalStateException(MessageContextConfig.class.getName() +
@@ -56,26 +62,42 @@ class UnmodifiableMessageContextConfig i
/*
* generated
*/
+
+ /**
+ * {@inheritDoc}
+ */
public MessageInterpolator getMessageInterpolator()
{
return messageContextConfig.getMessageInterpolator();
}
+ /**
+ * {@inheritDoc}
+ */
public MessageResolver getMessageResolver()
{
return messageContextConfig.getMessageResolver();
}
+ /**
+ * {@inheritDoc}
+ */
public LocaleResolver getLocaleResolver()
{
return messageContextConfig.getLocaleResolver();
}
+ /**
+ * {@inheritDoc}
+ */
public MessageHandler getMessageHandler()
{
return messageContextConfig.getMessageHandler();
}
+ /**
+ * {@inheritDoc}
+ */
public FormatterFactory getFormatterFactory()
{
return messageContextConfig.getFormatterFactory();
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=1079585&r1=1079584&r2=1079585&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 Tue Mar 8 22:29:51 2011
@@ -41,21 +41,33 @@ public class DefaultScriptExecutor imple
this.scriptEngine = scriptEngine;
}
+ /**
+ * {@inheritDoc}
+ */
public Object eval(String script)
{
return eval(script, Object.class);
}
+ /**
+ * {@inheritDoc}
+ */
public Object eval(String script, Map<String, Object> arguments)
{
return eval(script, arguments, Object.class);
}
+ /**
+ * {@inheritDoc}
+ */
public Object eval(String script, Bindings bindings)
{
return eval(script, bindings, Object.class);
}
+ /**
+ * {@inheritDoc}
+ */
public <T> T eval(String script, Class<T> returnType)
{
try
@@ -69,11 +81,17 @@ public class DefaultScriptExecutor imple
}
}
+ /**
+ * {@inheritDoc}
+ */
public <T> T eval(String script, Map<String, Object> arguments, Class<T> returnType)
{
return eval(script, new SimpleBindings(arguments), returnType);
}
+ /**
+ * {@inheritDoc}
+ */
public <T> T eval(String script, Bindings bindings, Class<T> returnType)
{
try