You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2020/06/05 08:13:38 UTC
[myfaces] branch master updated: refactored
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new 403e7a4 refactored
403e7a4 is described below
commit 403e7a43ef9154cb69aa6b531f13de78cc88cdfa
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Fri Jun 5 10:13:27 2020 +0200
refactored
---
.../view/facelets/tag/BeanPropertyTagRule.java | 16 ++++++++--------
.../tag/composite/CompositeComponentRule.java | 22 ----------------------
.../view/facelets/tag/jsf/ComponentRule.java | 11 -----------
3 files changed, 8 insertions(+), 41 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/BeanPropertyTagRule.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/BeanPropertyTagRule.java
index 5493e7a..0216cd7 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/BeanPropertyTagRule.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/BeanPropertyTagRule.java
@@ -110,23 +110,23 @@ public final class BeanPropertyTagRule extends MetaRule
{
try
{
- if (method != null)
+ if (function != null)
{
- if (valueArgs == null)
+ if (value == null)
{
String str = this.attribute.getValue();
- valueArgs = new Object[] { ctx.getExpressionFactory().coerceToType(str, propertyType) };
+ value = ctx.getExpressionFactory().coerceToType(str, propertyType);
}
- method.invoke(instance, valueArgs);
+ function.accept(instance, value);
}
- else if (function != null)
+ else if (method != null)
{
- if (value == null)
+ if (valueArgs == null)
{
String str = this.attribute.getValue();
- value = ctx.getExpressionFactory().coerceToType(str, propertyType);
+ valueArgs = new Object[] { ctx.getExpressionFactory().coerceToType(str, propertyType) };
}
- function.accept(instance, value);
+ method.invoke(instance, valueArgs);
}
}
catch (InvocationTargetException e)
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java
index b4ece12..df641a8 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java
@@ -27,7 +27,6 @@ import javax.faces.view.facelets.MetaRule;
import javax.faces.view.facelets.Metadata;
import javax.faces.view.facelets.MetadataTarget;
import javax.faces.view.facelets.TagAttribute;
-import org.apache.myfaces.view.facelets.tag.MethodHandleMetadataTargetImpl;
/**
* Copy of org.apache.myfaces.view.facelets.tag.jsf.ComponentRule
@@ -133,27 +132,6 @@ final class CompositeComponentRule extends MetaRule
return new ValueExpressionMetadata(name, type, attribute);
}
- else if (meta instanceof MethodHandleMetadataTargetImpl)
- {
- if (((MethodHandleMetadataTargetImpl) meta).getWriteFunction(name) == null)
- {
- Class<?> type = meta.getPropertyType(name);
- if (type == null)
- {
- if (((MethodHandleMetadataTargetImpl) meta).getLambdaProperty(name) == null)
- {
- // this was an attribute literal, but not property
- warnAttr(attribute, meta.getTargetClass(), name);
- }
-
- return new LiteralAttributeMetadata(name, attribute.getValue());
- }
- else
- {
- return new TypedLiteralAttributeMetadata(name, type, attribute);
- }
- }
- }
else if (meta.getWriteMethod(name) == null)
{
Class<?> type = meta.getPropertyType(name);
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentRule.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentRule.java
index 461c4c5..8f2282a 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentRule.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentRule.java
@@ -27,7 +27,6 @@ import javax.faces.view.facelets.MetaRule;
import javax.faces.view.facelets.Metadata;
import javax.faces.view.facelets.MetadataTarget;
import javax.faces.view.facelets.TagAttribute;
-import org.apache.myfaces.view.facelets.tag.MethodHandleMetadataTargetImpl;
/**
*
@@ -100,16 +99,6 @@ final class ComponentRule extends MetaRule
return new ValueExpressionMetadata(name, type, attribute);
}
- else if (meta instanceof MethodHandleMetadataTargetImpl)
- {
- if (((MethodHandleMetadataTargetImpl) meta).getWriteFunction(name) == null)
- {
- // this was an attribute literal, but not property
- warnAttr(attribute, meta.getTargetClass(), name);
-
- return new LiteralAttributeMetadata(name, attribute.getValue());
- }
- }
else if (meta.getWriteMethod(name) == null)
{
// this was an attribute literal, but not property