You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/09/30 10:10:42 UTC

svn commit: r292674 - /myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjax.java

Author: mmarinschek
Date: Fri Sep 30 01:10:38 2005
New Revision: 292674

URL: http://svn.apache.org/viewcvs?rev=292674&view=rev
Log:
Fixed bug - no value bindings evaluated

Modified:
    myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjax.java

Modified: myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjax.java
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjax.java?rev=292674&r1=292673&r2=292674&view=diff
==============================================================================
--- myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjax.java (original)
+++ myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjax.java Fri Sep 30 01:10:38 2005
@@ -21,6 +21,7 @@
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
 import javax.faces.render.Renderer;
 import java.io.IOException;
 
@@ -34,7 +35,6 @@
 public class InputSuggestAjax extends HtmlInputText implements AjaxComponent
 {
     private MethodBinding _suggestedItemsMethod;
-    private Integer _maxSuggestedItems;
 
     private String _popupId;
     private String _popupStyleClass;
@@ -49,6 +49,8 @@
 
     private String _layout;
 
+    private Integer _maxSuggestedItems;
+
     public Object saveState(FacesContext context)
     {
         Object[] values = new Object[12];
@@ -99,8 +101,10 @@
 
     public String getLayout()
     {
-       if (_layout != null) return _layout;
-       return "default";
+        if (_layout != null)
+            return _layout;
+        ValueBinding vb = getValueBinding("layout");
+        return vb != null ? vb.getValue(getFacesContext()).toString() : "default";
     }
 
     public void setLayout(String layout)
@@ -120,7 +124,10 @@
 
     public String getPopupId()
     {
-        return _popupId;
+        if (_popupId != null)
+            return _popupId;
+        ValueBinding vb = getValueBinding("popupId");
+        return vb != null ? vb.getValue(getFacesContext()).toString() : null;
     }
 
     public void setPopupId(String popupId)
@@ -130,7 +137,10 @@
 
     public String getPopupStyleClass()
     {
-        return _popupStyleClass;
+        if (_popupStyleClass != null)
+            return _popupStyleClass;
+        ValueBinding vb = getValueBinding("popupStyleClass");
+        return vb != null ? vb.getValue(getFacesContext()).toString() : null;
     }
 
     public void setPopupStyleClass(String popupStyleClass)
@@ -140,7 +150,10 @@
 
     public String getPopupStyle()
     {
-        return _popupStyle;
+        if (_popupStyle != null)
+            return _popupStyle;
+        ValueBinding vb = getValueBinding("popupStyle");
+        return vb != null ? vb.getValue(getFacesContext()).toString() : null;
     }
 
     public void setPopupStyle(String popupStyle)
@@ -150,7 +163,10 @@
 
     public String getListId()
     {
-        return _listId;
+        if (_listId != null)
+            return _listId;
+        ValueBinding vb = getValueBinding("listId");
+        return vb != null ? vb.getValue(getFacesContext()).toString() : null;
     }
 
     public void setListId(String listId)
@@ -160,7 +176,10 @@
 
     public String getListStyleClass()
     {
-        return _listStyleClass;
+        if (_listStyleClass != null)
+            return _listStyleClass;
+        ValueBinding vb = getValueBinding("listStyleClass");
+        return vb != null ? vb.getValue(getFacesContext()).toString() : null;
     }
 
     public void setListStyleClass(String listStyleClass)
@@ -170,7 +189,10 @@
 
     public String getListStyle()
     {
-        return _listStyle;
+        if (_listStyle != null)
+            return _listStyle;
+        ValueBinding vb = getValueBinding("listStyle");
+        return vb != null ? vb.getValue(getFacesContext()).toString() : null;
     }
 
     public void setListStyle(String listStyle)
@@ -180,7 +202,10 @@
 
     public String getListItemStyleClass()
     {
-        return _listItemStyleClass;
+        if (_listItemStyleClass != null)
+            return _listItemStyleClass;
+        ValueBinding vb = getValueBinding("listItemStyleClass");
+        return vb != null ? vb.getValue(getFacesContext()).toString() : null;
     }
 
     public void setListItemStyleClass(String listItemStyleClass)
@@ -190,7 +215,10 @@
 
     public String getListItemStyle()
     {
-        return _listItemStyle;
+        if (_listItemStyle != null)
+            return _listItemStyle;
+        ValueBinding vb = getValueBinding("listItemStyle");
+        return vb != null ? vb.getValue(getFacesContext()).toString() : null;
     }
 
     public void setListItemStyle(String listItemStyle)
@@ -199,7 +227,10 @@
     }
 
 	public Integer getMaxSuggestedItems() {
-		return _maxSuggestedItems;
+        if (_maxSuggestedItems != null)
+            return _maxSuggestedItems;
+        ValueBinding vb = getValueBinding("maxSuggestedItems");
+        return vb != null ? (Integer) vb.getValue(getFacesContext()) : null;
 	}
 
 	public void setMaxSuggestedItems(Integer suggestedItems) {