Author: struberg
Date: Tue Mar 8 12:19:56 2011
New Revision: 1079339
URL: http://svn.apache.org/viewvc?rev=1079339&view=rev
Log:
OWB-528 use ApplicationWrapper in JSF2 plugin
Thanks to Martin Koci for this patch!
Modified:
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
Modified:
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java?rev=1079339&r1=1079338&r2=1079339&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
(original)
+++
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
Tue Mar 8 12:19:56 2011
@@ -18,42 +18,13 @@
*/
package org.apache.webbeans.jsf;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-import javax.el.ELContextListener;
-import javax.el.ELException;
-import javax.el.ELResolver;
import javax.el.ExpressionFactory;
-import javax.el.ValueExpression;
-import javax.faces.FacesException;
import javax.faces.application.Application;
-import javax.faces.application.NavigationHandler;
-import javax.faces.application.ProjectStage;
-import javax.faces.application.Resource;
-import javax.faces.application.ResourceHandler;
-import javax.faces.application.StateManager;
-import javax.faces.application.ViewHandler;
-import javax.faces.component.UIComponent;
-import javax.faces.component.behavior.Behavior;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.el.MethodBinding;
-import javax.faces.el.PropertyResolver;
-import javax.faces.el.ReferenceSyntaxException;
-import javax.faces.el.ValueBinding;
-import javax.faces.el.VariableResolver;
-import javax.faces.event.ActionListener;
-import javax.faces.event.SystemEvent;
-import javax.faces.event.SystemEventListener;
-import javax.faces.validator.Validator;
+import javax.faces.application.ApplicationWrapper;
import org.apache.webbeans.config.WebBeansContext;
-public class OwbApplication extends Application
+public class OwbApplication extends ApplicationWrapper
{
private Application wrappedApplication;
@@ -64,218 +35,6 @@ public class OwbApplication extends Appl
this.wrappedApplication = wrappedApplication;
}
- @Override
- public void addComponent(String arg0, String arg1)
- {
- this.wrappedApplication.addComponent(arg0, arg1);
- }
-
-
- @Override
- public void addConverter(Class<?> arg0, String arg1)
- {
- this.wrappedApplication.addConverter(arg0, arg1);
- }
-
- @Override
- public void addConverter(String arg0, String arg1)
- {
- this.wrappedApplication.addConverter(arg0, arg1);
- }
-
- @Override
- public void addValidator(String arg0, String arg1)
- {
- this.wrappedApplication.addValidator(arg0, arg1);
- }
-
- @Override
- public UIComponent createComponent(String arg0) throws FacesException
- {
- return this.wrappedApplication.createComponent(arg0);
- }
-
- @Override
- public UIComponent createComponent(ValueBinding arg0, FacesContext arg1,
String arg2) throws FacesException
- {
- return this.wrappedApplication.createComponent(arg0, arg1, arg2);
- }
-
- @Override
- public Converter createConverter(Class<?> arg0)
- {
- return this.wrappedApplication.createConverter(arg0);
- }
-
- @Override
- public Converter createConverter(String arg0)
- {
- return this.wrappedApplication.createConverter(arg0);
- }
-
- @Override
- public MethodBinding createMethodBinding(String arg0, Class<?>[] arg1)
throws ReferenceSyntaxException
- {
- return this.wrappedApplication.createMethodBinding(arg0, arg1);
- }
-
- @Override
- public Validator createValidator(String arg0) throws FacesException
- {
-
- return this.wrappedApplication.createValidator(arg0);
- }
-
- @Override
- public ValueBinding createValueBinding(String arg0) throws
ReferenceSyntaxException
- {
- return this.wrappedApplication.createValueBinding(arg0);
- }
-
- @Override
- public ActionListener getActionListener()
- {
- return this.wrappedApplication.getActionListener();
- }
-
- @Override
- public Iterator<String> getComponentTypes()
- {
- return this.wrappedApplication.getComponentTypes();
- }
-
- @Override
- public Iterator<String> getConverterIds()
- {
- return this.wrappedApplication.getConverterIds();
- }
-
- @Override
- public Iterator<Class<?>> getConverterTypes()
- {
- return this.wrappedApplication.getConverterTypes();
- }
-
- @Override
- public Locale getDefaultLocale()
- {
- return this.wrappedApplication.getDefaultLocale();
- }
-
- @Override
- public String getDefaultRenderKitId()
- {
- return this.wrappedApplication.getDefaultRenderKitId();
- }
-
- @Override
- public String getMessageBundle()
- {
- return this.wrappedApplication.getMessageBundle();
- }
-
- @Override
- public NavigationHandler getNavigationHandler()
- {
- return this.wrappedApplication.getNavigationHandler();
- }
-
- @Override
- public PropertyResolver getPropertyResolver()
- {
- return this.wrappedApplication.getPropertyResolver();
- }
-
- @Override
- public StateManager getStateManager()
- {
- return this.wrappedApplication.getStateManager();
- }
-
- @Override
- public Iterator<Locale> getSupportedLocales()
- {
- return this.wrappedApplication.getSupportedLocales();
- }
-
- @Override
- public Iterator<String> getValidatorIds()
- {
- return this.wrappedApplication.getValidatorIds();
- }
-
- @Override
- public VariableResolver getVariableResolver()
- {
- return this.wrappedApplication.getVariableResolver();
- }
-
- @Override
- public ViewHandler getViewHandler()
- {
- return this.wrappedApplication.getViewHandler();
- }
-
- @Override
- public void setActionListener(ActionListener arg0)
- {
- this.wrappedApplication.setActionListener(arg0);
- }
-
- @Override
- public void setDefaultLocale(Locale arg0)
- {
- this.wrappedApplication.setDefaultLocale(arg0);
- }
-
- @Override
- public void setDefaultRenderKitId(String arg0)
- {
- this.wrappedApplication.setDefaultRenderKitId(arg0);
- }
-
- @Override
- public void setMessageBundle(String arg0)
- {
- this.wrappedApplication.setMessageBundle(arg0);
- }
-
- @Override
- public void setNavigationHandler(NavigationHandler arg0)
- {
- this.wrappedApplication.setNavigationHandler(arg0);
- }
-
- @Override
- public void setPropertyResolver(PropertyResolver arg0)
- {
- this.wrappedApplication.setPropertyResolver(arg0);
- }
-
- @Override
- public void setStateManager(StateManager arg0)
- {
- this.wrappedApplication.setStateManager(arg0);
- }
-
- @Override
- public void setSupportedLocales(Collection<Locale> arg0)
- {
- this.wrappedApplication.setSupportedLocales(arg0);
-
- }
-
- @Override
- public void setVariableResolver(VariableResolver arg0)
- {
- this.wrappedApplication.setVariableResolver(arg0);
- }
-
- @Override
- public void setViewHandler(ViewHandler arg0)
- {
- this.wrappedApplication.setViewHandler(arg0);
- }
/* (non-Javadoc)
* @see javax.faces.application.Application#getExpressionFactory()
@@ -292,256 +51,10 @@ public class OwbApplication extends Appl
return expressionFactory;
}
- /* (non-Javadoc)
- * @see javax.faces.application.Application#addBehavior(java.lang.String,
java.lang.String)
- */
- @Override
- public void addBehavior(String behaviorId, String behaviorClass)
- {
- wrappedApplication.addBehavior(behaviorId, behaviorClass);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#addDefaultValidatorId(java.lang.String)
- */
- @Override
- public void addDefaultValidatorId(String validatorId)
- {
-
- wrappedApplication.addDefaultValidatorId(validatorId);
- }
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#addELContextListener(javax.el.ELContextListener)
- */
@Override
- public void addELContextListener(ELContextListener listener)
+ public Application getWrapped()
{
-
- wrappedApplication.addELContextListener(listener);
+ return wrappedApplication;
}
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#addELResolver(javax.el.ELResolver)
- */
- @Override
- public void addELResolver(ELResolver resolver)
- {
-
- wrappedApplication.addELResolver(resolver);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#createBehavior(java.lang.String)
- */
- @Override
- public Behavior createBehavior(String behaviorId) throws FacesException
- {
-
- return wrappedApplication.createBehavior(behaviorId);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#createComponent(javax.faces.context.FacesContext,
javax.faces.application.Resource)
- */
- @Override
- public UIComponent createComponent(FacesContext context, Resource
componentResource)
- {
-
- return wrappedApplication.createComponent(context, componentResource);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#createComponent(javax.faces.context.FacesContext,
java.lang.String, java.lang.String)
- */
- @Override
- public UIComponent createComponent(FacesContext context, String
componentType, String rendererType)
- {
-
- return wrappedApplication.createComponent(context, componentType,
rendererType);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#createComponent(javax.el.ValueExpression,
javax.faces.context.FacesContext, java.lang.String, java.lang.String)
- */
- @Override
- public UIComponent createComponent(ValueExpression componentExpression,
FacesContext context, String componentType, String rendererType)
- {
-
- return wrappedApplication.createComponent(componentExpression,
context, componentType, rendererType);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#createComponent(javax.el.ValueExpression,
javax.faces.context.FacesContext, java.lang.String)
- */
- @Override
- public UIComponent createComponent(ValueExpression componentExpression,
FacesContext context, String componentType) throws FacesException
- {
-
- return wrappedApplication.createComponent(componentExpression,
context, componentType);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#evaluateExpressionGet(javax.faces.context.FacesContext,
java.lang.String, java.lang.Class)
- */
- @Override
- public <T> T evaluateExpressionGet(FacesContext context, String
expression, Class<? extends T> expectedType) throws ELException
- {
-
- return wrappedApplication.evaluateExpressionGet(context, expression,
expectedType);
- }
-
- /* (non-Javadoc)
- * @see javax.faces.application.Application#getBehaviorIds()
- */
- @Override
- public Iterator<String> getBehaviorIds()
- {
-
- return wrappedApplication.getBehaviorIds();
- }
-
- /* (non-Javadoc)
- * @see javax.faces.application.Application#getDefaultValidatorInfo()
- */
- @Override
- public Map<String, String> getDefaultValidatorInfo()
- {
-
- return wrappedApplication.getDefaultValidatorInfo();
- }
-
- /* (non-Javadoc)
- * @see javax.faces.application.Application#getELContextListeners()
- */
- @Override
- public ELContextListener[] getELContextListeners()
- {
-
- return wrappedApplication.getELContextListeners();
- }
-
- /* (non-Javadoc)
- * @see javax.faces.application.Application#getELResolver()
- */
- @Override
- public ELResolver getELResolver()
- {
-
- return wrappedApplication.getELResolver();
- }
-
- /* (non-Javadoc)
- * @see javax.faces.application.Application#getProjectStage()
- */
- @Override
- public ProjectStage getProjectStage()
- {
-
- return wrappedApplication.getProjectStage();
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#getResourceBundle(javax.faces.context.FacesContext,
java.lang.String)
- */
- @Override
- public ResourceBundle getResourceBundle(FacesContext ctx, String name)
throws FacesException, NullPointerException
- {
-
- return wrappedApplication.getResourceBundle(ctx, name);
- }
-
- /* (non-Javadoc)
- * @see javax.faces.application.Application#getResourceHandler()
- */
- @Override
- public ResourceHandler getResourceHandler()
- {
-
- return wrappedApplication.getResourceHandler();
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#publishEvent(javax.faces.context.FacesContext,
java.lang.Class, java.lang.Class, java.lang.Object)
- */
- @Override
- public void publishEvent(FacesContext facesContext, Class<? extends
SystemEvent> systemEventClass, Class<?> sourceBaseType, Object source)
- {
-
- wrappedApplication.publishEvent(facesContext, systemEventClass,
sourceBaseType, source);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#publishEvent(javax.faces.context.FacesContext,
java.lang.Class, java.lang.Object)
- */
- @Override
- public void publishEvent(FacesContext facesContext, Class<? extends
SystemEvent> systemEventClass, Object source)
- {
-
- wrappedApplication.publishEvent(facesContext, systemEventClass,
source);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#removeELContextListener(javax.el.ELContextListener)
- */
- @Override
- public void removeELContextListener(ELContextListener listener)
- {
-
- wrappedApplication.removeELContextListener(listener);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#setResourceHandler(javax.faces.application.ResourceHandler)
- */
- @Override
- public void setResourceHandler(ResourceHandler resourceHandler)
- {
-
- wrappedApplication.setResourceHandler(resourceHandler);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#subscribeToEvent(java.lang.Class,
java.lang.Class, javax.faces.event.SystemEventListener)
- */
- @Override
- public void subscribeToEvent(Class<? extends SystemEvent>
systemEventClass, Class<?> sourceClass, SystemEventListener listener)
- {
-
- wrappedApplication.subscribeToEvent(systemEventClass, sourceClass,
listener);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#subscribeToEvent(java.lang.Class,
javax.faces.event.SystemEventListener)
- */
- @Override
- public void subscribeToEvent(Class<? extends SystemEvent>
systemEventClass, SystemEventListener listener)
- {
-
- wrappedApplication.subscribeToEvent(systemEventClass, listener);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#unsubscribeFromEvent(java.lang.Class,
java.lang.Class, javax.faces.event.SystemEventListener)
- */
- @Override
- public void unsubscribeFromEvent(Class<? extends SystemEvent>
systemEventClass, Class<?> sourceClass, SystemEventListener listener)
- {
-
- wrappedApplication.unsubscribeFromEvent(systemEventClass, sourceClass,
listener);
- }
-
- /* (non-Javadoc)
- * @see
javax.faces.application.Application#unsubscribeFromEvent(java.lang.Class,
javax.faces.event.SystemEventListener)
- */
- @Override
- public void unsubscribeFromEvent(Class<? extends SystemEvent>
systemEventClass, SystemEventListener listener)
- {
-
- wrappedApplication.unsubscribeFromEvent(systemEventClass, listener);
- }
-
-
-
-
}
