You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/11/20 06:00:00 UTC
svn commit: r882415 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: application/
resource/ view/facelets/tag/ view/facelets/tag/composite/
view/facelets/tag/jsf/ view/facelets/tag/jsf/core/
view/facelets/tag/jsf/html/ view/facelets/tag/ui/
Author: lu4242
Date: Fri Nov 20 04:59:57 2009
New Revision: 882415
URL: http://svn.apache.org/viewvc?rev=882415&view=rev
Log:
MYFACES-2411 Update api to match latest signature
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/ResourceImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaTagHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetadataTargetImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetadataTargetImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDelegateHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertNumberHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValidateDelegateHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlComponentHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java Fri Nov 20 04:59:57 2009
@@ -186,7 +186,7 @@
* the one described on the javadoc of ResourceHandler.handleResourceRequest
*/
@Override
- public void handleResourceRequest(FacesContext facesContext)
+ public void handleResourceRequest(FacesContext facesContext) throws IOException
{
String resourceBasePath = getResourceHandlerSupport()
.calculateResourceBasePath(facesContext);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/ResourceImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/ResourceImpl.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/ResourceImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/ResourceImpl.java Fri Nov 20 04:59:57 2009
@@ -65,7 +65,7 @@
}
@Override
- public InputStream getInputStream()
+ public InputStream getInputStream() throws IOException
{
if (couldResourceContainValueExpressions())
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaTagHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaTagHandlerImpl.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaTagHandlerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaTagHandlerImpl.java Fri Nov 20 04:59:57 2009
@@ -43,7 +43,7 @@
* @param type
* @return
*/
- protected MetaRuleset createMetaRuleset(Class<?> type)
+ protected MetaRuleset createMetaRuleset(Class type)
{
ParameterCheck.notNull("type", type);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetadataTargetImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetadataTargetImpl.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetadataTargetImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetadataTargetImpl.java Fri Nov 20 04:59:57 2009
@@ -92,7 +92,7 @@
return null;
}
- public boolean isTargetInstanceOf(Class<?> type)
+ public boolean isTargetInstanceOf(Class type)
{
return type.isAssignableFrom(_type);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java Fri Nov 20 04:59:57 2009
@@ -149,7 +149,7 @@
* parameter type
* @return a MethodExpression instance
*/
- public MethodExpression getMethodExpression(FaceletContext ctx, Class<?> type, Class<?>[] paramTypes)
+ public MethodExpression getMethodExpression(FaceletContext ctx, Class type, Class[] paramTypes)
{
try
{
@@ -238,7 +238,7 @@
* expected return type
* @return Object value of this attribute
*/
- public Object getObject(FaceletContext ctx, Class<?> type)
+ public Object getObject(FaceletContext ctx, Class type)
{
if (this.literal)
{
@@ -283,7 +283,7 @@
* expected return type
* @return ValueExpression instance
*/
- public ValueExpression getValueExpression(FaceletContext ctx, Class<?> type)
+ public ValueExpression getValueExpression(FaceletContext ctx, Class type)
{
try
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetadataTargetImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetadataTargetImpl.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetadataTargetImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetadataTargetImpl.java Fri Nov 20 04:59:57 2009
@@ -124,7 +124,7 @@
return null;
}
- public boolean isTargetInstanceOf(Class<?> type)
+ public boolean isTargetInstanceOf(Class type)
{
return _delegate.isTargetInstanceOf(type);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java Fri Nov 20 04:59:57 2009
@@ -64,7 +64,7 @@
}
- public InputStream getInputStream()
+ public InputStream getInputStream() throws IOException
{
return getWrapped().getInputStream();
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java Fri Nov 20 04:59:57 2009
@@ -104,7 +104,7 @@
* "binding" and "event"
*/
@Override
- public MetaRuleset createMetaRuleset(Class<?> type)
+ public MetaRuleset createMetaRuleset(Class type)
{
MetaRuleset ruleset = new MetaRulesetImpl(_delegate.getTag(), type);
ruleset.ignore("binding");
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java Fri Nov 20 04:59:57 2009
@@ -253,7 +253,7 @@
}
@Override
- protected MetaRuleset createMetaRuleset(Class<?> type)
+ protected MetaRuleset createMetaRuleset(Class type)
{
/*MetaRuleset m = super.createMetaRuleset(type);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java Fri Nov 20 04:59:57 2009
@@ -339,7 +339,7 @@
}
@Override
- public MetaRuleset createMetaRuleset(Class<?> type)
+ public MetaRuleset createMetaRuleset(Class type)
{
MetaRuleset m = new MetaRulesetImpl(_delegate.getTag(), type);
// ignore standard component attributes
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java Fri Nov 20 04:59:57 2009
@@ -152,7 +152,7 @@
return ctx.getFacesContext().getApplication().createConverter(this.converterId);
}
- protected MetaRuleset createMetaRuleset(Class<?> type)
+ protected MetaRuleset createMetaRuleset(Class type)
{
return super.createMetaRuleset(type).ignore("binding");
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java Fri Nov 20 04:59:57 2009
@@ -114,7 +114,7 @@
}
@Override
- public MetaRuleset createMetaRuleset(Class<?> type)
+ public MetaRuleset createMetaRuleset(Class type)
{
return new MetaRulesetImpl(_delegate.getTag(), type).ignore("binding");
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java Fri Nov 20 04:59:57 2009
@@ -131,7 +131,7 @@
return ctx.getFacesContext().getApplication().createValidator(this.validatorId);
}
- protected MetaRuleset createMetaRuleset(Class<?> type)
+ protected MetaRuleset createMetaRuleset(Class type)
{
return super.createMetaRuleset(type).ignore("binding");
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java Fri Nov 20 04:59:57 2009
@@ -97,7 +97,7 @@
}
@Override
- public MetaRuleset createMetaRuleset(Class<?> type)
+ public MetaRuleset createMetaRuleset(Class type)
{
return new MetaRulesetImpl(_delegate.getTag(), type).ignore("binding");
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java Fri Nov 20 04:59:57 2009
@@ -145,7 +145,7 @@
}
}
- protected MetaRuleset createMetaRuleset(Class<?> type)
+ protected MetaRuleset createMetaRuleset(Class type)
{
return super.createMetaRuleset(type).ignoreAll();
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDelegateHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDelegateHandler.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDelegateHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDelegateHandler.java Fri Nov 20 04:59:57 2009
@@ -67,7 +67,7 @@
return ctx.getFacesContext().getApplication().createConverter(this.converterId.getValue(ctx));
}
- protected MetaRuleset createMetaRuleset(Class<?> type)
+ protected MetaRuleset createMetaRuleset(Class type)
{
return super.createMetaRuleset(type).ignoreAll();
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertNumberHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertNumberHandler.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertNumberHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertNumberHandler.java Fri Nov 20 04:59:57 2009
@@ -84,7 +84,7 @@
}
}
- protected MetaRuleset createMetaRuleset(Class<?> type)
+ protected MetaRuleset createMetaRuleset(Class type)
{
return super.createMetaRuleset(type).ignore("locale");
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValidateDelegateHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValidateDelegateHandler.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValidateDelegateHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValidateDelegateHandler.java Fri Nov 20 04:59:57 2009
@@ -62,7 +62,7 @@
return ctx.getFacesContext().getApplication().createValidator(this.validatorId.getValue(ctx));
}
- protected MetaRuleset createMetaRuleset(Class<?> type)
+ protected MetaRuleset createMetaRuleset(Class type)
{
return super.createMetaRuleset(type).ignoreAll();
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlComponentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlComponentHandler.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlComponentHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlComponentHandler.java Fri Nov 20 04:59:57 2009
@@ -48,7 +48,7 @@
super(config);
}
- protected MetaRuleset createMetaRuleset(Class<?> type)
+ protected MetaRuleset createMetaRuleset(Class type)
{
return super.createMetaRuleset(type).alias("class", "styleClass");
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java?rev=882415&r1=882414&r2=882415&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java Fri Nov 20 04:59:57 2009
@@ -48,7 +48,7 @@
super(config);
}
- protected MetaRuleset createMetaRuleset(Class<?> type)
+ protected MetaRuleset createMetaRuleset(Class type)
{
MetaRuleset meta = super.createMetaRuleset(type);