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/10 16:29:07 UTC
svn commit: r1080249 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/
core/impl/src/main/java/org/apache/myface...
Author: gpetracek
Date: Thu Mar 10 15:29:06 2011
New Revision: 1080249
URL: http://svn.apache.org/viewvc?rev=1080249&view=rev
Log:
EXTCDI-151 improve javadoc
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractAttributeAware.java
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AttributeAware.java
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntry.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBean.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBeanDescriptor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigDescriptor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigResolver.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/InvalidValueAwareValidatorContext.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/SerializableValidatorFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanDescriptor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigResolver.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/LifecycleAwarePageBeanDescriptor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleFactoryWrapper.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleWrapper.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/JsfRequestLifecycleBroadcaster.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/CodiRenderKitFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InterceptedRenderKit.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleFactoryWrapper.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleWrapper.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/system/CodiJsf2SystemEventListener.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/CodiRenderKitFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/InterceptedRenderKit.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java
myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptBuilder.java
myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptExecutor.java
myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptBuilder.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractAttributeAware.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractAttributeAware.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractAttributeAware.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractAttributeAware.java Thu Mar 10 15:29:06 2011
@@ -33,11 +33,17 @@ public abstract class AbstractAttributeA
private Map<String, Object> configAttributes;
+ /**
+ * {@inheritDoc}
+ */
public boolean setAttribute(String name, Object value)
{
return setAttribute(name, value, true);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean setAttribute(String name, Object value, boolean forceOverride)
{
if(!forceOverride && containsAttribute(name))
@@ -48,11 +54,17 @@ public abstract class AbstractAttributeA
return true;
}
+ /**
+ * {@inheritDoc}
+ */
public boolean containsAttribute(String name)
{
return this.getConfigAttributeMap().containsKey(name);
}
+ /**
+ * {@inheritDoc}
+ */
@SuppressWarnings({"unchecked"})
public <T> T getAttribute(String name, Class<T> targetType)
{
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AttributeAware.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AttributeAware.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AttributeAware.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AttributeAware.java Thu Mar 10 15:29:06 2011
@@ -29,11 +29,36 @@ import java.io.Serializable;
*/
public interface AttributeAware extends Serializable
{
+ /**
+ * Sets an attribute
+ * @param name name of the attribute
+ * @param value value of the attribute (null values aren't allowed)
+ * @return true if it was possible to set the value
+ */
boolean setAttribute(String name, Object value);
+ /**
+ * Sets or updates an attribute
+ * @param name name of the attribute
+ * @param value value of the attribute
+ * @param forceOverride flag which indicates if it is permitted to override an existing value
+ * @return true if it was possible to set the value
+ */
boolean setAttribute(String name, Object value, boolean forceOverride);
+ /**
+ * Returns true if there is a value for the given name
+ * @param name name of the argument in question
+ * @return true if there is a value for the given name, false otherwise
+ */
boolean containsAttribute(String name);
+ /**
+ * Exposes the value for the given name
+ * @param name name of the attribute
+ * @param targetType type of the attribute
+ * @param <T> current type
+ * @return value of the attribute, or null if there is no attribute with the given name
+ */
<T> T getAttribute(String name, Class<T> targetType);
}
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java Thu Mar 10 15:29:06 2011
@@ -93,7 +93,7 @@ import java.util.logging.Logger;
@Typed()
public abstract class ProjectStage implements Serializable
{
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -1210639662598734888L;
/**
* This map contains a static map with all registered projectStages.
@@ -185,7 +185,9 @@ public abstract class ProjectStage imple
return psName;
}
-
+ /**
+ * Project-stage for unit-tests
+ */
@Typed()
public static final class UnitTest extends ProjectStage
{
@@ -197,6 +199,9 @@ public abstract class ProjectStage imple
*/
public static final UnitTest UnitTest = new UnitTest();
+ /**
+ * Project-stage for development
+ */
@Typed()
public static final class Development extends ProjectStage
{
@@ -208,6 +213,9 @@ public abstract class ProjectStage imple
*/
public static final Development Development = new Development();
+ /**
+ * Project-stage for system-tests
+ */
@Typed()
public static final class SystemTest extends ProjectStage
{
@@ -219,6 +227,9 @@ public abstract class ProjectStage imple
*/
public static final SystemTest SystemTest = new SystemTest();
+ /**
+ * Project-stage for integration-tests
+ */
@Typed()
public static final class IntegrationTest extends ProjectStage
{
@@ -230,6 +241,9 @@ public abstract class ProjectStage imple
*/
public static final IntegrationTest IntegrationTest = new IntegrationTest();
+ /**
+ * Project-stage for staging
+ */
@Typed()
public static final class Staging extends ProjectStage
{
@@ -241,6 +255,9 @@ public abstract class ProjectStage imple
*/
public static final Staging Staging = new Staging();
+ /**
+ * Default project-stage for production
+ */
@Typed()
public static final class Production extends ProjectStage
{
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java Thu Mar 10 15:29:06 2011
@@ -30,21 +30,33 @@ class DefaultLoggerFactory implements Lo
{
private static final long serialVersionUID = -4149574697548186019L;
+ /**
+ * {@inheritDoc}
+ */
public Logger getLogger(String s)
{
return new DefaultLogger(s);
}
+ /**
+ * {@inheritDoc}
+ */
public Logger getLogger(String s, String s1)
{
return new DefaultLogger(s, s1, false);
}
+ /**
+ * {@inheritDoc}
+ */
public Logger getAnonymousLogger()
{
return new DefaultLogger();
}
+ /**
+ * {@inheritDoc}
+ */
public Logger getAnonymousLogger(String s)
{
return new DefaultLogger(null, s, true);
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntry.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntry.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntry.java Thu Mar 10 15:29:06 2011
@@ -27,20 +27,49 @@ import java.io.Serializable;
*/
public interface BeanEntry<T> extends Serializable
{
+ /**
+ * {@link Bean} of the current entry
+ * @return current bean
+ */
Bean<T> getBean();
+ /**
+ * {@link CreationalContext} of the current entry
+ * @return creational-context of the bean
+ */
CreationalContext<T> getCreationalContext();
+ /**
+ * Scoped instance which was created based on the {@link Bean} of the current entry.
+ * If it hasn't been created, it will be created automatically.
+ * @return instance of the bean
+ */
T getBeanInstance();
/**
+ * Resets the bean instance to null
* @return the old instance
*/
T resetBeanInstance();
+ /**
+ * Flag which indicates if the
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.event.ScopeBeanEvent} is enabled
+ * @return true if the event is enabled, false otherwise
+ */
boolean isScopeBeanEventEnabled();
+ /**
+ * Flag which indicates if the
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.event.AccessBeanEvent} is enabled
+ * @return true if the event is enabled, false otherwise
+ */
boolean isAccessBeanEventEnabled();
+ /**
+ * Flag which indicates if the
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.event.UnscopeBeanEvent} is enabled
+ * @return true if the event is enabled, false otherwise
+ */
boolean isUnscopeBeanEventEnabled();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java Thu Mar 10 15:29:06 2011
@@ -64,26 +64,42 @@ class InjectableValidator implements Val
/*
* generated
*/
+
+ /**
+ * {@inheritDoc}
+ */
public <T> Set<ConstraintViolation<T>> validate(T t, Class<?>... classes)
{
return getWrapped().validate(t, classes);
}
+ /**
+ * {@inheritDoc}
+ */
public <T> Set<ConstraintViolation<T>> validateProperty(T t, String s, Class<?>... classes)
{
return getWrapped().validateProperty(t, s, classes);
}
+ /**
+ * {@inheritDoc}
+ */
public <T> Set<ConstraintViolation<T>> validateValue(Class<T> tClass, String s, Object o, Class<?>... classes)
{
return getWrapped().validateValue(tClass, s, o, classes);
}
+ /**
+ * {@inheritDoc}
+ */
public BeanDescriptor getConstraintsForClass(Class<?> aClass)
{
return getWrapped().getConstraintsForClass(aClass);
}
+ /**
+ * {@inheritDoc}
+ */
public <T> T unwrap(Class<T> tClass)
{
return getWrapped().unwrap(tClass);
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java Thu Mar 10 15:29:06 2011
@@ -40,6 +40,9 @@ class InjectableValidatorFactory impleme
private transient ValidatorFactory wrapped;
+ /**
+ * Default constructor
+ */
public InjectableValidatorFactory()
{
}
@@ -66,31 +69,50 @@ class InjectableValidatorFactory impleme
/*
* generated
*/
+
+ /**
+ * {@inheritDoc}
+ */
public Validator getValidator()
{
return getWrapped().getValidator();
}
+ /**
+ * {@inheritDoc}
+ */
public ValidatorContext usingContext()
{
return getWrapped().usingContext();
}
+ /**
+ * {@inheritDoc}
+ */
public MessageInterpolator getMessageInterpolator()
{
return getWrapped().getMessageInterpolator();
}
+ /**
+ * {@inheritDoc}
+ */
public TraversableResolver getTraversableResolver()
{
return getWrapped().getTraversableResolver();
}
+ /**
+ * {@inheritDoc}
+ */
public ConstraintValidatorFactory getConstraintValidatorFactory()
{
return getWrapped().getConstraintValidatorFactory();
}
+ /**
+ * {@inheritDoc}
+ */
public <T> T unwrap(Class<T> tClass)
{
return getWrapped().unwrap(tClass);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java Thu Mar 10 15:29:06 2011
@@ -39,22 +39,41 @@ import static java.lang.annotation.Reten
@Documented
public @interface Page
{
+ /**
+ * Allows to specify a custom base-path for the page represented by the view-conig
+ * @return base-path
+ */
String basePath() default ".";
+ /**
+ * Allows to specify a custom (file-)name for the page represented by the view-conig
+ * @return name of the page
+ */
String name() default "";
+ /**
+ * Allows to specify the (file-)extension for the page represented by the view-conig
+ * @return extension of the page
+ */
//TODO config for default extension
String extension() default Extension.XHTML;
+ /**
+ * Allows to specify navigation-mode which should be used to navigate to the page represented by the view-config
+ * @return navigation-mode which should be used to navigate to the page represented by the view-config
+ */
//TODO config for default navigation mode
NavigationMode navigation() default NavigationMode.DEFAULT;
/**
* for including view params in jsf2
- * @return
+ * @return the strategy which should be used by jsf2 for handling view-parameters (for the navigation)
*/
ViewParameterMode viewParams() default ViewParameterMode.DEFAULT;
+ /**
+ * Extension of the markup file
+ */
public interface Extension
{
String XHTML = "xhtml";
@@ -63,11 +82,17 @@ public @interface Page
String JSP = "jsp";
}
+ /**
+ * Type of the navigation which should be used by the {@link javax.faces.application.NavigationHandler}
+ */
public enum NavigationMode
{
DEFAULT, FORWARD, REDIRECT
}
+ /**
+ * Mode specifies if JSF2 should include view-params
+ */
public enum ViewParameterMode
{
DEFAULT, INCLUDE, EXCLUDE
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBean.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBean.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBean.java Thu Mar 10 15:29:06 2011
@@ -40,15 +40,30 @@ import static java.lang.annotation.Reten
@Documented
public @interface PageBean
{
+ /**
+ * Class of the page-bean
+ * @return class of the page-bean
+ */
Class value();
+ /**
+ * Optional name of the page-bean
+ * @return name of the page-bean
+ */
String name() default "";
+ /**
+ * Allows to specify multiple page-beans
+ */
@Target(TYPE)
@Retention(RUNTIME)
@Documented
public static @interface List
{
+ /**
+ * Allows to specify multiple page-beans
+ * @return page-bean annotations
+ */
PageBean[] value();
}
}
\ No newline at end of file
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBeanDescriptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBeanDescriptor.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBeanDescriptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBeanDescriptor.java Thu Mar 10 15:29:06 2011
@@ -23,7 +23,15 @@ package org.apache.myfaces.extensions.cd
*/
public interface PageBeanDescriptor
{
+ /**
+ * Class of the configured page-bean which is represented by this entry
+ * @return class of the configured page-bean
+ */
Class getBeanClass();
+ /**
+ * Name of the configured page-bean which is represented by this entry
+ * @return name of the configured page-bean
+ */
String getBeanName();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigDescriptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigDescriptor.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigDescriptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigDescriptor.java Thu Mar 10 15:29:06 2011
@@ -29,15 +29,40 @@ import java.util.List;
*/
public interface ViewConfigDescriptor
{
+ /**
+ * View-ID of the current descriptor
+ * @return current view-id
+ */
String getViewId();
+ /**
+ * Class which was used for creating the current descriptor
+ * @return view-config class
+ */
Class<? extends ViewConfig> getViewConfig();
+ /**
+ * Navigation type which should be used if type-safe navigation is used
+ * @return configured navigation mode
+ */
Page.NavigationMode getNavigationMode();
+ /**
+ * Custom meta-data which is configured for the entry. It allows to provide and resolve custom meta-data annotated
+ * with {@link org.apache.myfaces.extensions.cdi.core.api.config.view.ViewMetaData}
+ * @return custom meta-data of the current entry
+ */
List<Annotation> getMetaData();
+ /**
+ * {@link AccessDecisionVoter}s which should be invoked to secure the page represented by the current entry.
+ * @return configured access-decision-voters
+ */
List<Class<? extends AccessDecisionVoter>> getAccessDecisionVoters();
+ /**
+ * Page-bean descriptors for the page represented by the current entry.
+ * @return descriptors which represent the page-beans for the current page
+ */
List<PageBeanDescriptor> getPageBeanConfigs();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigResolver.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigResolver.java Thu Mar 10 15:29:06 2011
@@ -28,13 +28,36 @@ import java.util.List;
*/
public interface ViewConfigResolver extends Serializable
{
+ /**
+ * Resolves the {@link ViewConfigDescriptor} for the given view-id
+ * @param viewId view-id of the page
+ * @return view-config-descriptor which represents the given view-id, null otherwise
+ */
ViewConfigDescriptor getViewConfig(String viewId);
+ /**
+ * Resolves the {@link ViewConfigDescriptor} for the given view-config-class
+ * @param viewDefinitionClass view-config-class of the page
+ * @return view-config-descriptor which represents the given view-config-class
+ */
ViewConfigDescriptor getViewConfig(Class<? extends ViewConfig> viewDefinitionClass);
+ /**
+ * Resolves all descriptors for the known {@link ViewConfig}s
+ * @return all descriptors for the known view-configs
+ */
List<ViewConfigDescriptor> getViewConfigs();
+ /**
+ * Resolves the descriptor for the default-error page
+ * @return descriptor for the default-error page
+ */
ViewConfigDescriptor getDefaultErrorViewConfig();
+ /**
+ * Resolves the descriptor for the inline- (or default-) error-page
+ * @param viewDefinitionClass view-config class which should be inspected concerning an inline-error-page
+ * @return descriptor for the error page
+ */
ViewConfigDescriptor getErrorViewConfig(Class<? extends ViewConfig> viewDefinitionClass);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/InvalidValueAwareValidatorContext.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/bv/resolver/InvalidValueAwareValidatorContext.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/InvalidValueAwareValidatorContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/InvalidValueAwareValidatorContext.java Thu Mar 10 15:29:06 2011
@@ -40,6 +40,9 @@ class InvalidValueAwareValidatorContext
this.wrapped = wrapped;
}
+ /**
+ * {@inheritDoc}
+ */
public ValidatorContext messageInterpolator(MessageInterpolator messageInterpolator)
{
MessageInterpolator messageInterpolatorWrapper = new InvalidValueAwareMessageInterpolator(messageInterpolator);
@@ -50,16 +53,26 @@ class InvalidValueAwareValidatorContext
/*
* generated
*/
+
+ /**
+ * {@inheritDoc}
+ */
public ValidatorContext traversableResolver(TraversableResolver traversableResolver)
{
return wrapped.traversableResolver(traversableResolver);
}
+ /**
+ * {@inheritDoc}
+ */
public ValidatorContext constraintValidatorFactory(ConstraintValidatorFactory constraintValidatorFactory)
{
return wrapped.constraintValidatorFactory(constraintValidatorFactory);
}
+ /**
+ * {@inheritDoc}
+ */
public Validator getValidator()
{
return wrapped.getValidator();
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/SerializableValidatorFactory.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/bv/resolver/SerializableValidatorFactory.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/SerializableValidatorFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/SerializableValidatorFactory.java Thu Mar 10 15:29:06 2011
@@ -55,31 +55,49 @@ class SerializableValidatorFactory imple
{
}
+ /**
+ * {@inheritDoc}
+ */
public Validator getValidator()
{
return getValidatorFactory().getValidator();
}
+ /**
+ * {@inheritDoc}
+ */
public ValidatorContext usingContext()
{
return getValidatorFactory().usingContext();
}
+ /**
+ * {@inheritDoc}
+ */
public MessageInterpolator getMessageInterpolator()
{
return getValidatorFactory().getMessageInterpolator();
}
+ /**
+ * {@inheritDoc}
+ */
public TraversableResolver getTraversableResolver()
{
return getValidatorFactory().getTraversableResolver();
}
+ /**
+ * {@inheritDoc}
+ */
public ConstraintValidatorFactory getConstraintValidatorFactory()
{
return getValidatorFactory().getConstraintValidatorFactory();
}
+ /**
+ * {@inheritDoc}
+ */
public <T> T unwrap(Class<T> tClass)
{
return getValidatorFactory().unwrap(tClass);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanDescriptor.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/config/view/DefaultPageBeanDescriptor.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanDescriptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanDescriptor.java Thu Mar 10 15:29:06 2011
@@ -61,37 +61,57 @@ class DefaultPageBeanDescriptor implemen
this.phasesLifecycleCallbacks = Collections.unmodifiableMap(findCallbackDefinitions(beanClass));
}
+ /**
+ * {@inheritDoc}
+ */
public String getBeanName()
{
return beanName;
}
+ /**
+ * {@inheritDoc}
+ */
public Class getBeanClass()
{
return beanClass;
}
+ /**
+ * {@inheritDoc}
+ */
public RequestLifecycleCallbackEntry getPhasesLifecycleCallback(PhaseId phaseId)
{
return phasesLifecycleCallbacks.get(phaseId);
}
-
+ /**
+ * {@inheritDoc}
+ */
public List<Method> getInitViewMethods()
{
return Collections.unmodifiableList(this.initViewMethods);
}
+ /**
+ * {@inheritDoc}
+ */
public List<Method> getPrePageActionMethods()
{
return Collections.unmodifiableList(this.prePageActionMethods);
}
+ /**
+ * {@inheritDoc}
+ */
public List<Method> getPreRenderViewMethods()
{
return Collections.unmodifiableList(this.preRenderViewMethods);
}
+ /**
+ * {@inheritDoc}
+ */
public List<Method> getPostRenderViewMethods()
{
return Collections.unmodifiableList(this.postRenderViewMethods);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigResolver.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/config/view/DefaultViewConfigResolver.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigResolver.java Thu Mar 10 15:29:06 2011
@@ -35,16 +35,25 @@ public class DefaultViewConfigResolver i
{
private static final long serialVersionUID = 5092196084535892957L;
+ /**
+ * {@inheritDoc}
+ */
public ViewConfigDescriptor getViewConfig(String viewId)
{
return ViewConfigCache.getViewConfig(viewId);
}
+ /**
+ * {@inheritDoc}
+ */
public ViewConfigDescriptor getDefaultErrorViewConfig()
{
return ViewConfigCache.getDefaultErrorView();
}
+ /**
+ * {@inheritDoc}
+ */
public ViewConfigDescriptor getErrorViewConfig(Class<? extends ViewConfig> viewDefinitionClass)
{
ViewConfigDescriptor viewConfigDescriptor = getViewConfig(viewDefinitionClass);
@@ -62,12 +71,18 @@ public class DefaultViewConfigResolver i
return getViewConfig(errorView);
}
+ /**
+ * {@inheritDoc}
+ */
public List<ViewConfigDescriptor> getViewConfigs()
{
return Collections
.unmodifiableList((List<? extends ViewConfigDescriptor>) ViewConfigCache.getViewConfigDescriptors());
}
+ /**
+ * {@inheritDoc}
+ */
public ViewConfigDescriptor getViewConfig(Class<? extends ViewConfig> viewDefinitionClass)
{
return ViewConfigCache.getViewConfig(viewDefinitionClass);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.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/config/view/ViewConfigCache.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java Thu Mar 10 15:29:06 2011
@@ -99,11 +99,20 @@ public class ViewConfigCache
storeViewConfigDescriptor(viewId, viewDefinitionEntry, true);
}
+ /**
+ * Resolves the {@link ViewConfigDescriptor} for the given view-id
+ * @param viewId view-id of the page
+ * @return view-config-descriptor which represents the given view-id, null otherwise
+ */
public static ViewConfigDescriptor getViewConfig(String viewId)
{
return getViewIdToViewDefinitionEntryMapping(true).get(viewId);
}
+ /**
+ * Resolves all descriptors for the known {@link ViewConfig}s
+ * @return all descriptors for the known view-configs
+ */
public static Collection<ViewConfigDescriptor> getViewConfigDescriptors()
{
Map<String, ViewConfigDescriptor> entryMap = getViewIdToViewDefinitionEntryMapping(true);
@@ -111,11 +120,20 @@ public class ViewConfigCache
return entryMap.values();
}
+ /**
+ * Resolves the {@link ViewConfigDescriptor} for the given view-config-class
+ * @param viewDefinitionClass view-config-class of the page
+ * @return view-config-descriptor which represents the given view-config-class
+ */
public static ViewConfigDescriptor getViewConfig(Class<? extends ViewConfig> viewDefinitionClass)
{
return getViewDefinitionToViewDefinitionEntryMapping(true).get(viewDefinitionClass);
}
+ /**
+ * Resolves the descriptor for the default-error page
+ * @return descriptor for the default-error page
+ */
public static ViewConfigDescriptor getDefaultErrorView()
{
lazyInlineViewConfigCompilation();
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/LifecycleAwarePageBeanDescriptor.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/config/view/spi/LifecycleAwarePageBeanDescriptor.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/LifecycleAwarePageBeanDescriptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/LifecycleAwarePageBeanDescriptor.java Thu Mar 10 15:29:06 2011
@@ -29,13 +29,40 @@ import java.util.List;
*/
public interface LifecycleAwarePageBeanDescriptor extends PageBeanDescriptor
{
+ /**
+ * Exposes the lifecycle-callbacks annotated with
+ * {@link org.apache.myfaces.extensions.cdi.jsf.api.config.view.InitView}
+ * @return init-view lifecycle-callback methods
+ */
List<Method> getInitViewMethods();
+ /**
+ * Exposes the lifecycle-callbacks annotated with
+ * {@link org.apache.myfaces.extensions.cdi.jsf.api.config.view.PrePageAction}
+ * @return pre-page-action lifecycle-callback methods
+ */
List<Method> getPrePageActionMethods();
+ /**
+ * Exposes the lifecycle-callbacks annotated with
+ * {@link org.apache.myfaces.extensions.cdi.jsf.api.config.view.PreRenderView}
+ * @return pre-render-view lifecycle-callback methods
+ */
List<Method> getPreRenderViewMethods();
+ /**
+ * Exposes the lifecycle-callbacks annotated with
+ * {@link org.apache.myfaces.extensions.cdi.jsf.api.config.view.PostRenderView}
+ * @return post-render-view lifecycle-callback methods
+ */
List<Method> getPostRenderViewMethods();
+ /**
+ * Exposes the entry for the lifecycle-callbacks
+ * ({@link org.apache.myfaces.extensions.cdi.jsf.api.listener.phase.BeforePhase} and/or
+ * {@link org.apache.myfaces.extensions.cdi.jsf.api.listener.phase.AfterPhase}) for the given {@link PhaseId}
+ * @param phaseId current phase-id
+ * @return entry for the lifecycle-callbacks
+ */
RequestLifecycleCallbackEntry getPhasesLifecycleCallback(PhaseId phaseId);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.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/config/view/spi/RequestLifecycleCallbackEntry.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.java Thu Mar 10 15:29:06 2011
@@ -26,7 +26,17 @@ import java.util.List;
*/
public interface RequestLifecycleCallbackEntry
{
+ /**
+ * Exposes the lifecycle callbacks annotated with
+ * {@link org.apache.myfaces.extensions.cdi.jsf.api.listener.phase.BeforePhase}
+ * @return before-phase lifecycle callbacks
+ */
List<Method> getBeforePhaseCallbacks();
+ /**
+ * Exposes the lifecycle callbacks annotated with
+ * {@link org.apache.myfaces.extensions.cdi.jsf.api.listener.phase.AfterPhase}
+ * @return after-phase lifecycle callbacks
+ */
List<Method> getAfterPhaseCallbacks();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleFactoryWrapper.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/listener/phase/CodiLifecycleFactoryWrapper.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleFactoryWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleFactoryWrapper.java Thu Mar 10 15:29:06 2011
@@ -39,11 +39,17 @@ public class CodiLifecycleFactoryWrapper
this.deactivated = !isActivated();
}
+ /**
+ * {@inheritDoc}
+ */
public void addLifecycle(String s, Lifecycle lifecycle)
{
wrapped.addLifecycle(s, lifecycle);
}
+ /**
+ * {@inheritDoc}
+ */
public Lifecycle getLifecycle(String s)
{
Lifecycle result = this.wrapped.getLifecycle(s);
@@ -55,11 +61,17 @@ public class CodiLifecycleFactoryWrapper
return new CodiLifecycleWrapper(result, PhaseListenerExtension.consumePhaseListeners());
}
+ /**
+ * {@inheritDoc}
+ */
public Iterator<String> getLifecycleIds()
{
return wrapped.getLifecycleIds();
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleWrapper.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/listener/phase/CodiLifecycleWrapper.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleWrapper.java Thu Mar 10 15:29:06 2011
@@ -57,11 +57,21 @@ class CodiLifecycleWrapper extends Lifec
}
}
+ /**
+ * {@inheritDoc}
+ */
public void addPhaseListener(PhaseListener phaseListener)
{
wrapped.addPhaseListener(phaseListener);
}
+ /**
+ * Broadcasts {@link org.apache.myfaces.extensions.cdi.core.api.startup.event.StartupEvent} and
+ * {@link org.apache.myfaces.extensions.cdi.jsf.api.listener.request.BeforeFacesRequest} btw.
+ * {@link org.apache.myfaces.extensions.cdi.jsf.api.listener.request.AfterFacesRequest}
+ *
+ * {@inheritDoc}
+ */
public void execute(FacesContext facesContext)
{
broadcastApplicationStartupBroadcaster();
@@ -82,16 +92,27 @@ class CodiLifecycleWrapper extends Lifec
wrapped.execute(facesContext);
}
+ /**
+ * {@inheritDoc}
+ */
public PhaseListener[] getPhaseListeners()
{
return this.wrapped.getPhaseListeners();
}
+ /**
+ * {@inheritDoc}
+ */
public void removePhaseListener(PhaseListener phaseListener)
{
wrapped.removePhaseListener(phaseListener);
}
+ /**
+ * Performs cleanup tasks after the rendering process
+ *
+ * {@inheritDoc}
+ */
public void render(FacesContext facesContext)
{
wrapped.render(facesContext);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/JsfRequestLifecycleBroadcaster.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/listener/phase/JsfRequestLifecycleBroadcaster.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/JsfRequestLifecycleBroadcaster.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/JsfRequestLifecycleBroadcaster.java Thu Mar 10 15:29:06 2011
@@ -80,6 +80,9 @@ public class JsfRequestLifecycleBroadcas
{
private static final long serialVersionUID = 849645435335842723L;
+ /**
+ * {@inheritDoc}
+ */
public JsfPhaseId value()
{
return JsfPhaseId.convertFromFacesClass(phaseId);
@@ -93,6 +96,9 @@ public class JsfRequestLifecycleBroadcas
{
private static final long serialVersionUID = 490037768660184656L;
+ /**
+ * {@inheritDoc}
+ */
public JsfPhaseId value()
{
return JsfPhaseId.convertFromFacesClass(phaseId);
@@ -103,31 +109,50 @@ public class JsfRequestLifecycleBroadcas
/*
* implementation of JsfLifecyclePhaseInformation methods
*/
+
+ /**
+ * {@inheritDoc}
+ */
public boolean isRestoreViewPhase()
{
return javax.faces.event.PhaseId.RESTORE_VIEW.equals(this.facesPhaseId);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isApplyRequestValuesPhase()
{
return javax.faces.event.PhaseId.APPLY_REQUEST_VALUES.equals(this.facesPhaseId);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isProcessValidationsPhase()
{
return javax.faces.event.PhaseId.PROCESS_VALIDATIONS.equals(this.facesPhaseId);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isUpdateModelValuesPhase()
{
return javax.faces.event.PhaseId.UPDATE_MODEL_VALUES.equals(this.facesPhaseId);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isInvokeApplicationPhase()
{
return javax.faces.event.PhaseId.INVOKE_APPLICATION.equals(this.facesPhaseId);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isRenderResponsePhase()
{
return javax.faces.event.PhaseId.RENDER_RESPONSE.equals(this.facesPhaseId);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextFactory.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/listener/request/CodiFacesContextFactory.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextFactory.java Thu Mar 10 15:29:06 2011
@@ -40,6 +40,11 @@ public class CodiFacesContextFactory ext
this.deactivated = !isActivated();
}
+ /**
+ * Wrapps the created {@link FacesContext} with {@link CodiFacesContextWrapper}
+ *
+ * {@inheritDoc}
+ */
public FacesContext getFacesContext(Object context,
Object request,
Object response,
@@ -72,7 +77,9 @@ public class CodiFacesContextFactory ext
return new CodiFacesContextWrapper(facesContext);
}
-
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.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/ClientSideWindowHandler.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java Thu Mar 10 15:29:06 2011
@@ -80,6 +80,9 @@ public class ClientSideWindowHandler ext
super(config);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public String encodeURL(String url)
{
@@ -95,6 +98,9 @@ public class ClientSideWindowHandler ext
}
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public String restoreWindowId(ExternalContext externalContext)
{
@@ -109,6 +115,9 @@ public class ClientSideWindowHandler ext
}
}
+ /**
+ * {@inheritDoc}
+ */
public void beforeLifecycleExecute(FacesContext facesContext)
{
if (!isClientSideWindowHandlerRequest())
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/CodiRenderKitFactory.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/CodiRenderKitFactory.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/CodiRenderKitFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/CodiRenderKitFactory.java Thu Mar 10 15:29:06 2011
@@ -53,11 +53,19 @@ public class CodiRenderKitFactory extend
}
}
+ /**
+ * {@inheritDoc}
+ */
public void addRenderKit(String s, RenderKit renderKit)
{
wrapped.addRenderKit(s, renderKit);
}
+ /**
+ * Creates an intercepted {@link RenderKit} in order to wrap the {@link javax.faces.context.ResponseWriter}
+ *
+ * {@inheritDoc}
+ */
public RenderKit getRenderKit(FacesContext facesContext, String s)
{
RenderKit renderKit = wrapped.getRenderKit(facesContext, s);
@@ -113,11 +121,17 @@ public class CodiRenderKitFactory extend
}
}
+ /**
+ * {@inheritDoc}
+ */
public Iterator<String> getRenderKitIds()
{
return wrapped.getRenderKitIds();
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowHandler.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/DefaultWindowHandler.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowHandler.java Thu Mar 10 15:29:06 2011
@@ -60,6 +60,9 @@ public class DefaultWindowHandler implem
this.useWindowAwareUrlEncoding = config.isUrlParameterSupported();
}
+ /**
+ * {@inheritDoc}
+ */
public String encodeURL(String url)
{
if(this.useWindowAwareUrlEncoding)
@@ -69,6 +72,9 @@ public class DefaultWindowHandler implem
return url;
}
+ /**
+ * {@inheritDoc}
+ */
public void sendRedirect(ExternalContext externalContext, String url, boolean addRequestParameter)
throws IOException
{
@@ -94,6 +100,9 @@ public class DefaultWindowHandler implem
externalContext.redirect(url);
}
+ /**
+ * {@inheritDoc}
+ */
//TODO add a counter in case of project stage dev
public String createWindowId()
{
@@ -146,6 +155,9 @@ public class DefaultWindowHandler implem
return windowContextIdHolderComponent.getWindowContextId();
}
+ /**
+ * {@inheritDoc}
+ */
public String restoreWindowId(ExternalContext externalContext)
{
if(!this.useWindowAwareUrlEncoding)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InterceptedRenderKit.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/InterceptedRenderKit.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InterceptedRenderKit.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InterceptedRenderKit.java Thu Mar 10 15:29:06 2011
@@ -38,21 +38,36 @@ class InterceptedRenderKit extends Rende
this.wrapped = wrapped;
}
+ /**
+ * {@inheritDoc}
+ */
public void addRenderer(String s, String s1, Renderer renderer)
{
wrapped.addRenderer(s, s1, renderer);
}
+ /**
+ * {@inheritDoc}
+ */
public Renderer getRenderer(String s, String s1)
{
return wrapped.getRenderer(s, s1);
}
+ /**
+ * {@inheritDoc}
+ */
public ResponseStateManager getResponseStateManager()
{
return wrapped.getResponseStateManager();
}
+ /**
+ * Creates an intercepted {@link ResponseWriter} which adds a {@link WindowContextIdHolderComponent} to the
+ * component tree.
+ *
+ * {@inheritDoc}
+ */
public ResponseWriter createResponseWriter(Writer writer, String s, String s1)
{
ResponseWriter responseWriter = wrapped.createResponseWriter(writer, s, s1);
@@ -65,6 +80,9 @@ class InterceptedRenderKit extends Rende
return new InterceptedResponseWriter(responseWriter);
}
+ /**
+ * {@inheritDoc}
+ */
public ResponseStream createResponseStream(OutputStream outputStream)
{
return wrapped.createResponseStream(outputStream);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowHandler.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/WindowHandler.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowHandler.java Thu Mar 10 15:29:06 2011
@@ -27,11 +27,32 @@ import java.io.Serializable;
*/
public interface WindowHandler extends Serializable
{
+ /**
+ * Allows to intercept the URL encoding
+ * @param url URL which has to be encoded
+ * @return the changed URL
+ */
String encodeURL(String url);
+ /**
+ * Allows to intercept redirects
+ * @param externalContext current external-context
+ * @param url current URL
+ * @param addRequestParameter flag which indicates if the request-parameters should be added to the URL
+ * @throws IOException exception which might be thrown by the external-context during the redirect
+ */
void sendRedirect(ExternalContext externalContext, String url, boolean addRequestParameter) throws IOException;
+ /**
+ * Creates a new and unique window-id for the current user-session
+ * @return valid window-id
+ */
String createWindowId();
+ /**
+ * Allows to restore the window-id depending on the window-strategy supported by the implementation
+ * @param externalContext current external-context
+ * @return extracted window-id, null otherwise
+ */
String restoreWindowId(ExternalContext externalContext);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleFactoryWrapper.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/phase/CodiLifecycleFactoryWrapper.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleFactoryWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleFactoryWrapper.java Thu Mar 10 15:29:06 2011
@@ -41,11 +41,17 @@ public class CodiLifecycleFactoryWrapper
this.deactivated = !isActivated();
}
+ /**
+ * {@inheritDoc}
+ */
public void addLifecycle(String s, Lifecycle lifecycle)
{
wrapped.addLifecycle(s, lifecycle);
}
+ /**
+ * {@inheritDoc}
+ */
public Lifecycle getLifecycle(String s)
{
Lifecycle result = this.wrapped.getLifecycle(s);
@@ -57,16 +63,25 @@ public class CodiLifecycleFactoryWrapper
return new CodiLifecycleWrapper(result, PhaseListenerExtension.consumePhaseListeners());
}
+ /**
+ * {@inheritDoc}
+ */
public Iterator<String> getLifecycleIds()
{
return wrapped.getLifecycleIds();
}
+ /**
+ * {@inheritDoc}
+ */
public LifecycleFactory getWrapped()
{
return wrapped.getWrapped();
}
+ /**
+ * {@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/listener/phase/CodiLifecycleWrapper.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/phase/CodiLifecycleWrapper.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleWrapper.java Thu Mar 10 15:29:06 2011
@@ -58,11 +58,21 @@ class CodiLifecycleWrapper extends Lifec
}
}
+ /**
+ * {@inheritDoc}
+ */
public void addPhaseListener(PhaseListener phaseListener)
{
wrapped.addPhaseListener(phaseListener);
}
+ /**
+ * Broadcasts {@link org.apache.myfaces.extensions.cdi.core.api.startup.event.StartupEvent} and
+ * {@link org.apache.myfaces.extensions.cdi.jsf.api.listener.request.BeforeFacesRequest} btw.
+ * {@link org.apache.myfaces.extensions.cdi.jsf.api.listener.request.AfterFacesRequest}
+ *
+ * {@inheritDoc}
+ */
public void execute(FacesContext facesContext)
{
broadcastApplicationStartupBroadcaster();
@@ -83,16 +93,27 @@ class CodiLifecycleWrapper extends Lifec
wrapped.execute(facesContext);
}
+ /**
+ * {@inheritDoc}
+ */
public PhaseListener[] getPhaseListeners()
{
return wrapped.getPhaseListeners();
}
+ /**
+ * {@inheritDoc}
+ */
public void removePhaseListener(PhaseListener phaseListener)
{
wrapped.removePhaseListener(phaseListener);
}
+ /**
+ * Performs cleanup tasks after the rendering process
+ *
+ * {@inheritDoc}
+ */
public void render(FacesContext facesContext)
{
wrapped.render(facesContext);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextFactory.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/CodiFacesContextFactory.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextFactory.java Thu Mar 10 15:29:06 2011
@@ -40,6 +40,11 @@ public class CodiFacesContextFactory ext
this.deactivated = !isActivated();
}
+ /**
+ * Wrapps the created {@link FacesContext} with {@link CodiFacesContextWrapper}
+ *
+ * {@inheritDoc}
+ */
@Override
public FacesContext getFacesContext(Object context,
Object request,
@@ -62,6 +67,9 @@ public class CodiFacesContextFactory ext
return new CodiFacesContextWrapper(facesContext);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public FacesContextFactory getWrapped()
{
@@ -77,6 +85,9 @@ public class CodiFacesContextFactory ext
return new CodiFacesContextWrapper(facesContext);
}
+ /**
+ * {@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/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=1080249&r1=1080248&r2=1080249&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 Thu Mar 10 15:29:06 2011
@@ -42,11 +42,19 @@ public class CodiJsf2SystemEventListener
this.deactivated = !isActivated();
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isListenerForSource(Object source)
{
return !this.deactivated && source instanceof Application;
}
+ /**
+ * Broadcasts {@link PostConstructApplicationEvent} and {@link PreDestroyApplicationEvent} for CDI observers.
+ *
+ * {@inheritDoc}
+ */
public void processEvent(SystemEvent systemEvent)
{
if(systemEvent instanceof PostConstructApplicationEvent)
@@ -67,6 +75,9 @@ public class CodiJsf2SystemEventListener
beanManager, SystemEventBroadcaster.BEAN_NAME, SystemEventBroadcaster.class);
}
+ /**
+ * {@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/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=1080249&r1=1080248&r2=1080249&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 Thu Mar 10 15:29:06 2011
@@ -56,11 +56,19 @@ public class CodiRenderKitFactory extend
}
}
+ /**
+ * {@inheritDoc}
+ */
public void addRenderKit(String s, RenderKit renderKit)
{
wrapped.addRenderKit(s, renderKit);
}
+ /**
+ * Creates an intercepted {@link RenderKit} in order to wrap the {@link javax.faces.context.ResponseWriter}
+ *
+ * {@inheritDoc}
+ */
public RenderKit getRenderKit(FacesContext facesContext, String s)
{
RenderKit renderKit = wrapped.getRenderKit(facesContext, s);
@@ -116,17 +124,26 @@ public class CodiRenderKitFactory extend
}
}
+ /**
+ * {@inheritDoc}
+ */
public Iterator<String> getRenderKitIds()
{
return wrapped.getRenderKitIds();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public RenderKitFactory getWrapped()
{
return this.wrapped;
}
+ /**
+ * {@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/scope/conversation/InterceptedRenderKit.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/InterceptedRenderKit.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/InterceptedRenderKit.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/InterceptedRenderKit.java Thu Mar 10 15:29:06 2011
@@ -37,6 +37,12 @@ class InterceptedRenderKit extends Rende
this.wrapped = wrapped;
}
+ /**
+ * Adds a {@link org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.WindowContextIdHolderComponent}
+ * to the component tree.
+ *
+ * {@inheritDoc}
+ */
public ResponseWriter createResponseWriter(Writer writer, String s, String s1)
{
addWindowContextIdHolderComponent();
@@ -44,10 +50,12 @@ class InterceptedRenderKit extends Rende
return this.wrapped.createResponseWriter(writer, s, s1);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public RenderKit getWrapped()
{
return wrapped;
}
-
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.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/ServerSideWindowHandler.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java Thu Mar 10 15:29:06 2011
@@ -57,6 +57,9 @@ public class ServerSideWindowHandler ext
this.useFallback = tryToLoadClassForName("org.apache.myfaces.context.FacesContextFactoryImpl") == null;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void sendRedirect(ExternalContext externalContext, String url, boolean addRequestParameter)
throws IOException
@@ -89,6 +92,9 @@ public class ServerSideWindowHandler ext
externalContext.redirect(url);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public String restoreWindowId(ExternalContext externalContext)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.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/view/ViewScopedContext.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java Thu Mar 10 15:29:06 2011
@@ -47,7 +47,9 @@ public class ViewScopedContext implement
private boolean isJsfSubscribed = false;
-
+ /**
+ * {@inheritDoc}
+ */
public <T> T get(Contextual<T> component)
{
checkActive();
@@ -76,6 +78,9 @@ public class ViewScopedContext implement
return instance;
}
+ /**
+ * {@inheritDoc}
+ */
public <T> T get(Contextual<T> component, CreationalContext<T> creationalContext)
{
checkActive();
@@ -138,6 +143,9 @@ public class ViewScopedContext implement
return instance;
}
+ /**
+ * {@inheritDoc}
+ */
public Class<? extends Annotation> getScope()
{
return ViewScoped.class;
@@ -160,6 +168,9 @@ public class ViewScopedContext implement
}
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isListenerForSource(Object source)
{
if (source instanceof UIViewRoot)
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java Thu Mar 10 15:29:06 2011
@@ -49,6 +49,9 @@ public class DefaultFormatterFactory imp
private ConcurrentHashMap<FormatterConfigKey, GenericConfig> formatterConfigs =
new ConcurrentHashMap<FormatterConfigKey, GenericConfig>();
+ /**
+ * {@inheritDoc}
+ */
public synchronized FormatterFactory add(Formatter formatter)
{
if(!this.formatters.contains(formatter))
@@ -62,6 +65,9 @@ public class DefaultFormatterFactory imp
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public synchronized List<Formatter> reset()
{
List<Formatter> oldFormatters = Collections.unmodifiableList(this.formatters);
@@ -69,6 +75,9 @@ public class DefaultFormatterFactory imp
return oldFormatters;
}
+ /**
+ * {@inheritDoc}
+ */
public Formatter findFormatter(Class<?> type)
{
if (this.formatterCache != null && this.formatterCache.containsKey(type))
@@ -98,12 +107,18 @@ public class DefaultFormatterFactory imp
}
}
+ /**
+ * {@inheritDoc}
+ */
public FormatterFactory addFormatterConfig(Class<?> type, GenericConfig formatterConfig)
{
addFormatterConfig(type, formatterConfig, Locale.getDefault());
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public FormatterFactory addFormatterConfig(Class<?> type, GenericConfig formatterConfig, Locale locale)
{
if (formatterConfig.containsProperty(Locale.class.getName()))
@@ -114,6 +129,9 @@ public class DefaultFormatterFactory imp
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public GenericConfig findFormatterConfig(Class<?> type, Locale locale)
{
return this.formatterConfigs.get(createKey(type, locale));
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptBuilder.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/ScriptBuilder.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptBuilder.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptBuilder.java Thu Mar 10 15:29:06 2011
@@ -25,13 +25,38 @@ import javax.script.Bindings;
*/
public interface ScriptBuilder
{
+ /**
+ * Adds a script to the current builder instance
+ * @param script target script
+ * @return current builder
+ */
ScriptBuilder script(String script);
+ /**
+ * Adds an argument with a specific nam to the current builder instance
+ * @param name name of the argument
+ * @param value value of the argument
+ * @return current builder
+ */
ScriptBuilder namedArgument(String name, Object value);
+ /**
+ * Adds a {@link Bindings} instance to the current builder instance
+ * @param bindings bindings which should be used
+ * @return current builder
+ */
ScriptBuilder bindings(Bindings bindings);
+ /**
+ * Evaluates the script built with the current {@link ScriptBuilder}
+ * @return result of the evaluated script
+ */
Object eval();
+ /**
+ * Evaluates the script built with the current {@link ScriptBuilder}
+ * @param returnType target type of the result
+ * @return result of the evaluated script
+ */
<T> T eval(Class<T> returnType);
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptExecutor.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/ScriptExecutor.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptExecutor.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptExecutor.java Thu Mar 10 15:29:06 2011
@@ -26,15 +26,52 @@ import java.util.Map;
*/
public interface ScriptExecutor
{
+ /**
+ * Executes the given script
+ * @param script script which has to be executed
+ * @return result of the script
+ */
Object eval(String script);
+ /**
+ * Executes the given script with the given arguments
+ * @param script script which has to be executed
+ * @param arguments current arguments
+ * @return result of the script
+ */
Object eval(String script, Map<String, Object> arguments);
+ /**
+ * Executes the given script with the given {@link Bindings}
+ * @param script script which has to be executed
+ * @param bindings current bindings
+ * @return result of the script
+ */
Object eval(String script, Bindings bindings);
+ /**
+ * Executes the given script and the expected type of the result
+ * @param script script which has to be executed
+ * @param returnType type of the result
+ * @return result of the script
+ */
<T> T eval(String script, Class<T> returnType);
+ /**
+ * Executes the given script with the given arguments and the expected type of the result
+ * @param script script which has to be executed
+ * @param arguments current arguments
+ * @param returnType type of the result
+ * @return result of the script
+ */
<T> T eval(String script, Map<String, Object> arguments, Class<T> returnType);
+ /**
+ * Executes the given script with the given {@link Bindings} and the expected type of the result
+ * @param script script which has to be executed
+ * @param bindings current bindings
+ * @param returnType type of the result
+ * @return result of the script
+ */
<T> T eval(String script, Bindings bindings, Class<T> returnType);
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptBuilder.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/DefaultScriptBuilder.java?rev=1080249&r1=1080248&r2=1080249&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptBuilder.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultScriptBuilder.java Thu Mar 10 15:29:06 2011
@@ -46,6 +46,9 @@ class DefaultScriptBuilder implements Sc
this.scriptEngine = scriptEngine;
}
+ /**
+ * {@inheritDoc}
+ */
public ScriptBuilder script(String script)
{
DefaultScriptBuilder newScriptBuilder = new DefaultScriptBuilder(this.scriptEngine);
@@ -53,6 +56,9 @@ class DefaultScriptBuilder implements Sc
return newScriptBuilder;
}
+ /**
+ * {@inheritDoc}
+ */
public ScriptBuilder namedArgument(String name, Object value)
{
if(this.bindings != null)
@@ -68,6 +74,9 @@ class DefaultScriptBuilder implements Sc
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public ScriptBuilder bindings(Bindings bindings)
{
if(this.arguments != null)
@@ -79,11 +88,17 @@ class DefaultScriptBuilder implements Sc
return this;
}
+ /**
+ * {@inheritDoc}
+ */
public Object eval()
{
return eval(Object.class);
}
+ /**
+ * {@inheritDoc}
+ */
public <T> T eval(Class<T> returnType)
{
try