You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sv...@apache.org on 2005/08/22 17:09:10 UTC
svn commit: r234502 - in /myfaces/sandbox/trunk:
src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java
src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxTag.java
tld/myfaces_sandbox.tld
Author: svieujot
Date: Mon Aug 22 08:08:51 2005
New Revision: 234502
URL: http://svn.apache.org/viewcvs?rev=234502&view=rev
Log:
inputSuggestAjax : Add user role attrites & misc fixes.
Modified:
myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java
myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxTag.java
myfaces/sandbox/trunk/tld/myfaces_sandbox.tld
Modified: myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java?rev=234502&r1=234501&r2=234502&view=diff
==============================================================================
--- myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java (original)
+++ myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxRenderer.java Mon Aug 22 08:08:51 2005
@@ -16,8 +16,6 @@
package org.apache.myfaces.custom.inputsuggestajax;
-
-
import org.apache.myfaces.component.html.util.AddResource;
import org.apache.myfaces.custom.ajax.api.AjaxPhaseListener;
import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
@@ -113,13 +111,13 @@
{
RendererUtils.checkParamValidity(context, component, InputSuggestAjax.class);
- if( HtmlRendererUtils.isDisplayValueOnly(component) ){
+ if( HtmlRendererUtils.isDisplayValueOnly(component) || isDisabled(context, component)){
super.encodeEnd(context, component);
return;
}
- InputSuggestAjax InputSuggestAjax = (InputSuggestAjax) component;
-
+ InputSuggestAjax inputSuggestAjax = (InputSuggestAjax) component;
+
this.encodeJavascript(context,component);
component.getAttributes().put("autocomplete","off");
@@ -128,26 +126,26 @@
ResponseWriter out = context.getResponseWriter();
out.startElement(HTML.DIV_ELEM, null);
- if(InputSuggestAjax.getLayout().equals("default"))
+ if(inputSuggestAjax.getLayout().equals("default"))
{
out.writeAttribute(HTML.CLASS_ATTR, "ajaxPopup", null);
}
- if(InputSuggestAjax.getPopupStyleClass()!= null)
+ if(inputSuggestAjax.getPopupStyleClass()!= null)
{
- out.writeAttribute(HTML.CLASS_ATTR, InputSuggestAjax.getPopupStyleClass(), null);
+ out.writeAttribute(HTML.CLASS_ATTR, inputSuggestAjax.getPopupStyleClass(), null);
}
- if (InputSuggestAjax.getPopupId() != null)
+ if (inputSuggestAjax.getPopupId() != null)
{
- out.writeAttribute(HTML.ID_ATTR,InputSuggestAjax.getPopupId(), null);
+ out.writeAttribute(HTML.ID_ATTR,inputSuggestAjax.getPopupId(), null);
}
else
{
out.writeAttribute(HTML.ID_ATTR,
component.getClientId(context)+"_auto_complete", null);
}
- if (InputSuggestAjax.getPopupStyle() != null)
+ if (inputSuggestAjax.getPopupStyle() != null)
{
- out.writeAttribute(HTML.STYLE_ATTR, InputSuggestAjax.getPopupStyle(),null);
+ out.writeAttribute(HTML.STYLE_ATTR, inputSuggestAjax.getPopupStyle(),null);
}
out.endElement(HTML.DIV_ELEM);
@@ -160,9 +158,9 @@
out.writeText("new Ajax.Autocompleter('",null);
out.writeText(component.getClientId(context),null);
out.writeText("','",null);
- if (InputSuggestAjax.getPopupId() != null)
+ if (inputSuggestAjax.getPopupId() != null)
{
- out.writeText(InputSuggestAjax.getPopupId(), null);
+ out.writeText(inputSuggestAjax.getPopupId(), null);
}
else
{
Modified: myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxTag.java
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxTag.java?rev=234502&r1=234501&r2=234502&view=diff
==============================================================================
--- myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxTag.java (original)
+++ myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/inputsuggestajax/InputSuggestAjaxTag.java Mon Aug 22 08:08:51 2005
@@ -22,7 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.taglib.html.HtmlInputTextTagBase;
+import org.apache.myfaces.taglib.html.ext.HtmlInputTextTag;
/**
@@ -31,7 +31,7 @@
* @version $Revision: $ $Date: $
*/
-public class InputSuggestAjaxTag extends HtmlInputTextTagBase
+public class InputSuggestAjaxTag extends HtmlInputTextTag
{
private static Log log = LogFactory.getLog(InputSuggestAjaxTag.class);
Modified: myfaces/sandbox/trunk/tld/myfaces_sandbox.tld
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/tld/myfaces_sandbox.tld?rev=234502&r1=234501&r2=234502&view=diff
==============================================================================
--- myfaces/sandbox/trunk/tld/myfaces_sandbox.tld (original)
+++ myfaces/sandbox/trunk/tld/myfaces_sandbox.tld Mon Aug 22 08:08:51 2005
@@ -163,6 +163,7 @@
&alt_location_attributes;
&html_input_suggest_attributes;
&display_value_only_attributes;
+ &user_role_attributes;
<attribute>
<name>size</name>