This is an automated email from the ASF dual-hosted git repository.

doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git


The following commit(s) were added to refs/heads/master by this push:
     new baebd5d3 EMPIREDB-453 FacesImpl: method renamed
baebd5d3 is described below

commit baebd5d3e5593142dc37abca6d74f5255079b76f
Author: Rainer Döbele <[email protected]>
AuthorDate: Wed Jan 8 06:17:34 2025 +0100

    EMPIREDB-453
    FacesImpl: method renamed
---
 .../java/org/apache/empire/jakarta/impl/FacesImplementation.java  | 8 ++++----
 .../org/apache/empire/jakarta/impl/MojarraImplementation.java     | 2 +-
 .../org/apache/empire/jakarta/impl/MyFacesImplementation.java     | 2 +-
 .../java/org/apache/empire/jakarta/utils/TagEncodingHelper.java   | 6 +++---
 .../java/org/apache/empire/jsf2/impl/FacesImplementation.java     | 6 +++---
 .../java/org/apache/empire/jsf2/impl/MojarraImplementation.java   | 2 +-
 .../java/org/apache/empire/jsf2/impl/MyFacesImplementation.java   | 2 +-
 .../main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java | 6 +++---
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/FacesImplementation.java
 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/FacesImplementation.java
index 35216d3b..7d290519 100644
--- 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/FacesImplementation.java
+++ 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/FacesImplementation.java
@@ -109,13 +109,13 @@ public interface FacesImplementation
        ValueExpression unwrapValueExpression(ValueExpression ve);
 
     /**
-     * Returns a read or write method for an attribute
-     * @param component the component
+     * Returns a read or write method for an JavaBean property
+     * @param component the UIComponent
      * @param attribute the attribute name
-     * @param writeMethod flag wheter to the read or write method
+     * @param writeMethod flag whether to the read or write method
      * @return the method or null
      */
