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 2007/02/13 15:23:08 UTC

svn commit: r507016 - /myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/InputSuggestAjaxRenderer.java

Author: mmarinschek
Date: Tue Feb 13 06:23:08 2007
New Revision: 507016

URL: http://svn.apache.org/viewvc?view=rev&rev=507016
Log:
small fix: use submitted value

Modified:
    myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/InputSuggestAjaxRenderer.java

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/InputSuggestAjaxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/InputSuggestAjaxRenderer.java?view=diff&rev=507016&r1=507015&r2=507016
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/InputSuggestAjaxRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/InputSuggestAjaxRenderer.java Tue Feb 13 06:23:08 2007
@@ -83,7 +83,6 @@
 
         ResponseWriter out = context.getResponseWriter();
 
-        Object valueObject = RendererUtils.getStringValue(context, inputSuggestAjax);
         String label = null;
         String value = null;
 
@@ -94,30 +93,23 @@
 		/* check if the user supplied a label method */
 		if (inputSuggestAjax.getItemLabelMethod() == null)
 		{
-			if (valueObject instanceof String)
-			{
-				valueToRender = (String) valueObject;
-
-				idToRender = clientId;
-			}
-			else if (valueObject == null)
-			{
-				valueToRender = "";
-
-				idToRender = clientId;
-			}
-		}
+			valueToRender = RendererUtils.getStringValue(context, inputSuggestAjax);
+            value = valueToRender;
+        }
 		else
         {
             MethodBinding labelMethod = inputSuggestAjax.getItemLabelMethod();
 
             if (labelMethod != null)
             {
-				Converter converter = getRequiredConverter(context, inputSuggestAjax);
+                Object valueObject = inputSuggestAjax.getValue();
+
+                Converter converter = getRequiredConverter(context, inputSuggestAjax);
 
                 label = (String) labelMethod.invoke(context, new Object[]{valueObject});
 
 				value = converter.getAsString(context, inputSuggestAjax, valueObject);
+                valueToRender = value;
 
                 idToRender = clientId + "_valueFake";
             }