You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/10/25 16:59:53 UTC
svn commit: r1188686 [2/2] - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: component/visit/
config/ config/annotation/ config/element/
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java Tue Oct 25 14:59:52 2011
@@ -40,7 +40,8 @@ import org.apache.myfaces.spi.ServicePro
* Date: Mar 12, 2007
* Time: 9:53:40 PM
*/
-public class DefaultLifecycleProviderFactory extends LifecycleProviderFactory {
+public class DefaultLifecycleProviderFactory extends LifecycleProviderFactory
+{
//private static Log log = LogFactory.getLog(DefaultLifecycleProviderFactory.class);
private static Logger log = Logger.getLogger(DefaultLifecycleProviderFactory.class.getName());
@@ -50,7 +51,8 @@ public class DefaultLifecycleProviderFac
* <p>This also can be configured using a SPI entry (/META-INF/services/...).
* </p>
*/
- public static final String LIFECYCLE_PROVIDER_INSTANCE_KEY = LifecycleProvider.class.getName() + ".LIFECYCLE_PROVIDER_INSTANCE";
+ public static final String LIFECYCLE_PROVIDER_INSTANCE_KEY
+ = LifecycleProvider.class.getName() + ".LIFECYCLE_PROVIDER_INSTANCE";
@JSFWebConfigParam(name="org.apache.myfaces.config.annotation.LifecycleProvider", since="1.1")
public static final String LIFECYCLE_PROVIDER = LifecycleProvider.class.getName();
@@ -74,7 +76,8 @@ public class DefaultLifecycleProviderFac
}
else
{
- lifecycleProvider = (LifecycleProvider) externalContext.getApplicationMap().get(LIFECYCLE_PROVIDER_INSTANCE_KEY);
+ lifecycleProvider = (LifecycleProvider)
+ externalContext.getApplicationMap().get(LIFECYCLE_PROVIDER_INSTANCE_KEY);
}
if (lifecycleProvider == null)
{
@@ -88,13 +91,15 @@ public class DefaultLifecycleProviderFac
else
{
//Retrieve it because it was resolved
- lifecycleProvider = (LifecycleProvider) externalContext.getApplicationMap().get(LIFECYCLE_PROVIDER_INSTANCE_KEY);
+ lifecycleProvider = (LifecycleProvider)
+ externalContext.getApplicationMap().get(LIFECYCLE_PROVIDER_INSTANCE_KEY);
}
}
else
{
//Retrieve it because it was resolved
- lifecycleProvider = (LifecycleProvider) externalContext.getApplicationMap().get(LIFECYCLE_PROVIDER_INSTANCE_KEY);
+ lifecycleProvider = (LifecycleProvider)
+ externalContext.getApplicationMap().get(LIFECYCLE_PROVIDER_INSTANCE_KEY);
}
log.info("Using LifecycleProvider "+ lifecycleProvider.getClass().getName());
}
@@ -102,8 +107,8 @@ public class DefaultLifecycleProviderFac
}
@Override
- public void release() {
-
+ public void release()
+ {
}
@@ -118,8 +123,9 @@ public class DefaultLifecycleProviderFac
Object obj = createClass(lifecycleProvider, externalContext);
- if (obj instanceof LifecycleProvider) {
- externalContext.getApplicationMap().put(LIFECYCLE_PROVIDER_INSTANCE_KEY, (LifecycleProvider) obj);
+ if (obj instanceof LifecycleProvider)
+ {
+ externalContext.getApplicationMap().put(LIFECYCLE_PROVIDER_INSTANCE_KEY, obj);
return true;
}
}
@@ -162,7 +168,9 @@ public class DefaultLifecycleProviderFac
InvocationTargetException,
PrivilegedActionException
{
- List<String> classList = ServiceProviderFinderFactory.getServiceProviderFinder(extContext).getServiceProviderList(LIFECYCLE_PROVIDER);
+ List<String> classList
+ = ServiceProviderFinderFactory.getServiceProviderFinder(extContext).
+ getServiceProviderList(LIFECYCLE_PROVIDER);
Iterator<String> iter = classList.iterator();
while (iter.hasNext())
{
@@ -170,21 +178,24 @@ public class DefaultLifecycleProviderFac
Object obj = createClass(className,extContext);
if (DiscoverableLifecycleProvider.class.isAssignableFrom(obj.getClass()))
{
- DiscoverableLifecycleProvider discoverableLifecycleProvider = (DiscoverableLifecycleProvider) obj;
+ DiscoverableLifecycleProvider discoverableLifecycleProvider =
+ (DiscoverableLifecycleProvider) obj;
if (discoverableLifecycleProvider.isAvailable())
{
- extContext.getApplicationMap().put(LIFECYCLE_PROVIDER_INSTANCE_KEY, discoverableLifecycleProvider);
- return (Boolean) true;
+ extContext.getApplicationMap().put(LIFECYCLE_PROVIDER_INSTANCE_KEY,
+ discoverableLifecycleProvider);
+ return true;
}
}
}
- return (Boolean) false;
+ return false;
}
});
}
else
{
- List<String> classList = ServiceProviderFinderFactory.getServiceProviderFinder(extContext).getServiceProviderList(LIFECYCLE_PROVIDER);
+ List<String> classList = ServiceProviderFinderFactory.getServiceProviderFinder(extContext).
+ getServiceProviderList(LIFECYCLE_PROVIDER);
Iterator<String> iter = classList.iterator();
while (iter.hasNext())
{
@@ -192,10 +203,12 @@ public class DefaultLifecycleProviderFac
Object obj = createClass(className,extContext);
if (DiscoverableLifecycleProvider.class.isAssignableFrom(obj.getClass()))
{
- DiscoverableLifecycleProvider discoverableLifecycleProvider = (DiscoverableLifecycleProvider) obj;
+ DiscoverableLifecycleProvider discoverableLifecycleProvider
+ = (DiscoverableLifecycleProvider) obj;
if (discoverableLifecycleProvider.isAvailable())
{
- extContext.getApplicationMap().put(LIFECYCLE_PROVIDER_INSTANCE_KEY, discoverableLifecycleProvider);
+ extContext.getApplicationMap().put(LIFECYCLE_PROVIDER_INSTANCE_KEY,
+ discoverableLifecycleProvider);
return (Boolean) true;
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProvider.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProvider.java Tue Oct 25 14:59:52 2011
@@ -28,7 +28,8 @@ import javax.naming.NamingException;
*
* @version $Rev$ $Date$
*/
-public interface LifecycleProvider {
+public interface LifecycleProvider
+{
/**
* Create an object of the class with the supplied name, inject dependencies as appropriate,
@@ -37,7 +38,9 @@ public interface LifecycleProvider {
* @param className name of the class of the desired object
* @return a fully constructed, dependency-injected, and initialized object.
*/
- Object newInstance(String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException, NamingException, InvocationTargetException;
+ Object newInstance(String className)
+ throws ClassNotFoundException, IllegalAccessException, InstantiationException,
+ NamingException, InvocationTargetException;
/**
* Take whatever steps are needed to shut down the object, including calling a preDestroy method.
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProvider2.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProvider2.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProvider2.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProvider2.java Tue Oct 25 14:59:52 2011
@@ -36,7 +36,9 @@ public interface LifecycleProvider2 exte
* @param className name of the class of the desired object
* @return a fully constructed, dependency-injected, and initialized object.
*/
- Object newInstance(String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException, NamingException, InvocationTargetException;
+ Object newInstance(String className)
+ throws ClassNotFoundException, IllegalAccessException, InstantiationException,
+ NamingException, InvocationTargetException;
/**
* Call a postConstruct method as appropriate.
@@ -44,4 +46,4 @@ public interface LifecycleProvider2 exte
* @param o object to initialize
*/
void postConstruct(Object o) throws IllegalAccessException, InvocationTargetException;
-}
\ No newline at end of file
+}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java Tue Oct 25 14:59:52 2011
@@ -28,7 +28,9 @@ import javax.faces.context.FacesContext;
import org.apache.myfaces.spi.impl.SpiUtils;
-public abstract class LifecycleProviderFactory {
+
+public abstract class LifecycleProviderFactory
+{
protected static final String FACTORY_DEFAULT = DefaultLifecycleProviderFactory.class.getName();
private static final String FACTORY_KEY = LifecycleProviderFactory.class.getName();
@@ -53,7 +55,8 @@ public abstract class LifecycleProviderF
if (System.getSecurityManager() != null)
{
final ExternalContext ectx = ctx;
- lpf = (LifecycleProviderFactory) AccessController.doPrivileged(new java.security.PrivilegedExceptionAction<Object>()
+ lpf = (LifecycleProviderFactory)
+ AccessController.doPrivileged(new java.security.PrivilegedExceptionAction<Object>()
{
public Object run() throws PrivilegedActionException
{
@@ -76,7 +79,8 @@ public abstract class LifecycleProviderF
}
- public static void setLifecycleProviderFactory(LifecycleProviderFactory instance) {
+ public static void setLifecycleProviderFactory(LifecycleProviderFactory instance)
+ {
FacesContext.getCurrentInstance().getExternalContext().getApplicationMap().put(FACTORY_KEY, instance);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java Tue Oct 25 14:59:52 2011
@@ -31,7 +31,8 @@ public class NoAnnotationLifecyleProvide
}
- public Object newInstance(String className) throws InstantiationException, IllegalAccessException, InvocationTargetException, ClassNotFoundException
+ public Object newInstance(String className)
+ throws InstantiationException, IllegalAccessException, InvocationTargetException, ClassNotFoundException
{
return ClassUtils.classForName(className).newInstance();
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java Tue Oct 25 14:59:52 2011
@@ -39,7 +39,8 @@ public class NoInjectionAnnotationLifecy
public Object newInstance(String className)
- throws InstantiationException, IllegalAccessException, NamingException, InvocationTargetException, ClassNotFoundException
+ throws InstantiationException, IllegalAccessException, NamingException,
+ InvocationTargetException, ClassNotFoundException
{
Class clazz = ClassUtils.classForName(className);
Object object = clazz.newInstance();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java Tue Oct 25 14:59:52 2011
@@ -43,7 +43,9 @@ public class TomcatAnnotationLifecyclePr
public Object newInstance(String className)
- throws InstantiationException, IllegalAccessException, InvocationTargetException, NamingException, ClassNotFoundException {
+ throws InstantiationException, IllegalAccessException, InvocationTargetException,
+ NamingException, ClassNotFoundException
+ {
Class<?> clazz = ClassUtils.classForName(className);
log.info("Creating instance of " + className);
Object object = clazz.newInstance();
@@ -66,7 +68,9 @@ public class TomcatAnnotationLifecyclePr
annotationProcessor = (org.apache.AnnotationProcessor) ((ServletContext)
externalContext.getContext()).getAttribute(org.apache.AnnotationProcessor.class.getName());
return annotationProcessor != null;
- } catch (Throwable e) {
+ }
+ catch (Throwable e)
+ {
// ignore
}
return false;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/FacesConfigData.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/FacesConfigData.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/FacesConfigData.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/FacesConfigData.java Tue Oct 25 14:59:52 2011
@@ -22,7 +22,6 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
-import javax.el.ELResolver;
/**
@@ -164,7 +163,8 @@ public abstract class FacesConfigData im
public abstract Collection<String> getRenderKitClasses(String renderKitId);
/**
- * @return Iterator over {@link org.apache.myfaces.config.element.ClientBehaviorRenderer ClientBehaviorRenderer}s for the given renderKitId
+ * @return Iterator over {@link org.apache.myfaces.config.element.ClientBehaviorRenderer ClientBehaviorRenderer}s
+ * for the given renderKitId
*/
public abstract Collection<ClientBehaviorRenderer> getClientBehaviorRenderers (String renderKitId);
@@ -185,7 +185,7 @@ public abstract class FacesConfigData im
public abstract Collection<ResourceBundle> getResourceBundles();
/**
- * @return Iterator over {@link ELResolver} implementation class names
+ * @return Iterator over {@link javax.el.ELResolver} implementation class names
*/
public abstract Collection<String> getElResolvers();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java Tue Oct 25 14:59:52 2011
@@ -30,7 +30,8 @@ import javax.faces.context.FacesContext;
*/
public abstract class ManagedBean implements Serializable
{
- // <!ELEMENT managed-bean (description*, display-name*, icon*, managed-bean-name, managed-bean-class, managed-bean-scope, (managed-property* | map-entries | list-entries))>
+ // <!ELEMENT managed-bean (description*, display-name*, icon*, managed-bean-name, managed-bean-class,
+ // managed-bean-scope, (managed-property* | map-entries | list-entries))>
public static final int INIT_MODE_NO_INIT = 0;
public static final int INIT_MODE_PROPERTIES = 1;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/ManagedProperty.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/ManagedProperty.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/ManagedProperty.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/ManagedProperty.java Tue Oct 25 14:59:52 2011
@@ -23,7 +23,6 @@ import java.io.Serializable;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
-import org.apache.myfaces.config.element.ListEntries;
/**
@@ -34,7 +33,8 @@ import org.apache.myfaces.config.element
*/
public abstract class ManagedProperty implements Serializable
{
- // <!ELEMENT managed-property (description*, display-name*, icon*, property-name, property-class?, (map-entries|null-value|value|list-entries))>
+ // <!ELEMENT managed-property (description*, display-name*, icon*,
+ // property-name, property-class?, (map-entries|null-value|value|list-entries))>
public static final int TYPE_UNKNOWN = 0;
public static final int TYPE_MAP = 1;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/NavigationCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/NavigationCase.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/NavigationCase.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/NavigationCase.java Tue Oct 25 14:59:52 2011
@@ -30,7 +30,8 @@ import java.io.Serializable;
*/
public abstract class NavigationCase implements Serializable
{
- // <!ELEMENT navigation-case (description*, display-name*, icon*, from-action?, from-outcome?, to-view-id, redirect?)>
+ // <!ELEMENT navigation-case (description*, display-name*, icon*, from-action?,
+ // from-outcome?, to-view-id, redirect?)>
public abstract String getFromAction();
public abstract String getFromOutcome();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Ordering.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Ordering.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Ordering.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Ordering.java Tue Oct 25 14:59:52 2011
@@ -19,7 +19,6 @@
package org.apache.myfaces.config.element;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.List;
public abstract class Ordering implements Serializable
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Property.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Property.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Property.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Property.java Tue Oct 25 14:59:52 2011
@@ -19,10 +19,7 @@
package org.apache.myfaces.config.element;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
/**
* @author Martin Marinschek
@@ -36,7 +33,8 @@ import java.util.List;
property names that will be recognized when performing introspection
against that class via java.beans.Introspector.
- <!ELEMENT property (description*, display-name*, icon*, property-name, property-class, default-value?, suggested-value?, property-extension*)>
+ <!ELEMENT property (description*, display-name*, icon*, property-name, property-class,
+default-value?, suggested-value?, property-extension*)>
* <p/>
*/
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Renderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Renderer.java?rev=1188686&r1=1188685&r2=1188686&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Renderer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Renderer.java Tue Oct 25 14:59:52 2011
@@ -26,7 +26,8 @@ import java.io.Serializable;
*/
public abstract class Renderer implements Serializable
{
- // <!ELEMENT renderer (description*, display-name*, icon*, component-family, renderer-type, renderer-class, attribute*, renderer-extension*)>
+ // <!ELEMENT renderer (description*, display-name*, icon*, component-family,
+ // renderer-type, renderer-class, attribute*, renderer-extension*)>
public abstract String getComponentFamily();
public abstract String getRendererType();