-    Method getAttributeMethod(final UIComponent component, String attribute, 
boolean writeMethod);
+    Method getPropertyMethod(final UIComponent component, String attribute, 
boolean writeMethod);
        
     /**
      * BeanStorageProvider
diff --git 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/MojarraImplementation.java
 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/MojarraImplementation.java
index 0ae5b839..55f45860 100644
--- 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/MojarraImplementation.java
+++ 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/MojarraImplementation.java
@@ -157,7 +157,7 @@ public class MojarraImplementation implements 
FacesImplementation
     }
     
     @Override
-    public Method getAttributeMethod(final UIComponent component, String 
attribute, boolean writeMethod)
+    public Method getPropertyMethod(final UIComponent component, String 
attribute, boolean writeMethod)
     {
         // Not yet implemented. 
         // Is Implementation required?
diff --git 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/MyFacesImplementation.java
 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/MyFacesImplementation.java
index 795d31bb..85493c4e 100644
--- 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/MyFacesImplementation.java
+++ 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/MyFacesImplementation.java
@@ -142,7 +142,7 @@ public class MyFacesImplementation implements 
FacesImplementation
     }
     
     @Override
-    public Method getAttributeMethod(final UIComponent component, String 
attribute, boolean writeMethod)
+    public Method getPropertyMethod(final UIComponent component, String 
attribute, boolean writeMethod)
     {
         try {
             // get the map
diff --git 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
index a1bfc6e1..eca41eb1 100644
--- 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
+++ 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
@@ -830,7 +830,7 @@ public class TagEncodingHelper implements NamingContainer
                     value= null; /* should never come here! */
                 if (value==null)
                 {   // Check readMethod
-                    Method readMethod = 
FacesUtils.getFacesImplementation().getAttributeMethod(this.component, "value", 
false);
+                    Method readMethod = 
FacesUtils.getFacesImplementation().getPropertyMethod(this.component, "value", 
false);
                     if (readMethod!=null)
                         return ClassUtils.invokeSimpleMethod(this.component, 
readMethod); // attribute is a javabean property!
                     // use a value expression
@@ -946,9 +946,9 @@ public class TagEncodingHelper implements NamingContainer
         if (hasValueExpression()) 
         {   // check readonly
             FacesImplementation impl = FacesUtils.getFacesImplementation();
-            if (impl.getAttributeMethod(this.component, "value", false)!=null)
+            if (impl.getPropertyMethod(this.component, "value", false)!=null)
             {   // attribute is a javabean property! 
-                return (impl.getAttributeMethod(this.component, "value", 
true)==null);
+                return (impl.getPropertyMethod(this.component, "value", 
true)==null);
             }
             // Check value expression
             ValueExpression ve = findValueExpression("value");
diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/FacesImplementation.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/FacesImplementation.java
index a832965c..55faeb83 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/FacesImplementation.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/FacesImplementation.java
@@ -109,13 +109,13 @@ public interface FacesImplementation
        ValueExpression unwrapValueExpression(ValueExpression ve);
 
     /**
-     * Returns a read or write method for an attribute
+     * Returns a read or write method for an JavaBean property
      * @param component the component
      * @param attribute the attribute name
-     * @param writeMethod flag wheter to the read or write method
+     * @param writeMethod flag whether to the read or write method
      * @return the method or null
      */
-    Method getAttributeMethod(final UIComponent component, String attribute, 
boolean writeMethod);
+    Method getPropertyMethod(final UIComponent component, String attribute, 
boolean writeMethod);
        
     /**
      * BeanStorageProvider
diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/MojarraImplementation.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/MojarraImplementation.java
index dbc8fb7b..13416f8a 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/MojarraImplementation.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/MojarraImplementation.java
@@ -157,7 +157,7 @@ public class MojarraImplementation implements 
FacesImplementation
     }
     
     @Override
-    public Method getAttributeMethod(final UIComponent component, String 
attribute, boolean writeMethod)
+    public Method getPropertyMethod(final UIComponent component, String 
attribute, boolean writeMethod)
     {
         // Not yet implemented. 
         // Is Implementation required?
diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/MyFacesImplementation.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/MyFacesImplementation.java
index e792cf21..c806bf8c 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/MyFacesImplementation.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/MyFacesImplementation.java
@@ -142,7 +142,7 @@ public class MyFacesImplementation implements 
FacesImplementation
     }
     
     @Override
-    public Method getAttributeMethod(final UIComponent component, String 
attribute, boolean writeMethod)
+    public Method getPropertyMethod(final UIComponent component, String 
attribute, boolean writeMethod)
     {
         try {
             // get the map
diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
index f6f311a5..ef7b969f 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
@@ -830,7 +830,7 @@ public class TagEncodingHelper implements NamingContainer
                     value= null; /* should never come here! */
                 if (value==null)
                 {   // Check readMethod
-                    Method readMethod = 
FacesUtils.getFacesImplementation().getAttributeMethod(this.component, "value", 
false);
+                    Method readMethod = 
FacesUtils.getFacesImplementation().getPropertyMethod(this.component, "value", 
false);
                     if (readMethod!=null)
                         return ClassUtils.invokeSimpleMethod(this.component, 
readMethod); // attribute is a javabean property!
                     // use a value expression
@@ -946,9 +946,9 @@ public class TagEncodingHelper implements NamingContainer
         if (hasValueExpression()) 
         {   // check readonly
             FacesImplementation impl = FacesUtils.getFacesImplementation();
-            if (impl.getAttributeMethod(this.component, "value", false)!=null)
+            if (impl.getPropertyMethod(this.component, "value", false)!=null)
             {   // attribute is a javabean property! 
-                return (impl.getAttributeMethod(this.component, "value", 
true)==null);
+                return (impl.getPropertyMethod(this.component, "value", 
true)==null);
             }
             // Check value expression
             ValueExpression ve = findValueExpression("value");

Reply via email to