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/08/23 11:12:26 UTC
svn commit: r239380 [1/3] - in /myfaces: examples/trunk/simple/
forrest/trunk/content/xdocs/sandbox/
share/trunk/src/java/org/apache/myfaces/renderkit/html/
tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/
tomahawk/trunk/src/java/org/apa...
Author: mmarinschek
Date: Tue Aug 23 02:11:59 2005
New Revision: 239380
URL: http://svn.apache.org/viewcvs?rev=239380&view=rev
Log:
patch by Frank Ye for passing the component instance. Thanks a lot!
Modified:
myfaces/examples/trunk/simple/aliasBean.jsp
myfaces/forrest/trunk/content/xdocs/sandbox/inputSuggestAjax.xml
myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlFormRendererBase.java
myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/AddResource.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlDateRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/layout/HtmlLayoutRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
Modified: myfaces/examples/trunk/simple/aliasBean.jsp
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/aliasBean.jsp?rev=239380&r1=239379&r2=239380&view=diff
==============================================================================
Binary files - no diff available.
Modified: myfaces/forrest/trunk/content/xdocs/sandbox/inputSuggestAjax.xml
URL: http://svn.apache.org/viewcvs/myfaces/forrest/trunk/content/xdocs/sandbox/inputSuggestAjax.xml?rev=239380&r1=239379&r2=239380&view=diff
==============================================================================
--- myfaces/forrest/trunk/content/xdocs/sandbox/inputSuggestAjax.xml (original)
+++ myfaces/forrest/trunk/content/xdocs/sandbox/inputSuggestAjax.xml Tue Aug 23 02:11:59 2005
@@ -17,13 +17,9 @@
<p>
A tag that defines an autosuggest control complete with Ajax binding.<br/>
This allows you to do real time autocompletion via asynchronous
- server requests - Ajax. <br/><br/>
- <code>
- Note, this control is experimental and it is currently
+ server requests. Note, this control is experimental and it is currently
located in the MyFaces sandbox and can be subject to
- alteration in the immediate future.
- Therefore use it with care.
- </code>
+ alteration in the immediate future. So use it with care.
</p>
</section>
<!-- screen shot -->
Modified: myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlFormRendererBase.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlFormRendererBase.java?rev=239380&r1=239379&r2=239380&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlFormRendererBase.java (original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlFormRendererBase.java Tue Aug 23 02:11:59 2005
@@ -96,7 +96,7 @@
ResponseWriter writer = facesContext.getResponseWriter();
//write hidden input to determine "submitted" value on decode
- writer.startElement(HTML.INPUT_ELEM, null);
+ writer.startElement(HTML.INPUT_ELEM, component);
writer.writeAttribute(HTML.TYPE_ATTR, "hidden", null);
writer.writeAttribute(HTML.NAME_ATTR, component.getClientId(facesContext) +
HIDDEN_SUBMIT_INPUT_SUFFIX, null);
Modified: myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java?rev=239380&r1=239379&r2=239380&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java Tue Aug 23 02:11:59 2005
@@ -376,7 +376,7 @@
SelectItem selectItem = (SelectItem) it.next();
if (selectItem instanceof SelectItemGroup) {
- writer.startElement(HTML.OPTGROUP_ELEM, null);
+ writer.startElement(HTML.OPTGROUP_ELEM, component);
writer.writeAttribute(HTML.LABEL_ATTR, selectItem.getLabel(),
null);
SelectItem[] selectItems = ((SelectItemGroup) selectItem)
@@ -389,7 +389,7 @@
converter, selectItem);
writer.write("\t");
- writer.startElement(HTML.OPTION_ELEM, null);
+ writer.startElement(HTML.OPTION_ELEM, component);
if (itemStrValue != null) {
writer.writeAttribute(HTML.VALUE_ATTR, itemStrValue, null);
}
@@ -662,7 +662,7 @@
if (lookupSet.contains(itemStrValue)) { //TODO/FIX: we always compare the String vales, better fill lookupSet with Strings only when useSubmittedValue==true, else use the real item value Objects
if( ! isSelectOne )
- writer.startElement(HTML.LI_ELEM, null);
+ writer.startElement(HTML.LI_ELEM, component);
writer.writeText(selectItem.getLabel(), null);
if( ! isSelectOne )
writer.endElement(HTML.LI_ELEM);
@@ -881,4 +881,4 @@
+ HIDDEN_COMMANDLINK_FIELD_NAME;
}
-}
\ No newline at end of file
+}
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/AddResource.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/AddResource.java?rev=239380&r1=239379&r2=239380&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/AddResource.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/AddResource.java Tue Aug 23 02:11:59 2005
@@ -28,6 +28,7 @@
import java.util.ResourceBundle;
import java.util.Set;
+import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.servlet.http.HttpServletRequest;
@@ -63,10 +64,10 @@
/**
* Adds the given Javascript resource to the document body.
*/
- public static void addJavaScriptHere(Class componentClass, String resourceFileName, FacesContext context) throws IOException{
+ public static void addJavaScriptHere(Class componentClass, String resourceFileName, FacesContext context, UIComponent component) throws IOException{
ResponseWriter writer = context.getResponseWriter();
- writer.startElement(HTML.SCRIPT_ELEM,null);
+ writer.startElement(HTML.SCRIPT_ELEM, component);
writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR,HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT,null);
writer.writeURIAttribute(HTML.SRC_ATTR,
getResourceMappedPath(componentClass, resourceFileName, context),
@@ -75,6 +76,13 @@
}
/**
+ * Adds the given Javascript resource to the document body, without passing UIComponent.
+ */
+ public static void addJavaScriptHere(Class componentClass, String resourceFileName, FacesContext context) throws IOException{
+ addJavaScriptHere(componentClass, resourceFileName,context,null);
+ }
+
+ /**
* Adds the given Javascript resource to the document Header.
* If the script is already has already been referenced, it's added only once.
*/
@@ -443,4 +451,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java?rev=239380&r1=239379&r2=239380&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java Tue Aug 23 02:11:59 2005
@@ -97,7 +97,7 @@
if(inputCalendar.isRenderAsPopup())
{
if(inputCalendar.isAddResources())
- addScriptAndCSSResources(facesContext);
+ addScriptAndCSSResources(facesContext, component);
String dateFormat = CalendarDateTimeConverter.createJSPopupFormat(facesContext,
inputCalendar.getPopupDateFormat());
@@ -161,7 +161,7 @@
{
ResponseWriter writer = facesContext.getResponseWriter();
- writer.startElement(HTML.SCRIPT_ELEM,null);
+ writer.startElement(HTML.SCRIPT_ELEM, component);
writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR,HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT,null);
writer.write("<!--\n");
writer.writeText(getLocalizedLanguageScript(symbols, months,
@@ -242,7 +242,7 @@
* Used by the x:inputDate renderer : HTMLDateRenderer
* @throws IOException
*/
- static public void addScriptAndCSSResources(FacesContext facesContext) throws IOException{
+ static public void addScriptAndCSSResources(FacesContext facesContext, UIComponent component) throws IOException{
// check to see if javascript has already been written (which could happen if more than one calendar on the same page)
if (facesContext.getExternalContext().getRequestMap().containsKey(JAVASCRIPT_ENCODED))
{
@@ -256,7 +256,7 @@
ResponseWriter writer = facesContext.getResponseWriter();
- writer.startElement(HTML.SCRIPT_ELEM, null);
+ writer.startElement(HTML.SCRIPT_ELEM, component);
writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
writer.write(
"jscalendarSetImageDirectory(\""
@@ -361,7 +361,7 @@
if (!renderButtonAsImage) {
// render the button
- writer.startElement(HTML.INPUT_ELEM, null);
+ writer.startElement(HTML.INPUT_ELEM, uiComponent);
writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_BUTTON, null);
writeOnclickJsCalendarFunctionCall(facesContext,uiComponent,dateFormat);
@@ -381,7 +381,7 @@
writer.endElement(HTML.INPUT_ELEM);
} else {
// render the image
- writer.startElement(HTML.IMG_ELEM, null);
+ writer.startElement(HTML.IMG_ELEM, uiComponent);
writer.writeAttribute(HTML.SRC_ATTR, AddResource.getResourceMappedPath(HtmlCalendarRenderer.class, "images/calendar.gif", facesContext), null);
//writer.writeAttribute(HTML.ONCLICK_ATTR, "document.getElementById(\\'"+buttonId+"\\').click()",null);
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java?rev=239380&r1=239379&r2=239380&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanelRenderer.java Tue Aug 23 02:11:59 2005
@@ -61,7 +61,7 @@
if (!collapsiblePanel.isCollapsed()) {
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
// TODO apply styles from the parent element to this DIV
- writer.startElement(HTML.DIV_ELEM, null);
+ writer.startElement(HTML.DIV_ELEM, uiComponent);
RendererUtils.renderChildren(facesContext, uiComponent);
writer.endElement(HTML.DIV_ELEM );
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
@@ -76,7 +76,7 @@
ResponseWriter writer = facesContext.getResponseWriter();
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- writer.startElement(HTML.DIV_ELEM, null);
+ writer.startElement(HTML.DIV_ELEM, uiComponent);
ViewHandler viewHandler = facesContext.getApplication().getViewHandler();
String viewId = facesContext.getViewRoot().getViewId();
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlDateRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlDateRenderer.java?rev=239380&r1=239379&r2=239380&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlDateRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlDateRenderer.java Tue Aug 23 02:11:59 2005
@@ -158,7 +158,7 @@
String monthNumber = Integer.toString(i+1);
writer.write("\t\t");
- writer.startElement(HTML.OPTION_ELEM, null);
+ writer.startElement(HTML.OPTION_ELEM, uiComponent);
writer.writeAttribute(HTML.VALUE_ATTR, monthNumber, null);
if (i == selectedMonth)
@@ -195,7 +195,7 @@
}
protected void encodePopupCalendarButton(FacesContext facesContext, UIComponent uiComponent, ResponseWriter writer, String clientId, Locale currentLocale) throws IOException{
- HtmlCalendarRenderer.addScriptAndCSSResources(facesContext);
+ HtmlCalendarRenderer.addScriptAndCSSResources(facesContext, uiComponent);
DateFormatSymbols symbols = new DateFormatSymbols(currentLocale);
@@ -205,7 +205,7 @@
Calendar.getInstance(currentLocale).getFirstDayOfWeek(),
null);
- writer.startElement(HTML.SCRIPT_ELEM,null);
+ writer.startElement(HTML.SCRIPT_ELEM,uiComponent);
writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR,HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT,null);
writer.write(localizedLanguageScript);
//writer.write("if (!document.layers) {\n");
@@ -217,7 +217,7 @@
String dateFormat = CalendarDateTimeConverter.createJSPopupFormat(facesContext, null);
// render the button
- writer.startElement(HTML.INPUT_ELEM, null);
+ writer.startElement(HTML.INPUT_ELEM, uiComponent);
writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_BUTTON, null);
String jsCalendarFunctionCall = "jscalendarPopUpCalendarForInputDate('"+clientId+"','"+dateFormat+"')";