JBoss Rich Faces SVN: r2166 - in trunk: samples/richfaces-demo/src/main/resources/org/richfaces/demo/common and 4 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: SergeySmirnov
Date: 2007-08-08 22:20:33 -0400 (Wed, 08 Aug 2007)
New Revision: 2166
Added:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/source/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/source/usage.html
trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/source/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/usage.xhtml
Modified:
trunk/samples/effect-sample/src/main/webapp/effect.xhtml
trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
trunk/samples/richfaces-demo/src/main/webapp/richfaces/comingSoon.xhtml
trunk/ui/effect/src/main/templates/effect.jspx
Log:
effect demo
Modified: trunk/samples/effect-sample/src/main/webapp/effect.xhtml
===================================================================
--- trunk/samples/effect-sample/src/main/webapp/effect.xhtml 2007-08-09 02:08:46 UTC (rev 2165)
+++ trunk/samples/effect-sample/src/main/webapp/effect.xhtml 2007-08-09 02:20:33 UTC (rev 2166)
@@ -9,7 +9,7 @@
<f:view contentType="text/html" >
- <body>
+ <body style="opacity:0.4;">
<script>
ma = 1.4;
@@ -57,8 +57,17 @@
</h:panelGrid>
</h:form>
+ <div id="my2" style="width:100px;height:100px;background-color:blue"> </div>
+ <script>
+ var ob = document.getElementById("my");
+ </script>
+
+
+ <e:effect event="load" for="window" type="Opacity" params="id:document.body,duration:0.8,from:0.4,to:1.0"/>
+
+
<h:outputText value="Using function parameters:" />
<span onclick="Richfaces.hideItP({id:'mynewpanel'})">Hide</span>
@@ -66,15 +75,19 @@
<div id="mynewpanel" style="width:100px;height:100px;background-color:lightblue"> </div>
- <e:effect name="Richfaces.hideItP" onmouseover="Richfaces.hideItP({id:'mynewpanel'})" type="Opacity" params="duration:0.8, from:1.0, to:0.2" />
+ <e:effect name="Richfaces.hideItP" type="Opacity" params="duration:0.8, from:1.0, to:0.2" />
<e:effect name="Richfaces.showItP" />
- <div id="dpanel" style="width:100px;height:100px;background-color:lightgreen"> </div>
+ <div id="dpanel" style="width:100px;height:100px;background-color:lightgreen"> </div>
- <e:effect event="onclick" for="dpanel" type="Fade" params="duration:0.8, id:'my'" />
- <e:effect event="load" for="window" type="Fade" params="duration:0.8" />
+<script>
+var bb=document.getElementById('dpanel');
+</script>
+
+ <e:effect event="onclick" for="my" type="Fade" params="id:bb,duration:0.8" />
+
<div style="margin:10px;"><a href='javascript:void(0)'
onclick='new Effect["Opacity"]( document.getElementById("mynewpanel"),{duration:0.8, from:1.0, to:0.2} );'>Click for Demo!</a><br /></div>
<!--
Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-08-09 02:08:46 UTC (rev 2165)
+++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-08-09 02:20:33 UTC (rev 2166)
@@ -61,5 +61,5 @@
message= richMisc, Message, /images/ico_common.gif, /images/cn_Message.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
messages= richMisc, Messages, /images/ico_common.gif, /images/cn_Messages.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
virtualEarth= richMisc, Virtual Earth, /images/ico_VirtualEarth.gif, /images/cn_VirtualEarth.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/effect.jsf
scrollableGrid= richDataIterators, Scrollable Data Grid, /images/ico_common.gif, /images/cn_ScrollableDataGrid.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/comingSoon.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/comingSoon.xhtml 2007-08-09 02:08:46 UTC (rev 2165)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/comingSoon.xhtml 2007-08-09 02:20:33 UTC (rev 2166)
@@ -7,6 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components</ui:define>
<ui:define name="body">
+ <div id="coming" style="display:none">
<div style="text-align:center"><h:graphicImage value="/images/coming_soon.gif" />
</div>
<p>The demo example development for this component is in progress. You can see
@@ -17,6 +18,9 @@
<a target="_blank" href="http://jboss.com/index.html?module=bb&op=viewforum&f=261">
http://jboss.com/index.html?module=bb&op=viewforum&f=261</a>
</p>
+ </div>
+ <rich:effect event="load" for="window" type="Appear" params="id:'coming',duration:1.0,from:0.1,to:1.0" />
+
</ui:define>
</ui:composition>
</html>
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/source/usage.html
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/source/usage.html (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/source/usage.html 2007-08-09 02:20:33 UTC (rev 2166)
@@ -0,0 +1 @@
+TODO: source should be added
\ No newline at end of file
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/source/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/source/usage.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/source/usage.xhtml 2007-08-09 02:20:33 UTC (rev 2166)
@@ -0,0 +1,6 @@
+<a4j:form ajaxSubmit="true" reRender="name">
+ <h:panelGrid>
+ <h:commandButton value="Set Local Name to John (Ajax)" action="#{userBean.nameItJohn}" />
+ <h:outputText id="name" value="Name:#{userBean.name}" />
+ </h:panelGrid>
+</a4j:form>
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/usage.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/usage.xhtml 2007-08-09 02:20:33 UTC (rev 2166)
@@ -0,0 +1,80 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+ <ui:composition template="/templates/component-sample.xhtml">
+ <ui:define name="sample">
+
+ <p>rich:effect utilizes the set of effects provided by scriptaculous javascript library. It
+ allows to attach effects to JSF components and html tags. For the reference of the available
+ effects and thier parameters see the scriptaculous documentation and wiki.
+ </p>
+ <p>
+ It is possible to use rich:effect in two modes:
+ <ul>
+ <li>attached to the JSF components or html tags and triggered by particular event. Wiring
+ effect with JSF components might be occurs on the server or client. Wiring with html tag is
+ possible only on the client side</li>
+ <li>invoking from the javascript code by effect name. During the rendering, rich:effect generates the javascript
+ function with defined name. When the function is called, the effect is applied</li>
+ </ul>
+ Those a the typical variants of using:
+<pre>
+<!-- attaching by event -->
+<rich:panel>
+ <rich:effect event="onmouseout" type="Opacity" params="duration:0.8,from:1.0,to:0.3" />
+ .... panel content ....
+</rich:panel>
+...
+
+<!-- invoking from javascript -->
+<div id="contentDiv">
+ ..... div content ......
+</div>
+
+<input type="button" onclick="hideDiv({duration:0.7})" value="Hide" />
+<input type="button" onclick="showDiv()" value="Show" />
+
+<rich:effect name="hideDiv" for="contentDiv" type="Fade" />
+<rich:effect name="showDiv" for="contentDiv" type="Appear" />
+
+<!-- attaching to window on load and applying on particular page element -->
+<rich:effect for="window" event="onload"
+ type="Appear" params="id:'contentDiv',duration:0.8,from:0.3,to:1.0" />
+</pre>
+
+ </p>
+
+ <div class="sample-container" >
+
+ <rich:separator height="1" style="padding-bottom:10px" />
+
+ <rich:panel id="mypanel" style="background-color:lightblue;width:300px" >
+ <rich:effect event="onmouseout" type="Opacity" params="from:1.0,to:0.3" />
+ <rich:effect event="onmouseover" type="Opacity" params="from:0.3,to:1.0" />
+
+ <f:verbatim>
+ The opacity of this panel will be set to 0.3 when the mouse cursor is out set
+ to 1.0 if the mouse is over. The default opacity is set to 0.3 when the page
+ is loaded.
+
+ </f:verbatim>
+
+ </rich:panel>
+ <rich:effect for="window" event="load" type="Opacity" params="id:'mypanel',from:1.0,to:0.3" />
+
+ <rich:separator height="1" style="padding-top:10px" />
+
+ </div>
+
+
+ </ui:define>
+ <ui:define name="sources">
+ Here is a fragment of page sources for the given example:
+ <iframe src="${facesContext.externalContext.requestContextPath}/richfaces/form/source/usage.html" class="source_frame"/>
+ </ui:define>
+ </ui:composition>
+</html>
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect.xhtml 2007-08-09 02:20:33 UTC (rev 2166)
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+<ui:composition template="/templates/main.xhtml">
+ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Rich Effects</ui:define>
+ <ui:define name="body">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tab label="Usage">
+ <ui:include src="/richfaces/effect/usage.xhtml"/>
+ </rich:tab>
+ </rich:tabPanel>
+ </ui:define>
+</ui:composition>
+</html>
Modified: trunk/ui/effect/src/main/templates/effect.jspx
===================================================================
--- trunk/ui/effect/src/main/templates/effect.jspx 2007-08-09 02:08:46 UTC (rev 2165)
+++ trunk/ui/effect/src/main/templates/effect.jspx 2007-08-09 02:20:33 UTC (rev 2166)
@@ -52,9 +52,13 @@
<c:if test="#{needsObserver}">
<script type="text/javascript" x:passThruWithExclusions="name,type,for">
//<![CDATA[
+{
var pm ="{"+"#{params}"+"}";var ename = Richfaces.effectEventOnOut('#{event}');
var obj= typeof #{forid} == "object"? #{forid}:$('#{forid}');
-Event.observe(obj,ename, Function("Richfaces.processEffect('#{forid}','#{type}',{},pm );"),{#{params}}.useCapture||false);
+var hash = { id: obj, params: pm };
+var bindedFunction = function(event){ return Richfaces.processEffect(this.id,'#{type}',{},this.params); }.bind(hash);
+Event.observe(obj,ename, bindedFunction,{#{params}}.useCapture||false);
+}
//]]>
</script>
</c:if>
18 years, 8 months
JBoss Rich Faces SVN: r2165 - in trunk/framework: impl/src/main/java/org/ajax4jsf/context and 3 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-08-08 22:08:46 -0400 (Wed, 08 Aug 2007)
New Revision: 2165
Modified:
trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
trunk/framework/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
Start progress on http://jira.jboss.org/jira/browse/RF-548 .
Display error page in ajax requests.
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2007-08-08 23:00:09 UTC (rev 2164)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2007-08-09 02:08:46 UTC (rev 2165)
@@ -109,6 +109,8 @@
public AjaxContext() {
super();
}
+
+ public abstract void release();
public abstract Map getResponseDataMap();
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2007-08-08 23:00:09 UTC (rev 2164)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2007-08-09 02:08:46 UTC (rev 2165)
@@ -78,499 +78,524 @@
*
*/
public class AjaxContextImpl extends AjaxContext {
- public static final String RESOURCES_PROCESSED = "org.ajax4jsf.framework.HEADER_PROCESSED";
+ public static final String RESOURCES_PROCESSED = "org.ajax4jsf.framework.HEADER_PROCESSED";
- private static final Log log = LogFactory.getLog(AjaxContext.class);
+ private static final Log log = LogFactory.getLog(AjaxContext.class);
- private static ComponentInvoker invoker;
+ private static ComponentInvoker invoker;
- private static Map contextClasses = new HashMap();
+ private static Map contextClasses = new HashMap();
- Set ajaxAreasToRender = new HashSet();
+ Set ajaxAreasToRender = new HashSet();
- Set ajaxRenderedAreas = new HashSet();
+ Set ajaxRenderedAreas = new HashSet();
- boolean ajaxRequest = false;
+ boolean ajaxRequest = false;
- boolean ajaxRequestSet = false;
+ boolean ajaxRequestSet = false;
- boolean selfRender = false;
+ boolean selfRender = false;
- Integer viewSequence = new Integer(1);
+ Integer viewSequence = new Integer(1);
- String submittedRegionClientId = null;
+ String submittedRegionClientId = null;
- boolean submittedRegionSet = false;
+ boolean submittedRegionSet = false;
- ViewIdHolder viewIdHolder = null;
+ ViewIdHolder viewIdHolder = null;
- Map responseDataMap = new HashMap();
+ Map responseDataMap = new HashMap();
- Map commonAjaxParameters = new HashMap();
+ Map commonAjaxParameters = new HashMap();
- static {
- try {
- // Attempt to create JSF1.2 specific invoker.
- invoker = new JsfOneOneInvoker();
- } catch (Exception e) {
- invoker = new JsfOneOneInvoker();
+ static {
+ try {
+ // Attempt to create JSF1.2 specific invoker.
+ invoker = new JsfOneOneInvoker();
+ } catch (Exception e) {
+ invoker = new JsfOneOneInvoker();
+ }
}
- }
+
+ public void release() {
+
+ ajaxAreasToRender = new HashSet();
- /**
- * @param root
- * @param context
- * @param callback
- * @param regionId
- * @return
- * @see org.ajax4jsf.context.JsfOneOneInvoker#invokeOnComponent(javax.faces.component.UIComponent,
- * javax.faces.context.FacesContext,
- * org.ajax4jsf.context.InvokerCallback, java.lang.String)
- */
- public static boolean invokeOnComponent(UIComponent root,
- FacesContext context, InvokerCallback callback, String regionId) {
- return invoker.invokeOnComponent(root, context, callback, regionId);
- }
+ ajaxRenderedAreas = new HashSet();
- /**
- * @param viewRoot
- * @param context
- * @param callback
- * @see org.ajax4jsf.context.JsfOneOneInvoker#invokeOnRegionOrRoot(org.ajax4jsf.component.AjaxViewRoot,
- * javax.faces.context.FacesContext,
- * org.ajax4jsf.context.InvokerCallback)
- */
- public static void invokeOnRegionOrRoot(AjaxViewRoot viewRoot,
- FacesContext context, InvokerCallback callback) {
- invoker.invokeOnRegionOrRoot(viewRoot, context, callback);
- }
+ ajaxRequest = false;
- private InvokerCallback _ajaxInvoker = new InvokerCallback() {
+ ajaxRequestSet = false;
- public void invoke(FacesContext context, UIComponent component) {
- if (component instanceof AjaxContainer) {
- AjaxContainer ajax = (AjaxContainer) component;
- renderAjaxRegion(context, component, true);
- } else {
- // Container not found, use Root for encode.
- renderAjaxRegion(context, context.getViewRoot(), true);
- }
+ selfRender = false;
+
+ viewSequence = new Integer(1);
+
+ submittedRegionClientId = null;
+
+ submittedRegionSet = false;
+
+ viewIdHolder = null;
+
+ responseDataMap = new HashMap();
+
+ commonAjaxParameters = new HashMap();
+
}
- public void invokeRoot(FacesContext context) {
- renderAjaxRegion(context, context.getViewRoot(), true);
+ /**
+ * @param root
+ * @param context
+ * @param callback
+ * @param regionId
+ * @return
+ * @see org.ajax4jsf.context.JsfOneOneInvoker#invokeOnComponent(javax.faces.component.UIComponent,
+ * javax.faces.context.FacesContext,
+ * org.ajax4jsf.context.InvokerCallback, java.lang.String)
+ */
+ public static boolean invokeOnComponent(UIComponent root,
+ FacesContext context, InvokerCallback callback, String regionId) {
+ return invoker.invokeOnComponent(root, context, callback, regionId);
}
- };
+ /**
+ * @param viewRoot
+ * @param context
+ * @param callback
+ * @see org.ajax4jsf.context.JsfOneOneInvoker#invokeOnRegionOrRoot(org.ajax4jsf.component.AjaxViewRoot,
+ * javax.faces.context.FacesContext,
+ * org.ajax4jsf.context.InvokerCallback)
+ */
+ public static void invokeOnRegionOrRoot(AjaxViewRoot viewRoot,
+ FacesContext context, InvokerCallback callback) {
+ invoker.invokeOnRegionOrRoot(viewRoot, context, callback);
+ }
- public void renderSubmittedAjaxRegion(FacesContext context) {
- renderSubmittedAjaxRegion(context, true);
- }
+ private InvokerCallback _ajaxInvoker = new InvokerCallback() {
- public void renderSubmittedAjaxRegion(FacesContext context,
- final boolean useFilterWriter) {
- InvokerCallback ajaxInvoker = new InvokerCallback() {
+ public void invoke(FacesContext context, UIComponent component) {
+ if (component instanceof AjaxContainer) {
+ AjaxContainer ajax = (AjaxContainer) component;
+ renderAjaxRegion(context, component, true);
+ } else {
+ // Container not found, use Root for encode.
+ renderAjaxRegion(context, context.getViewRoot(), true);
+ }
+ }
- public void invoke(FacesContext context, UIComponent component) {
- if (component instanceof AjaxContainer) {
- renderAjaxRegion(context, component, useFilterWriter);
- } else {
- // Container not found, use Root for encode.
- renderAjaxRegion(context, context.getViewRoot(),
- useFilterWriter);
+ public void invokeRoot(FacesContext context) {
+ renderAjaxRegion(context, context.getViewRoot(), true);
}
- }
- public void invokeRoot(FacesContext context) {
- renderAjaxRegion(context, context.getViewRoot(),
- useFilterWriter);
- }
+ };
- };
- if (!invokeOnComponent(context.getViewRoot(), context, ajaxInvoker,
- getSubmittedRegionClientId(context))) {
- renderAjaxRegion(context, context.getViewRoot(), useFilterWriter);
+ public void renderSubmittedAjaxRegion(FacesContext context) {
+ renderSubmittedAjaxRegion(context, true);
}
- }
+ public void renderSubmittedAjaxRegion(FacesContext context,
+ final boolean useFilterWriter) {
+ InvokerCallback ajaxInvoker = new InvokerCallback() {
- /**
- * @param context
- * @param useFilterWriter
- * TODO
- * @throws AbortProcessingException
- */
- public void renderAjaxRegion(FacesContext context, UIComponent component,
- boolean useFilterWriter) throws FacesException {
- if (log.isDebugEnabled()) {
- log.debug(Messages.getMessage(Messages.RENDER_AJAX_REQUEST,
- component.getId()));
+ public void invoke(FacesContext context, UIComponent component) {
+ if (component instanceof AjaxContainer) {
+ renderAjaxRegion(context, component, useFilterWriter);
+ } else {
+ // Container not found, use Root for encode.
+ renderAjaxRegion(context, context.getViewRoot(),
+ useFilterWriter);
+ }
+ }
+
+ public void invokeRoot(FacesContext context) {
+ renderAjaxRegion(context, context.getViewRoot(),
+ useFilterWriter);
+ }
+
+ };
+ if (!invokeOnComponent(context.getViewRoot(), context, ajaxInvoker,
+ getSubmittedRegionClientId(context))) {
+ renderAjaxRegion(context, context.getViewRoot(), useFilterWriter);
+ }
+
}
- try {
- setSelfRender(true);
- // create response writer.
- ExternalContext extContext = context.getExternalContext();
- RenderKit renderKit = context.getRenderKit();
- String encoding;
- // Depends if we talk about servlets, portlets, ...
- if (extContext.getRequest() instanceof ServletRequest) {
- ServletRequest request = (ServletRequest) extContext
- .getRequest();
- ServletResponse response = (ServletResponse) extContext
- .getResponse();
- // HACK - bypass MyFaces ( and other ) extensions filter.
- // Setup encoding and content type
- String contentType = "text/xml";
- // get the encoding - must be setup by faces context or filter.
- encoding = request.getCharacterEncoding();
- if (encoding == null) {
- encoding = "UTF-8";
+ /**
+ * @param context
+ * @param useFilterWriter
+ * TODO
+ * @throws AbortProcessingException
+ */
+ public void renderAjaxRegion(FacesContext context, UIComponent component,
+ boolean useFilterWriter) throws FacesException {
+ if (log.isDebugEnabled()) {
+ log.debug(Messages.getMessage(Messages.RENDER_AJAX_REQUEST,
+ component.getId()));
}
- response.setContentType(contentType + ";charset=" + encoding);
- } else
- encoding = "UTF-8";
+ try {
+ setSelfRender(true);
+ // create response writer.
+ ExternalContext extContext = context.getExternalContext();
+ RenderKit renderKit = context.getRenderKit();
+ String encoding;
+ // Depends if we talk about servlets, portlets, ...
+ if (extContext.getRequest() instanceof ServletRequest) {
+ ServletRequest request = (ServletRequest) extContext
+ .getRequest();
+ ServletResponse response = (ServletResponse) extContext
+ .getResponse();
+ // HACK - bypass MyFaces ( and other ) extensions filter.
- PrintWriter servletWriter;
- if (useFilterWriter
- && extContext.getRequestMap().containsKey(
- BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE)) {
- // HACK - Special case for MyFaces, since <f:view don't call
- // encode methods,
- // encode response as for self-rendered region directly to
- // filter response wrpper.
- // to avoid exceptions, inform wrapper to ignore illegal states
- // for getWriter/Stream.
- ServletResponse servletResponse = (ServletResponse) extContext
- .getRequestMap().get(
- BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE);
- servletResponse.resetBuffer();
- servletWriter = servletResponse.getWriter();
- ((FilterServletResponseWrapper) servletResponse)
- .setUseNullStream(true);
- } else {
- servletWriter = getWriter(extContext);
- }
- ResponseWriter writer = renderKit.createResponseWriter(
- servletWriter, null, encoding);
- context.setResponseWriter(writer);
- // make response
- writer.startDocument();
- encodeAjaxBegin(context, component);
- component.encodeBegin(context);
- ((AjaxContainer) component).encodeAjax(context);
- component.encodeEnd(context);
- saveViewState(context);
- encodeAjaxEnd(context, component);
- writer.endDocument();
- writer.flush();
- writer.close();
- servletWriter.close();
- // Save tree state.
- } catch (IOException e) {
- throw new FacesException(Messages.getMessage(
- Messages.RENDERING_AJAX_REGION_ERROR, component
- .getClientId(context)), e);
- } finally {
- context.responseComplete();
- // component.setRendererType(defaultRenderer);
+ // Setup encoding and content type
+ String contentType = "text/xml";
+ // get the encoding - must be setup by faces context or filter.
+ encoding = request.getCharacterEncoding();
+ if (encoding == null) {
+ encoding = "UTF-8";
+ }
+ response.setContentType(contentType + ";charset=" + encoding);
+ } else
+ encoding = "UTF-8";
+
+ PrintWriter servletWriter;
+ if (useFilterWriter
+ && extContext.getRequestMap().containsKey(
+ BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE)) {
+ // HACK - Special case for MyFaces, since <f:view don't call
+ // encode methods,
+ // encode response as for self-rendered region directly to
+ // filter response wrpper.
+ // to avoid exceptions, inform wrapper to ignore illegal states
+ // for getWriter/Stream.
+ ServletResponse servletResponse = (ServletResponse) extContext
+ .getRequestMap().get(
+ BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE);
+ servletResponse.resetBuffer();
+ servletWriter = servletResponse.getWriter();
+ ((FilterServletResponseWrapper) servletResponse)
+ .setUseNullStream(true);
+ } else {
+ servletWriter = getWriter(extContext);
+ }
+ ResponseWriter writer = renderKit.createResponseWriter(
+ servletWriter, null, encoding);
+ context.setResponseWriter(writer);
+ // make response
+ writer.startDocument();
+ encodeAjaxBegin(context, component);
+ component.encodeBegin(context);
+ ((AjaxContainer) component).encodeAjax(context);
+ component.encodeEnd(context);
+ saveViewState(context);
+ encodeAjaxEnd(context, component);
+ writer.endDocument();
+ writer.flush();
+ writer.close();
+ servletWriter.close();
+ // Save tree state.
+ } catch (IOException e) {
+ throw new FacesException(Messages.getMessage(
+ Messages.RENDERING_AJAX_REGION_ERROR, component
+ .getClientId(context)), e);
+ } finally {
+ context.responseComplete();
+ // component.setRendererType(defaultRenderer);
+ }
}
- }
- /**
- * Encode declaration for AJAX response. Render <html><body>
- *
- * @param context
- * @param component
- * @throws IOException
- */
- public void encodeAjaxBegin(FacesContext context, UIComponent component)
- throws IOException {
- // AjaxContainer ajax = (AjaxContainer) component;
- ResponseWriter out = context.getResponseWriter();
- // DebugUtils.traceView("ViewRoot in AJAX Page encode begin");
- out.startElement(HTML.HTML_ELEMENT, component);
- // TODO - html attributes. lang - from current locale ?
- Locale locale = context.getViewRoot().getLocale();
- out.writeAttribute(HTML.lang_ATTRIBUTE, locale.toString(), "lang");
- out.startElement(HTML.BODY_ELEMENT, component);
- }
+ /**
+ * Encode declaration for AJAX response. Render <html><body>
+ *
+ * @param context
+ * @param component
+ * @throws IOException
+ */
+ public void encodeAjaxBegin(FacesContext context, UIComponent component)
+ throws IOException {
+ // AjaxContainer ajax = (AjaxContainer) component;
+ ResponseWriter out = context.getResponseWriter();
+ // DebugUtils.traceView("ViewRoot in AJAX Page encode begin");
+ out.startElement(HTML.HTML_ELEMENT, component);
+ // TODO - html attributes. lang - from current locale ?
+ Locale locale = context.getViewRoot().getLocale();
+ out.writeAttribute(HTML.lang_ATTRIBUTE, locale.toString(), "lang");
+ out.startElement(HTML.BODY_ELEMENT, component);
+ }
- /**
- * End encoding of AJAX response. Render tag with included areas and
- * close </body></html>
- *
- * @param context
- * @param component
- * @throws IOException
- */
- public void encodeAjaxEnd(FacesContext context, UIComponent component)
- throws IOException {
- // AjaxContainer ajax = (AjaxContainer) component;
- ResponseWriter out = context.getResponseWriter();
- // DebugUtils.traceView("ViewRoot in AJAX Page encode begin");
- out.endElement(HTML.BODY_ELEMENT);
- out.endElement(HTML.HTML_ELEMENT);
- }
+ /**
+ * End encoding of AJAX response. Render tag with included areas and close
+ * </body></html>
+ *
+ * @param context
+ * @param component
+ * @throws IOException
+ */
+ public void encodeAjaxEnd(FacesContext context, UIComponent component)
+ throws IOException {
+ // AjaxContainer ajax = (AjaxContainer) component;
+ ResponseWriter out = context.getResponseWriter();
+ // DebugUtils.traceView("ViewRoot in AJAX Page encode begin");
+ out.endElement(HTML.BODY_ELEMENT);
+ out.endElement(HTML.HTML_ELEMENT);
+ }
- /**
- * @param context
- * @param root
- * @throws FacesException
- */
- public void processHeadResources(FacesContext context)
- throws FacesException {
- ExternalContext externalContext = context.getExternalContext();
- Map requestMap = externalContext.getRequestMap();
- if (!Boolean.TRUE.equals(requestMap.get(RESOURCES_PROCESSED))) {
- if (null != requestMap.get(BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE)) {
- if (log.isDebugEnabled()) {
- log
- .debug("Process component tree for collect used scripts and styles");
+ /**
+ * @param context
+ * @param root
+ * @throws FacesException
+ */
+ public void processHeadResources(FacesContext context)
+ throws FacesException {
+ ExternalContext externalContext = context.getExternalContext();
+ Map requestMap = externalContext.getRequestMap();
+ if (!Boolean.TRUE.equals(requestMap.get(RESOURCES_PROCESSED))) {
+ if (null != requestMap.get(BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE)) {
+ if (log.isDebugEnabled()) {
+ log
+ .debug("Process component tree for collect used scripts and styles");
+ }
+ UIViewRoot root = context.getViewRoot();
+ Set scripts = new LinkedHashSet();
+ Set styles = new LinkedHashSet();
+ RenderKitFactory rkFactory = (RenderKitFactory) FactoryFinder
+ .getFactory(FactoryFinder.RENDER_KIT_FACTORY);
+ RenderKit renderKit = rkFactory.getRenderKit(context, context
+ .getViewRoot().getRenderKitId());
+ processHeadResources(context, root, scripts, styles, renderKit);
+ if (scripts.size() > 0) {
+ if (log.isDebugEnabled()) {
+ StringBuffer buff = new StringBuffer(
+ "Scripts for insert into head : \n");
+ for (Iterator iter = scripts.iterator(); iter.hasNext();) {
+ String script = (String) iter.next();
+ buff.append(script).append("\n");
+ }
+ log.debug(buff.toString());
+ }
+ requestMap.put(SCRIPTS_PARAMETER, scripts);
+ }
+ // Set default style sheet for current skin.
+ String styleSheetUri = null;
+ try {
+ styleSheetUri = (String) SkinFactory.getInstance().getSkin(
+ context).getParameter(context,
+ Skin.generalStyleSheet);
+ } catch (SkinNotFoundException e) {
+ log.warn("Current Skin is not found", e);
+ }
+ if (null != styleSheetUri) {
+ String resourceURL = context.getApplication()
+ .getViewHandler().getResourceURL(context,
+ styleSheetUri);
+ // TODO - some resources can be non-session aware, we
+ // must
+ // skip encoding for this case ?
+ // But, in common case - static links not need session
+ // info,
+ // and dynamic resources perform encodings if nessesary
+ // resourceURL =
+ // context.getExternalContext().encodeResourceURL(resourceURL);
+ styles.add(resourceURL);
+ }
+ if (styles.size() > 0) {
+ if (log.isDebugEnabled()) {
+ StringBuffer buff = new StringBuffer(
+ "Styles for insert into head : \n");
+ for (Iterator iter = styles.iterator(); iter.hasNext();) {
+ String style = (String) iter.next();
+ buff.append(style).append("\n");
+ }
+ log.debug(buff.toString());
+ }
+ requestMap.put(STYLES_PARAMETER, styles);
+ }
+ // Mark as processed.
+ requestMap.put(RESOURCES_PROCESSED, Boolean.TRUE);
+ // Save viewId for a parser selection
+ requestMap.put(AjaxViewHandler.VIEW_ID_KEY, root.getViewId());
+ }
+
}
- UIViewRoot root = context.getViewRoot();
- Set scripts = new LinkedHashSet();
- Set styles = new LinkedHashSet();
- RenderKitFactory rkFactory = (RenderKitFactory) FactoryFinder
- .getFactory(FactoryFinder.RENDER_KIT_FACTORY);
- RenderKit renderKit = rkFactory.getRenderKit(context, context
- .getViewRoot().getRenderKitId());
- processHeadResources(context, root, scripts, styles, renderKit);
- if (scripts.size() > 0) {
- if (log.isDebugEnabled()) {
- StringBuffer buff = new StringBuffer(
- "Scripts for insert into head : \n");
- for (Iterator iter = scripts.iterator(); iter.hasNext();) {
- String script = (String) iter.next();
- buff.append(script).append("\n");
+ }
+
+ /**
+ * Append nessesary scripts and styles from component ( if renderer
+ * implements {@link HeaderResourceProducer}) and recursive process all
+ * facets and childrens.
+ *
+ * @param context
+ * TODO
+ * @param root
+ * @param scripts
+ * @param styles
+ * @param renderKit
+ * TODO
+ */
+ private void processHeadResources(FacesContext context, UIComponent root,
+ Set scripts, Set styles, RenderKit renderKit) {
+ Renderer renderer = getRenderer(context, root, renderKit);
+ if (null != renderer) {
+ if (renderer instanceof HeaderResourceProducer) {
+ HeaderResourceProducer producer = (HeaderResourceProducer) renderer;
+ Set set = producer.getHeaderScripts(context, root);
+ if (null != set) {
+ scripts.addAll(set);
+ }
+ set = producer.getHeaderStyles(context, root);
+ if (null != set) {
+ styles.addAll(set);
+ }
}
- log.debug(buff.toString());
- }
- requestMap.put(SCRIPTS_PARAMETER, scripts);
}
- // Set default style sheet for current skin.
- String styleSheetUri = null;
- try {
- styleSheetUri = (String) SkinFactory.getInstance().getSkin(
- context).getParameter(context,
- Skin.generalStyleSheet);
- } catch (SkinNotFoundException e) {
- log.warn("Current Skin is not found", e);
+ for (Iterator iter = root.getFacets().values().iterator(); iter
+ .hasNext();) {
+ UIComponent child = (UIComponent) iter.next();
+ processHeadResources(context, child, scripts, styles, renderKit);
}
- if (null != styleSheetUri) {
- String resourceURL = context.getApplication()
- .getViewHandler().getResourceURL(context,
- styleSheetUri);
- // TODO - some resources can be non-session aware, we
- // must
- // skip encoding for this case ?
- // But, in common case - static links not need session
- // info,
- // and dynamic resources perform encodings if nessesary
- // resourceURL =
- // context.getExternalContext().encodeResourceURL(resourceURL);
- styles.add(resourceURL);
+ for (Iterator iter = root.getChildren().iterator(); iter.hasNext();) {
+ UIComponent child = (UIComponent) iter.next();
+ processHeadResources(context, child, scripts, styles, renderKit);
}
- if (styles.size() > 0) {
- if (log.isDebugEnabled()) {
- StringBuffer buff = new StringBuffer(
- "Styles for insert into head : \n");
- for (Iterator iter = styles.iterator(); iter.hasNext();) {
- String style = (String) iter.next();
- buff.append(style).append("\n");
- }
- log.debug(buff.toString());
- }
- requestMap.put(STYLES_PARAMETER, styles);
+ }
+
+ /**
+ * Find renderer for given component.
+ *
+ * @param context
+ * @param comp
+ * @param renderKit
+ * @return
+ */
+ private Renderer getRenderer(FacesContext context, UIComponent comp,
+ RenderKit renderKit) {
+
+ String rendererType = comp.getRendererType();
+ if (rendererType != null) {
+ return (renderKit.getRenderer(comp.getFamily(), rendererType));
+ } else {
+ return (null);
}
- // Mark as processed.
- requestMap.put(RESOURCES_PROCESSED, Boolean.TRUE);
- // Save viewId for a parser selection
- requestMap.put(
- AjaxViewHandler.VIEW_ID_KEY,root.getViewId());
- }
}
- }
- /**
- * Append nessesary scripts and styles from component ( if renderer
- * implements {@link HeaderResourceProducer}) and recursive process all
- * facets and childrens.
- *
- * @param context
- * TODO
- * @param root
- * @param scripts
- * @param styles
- * @param renderKit
- * TODO
- */
- private void processHeadResources(FacesContext context, UIComponent root,
- Set scripts, Set styles, RenderKit renderKit) {
- Renderer renderer = getRenderer(context, root, renderKit);
- if (null != renderer) {
- if (renderer instanceof HeaderResourceProducer) {
- HeaderResourceProducer producer = (HeaderResourceProducer) renderer;
- Set set = producer.getHeaderScripts(context, root);
- if (null != set) {
- scripts.addAll(set);
+ public void saveViewState(FacesContext context) throws IOException {
+ // TODO - for facelets environment, we need to remove transient
+ // components.
+ try {
+ Application.class.getMethod("getExpressionFactory", null);
+ } catch (NoSuchMethodException e) {
+ // JSF 1.1 !
}
- set = producer.getHeaderStyles(context, root);
- if (null != set) {
- styles.addAll(set);
+ ResponseWriter writer = context.getResponseWriter();
+ StateManager stateManager = context.getApplication().getStateManager();
+ SerializedView serializedView = stateManager
+ .saveSerializedView(context);
+ if (null != serializedView) {
+ StringWriter bufWriter = new StringWriter();
+ ResponseWriter cloneWithWriter = writer.cloneWithWriter(bufWriter);
+ context.setResponseWriter(cloneWithWriter);
+ stateManager.writeState(context, serializedView);
+ cloneWithWriter.flush();
+ if (bufWriter.getBuffer().length() > 0) {
+ context.getExternalContext().getRequestMap().put(
+ AjaxViewHandler.SERIALIZED_STATE_KEY,
+ bufWriter.toString());
+ }
+ // Restore original writer.
+ context.setResponseWriter(writer);
}
- }
}
- for (Iterator iter = root.getFacets().values().iterator(); iter
- .hasNext();) {
- UIComponent child = (UIComponent) iter.next();
- processHeadResources(context, child, scripts, styles, renderKit);
+
+ /**
+ * @return Returns the ajaxRequest.
+ */
+ public boolean isAjaxRequest() {
+ return isAjaxRequest(FacesContext.getCurrentInstance());
}
- for (Iterator iter = root.getChildren().iterator(); iter.hasNext();) {
- UIComponent child = (UIComponent) iter.next();
- processHeadResources(context, child, scripts, styles, renderKit);
+
+ /**
+ * @return Returns the ajaxRequest.
+ */
+ public boolean isAjaxRequest(FacesContext context) {
+ if (!this.ajaxRequestSet) {
+ ajaxRequest = null != getSubmittedRegionClientId(context);
+ ajaxRequestSet = true;
+ }
+ return ajaxRequest;
}
- }
- /**
- * Find renderer for given component.
- *
- * @param context
- * @param comp
- * @param renderKit
- * @return
- */
- private Renderer getRenderer(FacesContext context, UIComponent comp,
- RenderKit renderKit) {
+ /**
+ * @param ajaxRequest
+ * The ajaxRequest to set.
+ */
+ public void setAjaxRequest(boolean ajaxRequest) {
+ this.ajaxRequest = ajaxRequest;
+ this.ajaxRequestSet = true;
+ }
- String rendererType = comp.getRendererType();
- if (rendererType != null) {
- return (renderKit.getRenderer(comp.getFamily(), rendererType));
- } else {
- return (null);
+ /**
+ * @return Returns the ajaxAreasToRender.
+ */
+ public Set getAjaxAreasToRender() {
+ return this.ajaxAreasToRender;
}
- }
-
- public void saveViewState(FacesContext context) throws IOException {
- // TODO - for facelets environment, we need to remove transient
- // components.
- try {
- Application.class.getMethod("getExpressionFactory", null);
- } catch (NoSuchMethodException e) {
- // JSF 1.1 !
+ /**
+ * Add affected regions's ID to ajaxView component.
+ *
+ * @param component
+ */
+ public void addRegionsFromComponent(UIComponent component) {
+ // First step - find parent ajax view
+ Set ajaxRegions = AjaxRendererUtils.getAjaxAreas(component);
+ // if (ajaxRegions == null){
+ // FacesContext context = FacesContext.getCurrentInstance();
+ // ajaxRegions = AjaxRendererUtils.getAbsoluteId(context,component);
+ // }
+ if (log.isDebugEnabled()) {
+ log.debug(Messages.getMessage(Messages.INVOKE_AJAX_REGION_LISTENER,
+ component.getId()));
+ }
+ if (ajaxRegions != null) {
+ for (Iterator iter = ajaxRegions.iterator(); iter.hasNext();) {
+ String id = iter.next().toString();
+ ajaxAreasToRender.add(convertId(component, id));
+ }
+ }
}
- ResponseWriter writer = context.getResponseWriter();
- StateManager stateManager = context.getApplication().getStateManager();
- SerializedView serializedView = stateManager
- .saveSerializedView(context);
- if (null != serializedView) {
- StringWriter bufWriter = new StringWriter();
- ResponseWriter cloneWithWriter = writer.cloneWithWriter(bufWriter);
- context.setResponseWriter(cloneWithWriter);
- stateManager.writeState(context, serializedView);
- cloneWithWriter.flush();
- if (bufWriter.getBuffer().length() > 0) {
- context.getExternalContext().getRequestMap().put(
- AjaxViewHandler.SERIALIZED_STATE_KEY,
- bufWriter.toString());
- }
- // Restore original writer.
- context.setResponseWriter(writer);
- }
- }
- /**
- * @return Returns the ajaxRequest.
- */
- public boolean isAjaxRequest() {
- return isAjaxRequest(FacesContext.getCurrentInstance());
- }
-
- /**
- * @return Returns the ajaxRequest.
- */
- public boolean isAjaxRequest(FacesContext context) {
- if (!this.ajaxRequestSet) {
- ajaxRequest = null != getSubmittedRegionClientId(context);
- ajaxRequestSet = true;
+ public void addComponentToAjaxRender(UIComponent component) {
+ this.ajaxAreasToRender.add(AjaxRendererUtils.getAbsoluteId(component));
}
- return ajaxRequest;
- }
- /**
- * @param ajaxRequest
- * The ajaxRequest to set.
- */
- public void setAjaxRequest(boolean ajaxRequest) {
- this.ajaxRequest = ajaxRequest;
- this.ajaxRequestSet = true;
- }
-
- /**
- * @return Returns the ajaxAreasToRender.
- */
- public Set getAjaxAreasToRender() {
- return this.ajaxAreasToRender;
- }
-
- /**
- * Add affected regions's ID to ajaxView component.
- *
- * @param component
- */
- public void addRegionsFromComponent(UIComponent component) {
- // First step - find parent ajax view
- Set ajaxRegions = AjaxRendererUtils.getAjaxAreas(component);
- // if (ajaxRegions == null){
- // FacesContext context = FacesContext.getCurrentInstance();
- // ajaxRegions = AjaxRendererUtils.getAbsoluteId(context,component);
- // }
- if (log.isDebugEnabled()) {
- log.debug(Messages.getMessage(Messages.INVOKE_AJAX_REGION_LISTENER,
- component.getId()));
+ public void addComponentToAjaxRender(UIComponent base, String id) {
+ this.ajaxAreasToRender.add(convertId(base, id));
}
- if (ajaxRegions != null) {
- for (Iterator iter = ajaxRegions.iterator(); iter.hasNext();) {
- String id = iter.next().toString();
- ajaxAreasToRender.add(convertId(component, id));
- }
- }
- }
- public void addComponentToAjaxRender(UIComponent component) {
- this.ajaxAreasToRender.add(AjaxRendererUtils.getAbsoluteId(component));
- }
-
- public void addComponentToAjaxRender(UIComponent base, String id) {
- this.ajaxAreasToRender.add(convertId(base, id));
- }
-
- /**
- * Test for relative id of target components. Attempt convert to
- * absolute. For use as argument for
- * {@link UIComponent#findComponent(java.lang.String)}
- *
- * @param component
- * @param id
- * @return
- */
- private String convertId(UIComponent component, String id) {
- if (id.charAt(0) == NamingContainer.SEPARATOR_CHAR) {
- return id;
+ /**
+ * Test for relative id of target components. Attempt convert to absolute.
+ * For use as argument for
+ * {@link UIComponent#findComponent(java.lang.String)}
+ *
+ * @param component
+ * @param id
+ * @return
+ */
+ private String convertId(UIComponent component, String id) {
+ if (id.charAt(0) == NamingContainer.SEPARATOR_CHAR) {
+ return id;
+ }
+ if (null == component) {
+ throw new NullPointerException(
+ "Base component for search re-rendered compnnent is null");
+ }
+ UIComponent target = findComponentFor(component, id);
+ if (null != target) {
+ return AjaxRendererUtils.getAbsoluteId(target);
+ }
+ log.warn("Target component for id " + id + " not found");
+ return id;
}
- if (null == component) {
- throw new NullPointerException(
- "Base component for search re-rendered compnnent is null");
- }
- UIComponent target = findComponentFor(component, id);
- if (null != target) {
- return AjaxRendererUtils.getAbsoluteId(target);
- }
- log.warn("Target component for id "+id+" not found");
- return id;
- }
/**
* @param component
@@ -582,192 +607,200 @@
UIComponent parent = component;
UIComponent root = component;
while (null == target && null != parent) {
- target = parent.findComponent(id);
- root = parent;
- parent = parent.getParent();
+ target = parent.findComponent(id);
+ root = parent;
+ parent = parent.getParent();
}
if (null == target) {
- target = findUIComponentBelow(root, id);
+ target = findUIComponentBelow(root, id);
}
return target;
}
- private UIComponent findUIComponentBelow(UIComponent root,
- String id) {
+ private UIComponent findUIComponentBelow(UIComponent root, String id) {
- UIComponent target = null;
- for (Iterator iter = root.getFacetsAndChildren(); iter.hasNext();) {
- UIComponent child = (UIComponent) iter.next();
- if (child instanceof NamingContainer) {
- try {
- target = child.findComponent(id);
- } catch (IllegalArgumentException iae) {
- continue;
+ UIComponent target = null;
+ for (Iterator iter = root.getFacetsAndChildren(); iter.hasNext();) {
+ UIComponent child = (UIComponent) iter.next();
+ if (child instanceof NamingContainer) {
+ try {
+ target = child.findComponent(id);
+ } catch (IllegalArgumentException iae) {
+ continue;
+ }
+ }
+ if (target == null) {
+ if (child.getChildCount() > 0) {
+ target = findUIComponentBelow(child, id);
+ }
+ }
+
+ if (target != null) {
+ break;
+ }
+
}
- }
- if (target == null) {
- if (child.getChildCount() > 0) {
- target = findUIComponentBelow(child, id);
- }
- }
+ return target;
+ }
- if (target != null) {
- break;
- }
-
+ /**
+ * @return Returns the ajaxRenderedAreas.
+ */
+ public Set getAjaxRenderedAreas() {
+ return ajaxRenderedAreas;
}
- return target;
- }
- /**
- * @return Returns the ajaxRenderedAreas.
- */
- public Set getAjaxRenderedAreas() {
- return ajaxRenderedAreas;
- }
+ public void addRenderedArea(String id) {
+ ajaxRenderedAreas.add(id);
+ }
- public void addRenderedArea(String id) {
- ajaxRenderedAreas.add(id);
- }
+ public boolean removeRenderedArea(String id) {
+ return ajaxRenderedAreas.remove(id);
+ }
- public boolean removeRenderedArea(String id) {
- return ajaxRenderedAreas.remove(id);
- }
+ /**
+ * @return Returns the submittedClientId.
+ */
+ public String getSubmittedRegionClientId(FacesContext context) {
+ if (!this.submittedRegionSet) {
+ ExternalContext externalContext = context.getExternalContext();
+ if (null == externalContext.getRequestMap().get(
+ "javax.servlet.error.exception")) {
+ Map requestParameterMap = externalContext
+ .getRequestParameterMap();
+ this.submittedRegionClientId = (String) requestParameterMap
+ .get(AjaxContainerRenderer.AJAX_PARAMETER_NAME);
- /**
- * @return Returns the submittedClientId.
- */
- public String getSubmittedRegionClientId(FacesContext context) {
- if (!this.submittedRegionSet) {
- this.submittedRegionClientId = (String) context
- .getExternalContext().getRequestParameterMap().get(
- AjaxContainerRenderer.AJAX_PARAMETER_NAME);
- this.submittedRegionSet = true;
- if (!this.ajaxRequestSet) {
- setAjaxRequest(this.submittedRegionClientId != null);
- }
+ } else {
+ // Error page, always parsed as non-ajax request.
+ this.submittedRegionClientId = null;
+ }
+ this.submittedRegionSet = true;
+ if (!this.ajaxRequestSet) {
+ setAjaxRequest(this.submittedRegionClientId != null);
+ }
+ }
+ return this.submittedRegionClientId;
}
- return this.submittedRegionClientId;
- }
- /**
- * @param submittedClientId
- * The submittedClientId to set.
- */
- public void setSubmittedRegionClientId(String submittedClientId) {
- this.submittedRegionClientId = submittedClientId;
- this.submittedRegionSet = true;
- }
+ /**
+ * @param submittedClientId
+ * The submittedClientId to set.
+ */
+ public void setSubmittedRegionClientId(String submittedClientId) {
+ this.submittedRegionClientId = submittedClientId;
+ this.submittedRegionSet = true;
+ }
- /**
- * @return Returns the selfRender.
- */
- public boolean isSelfRender() {
- return selfRender;
- }
+ /**
+ * @return Returns the selfRender.
+ */
+ public boolean isSelfRender() {
+ return selfRender;
+ }
- /**
- * @param selfRender
- * The selfRender to set.
- */
- public void setSelfRender(boolean selfRender) {
- this.selfRender = selfRender;
- }
+ /**
+ * @param selfRender
+ * The selfRender to set.
+ */
+ public void setSelfRender(boolean selfRender) {
+ this.selfRender = selfRender;
+ }
- /**
- * @return the vievIdHolder
- */
- public ViewIdHolder getViewIdHolder() {
- return viewIdHolder;
- }
+ /**
+ * @return the vievIdHolder
+ */
+ public ViewIdHolder getViewIdHolder() {
+ return viewIdHolder;
+ }
- /**
- * @param viewIdHolder
- * the vievIdHolder to set
- */
- public void setViewIdHolder(ViewIdHolder viewIdHolder) {
- this.viewIdHolder = viewIdHolder;
- }
+ /**
+ * @param viewIdHolder
+ * the vievIdHolder to set
+ */
+ public void setViewIdHolder(ViewIdHolder viewIdHolder) {
+ this.viewIdHolder = viewIdHolder;
+ }
- /**
- * @return the responseData
- */
- public Object getResponseData() {
- return responseDataMap.get(RESPONSE_DATA_KEY);
- }
+ /**
+ * @return the responseData
+ */
+ public Object getResponseData() {
+ return responseDataMap.get(RESPONSE_DATA_KEY);
+ }
- /**
- * @param responseData
- * the responseData to set
- */
- public void setResponseData(Object responseData) {
- this.responseDataMap.put(RESPONSE_DATA_KEY, responseData);
- }
+ /**
+ * @param responseData
+ * the responseData to set
+ */
+ public void setResponseData(Object responseData) {
+ this.responseDataMap.put(RESPONSE_DATA_KEY, responseData);
+ }
- /**
- * @return the responseDataMap
- */
- public Map getResponseDataMap() {
- return responseDataMap;
- }
+ /**
+ * @return the responseDataMap
+ */
+ public Map getResponseDataMap() {
+ return responseDataMap;
+ }
- /**
- * Gives back the writer of a Response object.
- *
- * @param extContext
- * The external context.
- * @return The writer of the response.
- * @throws FacesException
- * If the response object has no getWriter() method.
- */
- protected PrintWriter getWriter(ExternalContext extContext)
- throws FacesException {
- PrintWriter writer = null;
- Object response = extContext.getResponse();
- try {
- Method gW = response.getClass()
- .getMethod("getWriter", new Class[0]);
- writer = (PrintWriter) gW.invoke(response, new Object[0]);
- } catch (Exception e) {
- throw new FacesException(e);
+ /**
+ * Gives back the writer of a Response object.
+ *
+ * @param extContext
+ * The external context.
+ * @return The writer of the response.
+ * @throws FacesException
+ * If the response object has no getWriter() method.
+ */
+ protected PrintWriter getWriter(ExternalContext extContext)
+ throws FacesException {
+ PrintWriter writer = null;
+ Object response = extContext.getResponse();
+ try {
+ Method gW = response.getClass()
+ .getMethod("getWriter", new Class[0]);
+ writer = (PrintWriter) gW.invoke(response, new Object[0]);
+ } catch (Exception e) {
+ throw new FacesException(e);
+ }
+ return writer;
}
- return writer;
- }
- public String getAjaxActionURL() {
- return getAjaxActionURL(FacesContext.getCurrentInstance());
- }
+ public String getAjaxActionURL() {
+ return getAjaxActionURL(FacesContext.getCurrentInstance());
+ }
- public String getAjaxActionURL(FacesContext context) {
- // Check arguments
- if (null == context) {
- throw new NullPointerException(
- "Faces context for build AJAX Action URL is null");
+ public String getAjaxActionURL(FacesContext context) {
+ // Check arguments
+ if (null == context) {
+ throw new NullPointerException(
+ "Faces context for build AJAX Action URL is null");
+ }
+ UIViewRoot viewRoot = context.getViewRoot();
+ if (null == viewRoot) {
+ throw new NullPointerException(
+ "Faces view tree for build AJAX Action URL is null");
+ }
+ String viewId = viewRoot.getViewId();
+ if (null == viewId) {
+ throw new NullPointerException(
+ "View id for build AJAX Action URL is null");
+ }
+ if (!viewId.startsWith("/")) {
+ throw new IllegalArgumentException(
+ "Illegal view Id for build AJAX Action URL: " + viewId);
+ }
+ ViewHandler viewHandler = context.getApplication().getViewHandler();
+ return context.getExternalContext().encodeActionURL(
+ viewHandler.getActionURL(context, viewId));
}
- UIViewRoot viewRoot = context.getViewRoot();
- if (null == viewRoot) {
- throw new NullPointerException(
- "Faces view tree for build AJAX Action URL is null");
+
+ /**
+ * @return the commonAjaxParameters
+ */
+ public Map getCommonAjaxParameters() {
+ return commonAjaxParameters;
}
- String viewId = viewRoot.getViewId();
- if (null == viewId) {
- throw new NullPointerException(
- "View id for build AJAX Action URL is null");
- }
- if (!viewId.startsWith("/")) {
- throw new IllegalArgumentException(
- "Illegal view Id for build AJAX Action URL: " + viewId);
- }
- ViewHandler viewHandler = context.getApplication().getViewHandler();
- return context.getExternalContext().encodeActionURL(
- viewHandler.getActionURL(context, viewId));
- }
- /**
- * @return the commonAjaxParameters
- */
- public Map getCommonAjaxParameters() {
- return commonAjaxParameters;
- }
-
}
\ No newline at end of file
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java 2007-08-08 23:00:09 UTC (rev 2164)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java 2007-08-09 02:08:46 UTC (rev 2165)
@@ -53,12 +53,11 @@
private static final long serialVersionUID = -4087936963051339868L;
public static final String VIEW_BEAN_PREFIX = "org.ajax4jsf.viewbean:";
-
- public static final String VIEW_STATE_SAVED_PARAM = "org.ajax4jsf.VIEW_STATE_SAVED";
- private static final Log log = LogFactory
- .getLog(AjaxPhaseListener.class);
+ public static final String VIEW_STATE_SAVED_PARAM = "org.ajax4jsf.VIEW_STATE_SAVED";
+ private static final Log log = LogFactory.getLog(AjaxPhaseListener.class);
+
public static final String AJAX_BEAN_PREFIX = "org.ajax4jsf.ajaxviewbean:";
/*
@@ -68,44 +67,52 @@
*/
public void afterPhase(PhaseEvent event) {
PhaseId phaseId = event.getPhaseId();
- if(log.isDebugEnabled()){
- log.debug("Process after phase "+phaseId.toString());
+ if (log.isDebugEnabled()) {
+ log.debug("Process after phase " + phaseId.toString());
}
FacesContext context = event.getFacesContext();
Map requestMap = context.getExternalContext().getRequestMap();
AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
if (phaseId == PhaseId.RENDER_RESPONSE) {
- if (ajaxContext.isAjaxRequest()) {
- // JSF RI 1.1 hack - view state not saved in <f:view> tag.
- if(null == requestMap.get(VIEW_STATE_SAVED_PARAM)){
- try {
+ try {
+ if (ajaxContext.isAjaxRequest()) {
+ // JSF RI 1.1 hack - view state not saved in <f:view> tag.
+ if (null == requestMap.get(VIEW_STATE_SAVED_PARAM)) {
ajaxContext.saveViewState(context);
- } catch (IOException e) {
- throw new FacesException(e);
}
}
+ } catch (IOException e) {
+ throw new FacesException(e);
+ } finally {
+ ajaxContext.release();
}
-// ajaxContext.processHeadResources(context);
+ // ajaxContext.processHeadResources(context);
} else if (phaseId == PhaseId.RESTORE_VIEW) {
UIViewRoot viewRoot = context.getViewRoot();
- if(null != viewRoot){
- boolean isAjax = ajaxContext.isAjaxRequest();
- Map attributes = viewRoot.getAttributes();
- for (Iterator it = attributes.keySet().iterator(); it.hasNext();) {
- Object key = it.next();
- if (key instanceof String) {
- String stringKey = (String) key;
- if(stringKey.startsWith(VIEW_BEAN_PREFIX)){
- requestMap.put(stringKey.substring(VIEW_BEAN_PREFIX.length()), attributes.get(key));
- } else if(isAjax && stringKey.startsWith(AJAX_BEAN_PREFIX)){
- requestMap.put(stringKey.substring(AJAX_BEAN_PREFIX.length()), attributes.get(key));
+ if (null != viewRoot) {
+ boolean isAjax = ajaxContext.isAjaxRequest();
+ Map attributes = viewRoot.getAttributes();
+ for (Iterator it = attributes.keySet().iterator(); it.hasNext();) {
+ Object key = it.next();
+ if (key instanceof String) {
+ String stringKey = (String) key;
+ if (stringKey.startsWith(VIEW_BEAN_PREFIX)) {
+ requestMap.put(stringKey.substring(VIEW_BEAN_PREFIX
+ .length()), attributes.get(key));
+ } else if (isAjax
+ && stringKey.startsWith(AJAX_BEAN_PREFIX)) {
+ requestMap.put(stringKey.substring(AJAX_BEAN_PREFIX
+ .length()), attributes.get(key));
+ }
+
}
-
}
}
- }
}
+ if(context.getResponseComplete()){
+ ajaxContext.release();
+ }
}
/*
@@ -115,14 +122,15 @@
*/
public void beforePhase(PhaseEvent event) {
PhaseId phaseId = event.getPhaseId();
- if(log.isDebugEnabled()){
- log.debug("Process before phase "+phaseId.toString());
+ if (log.isDebugEnabled()) {
+ log.debug("Process before phase " + phaseId.toString());
}
FacesContext context = event.getFacesContext();
if (phaseId == PhaseId.RENDER_RESPONSE) {
- // Clear ViewId replacement, to avoid incorrect rendering of forms URI.
+ // Clear ViewId replacement, to avoid incorrect rendering of forms
+ // URI.
AjaxContext.getCurrentInstance(context).setViewIdHolder(null);
-
+
UIViewRoot root = context.getViewRoot();
log.debug(Messages.getMessage(
Messages.ENTER_BEFORE_RENDER_VIEW_PHASE, root.getViewId(),
@@ -145,6 +153,7 @@
}
}
+
/*
* (non-Javadoc)
*
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2007-08-08 23:00:09 UTC (rev 2164)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2007-08-09 02:08:46 UTC (rev 2165)
@@ -39,6 +39,7 @@
import javax.servlet.http.HttpSession;
import org.ajax4jsf.Messages;
+import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.renderkit.AjaxContainerRenderer;
import org.ajax4jsf.resource.InternetResourceService;
import org.apache.commons.logging.Log;
@@ -54,334 +55,349 @@
*/
public abstract class BaseFilter implements Filter {
- public static final String AJAX_PUSH_KEY_HEADER = "Ajax-Push-Key";
+ public static final String AJAX_PUSH_KEY_HEADER = "Ajax-Push-Key";
- private static final Log log = LogFactory.getLog(BaseFilter.class);
+ private static final Log log = LogFactory.getLog(BaseFilter.class);
- public static final boolean DEBUG = true;
+ public static final boolean DEBUG = true;
- private FilterConfig filterConfig;
+ private FilterConfig filterConfig;
- private static final String FUNCTION_NAME_PARAMETER = "function";
+ private static final String FUNCTION_NAME_PARAMETER = "function";
- private String function = "alert('Data received');JSHttpRequest.dataReady";
+ private String function = "alert('Data received');JSHttpRequest.dataReady";
- private String attributesNames;
+ private String attributesNames;
- private boolean rewriteid = false;
+ private boolean rewriteid = false;
- public static final String REWRITEID_PARAMETER = "rewriteid";
+ public static final String REWRITEID_PARAMETER = "rewriteid";
- public static final String STYLESHEET_PARAMETER = "xsl";
+ public static final String STYLESHEET_PARAMETER = "xsl";
- public static final String ABSOLUTE_TAGS_PARAMETER = "absolute-attributes";
+ public static final String ABSOLUTE_TAGS_PARAMETER = "absolute-attributes";
- // private WebXml webXml;
- // private String xsl;
- // private Templates xslTemplates;
- /**
- *
- */
- private static final long serialVersionUID = -2295534611886142935L;
+ // private WebXml webXml;
+ // private String xsl;
+ // private Templates xslTemplates;
+ /**
+ *
+ */
+ private static final long serialVersionUID = -2295534611886142935L;
- public static final String DATA_PARAMETER = "DATA";
+ public static final String DATA_PARAMETER = "DATA";
- public static final String DEFAULT_SERVLET_PATH = "/resource";
+ public static final String DEFAULT_SERVLET_PATH = "/resource";
- public static final String RENDERER_PREFIX = "/renderer";
+ public static final String RENDERER_PREFIX = "/renderer";
- public static final String CACHEABLE_PREFIX = "/cache";
+ public static final String CACHEABLE_PREFIX = "/cache";
- // private static final Pattern rendererPattern =
- // Pattern.compile(RENDERER_PREFIX+"/([^/]+)/([^/]+)/([^/]+)/(.*)");
- // private static final Pattern builderPattern =
- // Pattern.compile(CACHEABLE_PREFIX+"/(.*)");
- public static final String FILTER_PERFORMED = "com.exade.vcp.Filter.done";
+ // private static final Pattern rendererPattern =
+ // Pattern.compile(RENDERER_PREFIX+"/([^/]+)/([^/]+)/([^/]+)/(.*)");
+ // private static final Pattern builderPattern =
+ // Pattern.compile(CACHEABLE_PREFIX+"/(.*)");
+ public static final String FILTER_PERFORMED = "com.exade.vcp.Filter.done";
- public static final String RESPONSE_WRAPPER_ATTRIBUTE = "com.exade.vcp.Filter.ResponseWrapper";
+ public static final String RESPONSE_WRAPPER_ATTRIBUTE = "com.exade.vcp.Filter.ResponseWrapper";
- protected BaseXMLFilter xmlFilter = null;
+ protected BaseXMLFilter xmlFilter = null;
- protected InternetResourceService resourceService = null;
+ protected InternetResourceService resourceService = null;
- protected PollEventsManager eventsManager;
+ protected PollEventsManager eventsManager;
- /**
- * Initialize the filter.
- */
- public void init(FilterConfig config) throws ServletException {
- if (log.isDebugEnabled()) {
- log.debug("Init ajax4jsf filter with nane: "
- + config.getFilterName());
- Enumeration parameterNames = config.getInitParameterNames();
- StringBuffer parameters = new StringBuffer("Init parameters :\n");
- while (parameterNames.hasMoreElements()) {
- String name = (String) parameterNames.nextElement();
- parameters.append(name).append(" : '").append(
- config.getInitParameter(name)).append('\n');
- }
- log.debug(parameters);
- // log.debug("Stack Trace", new Exception());
- }
- // Save config
- filterConfig = config;
- setFunction((String) nz(filterConfig
- .getInitParameter(FUNCTION_NAME_PARAMETER), getFunction()));
- setAttributesNames(filterConfig
- .getInitParameter(ABSOLUTE_TAGS_PARAMETER));
- xmlFilter.init(config);
- if ("true".equalsIgnoreCase(filterConfig
- .getInitParameter(REWRITEID_PARAMETER))) {
- this.setRewriteid(true);
- }
+ /**
+ * Initialize the filter.
+ */
+ public void init(FilterConfig config) throws ServletException {
+ if (log.isDebugEnabled()) {
+ log.debug("Init ajax4jsf filter with nane: "
+ + config.getFilterName());
+ Enumeration parameterNames = config.getInitParameterNames();
+ StringBuffer parameters = new StringBuffer("Init parameters :\n");
+ while (parameterNames.hasMoreElements()) {
+ String name = (String) parameterNames.nextElement();
+ parameters.append(name).append(" : '").append(
+ config.getInitParameter(name)).append('\n');
+ }
+ log.debug(parameters);
+ // log.debug("Stack Trace", new Exception());
+ }
+ // Save config
+ filterConfig = config;
+ setFunction((String) nz(filterConfig
+ .getInitParameter(FUNCTION_NAME_PARAMETER), getFunction()));
+ setAttributesNames(filterConfig
+ .getInitParameter(ABSOLUTE_TAGS_PARAMETER));
+ xmlFilter.init(config);
+ if ("true".equalsIgnoreCase(filterConfig
+ .getInitParameter(REWRITEID_PARAMETER))) {
+ this.setRewriteid(true);
+ }
- String prefix = filterConfig.getServletContext().getRealPath("/");
- String file = filterConfig.getInitParameter("log4j-init-file");
- // if the log4j-init-file is not set, then no point in trying
- if (file != null) {
- Log4JConfigurator log4jconfig = new Log4JConfigurator(prefix);
- log4jconfig.doConfigure(file);
+ String prefix = filterConfig.getServletContext().getRealPath("/");
+ String file = filterConfig.getInitParameter("log4j-init-file");
+ // if the log4j-init-file is not set, then no point in trying
+ if (file != null) {
+ Log4JConfigurator log4jconfig = new Log4JConfigurator(prefix);
+ log4jconfig.doConfigure(file);
+ }
+ resourceService = new InternetResourceService();
+ // Caching initialization.
+ resourceService.init(filterConfig);
+ eventsManager = new PollEventsManager();
+ eventsManager.init(filterConfig.getServletContext());
}
- resourceService = new InternetResourceService();
- // Caching initialization.
- resourceService.init(filterConfig);
- eventsManager = new PollEventsManager();
- eventsManager.init(filterConfig.getServletContext());
- }
- /**
- * @param httpServletRequest
- * @throws UnsupportedEncodingException
- */
- protected void setupRequestEncoding(HttpServletRequest httpServletRequest)
- throws UnsupportedEncodingException {
- String contentType = httpServletRequest.getHeader("Content-Type");
+ /**
+ * @param httpServletRequest
+ * @throws UnsupportedEncodingException
+ */
+ protected void setupRequestEncoding(HttpServletRequest httpServletRequest)
+ throws UnsupportedEncodingException {
+ String contentType = httpServletRequest.getHeader("Content-Type");
- String characterEncoding = lookupCharacterEncoding(contentType);
+ String characterEncoding = lookupCharacterEncoding(contentType);
- if (characterEncoding == null) {
- HttpSession session = httpServletRequest.getSession(false);
+ if (characterEncoding == null) {
+ HttpSession session = httpServletRequest.getSession(false);
- if (session != null) {
- characterEncoding = (String) session
- .getAttribute(ViewHandler.CHARACTER_ENCODING_KEY);
- }
+ if (session != null) {
+ characterEncoding = (String) session
+ .getAttribute(ViewHandler.CHARACTER_ENCODING_KEY);
+ }
- if (characterEncoding != null) {
- httpServletRequest.setCharacterEncoding(characterEncoding);
- }
+ if (characterEncoding != null) {
+ httpServletRequest.setCharacterEncoding(characterEncoding);
+ }
+ }
}
- }
- /**
- * Detect request encoding from Content-Type header
- *
- * @param contentType
- * @return - charset, if present.
- */
- private String lookupCharacterEncoding(String contentType) {
- String characterEncoding = null;
+ /**
+ * Detect request encoding from Content-Type header
+ *
+ * @param contentType
+ * @return - charset, if present.
+ */
+ private String lookupCharacterEncoding(String contentType) {
+ String characterEncoding = null;
- if (contentType != null) {
- int charsetFind = contentType.indexOf("charset=");
- if (charsetFind != -1) {
- if (charsetFind == 0) {
- // charset at beginning of Content-Type, curious
- characterEncoding = contentType.substring(8);
- } else {
- char charBefore = contentType.charAt(charsetFind - 1);
- if (charBefore == ';' || Character.isWhitespace(charBefore)) {
- // Correct charset after mime type
- characterEncoding = contentType
- .substring(charsetFind + 8);
- }
+ if (contentType != null) {
+ int charsetFind = contentType.indexOf("charset=");
+ if (charsetFind != -1) {
+ if (charsetFind == 0) {
+ // charset at beginning of Content-Type, curious
+ characterEncoding = contentType.substring(8);
+ } else {
+ char charBefore = contentType.charAt(charsetFind - 1);
+ if (charBefore == ';' || Character.isWhitespace(charBefore)) {
+ // Correct charset after mime type
+ characterEncoding = contentType
+ .substring(charsetFind + 8);
+ }
+ }
+ if (log.isDebugEnabled())
+ log.debug(Messages.getMessage(
+ Messages.CONTENT_TYPE_ENCODING, characterEncoding));
+ } else {
+ if (log.isDebugEnabled())
+ log.debug(Messages.getMessage(
+ Messages.CONTENT_TYPE_NO_ENCODING, contentType));
+ }
}
- if (log.isDebugEnabled())
- log.debug(Messages.getMessage(
- Messages.CONTENT_TYPE_ENCODING, characterEncoding));
- } else {
- if (log.isDebugEnabled())
- log.debug(Messages.getMessage(
- Messages.CONTENT_TYPE_NO_ENCODING, contentType));
- }
+ return characterEncoding;
}
- return characterEncoding;
- }
- /**
- * @param initParameter
- * @param function2
- * @return
- */
- private Object nz(Object param, Object def) {
- return param != null ? param : def;
- }
-
- /**
- * Execute the filter.
- */
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
- long startTimeMills = 0;
- // Detect case of request - normal, AJAX, AJAX - JavaScript
- // TODO - detect first processing in filter.
- HttpServletRequest httpServletRequest = (HttpServletRequest) request;
- HttpServletResponse httpServletResponse = (HttpServletResponse) response;
- if (log.isDebugEnabled()) {
- startTimeMills = System.currentTimeMillis();
- log.debug(Messages.getMessage(Messages.FILTER_START_INFO, new Date(
- startTimeMills), httpServletRequest.getRequestURI()));
+ /**
+ * @param initParameter
+ * @param function2
+ * @return
+ */
+ private Object nz(Object param, Object def) {
+ return param != null ? param : def;
}
- if (request.getAttribute(FILTER_PERFORMED) != Boolean.TRUE) {
- // mark - and not processing same request twice.
- request.setAttribute(FILTER_PERFORMED, Boolean.TRUE);
- String ajaxPushHeader = httpServletRequest.getHeader(AJAX_PUSH_KEY_HEADER);
- // check for a push check request.
- if (httpServletRequest.getMethod().equals("HEAD")
- && null != ajaxPushHeader) {
- PushEventsCounter listener = eventsManager.getListener(ajaxPushHeader);
- if(listener.isPerformed()){
- listener.processed();
- httpServletResponse.setStatus(200);
- if (log.isDebugEnabled()) {
- log.debug("Occurs event for a id "+ajaxPushHeader);
- }
- } else {
- // Response code - 'No content'
- httpServletResponse.setStatus(204);
- if (log.isDebugEnabled()) {
- log.debug("No event for a id "+ajaxPushHeader);
- }
+ /**
+ * Execute the filter.
+ */
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException {
+ long startTimeMills = 0;
+ // Detect case of request - normal, AJAX, AJAX - JavaScript
+ // TODO - detect first processing in filter.
+ HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+ HttpServletResponse httpServletResponse = (HttpServletResponse) response;
+ if (log.isDebugEnabled()) {
+ startTimeMills = System.currentTimeMillis();
+ log.debug(Messages.getMessage(Messages.FILTER_START_INFO, new Date(
+ startTimeMills), httpServletRequest.getRequestURI()));
+ }
+
+ if (request.getAttribute(FILTER_PERFORMED) != Boolean.TRUE) {
+ // mark - and not processing same request twice.
+ try {
+ request.setAttribute(FILTER_PERFORMED, Boolean.TRUE);
+ String ajaxPushHeader = httpServletRequest
+ .getHeader(AJAX_PUSH_KEY_HEADER);
+ // check for a push check request.
+ if (httpServletRequest.getMethod().equals("HEAD")
+ && null != ajaxPushHeader) {
+ PushEventsCounter listener = eventsManager
+ .getListener(ajaxPushHeader);
+ if (listener.isPerformed()) {
+ listener.processed();
+ httpServletResponse.setStatus(200);
+ if (log.isDebugEnabled()) {
+ log
+ .debug("Occurs event for a id "
+ + ajaxPushHeader);
+ }
+ } else {
+ // Response code - 'No content'
+ httpServletResponse.setStatus(204);
+ if (log.isDebugEnabled()) {
+ log.debug("No event for a id " + ajaxPushHeader);
+ }
+ }
+ } else
+ // check for resource request
+ if (!getResourceService().serviceResource(httpServletRequest,
+ httpServletResponse)) {
+ // Not request to resource - perform filtering.
+ // first stage - detect/set encoding of request. Same as in
+ // Myfaces External Context.
+ setupRequestEncoding(httpServletRequest);
+ // check ajax request parameter
+ // TODO - check for JSF page.
+ if (true) {
+ if (log.isDebugEnabled()) {
+ log.debug(Messages
+ .getMessage(Messages.FILTER_XML_OUTPUT));
+ }
+
+ // Execute the rest of the filter chain, including the
+ // JSP
+ xmlFilter.doXmlFilter(chain, httpServletRequest,
+ httpServletResponse);
+ } else {
+ // normal request, execute chain ...
+ if (log.isDebugEnabled()) {
+ log.debug(Messages
+ .getMessage(Messages.FILTER_NO_XML_CHAIN));
+ }
+ chain.doFilter(request, response);
+
+ }
+ }
+
+ } finally {
+ // Remove filter marker from response, to enable sequence calls ( for example, forward to error page )
+ request.removeAttribute(FILTER_PERFORMED);
+ Object ajaxContext = request.getAttribute(AjaxContext.AJAX_CONTEXT_KEY);
+ if(null != ajaxContext && ajaxContext instanceof AjaxContext){
+ ((AjaxContext)ajaxContext).release();
+ request.removeAttribute(AjaxContext.AJAX_CONTEXT_KEY);
+ }
}
- } else
- // check for resource request
- if (!getResourceService().serviceResource(httpServletRequest,
- httpServletResponse)) {
- // Not request to resource - perform filtering.
- // first stage - detect/set encoding of request. Same as in
- // Myfaces External Context.
- setupRequestEncoding(httpServletRequest);
- // check ajax request parameter
- // TODO - check for JSF page.
- if (true) {
- if (log.isDebugEnabled()) {
- log.debug(Messages
- .getMessage(Messages.FILTER_XML_OUTPUT));
- }
-
- // Execute the rest of the filter chain, including the
- // JSP
- xmlFilter.doXmlFilter(chain, httpServletRequest,
- httpServletResponse);
} else {
- // normal request, execute chain ...
- if (log.isDebugEnabled()) {
- log.debug(Messages
- .getMessage(Messages.FILTER_NO_XML_CHAIN));
- }
- chain.doFilter(request, response);
+ if (log.isDebugEnabled()) {
+ log.debug(Messages.getMessage(Messages.FILTER_NO_XML_CHAIN_2));
+ }
+ chain.doFilter(request, response);
}
- }
- } else {
- if (log.isDebugEnabled()) {
- log.debug(Messages.getMessage(Messages.FILTER_NO_XML_CHAIN_2));
- }
- chain.doFilter(request, response);
+ if (log.isDebugEnabled()) {
+ startTimeMills = System.currentTimeMillis() - startTimeMills;
+ log.debug(Messages.getMessage(Messages.FILTER_STOP_INFO, ""
+ + startTimeMills, httpServletRequest.getRequestURI()));
+ }
+ }
+ /**
+ * @param request
+ * @return
+ */
+ protected boolean isAjaxRequest(ServletRequest request) {
+ try {
+ return null != request
+ .getParameter(AjaxContainerRenderer.AJAX_PARAMETER_NAME);
+ } catch (Exception e) {
+ // OCJ 10 - throw exception for static resources.
+ return false;
+ }
}
- if (log.isDebugEnabled()) {
- startTimeMills = System.currentTimeMillis() - startTimeMills;
- log.debug(Messages.getMessage(Messages.FILTER_STOP_INFO, ""
- + startTimeMills, httpServletRequest.getRequestURI()));
+
+ /**
+ * Destroy the filter.
+ */
+ public void destroy() {
}
- }
- /**
- * @param request
- * @return
- */
- protected boolean isAjaxRequest(ServletRequest request) {
- try {
- return null != request
- .getParameter(AjaxContainerRenderer.AJAX_PARAMETER_NAME);
- } catch (Exception e) {
- // OCJ 10 - throw exception for static resources.
- return false;
+ /**
+ * @return Returns the servletContext.
+ */
+ ServletContext getServletContext() {
+ return filterConfig.getServletContext();
}
- }
- /**
- * Destroy the filter.
- */
- public void destroy() {
- }
+ /**
+ * @return the resourceService
+ * @throws ServletException
+ */
+ protected synchronized InternetResourceService getResourceService()
+ throws ServletException {
+ // if (resourceService == null) {
+ // resourceService = new InternetResourceService();
+ // // Caching initialization.
+ // resourceService.init(filterConfig);
+ //
+ // }
+ return resourceService;
+ }
- /**
- * @return Returns the servletContext.
- */
- ServletContext getServletContext() {
- return filterConfig.getServletContext();
- }
+ /**
+ * @param function
+ * The function to set.
+ */
+ protected void setFunction(String function) {
+ this.function = function;
+ }
- /**
- * @return the resourceService
- * @throws ServletException
- */
- protected synchronized InternetResourceService getResourceService()
- throws ServletException {
- // if (resourceService == null) {
- // resourceService = new InternetResourceService();
- // // Caching initialization.
- // resourceService.init(filterConfig);
- //
- // }
- return resourceService;
- }
+ /**
+ * @return Returns the function.
+ */
+ protected String getFunction() {
+ return function;
+ }
- /**
- * @param function
- * The function to set.
- */
- protected void setFunction(String function) {
- this.function = function;
- }
+ /**
+ * @param rewriteid
+ * The rewriteid to set.
+ */
+ protected void setRewriteid(boolean rewriteid) {
+ this.rewriteid = rewriteid;
+ }
- /**
- * @return Returns the function.
- */
- protected String getFunction() {
- return function;
- }
+ /**
+ * @return Returns the rewriteid.
+ */
+ protected boolean isRewriteid() {
+ return rewriteid;
+ }
- /**
- * @param rewriteid
- * The rewriteid to set.
- */
- protected void setRewriteid(boolean rewriteid) {
- this.rewriteid = rewriteid;
- }
+ /**
+ * @param attributesNames
+ * The attributesNames to set.
+ */
+ protected void setAttributesNames(String attributesNames) {
+ this.attributesNames = attributesNames;
+ }
- /**
- * @return Returns the rewriteid.
- */
- protected boolean isRewriteid() {
- return rewriteid;
- }
-
- /**
- * @param attributesNames
- * The attributesNames to set.
- */
- protected void setAttributesNames(String attributesNames) {
- this.attributesNames = attributesNames;
- }
-
- /**
- * @return Returns the attributesNames.
- */
- protected String getAttributesNames() {
- return attributesNames;
- }
+ /**
+ * @return Returns the attributesNames.
+ */
+ protected String getAttributesNames() {
+ return attributesNames;
+ }
}
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2007-08-08 23:00:09 UTC (rev 2164)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2007-08-09 02:08:46 UTC (rev 2165)
@@ -46,388 +46,393 @@
import org.apache.commons.logging.LogFactory;
public abstract class BaseXMLFilter {
- private static final Log log = LogFactory.getLog(BaseXMLFilter.class);
+ private static final Log log = LogFactory.getLog(BaseXMLFilter.class);
- public static final String RESPONSE_WRAPPER_ATTRIBUTE = "com.exade.vcp.Filter.ResponseWrapper";
+ public static final String RESPONSE_WRAPPER_ATTRIBUTE = "com.exade.vcp.Filter.ResponseWrapper";
- private String mimetype = "text/xml";
+ private String mimetype = "text/xml";
- private String publicid = "-//W3C//DTD XHTML 1.0 Transitional//EN";
+ private String publicid = "-//W3C//DTD XHTML 1.0 Transitional//EN";
- private String systemid = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";
+ private String systemid = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";
- private String namespace = "http://www.w3.org/1999/xhtml";
+ private String namespace = "http://www.w3.org/1999/xhtml";
- private static final String MIME_TYPE_PARAMETER = "mime-type";
+ private static final String MIME_TYPE_PARAMETER = "mime-type";
- private static final String PUBLICID_PARAMETER = "publicid";
+ private static final String PUBLICID_PARAMETER = "publicid";
- private static final String SYSTEMID_PARAMETER = "systemid";
+ private static final String SYSTEMID_PARAMETER = "systemid";
- private static final String NAMESPACE_PARAMETER = "namespace";
+ private static final String NAMESPACE_PARAMETER = "namespace";
- private boolean forcexml = false;
-
+ private boolean forcexml = false;
- private static final String FORCEXML_PARAMETER = "forceparser";
+ private static final String FORCEXML_PARAMETER = "forceparser";
- private static final String INIT_PARAMETER_PREFIX = "org.ajax4jsf.xmlfilter.";
+ private static final String INIT_PARAMETER_PREFIX = "org.ajax4jsf.xmlfilter.";
public static final String TEXT_HTML = "text/html";
public static final String APPLICATION_XHTML_XML = "application/xhtml+xml";
- public BaseFilter filter;
+ public BaseFilter filter;
- public void setFilter(BaseFilter filter) {
- this.filter = filter;
- }
+ public void setFilter(BaseFilter filter) {
+ this.filter = filter;
+ }
- public void init(FilterConfig config) throws ServletException {
- if (log.isDebugEnabled()) {
- log.debug("init XML filter service with class "
- + this.getClass().getName());
+ public void init(FilterConfig config) throws ServletException {
+ if (log.isDebugEnabled()) {
+ log.debug("init XML filter service with class "
+ + this.getClass().getName());
+ }
+ String forceXmlParameter = config.getInitParameter(FORCEXML_PARAMETER);
+ setupForceXml(forceXmlParameter);
+ forceXmlParameter = config.getServletContext().getInitParameter(
+ INIT_PARAMETER_PREFIX + FORCEXML_PARAMETER);
+ setMimetype((String) nz(config.getInitParameter(MIME_TYPE_PARAMETER),
+ "text/xml"));
+ setPublicid((String) nz(config.getInitParameter(PUBLICID_PARAMETER),
+ getPublicid()));
+ setSystemid((String) nz(config.getInitParameter(SYSTEMID_PARAMETER),
+ getSystemid()));
+ setNamespace((String) nz(config.getInitParameter(NAMESPACE_PARAMETER),
+ getNamespace()));
}
- String forceXmlParameter = config
- .getInitParameter(FORCEXML_PARAMETER);
- setupForceXml(forceXmlParameter);
- forceXmlParameter = config.getServletContext().getInitParameter(INIT_PARAMETER_PREFIX+FORCEXML_PARAMETER);
- setMimetype((String) nz(config.getInitParameter(MIME_TYPE_PARAMETER),
- "text/xml"));
- setPublicid((String) nz(config.getInitParameter(PUBLICID_PARAMETER),
- getPublicid()));
- setSystemid((String) nz(config.getInitParameter(SYSTEMID_PARAMETER),
- getSystemid()));
- setNamespace((String) nz(config.getInitParameter(NAMESPACE_PARAMETER),
- getNamespace()));
- }
- /**
- * @param forceXmlParameter
- */
- private void setupForceXml(String forceXmlParameter) {
- if ("false".equalsIgnoreCase(forceXmlParameter)) {
- this.forcexml = false;
+ /**
+ * @param forceXmlParameter
+ */
+ private void setupForceXml(String forceXmlParameter) {
+ if ("false".equalsIgnoreCase(forceXmlParameter)) {
+ this.forcexml = false;
+ }
+ if ("true".equalsIgnoreCase(forceXmlParameter)) {
+ this.forcexml = true;
+ }
}
- if ("true"
- .equalsIgnoreCase(forceXmlParameter)) {
- this.forcexml = true;
- }
- }
- /**
- * Perform filter chain with xml parsing and transformation. Subclasses
- * must implement concrete HTML to XML parsing, nesseasary
- * transformations and serialization.
- *
- * @param chain
- * @param httpServletRequest
- * @param httpServletResponse
- * @throws ServletException
- * @throws IOException
- */
- protected void doXmlFilter(FilterChain chain, HttpServletRequest request,
- final HttpServletResponse response) throws IOException,
- ServletException {
- if (log.isDebugEnabled()) {
- log.debug("XML filter service start processing request");
- }
- FilterServletResponseWrapper servletResponseWrapper = getWrapper(response);
- // HACK - to avoid MyFaces <f:view> incompabilites and bypass
- // intermediaty filters
- // in chain, self-rendered region write directly to wrapper stored in
- // request-scope attribute.
- request
- .setAttribute(RESPONSE_WRAPPER_ATTRIBUTE,
- servletResponseWrapper);
- chain.doFilter(request, servletResponseWrapper);
- String viewId = (String) request.getAttribute(AjaxViewHandler.VIEW_ID_KEY);
- HtmlParser parser = null;
- // setup response
- // Redirect in AJAX request - convert to special response recognized by
- // client.
- String redirectLocation = servletResponseWrapper.getRedirectLocation();
- String characterEncoding = servletResponseWrapper
- .getCharacterEncoding();
- Writer output;
- if (null != redirectLocation) {
- if (isAjaxRequest(request)) {
- // Special handling of redirect - client-side script must
- // Check for response and perform redirect by window.location
+ /**
+ * Perform filter chain with xml parsing and transformation. Subclasses must
+ * implement concrete HTML to XML parsing, nesseasary transformations and
+ * serialization.
+ *
+ * @param chain
+ * @param httpServletRequest
+ * @param httpServletResponse
+ * @throws ServletException
+ * @throws IOException
+ */
+ protected void doXmlFilter(FilterChain chain, HttpServletRequest request,
+ final HttpServletResponse response) throws IOException,
+ ServletException {
if (log.isDebugEnabled()) {
- log.debug("Create AJAX redirect response to url: "
- + redirectLocation);
+ log.debug("XML filter service start processing request");
}
- response.reset();
- // Keep cookies.
- for (Iterator iter = servletResponseWrapper.getCookies().iterator(); iter.hasNext();) {
- Cookie cookie = (Cookie) iter.next();
- response.addCookie(cookie);
+ FilterServletResponseWrapper servletResponseWrapper = getWrapper(response);
+ // HACK - to avoid MyFaces <f:view> incompabilites and bypass
+ // intermediaty filters
+ // in chain, self-rendered region write directly to wrapper stored in
+ // request-scope attribute.
+ try {
+ request.setAttribute(RESPONSE_WRAPPER_ATTRIBUTE,
+ servletResponseWrapper);
+ chain.doFilter(request, servletResponseWrapper);
+
+ } finally {
+ request.removeAttribute(RESPONSE_WRAPPER_ATTRIBUTE);
}
- // Copy response headers
- Map headers = servletResponseWrapper.getHeaders();
- for (Iterator iter = headers.entrySet().iterator(); iter
- .hasNext();) {
- Map.Entry header = (Map.Entry) iter.next();
- response.setHeader((String) header.getKey(),
- (String) header.getValue());
+ String viewId = (String) request
+ .getAttribute(AjaxViewHandler.VIEW_ID_KEY);
+ HtmlParser parser = null;
+ // setup response
+ // Redirect in AJAX request - convert to special response recognized by
+ // client.
+ String redirectLocation = servletResponseWrapper.getRedirectLocation();
+ String characterEncoding = servletResponseWrapper
+ .getCharacterEncoding();
+ Writer output;
+ if (null != redirectLocation) {
+ if (isAjaxRequest(request)) {
+ // Special handling of redirect - client-side script must
+ // Check for response and perform redirect by window.location
+ if (log.isDebugEnabled()) {
+ log.debug("Create AJAX redirect response to url: "
+ + redirectLocation);
+ }
+ response.reset();
+ // Keep cookies.
+ for (Iterator iter = servletResponseWrapper.getCookies()
+ .iterator(); iter.hasNext();) {
+ Cookie cookie = (Cookie) iter.next();
+ response.addCookie(cookie);
+ }
+ // Copy response headers
+ Map headers = servletResponseWrapper.getHeaders();
+ for (Iterator iter = headers.entrySet().iterator(); iter
+ .hasNext();) {
+ Map.Entry header = (Map.Entry) iter.next();
+ response.setHeader((String) header.getKey(),
+ (String) header.getValue());
+ }
+ response.setHeader(AjaxContainerRenderer.AJAX_FLAG_HEADER,
+ "redirect");
+ // Not caching AJAX request
+ response.setHeader("Cache-Control",
+ "no-cache, must-revalidate, max_age=0, no-store");
+ response.setHeader("Expires", "0");
+ response.setHeader("Pragma", "no-cache");
+ response.setContentType(getMimetype() + ";charset=UTF-8");
+ response.setHeader(AjaxContainerRenderer.AJAX_LOCATION_HEADER,
+ redirectLocation);
+ output = createResponseWriter(response, "UTF-8");
+ // For buggy XmlHttpRequest realisations repeat headers in
+ // <meta>
+ output.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ + "<html xmlns=\"http://www.w3.org/1999/xhtml\"><head>"
+ + "<meta name=\""
+ + AjaxContainerRenderer.AJAX_FLAG_HEADER
+ + "\" content=\"redirect\" />" + "<meta name=\""
+ + AjaxContainerRenderer.AJAX_LOCATION_HEADER
+ + "\" content=\"" + redirectLocation + "\" />"
+ + "</head></html>");
+ output.flush();
+ response.flushBuffer();
+ } else {
+ response.sendRedirect(redirectLocation);
+ }
+ return;
+ } else if ("true".equals(servletResponseWrapper.getHeaders().get(
+ AjaxContainerRenderer.AJAX_FLAG_HEADER))) {
+ if (log.isDebugEnabled()) {
+ log
+ .debug("Process response to well-formed XML for AJAX XMLHttpRequest parser");
+ }
+ // Not caching AJAX request
+ response.setHeader("Cache-Control",
+ "no-cache, must-revalidate, max_age=0, no-store");
+ response.setHeader("Expires", "0");
+ response.setHeader("Pragma", "no-cache");
+ // response.setCharacterEncoding(servletResponseWrapper
+ // .getCharacterEncoding()); //
+ // JSContentHandler.DEFAULT_ENCODING);
+ // Set the content-type. For AJAX responses default encoding -
+ // UTF8.
+ // TODO - for null encoding, setup only Output encoding for
+ // filter ?
+ String outputEncoding = "UTF-8";
+ String contentType = getMimetype() + ";charset=" + outputEncoding;
+ response.setContentType(contentType);
+ parser = getParser(getMimetype(), true, viewId);
+ if (null == parser) {
+ throw new ServletException(Messages.getMessage(
+ Messages.PARSER_NOT_INSTANTIATED_ERROR, contentType));
+ }
+ output = createResponseWriter(response, outputEncoding);
+ parser.setDoctype(getPublicid());
+ parser.setInputEncoding(characterEncoding);
+ parser.setOutputEncoding(outputEncoding);
+ parser.setViewState((String) request
+ .getAttribute(AjaxViewHandler.SERIALIZED_STATE_KEY));
+ } else {
+ // setup conversion reules for output contentType, send directly
+ // if content not
+ // supported by tidy.
+ String contentType = servletResponseWrapper.getContentType();
+ if (log.isDebugEnabled()) {
+ log.debug("create HTML/XML parser for content type: "
+ + contentType);
+ }
+ // if(contentType == null){
+ // contentType = request.getContentType();
+ // }
+ if (contentType != null) {
+ if (contentType.indexOf("charset") < 0
+ && null != characterEncoding) {
+ contentType += ";charset=" + characterEncoding;
+ }
+ parser = getParser(contentType, false, viewId);
+ response.setContentType(contentType);
+ }
+ // null or unsupported content type
+ if (null == parser) {
+ if (log.isDebugEnabled()) {
+ log
+ .debug("Parser not have support for the such content type, send response as-is");
+ }
+ try {
+ if (servletResponseWrapper.isUseWriter()) {
+ output = createResponseWriter(response,
+ characterEncoding);
+ servletResponseWrapper.sendContent(output);
+ } else if (servletResponseWrapper.isUseStream()) {
+ ServletOutputStream out = response.getOutputStream();
+ servletResponseWrapper.sendContent(out);
+ }
+ } finally {
+ // reuseWrapper(servletResponseWrapper);
+ }
+ return;
+ }
+ output = createResponseWriter(response, characterEncoding);
+
+ parser.setInputEncoding(characterEncoding);
+ parser.setOutputEncoding(characterEncoding);
}
- response.setHeader(AjaxContainerRenderer.AJAX_FLAG_HEADER,
- "redirect");
- // Not caching AJAX request
- response.setHeader("Cache-Control",
- "no-cache, must-revalidate, max_age=0, no-store");
- response.setHeader("Expires", "0");
- response.setHeader("Pragma", "no-cache");
- response.setContentType(getMimetype() + ";charset=UTF-8");
- response.setHeader(AjaxContainerRenderer.AJAX_LOCATION_HEADER,
- redirectLocation);
- output = createResponseWriter(response, "UTF-8");
- // For buggy XmlHttpRequest realisations repeat headers in
- // <meta>
- output.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
- + "<html xmlns=\"http://www.w3.org/1999/xhtml\"><head>"
- + "<meta name=\""
- + AjaxContainerRenderer.AJAX_FLAG_HEADER
- + "\" content=\"redirect\" />" + "<meta name=\""
- + AjaxContainerRenderer.AJAX_LOCATION_HEADER
- + "\" content=\"" + redirectLocation + "\" />"
- + "</head></html>");
- output.flush();
- response.flushBuffer();
- } else {
- response.sendRedirect(redirectLocation);
- }
- return;
- } else if ("true".equals(servletResponseWrapper.getHeaders().get(
- AjaxContainerRenderer.AJAX_FLAG_HEADER))) {
- if (log.isDebugEnabled()) {
- log
- .debug("Process response to well-formed XML for AJAX XMLHttpRequest parser");
- }
- // Not caching AJAX request
- response.setHeader("Cache-Control",
- "no-cache, must-revalidate, max_age=0, no-store");
- response.setHeader("Expires", "0");
- response.setHeader("Pragma", "no-cache");
- // response.setCharacterEncoding(servletResponseWrapper
- // .getCharacterEncoding()); //
- // JSContentHandler.DEFAULT_ENCODING);
- // Set the content-type. For AJAX responses default encoding -
- // UTF8.
- // TODO - for null encoding, setup only Output encoding for
- // filter ?
- String outputEncoding = "UTF-8";
- String contentType = getMimetype() + ";charset=" + outputEncoding;
- response.setContentType(contentType);
- parser = getParser(getMimetype(), true, viewId);
- if (null == parser) {
- throw new ServletException(Messages.getMessage(
- Messages.PARSER_NOT_INSTANTIATED_ERROR, contentType));
- }
- output = createResponseWriter(response, outputEncoding);
- parser.setDoctype(getPublicid());
- parser.setInputEncoding(characterEncoding);
- parser.setOutputEncoding(outputEncoding);
- parser.setViewState((String) request
- .getAttribute(AjaxViewHandler.SERIALIZED_STATE_KEY));
- } else {
- // setup conversion reules for output contentType, send directly
- // if content not
- // supported by tidy.
- String contentType = servletResponseWrapper.getContentType();
- if (log.isDebugEnabled()) {
- log.debug("create HTML/XML parser for content type: "
- + contentType);
- }
- // if(contentType == null){
- // contentType = request.getContentType();
- // }
- if (contentType != null) {
- if (contentType.indexOf("charset") < 0
- && null != characterEncoding) {
- contentType += ";charset=" + characterEncoding;
- }
- parser = getParser(contentType, false, viewId);
- response.setContentType(contentType);
- }
- // null or unsupported content type
- if (null == parser) {
- if (log.isDebugEnabled()) {
- log
- .debug("Parser not have support for the such content type, send response as-is");
- }
+
try {
- if (servletResponseWrapper.isUseWriter()) {
- output = createResponseWriter(response,
- characterEncoding);
- servletResponseWrapper.sendContent(output);
- } else if (servletResponseWrapper.isUseStream()) {
- ServletOutputStream out = response.getOutputStream();
- servletResponseWrapper.sendContent(out);
- }
+ // Setup scripts and styles
+ parser.setScripts((Set) request
+ .getAttribute(AjaxContext.SCRIPTS_PARAMETER));
+ parser.setStyles((Set) request
+ .getAttribute(AjaxContext.STYLES_PARAMETER));
+ // Process parsing.
+ long startTimeMills = System.currentTimeMillis();
+ servletResponseWrapper.parseContent(output, parser);
+ if (log.isDebugEnabled()) {
+ startTimeMills = System.currentTimeMillis() - startTimeMills;
+ log.debug(Messages.getMessage(Messages.PARSING_TIME_INFO, ""
+ + startTimeMills));
+ }
+ } catch (Exception e) {
+ throw new ServletException(Messages
+ .getMessage(Messages.JTIDY_PARSING_ERROR), e);
} finally {
- // reuseWrapper(servletResponseWrapper);
+ reuseParser(parser);
}
- return;
- }
- output = createResponseWriter(response, characterEncoding);
-
- parser.setInputEncoding(characterEncoding);
- parser.setOutputEncoding(characterEncoding);
}
- try {
- // Setup scripts and styles
- parser.setScripts((Set) request
- .getAttribute(AjaxContext.SCRIPTS_PARAMETER));
- parser.setStyles((Set) request
- .getAttribute(AjaxContext.STYLES_PARAMETER));
- // Process parsing.
- long startTimeMills = System.currentTimeMillis();
- servletResponseWrapper.parseContent(output, parser);
- if (log.isDebugEnabled()) {
- startTimeMills = System.currentTimeMillis() - startTimeMills;
- log.debug(Messages.getMessage(Messages.PARSING_TIME_INFO, ""
- + startTimeMills));
- }
- } catch (Exception e) {
- throw new ServletException(Messages
- .getMessage(Messages.JTIDY_PARSING_ERROR), e);
- } finally {
- reuseParser(parser);
+ /**
+ * @param response
+ * @return
+ * @throws ServletException
+ */
+ protected FilterServletResponseWrapper getWrapper(
+ HttpServletResponse response) throws ServletException {
+ return new FilterServletResponseWrapper(response);
}
- }
- /**
- * @param response
- * @return
- * @throws ServletException
- */
- protected FilterServletResponseWrapper getWrapper(
- HttpServletResponse response) throws ServletException {
- return new FilterServletResponseWrapper(response);
- }
-
- /**
- * @param request
- * @return
- */
- protected boolean isAjaxRequest(ServletRequest request) {
- try {
- return null != request
- .getParameter(AjaxContainerRenderer.AJAX_PARAMETER_NAME);
- } catch (Exception e) {
- // OCJ 10 - throw exception for static resources.
- return false;
+ /**
+ * @param request
+ * @return
+ */
+ protected boolean isAjaxRequest(ServletRequest request) {
+ try {
+ return null != request
+ .getParameter(AjaxContainerRenderer.AJAX_PARAMETER_NAME);
+ } catch (Exception e) {
+ // OCJ 10 - throw exception for static resources.
+ return false;
+ }
}
- }
- /**
- * @param response
- * @param characterEncoding
- * @return
- * @throws IOException
- * @throws UnsupportedEncodingException
- */
- private Writer createResponseWriter(final HttpServletResponse response,
- String characterEncoding) throws IOException,
- UnsupportedEncodingException {
- Writer output;
- try {
- output = response.getWriter();
- } catch (IllegalStateException e) {
- if (null != characterEncoding) {
- output = new OutputStreamWriter(response.getOutputStream(),
- characterEncoding);
- } else {
- output = new OutputStreamWriter(response.getOutputStream());
- }
+ /**
+ * @param response
+ * @param characterEncoding
+ * @return
+ * @throws IOException
+ * @throws UnsupportedEncodingException
+ */
+ private Writer createResponseWriter(final HttpServletResponse response,
+ String characterEncoding) throws IOException,
+ UnsupportedEncodingException {
+ Writer output;
+ try {
+ output = response.getWriter();
+ } catch (IllegalStateException e) {
+ if (null != characterEncoding) {
+ output = new OutputStreamWriter(response.getOutputStream(),
+ characterEncoding);
+ } else {
+ output = new OutputStreamWriter(response.getOutputStream());
+ }
+ }
+ return output;
}
- return output;
- }
- protected abstract void reuseParser(HtmlParser parser);
+ protected abstract void reuseParser(HtmlParser parser);
- protected abstract HtmlParser getParser(String mimetype, boolean isAjax, String viewId);
+ protected abstract HtmlParser getParser(String mimetype, boolean isAjax,
+ String viewId);
- /**
- * @param publicid
- * The publicid to set.
- */
- protected void setPublicid(String publicid) {
- this.publicid = publicid;
- }
+ /**
+ * @param publicid
+ * The publicid to set.
+ */
+ protected void setPublicid(String publicid) {
+ this.publicid = publicid;
+ }
- /**
- * @return Returns the publicid.
- */
- public String getPublicid() {
- return publicid;
- }
+ /**
+ * @return Returns the publicid.
+ */
+ public String getPublicid() {
+ return publicid;
+ }
- /**
- * @param systemid
- * The systemid to set.
- */
- protected void setSystemid(String systemid) {
- this.systemid = systemid;
- }
+ /**
+ * @param systemid
+ * The systemid to set.
+ */
+ protected void setSystemid(String systemid) {
+ this.systemid = systemid;
+ }
- /**
- * @return Returns the systemid.
- */
- public String getSystemid() {
- return systemid;
- }
+ /**
+ * @return Returns the systemid.
+ */
+ public String getSystemid() {
+ return systemid;
+ }
- /**
- * @param namespace
- * The namespace to set.
- */
- protected void setNamespace(String namespace) {
- this.namespace = namespace;
- }
+ /**
+ * @param namespace
+ * The namespace to set.
+ */
+ protected void setNamespace(String namespace) {
+ this.namespace = namespace;
+ }
- /**
- * @return Returns the namespace.
- */
- public String getNamespace() {
- return namespace;
- }
+ /**
+ * @return Returns the namespace.
+ */
+ public String getNamespace() {
+ return namespace;
+ }
- /**
- * @param mimetype
- * The mimetype to set.
- */
- protected void setMimetype(String mimetype) {
- this.mimetype = mimetype;
- }
+ /**
+ * @param mimetype
+ * The mimetype to set.
+ */
+ protected void setMimetype(String mimetype) {
+ this.mimetype = mimetype;
+ }
- /**
- * @return Returns the mimetype.
- */
- protected String getMimetype() {
- return mimetype;
- }
+ /**
+ * @return Returns the mimetype.
+ */
+ protected String getMimetype() {
+ return mimetype;
+ }
- /**
- * @return Returns the forcexml.
- */
- public boolean isForcexml() {
- return this.forcexml;
- }
+ /**
+ * @return Returns the forcexml.
+ */
+ public boolean isForcexml() {
+ return this.forcexml;
+ }
- /**
- * @param forcexml
- * The forcexml to set.
- */
- protected void setForcexml(boolean forcexml) {
- this.forcexml = forcexml;
- }
+ /**
+ * @param forcexml
+ * The forcexml to set.
+ */
+ protected void setForcexml(boolean forcexml) {
+ this.forcexml = forcexml;
+ }
- private Object nz(Object param, Object def) {
- return param != null ? param : def;
- }
+ private Object nz(Object param, Object def) {
+ return param != null ? param : def;
+ }
}
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-08-08 23:00:09 UTC (rev 2164)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-08-09 02:08:46 UTC (rev 2165)
@@ -26,8 +26,9 @@
_errorMessage : "XML Response object not set",
_contentType : null,
_onerror : function(req,status,message) {
- // Status not 200 - error !!!! TODO - I18N ???
- window.alert(message);
+ // Status not 200 - error !
+ // window.alert(message);
+ A4J.AJAX.replacePage(req);
},
onfinish : null,
options : {},
@@ -651,41 +652,7 @@
} else if(ajaxResponse == "reload"){
window.location.reload(true);
} else {
- var isIE = _SARISSA_IS_IE;
- // maksimkaszynski
- //Prevent "Permission denied in IE7"
- //Reset calling principal
- if (isIE) {
- var oldDocOpen = window.document.open;
- window.document.open = function() {
- oldDocOpen.apply(this, arguments);
- }
- }
- // /maksimkaszynski
- window.setTimeout(function() {
- var isDocOpen=false;
- try {
- window.document.open(req.getContentType(),true);
- isDocOpen=true;
- window.document.write(req.getResponseText());
- window.document.close();
- if(isIE){
- // For Ie , scripts on page not activated.
- window.location.reload(false);
- }
- } catch(e) {
- if(isDocOpen){
- window.document.close();
- }
- // Firefox/Mozilla in XHTML case don't support document.write()
-// window.location = "data:"+req.getContentType()+";charset=utf-8," + encodeURIComponent(req.getResponseText())
- // Use dom manipulation instead.
- var oDomDoc = (new DOMParser()).parseFromString(req.getResponseText(), "application/xhtml+xml");
- var node = window.document.importNode(oDomDoc.documentElement, true);
- window.document.replaceChild(node,window.document.documentElement);
- // TODO - scripts reloading ?
- }
- },30);
+ A4J.AJAX.replacePage(req);
}
} catch(e){
LOG.error("Error redirect to new location ");
@@ -788,7 +755,47 @@
}
};
+A4J.AJAX.replacePage = function(req){
+ var isIE = _SARISSA_IS_IE;
+ // maksimkaszynski
+ //Prevent "Permission denied in IE7"
+ //Reset calling principal
+ var oldDocOpen = window.document.open;
+ if (isIE) {
+ window.document.open = function() {
+ oldDocOpen.apply(this, arguments);
+ }
+ }
+ // /maksimkaszynski
+ window.setTimeout(function() {
+ var isDocOpen=false;
+ try {
+ window.document.open(req.getContentType(),true);
+ isDocOpen=true;
+ window.document.write(req.getResponseText());
+ window.document.close();
+ if(isIE){
+ // For Ie , scripts on page not activated.
+ window.location.reload(false);
+ }
+ } catch(e) {
+ if(isDocOpen){
+ window.document.close();
+ }
+ // Firefox/Mozilla in XHTML case don't support document.write()
+// window.location = "data:"+req.getContentType()+";charset=utf-8," + encodeURIComponent(req.getResponseText())
+ // Use dom manipulation instead.
+ var oDomDoc = (new DOMParser()).parseFromString(req.getResponseText(), "application/xhtml+xml");
+ var node = window.document.importNode(oDomDoc.documentElement, true);
+ window.document.replaceChild(node,window.document.documentElement);
+ // TODO - scripts reloading ?
+ } finally {
+ window.document.open = oldDocOpen;
+ }
+ },30);
+}
+
A4J.AJAX.replaceViewState = function(inputs,newinputs){
LOG.debug("Replace value for inputs: "+inputs.length + " by new values: "+ newinputs.length);
if( (newinputs.length > 0) && (inputs.length > 0) ){
18 years, 8 months
JBoss Rich Faces SVN: r2164 - in trunk: ui/tree/src/main/java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-08-08 19:00:09 -0400 (Wed, 08 Aug 2007)
New Revision: 2164
Modified:
trunk/test-applications/facelets/
trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
trunk/ui/tree/src/main/templates/htmlTree.jspx
Log:
Tree updated to render correctly with new markup
Property changes on: trunk/test-applications/facelets
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java 2007-08-08 22:09:01 UTC (rev 2163)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java 2007-08-08 23:00:09 UTC (rev 2164)
@@ -95,16 +95,16 @@
level -= floatingKey.depth();
}
- if (level != 0) {
+ //if (level != 0) {
beforeUp(level);
- }
+ //}
}
this.tree.setRowKey(context, null);
- if (level != 0) {
+ //if (level != 0) {
afterUp(level);
- }
+ //}
}
this.rowKey = newRowKey;
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-08-08 22:09:01 UTC (rev 2163)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-08-08 23:00:09 UTC (rev 2164)
@@ -35,21 +35,20 @@
import javax.faces.context.ResponseWriter;
import javax.faces.el.MethodBinding;
+import org.ajax4jsf.javascript.JSFunction;
+import org.ajax4jsf.javascript.JSReference;
+import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.model.DataVisitor;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.ajax4jsf.renderkit.ComponentsVariableResolver;
-import org.ajax4jsf.renderkit.RendererUtils;
-import org.ajax4jsf.javascript.JSFunction;
-import org.ajax4jsf.javascript.JSReference;
-import org.ajax4jsf.javascript.ScriptUtils;
-import org.richfaces.model.LastElementAware;
-import org.richfaces.model.TreeRowKey;
import org.richfaces.component.UITree;
import org.richfaces.component.UITreeNode;
import org.richfaces.component.nsutils.NSUtils;
-import org.richfaces.model.TreeRange;
import org.richfaces.component.state.TreeState;
import org.richfaces.component.state.TreeStateAdvisor;
+import org.richfaces.model.LastElementAware;
+import org.richfaces.model.TreeRange;
+import org.richfaces.model.TreeRowKey;
public abstract class TreeRendererBase extends CompositeRenderer {
@@ -99,10 +98,18 @@
}
public void afterUp(int levels) throws IOException {
+ Context c = droppedDownToLevelFlag.getContext();
+ if (c != null) {
+ openDiv(c);
+ closeDiv();
+ droppedDownToLevelFlag.setContext(null);
+ }
+
//writer.write("** afterUp **");
for (int i = 0; i < levels; i++) {
closeDiv();
}
+
//if (!isLastElement) closeDiv();
}
@@ -110,36 +117,54 @@
}
public void beforeDown() throws IOException {
+ Context c = droppedDownToLevelFlag.getContext();
+ droppedDownToLevelFlag.setContext(null);
+ openDiv(c);
//writer.write("** beforeDown **");
- droppedDownToLevelFlag.setFlag();
- if (this.getRowKey()==null ) openDiv();
+ //if (this.getRowKey()==null ) openDiv();
}
public void beforeUp(int levels) throws IOException {
}
- public void openDiv() throws IOException {
+ int stat = 0;
+
+ public void openDiv(Context context) throws IOException {
+ stat++;
writer.startElement("div", tree);
- getUtils().writeAttribute(writer, "id", clientId + "childs");
+
+ if (context == null) {
+ context = new Context();
+ context.setLast(this.actualLast);
+ context.setClientId(this.clientId);
+ context.setExpanded(this.expanded);
+ context.setRowKey(this.getRowKey());
+ }
+
+ getUtils().writeAttribute(writer, "id", context.getClientId() + "childs");
- if (!expanded) {
+ if (!context.isExpanded()) {
getUtils().writeAttribute(writer, "style", "display: none;");
}
String styleClasses = "";
- if (this.getRowKey() != null) {
+ if (context.getRowKey() != null) {
styleClasses = "dr-tree-h-ic-div";
- if (!isStackedLastElement() && showLines) styleClasses += " dr-tree-h-ic-line";
+ if (!context.isLast() && showLines) styleClasses += " dr-tree-h-ic-line";
}
if (styleClasses!="") getUtils().writeAttribute(writer, "class", styleClasses);
}
public void closeDiv() throws IOException {
writer.endElement("div");
+ stat--;
}
+ public int getStat() {
+ return stat;
+ }
}
private class DataVisitorWithLastElement implements DataVisitor,
@@ -172,20 +197,28 @@
navigator.followRowKey(context, (TreeRowKey) rowKey);
- if (!flag.isFlagSet()) {
+ Context c = flag.getContext();
+ if (c != null) {
+ navigator.openDiv(c);
navigator.closeDiv();
- } else {
- flag.resetFlag();
}
-
+
UITreeNode nodeFacet = tree.getNodeFacet();
Object oldAttrValue = nodeFacet.getAttributes().get("isLastElement");
try {
nodeFacet.getAttributes().put("isLastElement", new Boolean(isLastElement));
renderChild(context, nodeFacet);
+
+ c = new Context();
+ c.setClientId(tree.getClientId(context) + ":");
+ c.setLast(this.isLastElement);
+ c.setExpanded(tree.isExpanded());
+ c.setRowKey(tree.getRowKey());
+ flag.setContext(c);
+
//writer.write("** after renderChild **");
- navigator.openDiv();
+ //navigator.openDiv();
} finally {
if (oldAttrValue != null) {
nodeFacet.getAttributes().put("isLastElement", oldAttrValue);
@@ -304,13 +337,15 @@
tree.setRowKey(context, key);
String id = tree.getNodeFacet().getClientId(context);
+ String treeChildrenId = tree.getClientId(context) + ":childs";
if (ids.isEmpty() || ids.contains(id) || ids.contains(tree.getClientId(context))/* handle tree updates requests */) {
writeContent(context, tree, key);
encodeScripts = true;
renderedAreas.add(id);
encodedAreaIds.add(id);
- renderedAreas.add(id+":childs");
- encodedAreaIds.add(id+":childs");
+
+ renderedAreas.add(treeChildrenId);
+ //encodedAreaIds.add(id+":childs");
}
}
@@ -469,7 +504,7 @@
input.captureOrigValue();
if (key != null) {
- droppedDownToLevelFlag.setFlag();
+ droppedDownToLevelFlag.setContext(null);
//openLevelDownTable(context, input, writer);
input.setRowKey(context, key);
} else {
@@ -513,6 +548,8 @@
}*/
levelNavigator.followRowKey(context, null);
+
+ System.out.println("TreeRendererBase.writeContent() " + levelNavigator.getStat());
} finally {
input.setRowKey(context, null);
input.restoreOrigValue();
@@ -521,17 +558,44 @@
}
class Flag {
- private boolean flag = false;
-
- public void setFlag() {
- this.flag = true;
+ private Context context;
+
+ public Context getContext() {
+ return context;
}
- public void resetFlag() {
- this.flag = false;
+ public void setContext(Context context) {
+ this.context = context;
}
+}
- public boolean isFlagSet() {
- return flag;
+class Context {
+ private String clientId;
+ private Object rowKey;
+ private boolean expanded;
+ private boolean last;
+ public String getClientId() {
+ return clientId;
}
+ public void setClientId(String clientId) {
+ this.clientId = clientId;
+ }
+ public Object getRowKey() {
+ return rowKey;
+ }
+ public void setRowKey(Object rowKey) {
+ this.rowKey = rowKey;
+ }
+ public boolean isExpanded() {
+ return expanded;
+ }
+ public void setExpanded(boolean expanded) {
+ this.expanded = expanded;
+ }
+ public boolean isLast() {
+ return last;
+ }
+ public void setLast(boolean last) {
+ this.last = last;
+ }
}
\ No newline at end of file
Modified: trunk/ui/tree/src/main/templates/htmlTree.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-08-08 22:09:01 UTC (rev 2163)
+++ trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-08-08 23:00:09 UTC (rev 2164)
@@ -49,10 +49,11 @@
<vcp:body />
</tbody>
</table-->
- <div id="#{clientId}:children">
+ <!-- div id="#{clientId}:children">
<vcp:body />
- </div>
+ </div -->
+ <vcp:body />
<f:call name="encodeSelectionStateInput" />
<f:clientId var="clientId" />
18 years, 8 months
JBoss Rich Faces SVN: r2163 - in trunk/samples/richfaces-demo/src/main: webapp/images and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: SergeySmirnov
Date: 2007-08-08 18:09:01 -0400 (Wed, 08 Aug 2007)
New Revision: 2163
Added:
trunk/samples/richfaces-demo/src/main/webapp/images/cn_Effect.gif
trunk/samples/richfaces-demo/src/main/webapp/images/cn_Message.gif
trunk/samples/richfaces-demo/src/main/webapp/images/cn_Messages.gif
trunk/samples/richfaces-demo/src/main/webapp/images/cn_ScrollableDataGrid.gif
trunk/samples/richfaces-demo/src/main/webapp/images/cn_VirtualEarth.gif
trunk/samples/richfaces-demo/src/main/webapp/images/ico_VirtualEarth.gif
Modified:
trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
Log:
titles and icons for richfaces-demo.
Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-08-08 21:52:41 UTC (rev 2162)
+++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-08-08 22:09:01 UTC (rev 2163)
@@ -8,21 +8,21 @@
inputNumberSpinner= richInputs, Input Number Spinner, /images/ico_spinner.gif, /images/cn_spinner.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/inputNumberSpinner.jsf
dataFilterSlider= richDataIterators, Data Filter Slider, /images/ico_DataFilterSlider.gif, /images/cn_DataFilterSlider.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataFilterSlider.jsf
dataTable= richDataIterators, Data Table, /images/ico_DataTable.gif, /images/cn_DataTable.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataTable.jsf
-column= richDataIterators, Column, /images/ico_DataTable.gif, /images/cn_DataTable.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataTable.jsf
-columnGroup= richDataIterators, Column Group, /images/ico_DataTable.gif, /images/cn_DataTable.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataTable.jsf
-dataDefinitionList= richDataIterators, Data Definition List, /images/ico_DataTable.gif, /images/cn_DataTable.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataTable.jsf
-dataGrid= richDataIterators, Data Grid, /images/ico_DataTable.gif, /images/cn_DataTable.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataTable.jsf
-dataList= richDataIterators, Data List, /images/ico_DataTable.gif, /images/cn_DataTable.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataTable.jsf
-dataOrderedList= richDataIterators, Data Ordered List, /images/ico_DataTable.gif, /images/cn_DataTable.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataTable.jsf
+column= richDataIterators, Column, /images/ico_DataTable.gif, /images/cn_Column.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataTable.jsf
+columnGroup= richDataIterators, Column Group, /images/ico_DataTable.gif, /images/cn_ColumnGroup.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataTable.jsf
+dataDefinitionList= richDataIterators, Data Definition List, /images/ico_DataTable.gif, /images/cn_DataDefinitionList.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+dataGrid= richDataIterators, Data Grid, /images/ico_DataTable.gif, /images/cn_DataGrid.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+dataList= richDataIterators, Data List, /images/ico_DataTable.gif, /images/cn_DataList.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+dataOrderedList= richDataIterators, Data Ordered List, /images/ico_DataTable.gif, /images/cn_DataOrderedList.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
gmap= richMisc, Google Map, /images/ico_GoogleMap.gif, /images/cn_GoogleMap.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/gmap.jsf
paint2d= richOutputs, Paint2D, /images/ico_Paint2D.gif, /images/cn_Paint2D.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/paint2D.jsf
toolBar= richOutputs, Tool Bar, /images/ico_ToolBar.gif, /images/cn_ToolBar.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/toolBar.jsf
-toolTip= richOutputs, ToolTip, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/toolTip.jsf
+toolTip= richOutputs, ToolTip, /images/ico_panel.gif, /images/cn_ToolTip.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/toolTip.jsf
simpleTogglePanel= richOutputs, Simple Toggle Panel, /images/ico_SimpleTogglePanel.gif, /images/cn_SimpleTogglePanel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/simpleTogglePanel.jsf
dragIndicator= richDragDrop, Drag Indicator, /images/ico_DragIndicator.gif, /images/cn_DragIndicator.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dragSupport.jsf
dragSupport= richDragDrop, Drag Support, /images/ico_DragSupport.gif, /images/cn_DragSupport.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dragSupport.jsf
dropSupport= richDragDrop, Drop Support, /images/ico_DropSupport.gif, /images/cn_DropSupport.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dragSupport.jsf
-dndParam= richDragDrop, Drag-Drop Parameter, /images/ico_DropSupport.gif, /images/cn_DropSupport.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dragSupport.jsf
+dndParam= richDragDrop, Drag-Drop Parameter, /images/ico_DropSupport.gif, /images/cn_DragDropParameter.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dragSupport.jsf
panelBar= richOutputs, Panel Bar, /images/ico_PanelBar.gif, /images/cn_PanelBar.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panelBar.jsf
tree= richOutputs, Tree, /images/ico_Tree.gif, /images/cn_tree.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/tree.jsf
modalPanel= richOutputs, Modal Panel, /images/ico_ModalPanel.gif, /images/cn_ModalPanel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/modalPanel.jsf
@@ -30,9 +30,9 @@
suggestionBox= richInputs, Suggestion Box, /images/ico_SuggestionBox.gif, /images/cn_SuggestionBox.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/suggestionBox.jsf
dataTableScroller= richDataIterators, Data Table Scroller, /images/ico_DataTableScroller.gif, /images/cn_DataTableScroller.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataTableScroller.jsf
dropDownMenu= richMenu, Drop Down Menu, /images/ico_dropDownMenu.gif, /images/cn_DropDownMenu.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dropDownMenu.jsf
-menuGroup= richMenu, Menu Group, /images/ico_dropDownMenu.gif, /images/cn_DropDownMenu.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dropDownMenu.jsf
-menuItem= richMenu, Menu Item, /images/ico_dropDownMenu.gif, /images/cn_DropDownMenu.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dropDownMenu.jsf
-menuSeparator= richMenu, Menu Separator, /images/ico_dropDownMenu.gif, /images/cn_DropDownMenu.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dropDownMenu.jsf
+menuGroup= richMenu, Menu Group, /images/ico_dropDownMenu.gif, /images/cn_MenuGroup.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dropDownMenu.jsf
+menuItem= richMenu, Menu Item, /images/ico_dropDownMenu.gif, /images/cn_MenuItem.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dropDownMenu.jsf
+menuSeparator= richMenu, Menu Separator, /images/ico_dropDownMenu.gif, /images/cn_MenuSeparator.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dropDownMenu.jsf
ajaxattributes= ajaxSupport, Ajax Attributes, /images/ico_common.gif, /images/cn_ajaxAttributes.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/ajaxAttributes.jsf
actionparam= ajaxSupport, Action Parameter, /images/ico_common.gif, /images/cn_actionParameter.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/actionparam.jsf
commandButton= ajaxSupport, Command Button, /images/ico_common.gif, /images/cn_commandButton.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/commandButton.jsf
@@ -41,7 +41,7 @@
support= ajaxSupport, Ajax Support, /images/ico_common.gif, /images/cn_ajaxSupport.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/support.jsf
jsFunction= ajaxSupport, JavaScript Function, /images/ico_common.gif, /images/cn_jsFunction.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/jsFunction.jsf
poll= ajaxSupport, Poll, /images/ico_common.gif, /images/cn_poll.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/poll.jsf
-push= ajaxSupport, Push, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+push= ajaxSupport, Push, /images/ico_common.gif, /images/cn_push.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
status= ajaxSupport, Status, /images/ico_common.gif, /images/cn_status.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/status.jsf
ajaxListener= ajaxSupport, Ajax Listener, /images/ico_common.gif, /images/cn_ajaxListener.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/ajaxListener.jsf
region= ajaxSupport, Ajax Region, /images/ico_common.gif, /images/cn_ajaxRegion.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/region.jsf
@@ -49,17 +49,17 @@
loadScript= ajaxResources, Script, /images/ico_common.gif, /images/cn_Script.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/script.jsf
loadStyle= ajaxResources, Style, /images/ico_common.gif, /images/cn_Style.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/style.jsf
keepAlive= ajaxResources, Keep Alive, /images/ico_common.gif, /images/cn_KeepAlive.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/keepAlive.jsf
-include= ajaxOutput, Include, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-mediaOutput= ajaxOutput, Media Output, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-outputPanel= ajaxOutput, Output Panel, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-repeat= richDataIterators, Repeat, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-htmlCommandLink= ajaxMisc, Html Command Link, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-log= ajaxMisc, Log, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-page= ajaxMisc, Ajax Page, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-portlet= ajaxMisc, Ajax Portlet, /images/ico_common.gif, /images/cn_common.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-calendar= richInputs, Calendar, /images/ico_common.gif, /images/cn_calendar.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-message= richMisc, Message, /images/ico_common.gif, /images/cn_message.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-messages= richMisc, Messages, /images/ico_common.gif, /images/cn_messages.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-virtualEarth= richMisc, Virtual Earth, /images/ico_common.gif, /images/cn_virtualEarth.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-effect= richMisc, Effect, /images/ico_common.gif, /images/cn_effect.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
-scrollableGrid= richDataIterators, Scrollable Data Grid, /images/ico_common.gif, /images/cn_scrollableGrid.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+include= ajaxOutput, Include, /images/ico_common.gif, /images/cn_Include.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+mediaOutput= ajaxOutput, Media Output, /images/ico_common.gif, /images/cn_MediaOutput.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+outputPanel= ajaxOutput, Output Panel, /images/ico_common.gif, /images/cn_OutputPanel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+repeat= richDataIterators, Repeat, /images/ico_common.gif, /images/cn_Repeat.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+htmlCommandLink= ajaxMisc, Html Command Link, /images/ico_common.gif, /images/cn_HtmlCommandLink.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+log= ajaxMisc, Log, /images/ico_common.gif, /images/cn_Log.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+page= ajaxMisc, Ajax Page, /images/ico_common.gif, /images/cn_AjaxPage.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+portlet= ajaxMisc, Ajax Portlet, /images/ico_common.gif, /images/cn_AjaxPortlet.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+calendar= richInputs, Calendar, /images/ico_common.gif, /images/cn_Calendar.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+message= richMisc, Message, /images/ico_common.gif, /images/cn_Message.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+messages= richMisc, Messages, /images/ico_common.gif, /images/cn_Messages.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+virtualEarth= richMisc, Virtual Earth, /images/ico_VirtualEarth.gif, /images/cn_VirtualEarth.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
+scrollableGrid= richDataIterators, Scrollable Data Grid, /images/ico_common.gif, /images/cn_ScrollableDataGrid.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/comingSoon.jsf
Added: trunk/samples/richfaces-demo/src/main/webapp/images/cn_Effect.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/cn_Effect.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/richfaces-demo/src/main/webapp/images/cn_Message.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/cn_Message.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/richfaces-demo/src/main/webapp/images/cn_Messages.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/cn_Messages.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/richfaces-demo/src/main/webapp/images/cn_ScrollableDataGrid.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/cn_ScrollableDataGrid.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/richfaces-demo/src/main/webapp/images/cn_VirtualEarth.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/cn_VirtualEarth.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/richfaces-demo/src/main/webapp/images/ico_VirtualEarth.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/ico_VirtualEarth.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 8 months
JBoss Rich Faces SVN: r2162 - in trunk/docs: ajaxguide/en/src/main/resources/images and 5 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-08-08 17:52:41 -0400 (Wed, 08 Aug 2007)
New Revision: 2162
Added:
trunk/docs/ajaxguide/en/src/main/resources/images/bg_table.gif
trunk/docs/ajaxguide/en/src/main/resources/images/ico_important.gif
trunk/docs/ajaxguide/en/src/main/resources/images/ico_note.gif
trunk/docs/userguide/en/src/main/resources/css/
trunk/docs/userguide/en/src/main/resources/css/html.css
Removed:
trunk/docs/xslt/en/src/main/css/css/
trunk/docs/xslt/en/src/main/images/images/
Modified:
trunk/docs/ajaxguide/pom.xml
trunk/docs/userguide/pom.xml
Log:
Include html stylesheet into generated docks.
Added: trunk/docs/ajaxguide/en/src/main/resources/images/bg_table.gif
===================================================================
(Binary files differ)
Property changes on: trunk/docs/ajaxguide/en/src/main/resources/images/bg_table.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/ajaxguide/en/src/main/resources/images/ico_important.gif
===================================================================
(Binary files differ)
Property changes on: trunk/docs/ajaxguide/en/src/main/resources/images/ico_important.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/ajaxguide/en/src/main/resources/images/ico_note.gif
===================================================================
(Binary files differ)
Property changes on: trunk/docs/ajaxguide/en/src/main/resources/images/ico_note.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/docs/ajaxguide/pom.xml
===================================================================
--- trunk/docs/ajaxguide/pom.xml 2007-08-08 21:18:27 UTC (rev 2161)
+++ trunk/docs/ajaxguide/pom.xml 2007-08-08 21:52:41 UTC (rev 2162)
@@ -163,7 +163,7 @@
</imageResource>
<cssResource>
<directory>
- ${project.build.directory}/xslt/css
+ ${basedir}/src/main/resources
</directory>
</cssResource>
<!--
Added: trunk/docs/userguide/en/src/main/resources/css/html.css
===================================================================
--- trunk/docs/userguide/en/src/main/resources/css/html.css (rev 0)
+++ trunk/docs/userguide/en/src/main/resources/css/html.css 2007-08-08 21:52:41 UTC (rev 2162)
@@ -0,0 +1,335 @@
+* {
+ LINE-HEIGHT: 20px; FONT-FAMILY: verdana, helvetica, sans-serif
+}
+DIV.navheader TABLE, DIV.navheader TABLE td, DIV.navfooter TABLE, DIV.navfooter TABLE td{
+ BORDER-RIGHT: 0px; BORDER-TOP: 0px; MARGIN: 0px; BORDER-LEFT: 0px; BORDER-BOTTOM: 0px; FONT-SIZE: 11px; padding : 0px;
+}
+A {
+ COLOR: #2a7bd4; FONT-FAMILY: verdana, helvetica, sans-serif
+}
+A:hover {
+ COLOR: #003399; FONT-FAMILY: verdana, helvetica, sans-serif
+}
+A:visited {
+ COLOR: #888888; FONT-FAMILY: verdana, helvetica, sans-serif
+}
+P {
+ FONT-SIZE: 12px; COLOR: #000000; margin : 5px 0px 5px 0px;
+}
+OL {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+UL {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+LI {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+DL {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+DT {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+DD {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+BLOCKQUOTE {
+ FONT-SIZE: 12px; COLOR: #000000
+}
+TD {
+ COLOR: #000000
+}
+TH {
+ COLOR: #000000
+}
+SPAN {
+ COLOR: #000000
+}
+SPAN.property {
+ COLOR: #008cca;
+}
+SPAN.italic {
+ FONT-STYLE: italic;
+}
+
+BLOCKQUOTE {
+ MARGIN-RIGHT: 0px
+}
+
+P.title {
+ MARGIN-BOTTOM: 5px;
+ MARGIN-top: 20px;
+}
+
+div.book div.chapter .title {
+ text-align: left;
+}
+
+
+div.book .title {
+ text-align: center;
+}
+
+.mediaobject{
+ padding : 5px 10px 5px 35px;
+}
+H1 {
+ MARGIN: 0px; FONT-SIZE: 22px; COLOR: #ff6600; PADDING: 45px 0px 10px 0px;
+}
+H2 {
+ MARGIN: 0px; FONT-SIZE: 18px; COLOR: #2a7bd4; PADDING: 25px 0px 10px 0px;
+}
+H3 {
+ MARGIN: 0px; FONT-SIZE: 15px; COLOR: #000000; PADDING: 20px 0px 10px 0px;
+}
+H4 {
+ MARGIN: 0px; FONT-SIZE: 12px; COLOR: #000000; PADDING: 15px 0px 10px 0px;
+}
+H5 {
+ MARGIN: 0px; FONT-SIZE: 12px; COLOR: #000000; PADDING: 15px 0px 10px 0px;
+}
+H6 {
+ MARGIN: 0px; FONT-SIZE: 11px; COLOR: #000000; PADDING: 5px 0px 0px 0px;
+}
+
+div.book div.section div.mediaobject{
+text-align:left;
+}
+
+
+div.book div.mediaobject{
+text-align:center;
+}
+
+div.mediaobject, div.mediaobject img *{
+text-align:left;
+
+}
+
+DIV.note{
+ BORDER: #CECECE 1px solid; PADDING: 3px 10px 10px 50px; line-height : 14px; MARGIN: 10px 0px 10px 0px; FONT-SIZE: 11px; WIDTH: 500px; BACKGROUND-COLOR: #FFFDD3;
+ background-image : url('../images/ico_note.gif'); background-repeat : no-repeat; background-position :top left;
+}
+
+DIV.note *{
+ line-height : 14px;
+}
+
+.note P {
+ MARGIN-TOP: 0px; MARGIN-BOTTOM: 1em; PADDING-BOTTOM: 0px; PADDING-TOP: 0px
+}
+.important P {
+ MARGIN-TOP: 0px; MARGIN-BOTTOM: 1em; PADDING-BOTTOM: 0px; PADDING-TOP: 0px
+}
+DIV.important {
+ BORDER: #CECECE 1px solid; PADDING: 3px 10px 10px 50px; line-height : 14px; MARGIN: 10px 0px 10px 0px; FONT-SIZE: 11px; WIDTH: 500px; BACKGROUND-COLOR: #CFE3FF;
+ background-image : url('../images/ico_important.gif'); background-repeat : no-repeat; background-position :top left;
+}
+
+DIV.important *{
+ line-height : 14px;
+}
+
+.important pre.XML {
+PADDING: 1px 1px 1px 10px;
+
+}
+
+
+TABLE {
+ BORDER: #cccccc 1px solid; FONT-SIZE: 11px; BORDER-COLLAPSE: collapse; border-spacing: 0; empty-cells: hide; margin-bottom : 10px;
+}
+
+table *{
+ line-height : 14px;
+}
+
+
+.table TH {
+ WHITE-SPACE: nowrap; BACKGROUND-COLOR: #EEF5FF; TEXT-ALIGN: center; BORDER-BOTTOM: #CAE1FF 2px solid; PADDING: 2px 8px 2px 8px;
+ background-image : url('../images/bg_table.gif'); background-repeat : repeat-x; background-position :top left;
+}
+TD {
+ PADDING: 4px 8px 4px 8px; BORDER-BOTTOM: #cccccc 1px dotted; BORDER-right: #cccccc 1px dotted;
+}
+P.copyright {
+ TEXT-ALIGN: center
+}
+TT {
+ FONT-SIZE: 90%; COLOR: #000000; FONT-FAMILY: "Courier New", Courier, monospace
+}
+DL {
+ MARGIN-BOTTOM: 6px; MARGIN-LEFT: 8px
+}
+DT {
+ MARGIN-BOTTOM: 6px; MARGIN-LEFT: 8px
+}
+DD {
+ MARGIN-BOTTOM: 6px; MARGIN-LEFT: 8px
+}
+PRE {
+ BORDER: #cccccc 1px solid; PADDING: 5px 15px 5px 25px; FONT-SIZE: 11px; BACKGROUND-COLOR: #f5f5f5;
+}
+HR {
+ BORDER-TOP-WIDTH: 0px; PADDING-RIGHT: 0px; PADDING-LEFT: 0px; BORDER-LEFT-WIDTH: 0px; BORDER-BOTTOM-WIDTH: 0px; PADDING-BOTTOM: 0px; WIDTH: 100%; COLOR: #cccccc; PADDING-TOP: 0px; HEIGHT: 1px; BACKGROUND-COLOR: #cccccc; BORDER-RIGHT-WIDTH: 0px
+}
+.variablelist {
+ PADDING-BOTTOM: 10px; MARGIN: 0px; PADDING-TOP: 10px
+}
+.itemizedlist {
+ FONT-SIZE: 12px; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px;TEXT-ALIGN: justify
+}
+.term {
+ FONT-WEIGHT: bold
+}
+PRE.JAVA {
+ LINE-HEIGHT: 0px
+}
+PRE.XML {
+ LINE-HEIGHT: 0px
+}
+PRE.JSP {
+ LINE-HEIGHT: 0px
+}
+PRE.XHTML {
+ LINE-HEIGHT: 0px
+}
+.java_type {
+ COLOR: #008cca
+}
+.java_keyword {
+ FONT-WEIGHT: bold; COLOR: rgb(0,0,0)
+}
+.java_javadoc_comment {
+ COLOR: rgb(147,147,147); FONT-STYLE: italic; BACKGROUND-COLOR: rgb(247,247,247)
+}
+.java_comment {
+ COLOR: rgb(147,147,147); BACKGROUND-COLOR: rgb(247,247,247)
+}
+.java_operator {
+ COLOR: #003399
+}
+.java_plain {
+ COLOR: rgb(0,0,0)
+}
+.java_literal {
+ COLOR: #ff6600
+}
+PRE CODE {
+ FONT-SIZE: 12px; COLOR: rgb(0,0,0); FONT-FAMILY: monospace; WHITE-SPACE: nowrap
+}
+.java_javadoc_tag {
+ FONT-WEIGHT: bold; COLOR: rgb(147,147,147); FONT-STYLE: italic; BACKGROUND-COLOR: rgb(247,247,247)
+}
+.java_separator {
+ COLOR: #008cca
+}
+.xml_plain {
+ COLOR: rgb(0,0,0)
+}
+.xml_tag_name {
+ COLOR: #008cca
+}
+.xml_comment {
+ COLOR: rgb(147,147,147); BACKGROUND-COLOR: rgb(247,247,247)
+}
+.xml_tag_symbols {
+ COLOR: #008cca
+}
+.xml_rife_tag {
+ COLOR: rgb(0,0,0); BACKGROUND-COLOR: rgb(228,230,160)
+}
+.xml_attribute_value {
+ COLOR: #ff6600
+}
+.xml_attribute_name {
+ FONT-WEIGHT: bold; COLOR: rgb(0,0,0)
+}
+.xml_char_data {
+ COLOR: rgb(0,0,0)
+}
+.xml_rife_name {
+ COLOR: #008cca; BACKGROUND-COLOR: rgb(228,230,160)
+}
+.xml_processing_instruction {
+ FONT-WEIGHT: bold; COLOR: rgb(0,0,0); FONT-STYLE: italic
+}
+TD.java {
+ VERTICAL-ALIGN: top; LINE-HEIGHT: 10px
+}
+TD.java-ln {
+ VERTICAL-ALIGN: top; LINE-HEIGHT: 10px
+}
+TT.java {
+ MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+TT.java-ln {
+ MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+PRE.java {
+ MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+PRE.java-ln {
+ MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+TD.java-ln {
+ LINE-HEIGHT: 10px; TEXT-ALIGN: right
+}
+TT.java-ln {
+ COLOR: #888888; LINE-HEIGHT: 10px
+}
+PRE.java-ln {
+ COLOR: #888888; LINE-HEIGHT: 10px
+}
+SPAN.java0 {
+ FONT-SIZE: 8pt; COLOR: #ffffff; LINE-HEIGHT: 10px
+}
+SPAN.java1 {
+ FONT-SIZE: 8pt; COLOR: #808080
+}
+SPAN.java2 {
+ FONT-SIZE: 8pt; COLOR: #3f7f5f; LINE-HEIGHT: 10px
+}
+SPAN.java3 {
+ FONT-SIZE: 8pt; COLOR: #3f7f5f; LINE-HEIGHT: 10px
+}
+SPAN.java4 {
+ FONT-WEIGHT: bold; FONT-SIZE: 8pt; COLOR: #ff6600; LINE-HEIGHT: 10px
+}
+SPAN.java5 {
+ FONT-SIZE: 8pt; COLOR: #2a00ff; LINE-HEIGHT: 10px
+}
+SPAN.java6 {
+ FONT-SIZE: 8pt; COLOR: #990000; LINE-HEIGHT: 10px
+}
+SPAN.java7 {
+ FONT-SIZE: 8pt; COLOR: #990000; LINE-HEIGHT: 10px
+}
+SPAN.java8 {
+ FONT-SIZE: 8pt; COLOR: #000000; LINE-HEIGHT: 10px
+}
+SPAN.java9 {
+ FONT-WEIGHT: bold; FONT-SIZE: 8pt; COLOR: #ff6600; LINE-HEIGHT: 10px
+}
+SPAN.java10 {
+ FONT-SIZE: 8pt; COLOR: #000000; LINE-HEIGHT: 10px
+}
+SPAN.java11 {
+ FONT-SIZE: 8pt; COLOR: #7f9fbf; LINE-HEIGHT: 10px
+}
+SPAN.java12 {
+ FONT-SIZE: 8pt; COLOR: #7f7f9f; LINE-HEIGHT: 10px
+}
+SPAN.java13 {
+ FONT-SIZE: 8pt; COLOR: #3f3fbf; LINE-HEIGHT: 10px
+}
+SPAN.java14 {
+ FONT-SIZE: 8pt; COLOR: #3f5fbf; LINE-HEIGHT: 10px
+}
+SPAN.java15 {
+ FONT-SIZE: 8pt; COLOR: #ff6100; LINE-HEIGHT: 10px
+}
+SPAN.java16 {
+ FONT-SIZE: 8pt; COLOR: #646464; LINE-HEIGHT: 10px
+}
Property changes on: trunk/docs/userguide/en/src/main/resources/css/html.css
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/docs/userguide/pom.xml
===================================================================
--- trunk/docs/userguide/pom.xml 2007-08-08 21:18:27 UTC (rev 2161)
+++ trunk/docs/userguide/pom.xml 2007-08-08 21:52:41 UTC (rev 2162)
@@ -486,7 +486,7 @@
</imageResource>
<cssResource>
<directory>
- ${project.build.directory}/xslt/css
+ ${basedir}/src/main/resources
</directory>
</cssResource>
<sourceDocumentName>
18 years, 8 months
JBoss Rich Faces SVN: r2161 - in trunk/samples/richfaces-demo/src/main: webapp and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: ishabalov
Date: 2007-08-08 17:18:27 -0400 (Wed, 08 Aug 2007)
New Revision: 2161
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java
trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml
trunk/samples/richfaces-demo/src/main/webapp/welcome.xhtml
Log:
Removed blank image in welcome page
Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java 2007-08-08 20:30:09 UTC (rev 2160)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java 2007-08-08 21:18:27 UTC (rev 2161)
@@ -20,7 +20,11 @@
private ComponentDescriptor currentComponent;
private List componentGroups = null;
private Object activeTab;
-
+
+ public boolean getHasCurrentComponent() {
+ return currentComponent!=null;
+ }
+
public Object getActiveTab() {
return activeTab;
}
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml 2007-08-08 20:30:09 UTC (rev 2160)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml 2007-08-08 21:18:27 UTC (rev 2161)
@@ -33,7 +33,7 @@
</table>
<h:graphicImage value="#{componentNavigator.currentComponent.captionImage}"
- rendered="#{componentNavigator.currentComponent.captionImage!=''}" height="40" alt="" border="0" styleClass="component_name"/>
+ rendered="#{componentNavigator.hasCurrentComponent}" height="40" alt="" border="0" styleClass="component_name"/>
<table cellpadding="0" cellspacing="0" border="0" class="content_container" width="100%">
<tbody>
Modified: trunk/samples/richfaces-demo/src/main/webapp/welcome.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/welcome.xhtml 2007-08-08 20:30:09 UTC (rev 2160)
+++ trunk/samples/richfaces-demo/src/main/webapp/welcome.xhtml 2007-08-08 21:18:27 UTC (rev 2161)
@@ -6,8 +6,8 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components</ui:define>
<ui:define name="body">
- <p>Welcome to the <h:outputLink value="#" target="_blank">
- <strong>Rich Faces 3.0</strong>
+ <p>Welcome to the <h:outputLink value="http://labs.jboss.com/jbossrichfaces" target="_blank">
+ <strong>Rich Faces 3.1</strong>
</h:outputLink> demo!</p>
<h4>About RichFaces</h4>
<p>RichFaces is a rich component library for JavaServer Faces
18 years, 8 months
JBoss Rich Faces SVN: r2160 - in trunk/docs: userguide/en and 4 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-08-08 16:30:09 -0400 (Wed, 08 Aug 2007)
New Revision: 2160
Added:
trunk/docs/userguide/en/src/main/resources/images/bg_table.gif
trunk/docs/userguide/en/src/main/resources/images/ico_important.gif
trunk/docs/userguide/en/src/main/resources/images/ico_note.gif
trunk/docs/xslt/en/src/main/images/images/
trunk/docs/xslt/en/src/main/images/images/bg_table.gif
trunk/docs/xslt/en/src/main/images/images/ico_important.gif
trunk/docs/xslt/en/src/main/images/images/ico_note.gif
Removed:
trunk/docs/xslt/en/src/main/images/bg_table.gif
trunk/docs/xslt/en/src/main/images/ico_important.gif
trunk/docs/xslt/en/src/main/images/ico_note.gif
Modified:
trunk/docs/userguide/en/pom.xml
trunk/docs/userguide/pom.xml
trunk/docs/xslt/en/pom.xml
Log:
move css stylesheet to the common project.
Modified: trunk/docs/userguide/en/pom.xml
===================================================================
--- trunk/docs/userguide/en/pom.xml 2007-08-08 19:46:10 UTC (rev 2159)
+++ trunk/docs/userguide/en/pom.xml 2007-08-08 20:30:09 UTC (rev 2160)
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -18,22 +20,32 @@
<translation>en</translation>
</properties>
<build>
- <finalName>${project.parent.artifactId}_${translation}-${version}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- </plugin>
+ <finalName>
+ ${project.parent.artifactId}_${translation}-${version}
+ </finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <!--
<plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-style-plugin</artifactId>
+ <version>1.0.0</version>
+ <extensions>true</extensions>
</plugin>
- </plugins>
+ -->
+ </plugins>
</build>
</project>
Added: trunk/docs/userguide/en/src/main/resources/images/bg_table.gif
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/bg_table.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/userguide/en/src/main/resources/images/ico_important.gif
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/ico_important.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/userguide/en/src/main/resources/images/ico_note.gif
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/ico_note.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/docs/userguide/pom.xml
===================================================================
--- trunk/docs/userguide/pom.xml 2007-08-08 19:46:10 UTC (rev 2159)
+++ trunk/docs/userguide/pom.xml 2007-08-08 20:30:09 UTC (rev 2160)
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>docs</artifactId>
<groupId>org.richfaces</groupId>
@@ -118,7 +120,9 @@
<groupId>
org.richfaces.ui
</groupId>
- <artifactId>virtualEarth</artifactId>
+ <artifactId>
+ virtualEarth
+ </artifactId>
<version>
3.1.0-SNAPSHOT
</version>
@@ -160,9 +164,7 @@
<groupId>
org.richfaces.ui
</groupId>
- <artifactId>
- message
- </artifactId>
+ <artifactId>message</artifactId>
<version>
3.1.0-SNAPSHOT
</version>
@@ -304,7 +306,9 @@
<groupId>
org.richfaces.docs.xslt
</groupId>
- <artifactId>${translation}</artifactId>
+ <artifactId>
+ ${translation}
+ </artifactId>
<version>
3.1.0-SNAPSHOT
</version>
@@ -366,7 +370,8 @@
${project.build.directory}/xslt/xslt/f.xsl
</stylesheet>
<fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+ <fileMapper
+ implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
<targetExtension>
xml
</targetExtension>
@@ -410,7 +415,8 @@
${project.build.directory}/xslt/xslt/f.xsl
</stylesheet>
<fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+ <fileMapper
+ implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
<targetExtension>
xml
</targetExtension>
@@ -477,13 +483,12 @@
<directory>
${basedir}/src/main/resources
</directory>
- <!--
- <directory>${project.build.directory}/xslt/images</directory>
- -->
</imageResource>
- <cssResource>
- <directory>${project.build.directory}/xslt/css</directory>
- </cssResource>
+ <cssResource>
+ <directory>
+ ${project.build.directory}/xslt/css
+ </directory>
+ </cssResource>
<sourceDocumentName>
master.xml
</sourceDocumentName>
Modified: trunk/docs/xslt/en/pom.xml
===================================================================
--- trunk/docs/xslt/en/pom.xml 2007-08-08 19:46:10 UTC (rev 2159)
+++ trunk/docs/xslt/en/pom.xml 2007-08-08 20:30:09 UTC (rev 2160)
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>xslt</artifactId>
<groupId>org.richfaces.docs</groupId>
@@ -14,28 +16,27 @@
Docbook documentation stylesheets for En-Us translation
</description>
<build>
- <resources>
- <resource>
- <directory>src/main/xslt</directory>
- <targetPath>xslt</targetPath>
- </resource>
- <resource>
- <directory>src/main/css</directory>
- <targetPath>css</targetPath>
- </resource>
- <resource>
- <directory>src/main/images</directory>
- <targetPath>images</targetPath>
- </resource>
- </resources>
- <!--
- <plugins>
+ <resources>
+ <resource>
+ <directory>src/main/xslt</directory>
+ <targetPath>xslt</targetPath>
+ </resource>
+ <resource>
+ <directory>src/main/css</directory>
+ <targetPath>css</targetPath>
+ </resource>
+ <resource>
+ <directory>src/main/images</directory>
+ <targetPath>images</targetPath>
+ </resource>
+ </resources>
+ <plugins>
<plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-style-plugin</artifactId>
- <version>1.0.0</version>
- <extensions>true</extensions>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-style-plugin</artifactId>
+ <version>1.0.0</version>
+ <extensions>true</extensions>
</plugin>
- </plugins>
- --></build>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Deleted: trunk/docs/xslt/en/src/main/images/bg_table.gif
===================================================================
(Binary files differ)
Deleted: trunk/docs/xslt/en/src/main/images/ico_important.gif
===================================================================
(Binary files differ)
Deleted: trunk/docs/xslt/en/src/main/images/ico_note.gif
===================================================================
(Binary files differ)
Copied: trunk/docs/xslt/en/src/main/images/images/bg_table.gif (from rev 2159, trunk/docs/xslt/en/src/main/images/bg_table.gif)
===================================================================
(Binary files differ)
Copied: trunk/docs/xslt/en/src/main/images/images/ico_important.gif (from rev 2159, trunk/docs/xslt/en/src/main/images/ico_important.gif)
===================================================================
(Binary files differ)
Copied: trunk/docs/xslt/en/src/main/images/images/ico_note.gif (from rev 2159, trunk/docs/xslt/en/src/main/images/ico_note.gif)
===================================================================
(Binary files differ)
18 years, 9 months
JBoss Rich Faces SVN: r2159 - in trunk/docs: userguide/en/src/main/resources and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-08-08 15:46:10 -0400 (Wed, 08 Aug 2007)
New Revision: 2159
Added:
trunk/docs/xslt/en/src/main/images/bg_table.gif
trunk/docs/xslt/en/src/main/images/ico_important.gif
trunk/docs/xslt/en/src/main/images/ico_note.gif
Removed:
trunk/docs/userguide/en/src/main/resources/css/
trunk/docs/userguide/en/src/main/resources/images/bg_table.gif
trunk/docs/userguide/en/src/main/resources/images/ico_important.gif
trunk/docs/userguide/en/src/main/resources/images/ico_note.gif
Modified:
trunk/docs/userguide/pom.xml
Log:
Change prefix in tables for a core ajax4jsf components.
Move common style to xslt project.
Deleted: trunk/docs/userguide/en/src/main/resources/images/bg_table.gif
===================================================================
(Binary files differ)
Deleted: trunk/docs/userguide/en/src/main/resources/images/ico_important.gif
===================================================================
(Binary files differ)
Deleted: trunk/docs/userguide/en/src/main/resources/images/ico_note.gif
===================================================================
(Binary files differ)
Modified: trunk/docs/userguide/pom.xml
===================================================================
--- trunk/docs/userguide/pom.xml 2007-08-08 19:04:21 UTC (rev 2158)
+++ trunk/docs/userguide/pom.xml 2007-08-08 19:46:10 UTC (rev 2159)
@@ -161,6 +161,17 @@
org.richfaces.ui
</groupId>
<artifactId>
+ message
+ </artifactId>
+ <version>
+ 3.1.0-SNAPSHOT
+ </version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>
+ org.richfaces.ui
+ </groupId>
+ <artifactId>
panelmenu
</artifactId>
<version>
@@ -345,6 +356,9 @@
<includes>
<include>*.tld</include>
</includes>
+ <excludes>
+ <exclude>a4j.*</exclude>
+ </excludes>
<outputDir>
${project.build.directory}/generated/
</outputDir>
@@ -379,6 +393,50 @@
</parameter>
</parameters>
</transformationSet>
+ <transformationSet>
+ <dir>
+ ${project.build.directory}/library/META-INF
+ </dir>
+ <includes>
+ <include>a4j.*</include>
+ </includes>
+ <excludes>
+ <exclude>*.xml</exclude>
+ </excludes>
+ <outputDir>
+ ${project.build.directory}/generated/
+ </outputDir>
+ <stylesheet>
+ ${project.build.directory}/xslt/xslt/f.xsl
+ </stylesheet>
+ <fileMappers>
+ <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+ <targetExtension>
+ xml
+ </targetExtension>
+ </fileMapper>
+ </fileMappers>
+ <parameters>
+ <parameter>
+ <name>lang</name>
+ <value>
+ ..${file.separator}..${file.separator}..${file.separator}src${file.separator}main${file.separator}docbook
+ </value>
+ </parameter>
+ <parameter>
+ <name>title</name>
+ <value>${project.name}</value>
+ </parameter>
+ <parameter>
+ <name>separator</name>
+ <value>${file.separator}</value>
+ </parameter>
+ <parameter>
+ <name>prefix</name>
+ <value>a4j</value>
+ </parameter>
+ </parameters>
+ </transformationSet>
</transformationSets>
</configuration>
</plugin>
Copied: trunk/docs/xslt/en/src/main/images/bg_table.gif (from rev 2157, trunk/docs/userguide/en/src/main/resources/images/bg_table.gif)
===================================================================
(Binary files differ)
Copied: trunk/docs/xslt/en/src/main/images/ico_important.gif (from rev 2157, trunk/docs/userguide/en/src/main/resources/images/ico_important.gif)
===================================================================
(Binary files differ)
Copied: trunk/docs/xslt/en/src/main/images/ico_note.gif (from rev 2157, trunk/docs/userguide/en/src/main/resources/images/ico_note.gif)
===================================================================
(Binary files differ)
18 years, 9 months
JBoss Rich Faces SVN: r2158 - in trunk/ui/tooltip/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: dbiatenia
Date: 2007-08-08 15:04:21 -0400 (Wed, 08 Aug 2007)
New Revision: 2158
Modified:
trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
Log:
adding client parameters passing into ajax-request
Modified: trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
===================================================================
--- trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-08-08 17:38:09 UTC (rev 2157)
+++ trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-08-08 19:04:21 UTC (rev 2158)
@@ -22,12 +22,15 @@
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSFunctionDefinition;
import org.ajax4jsf.javascript.JSReference;
+import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.renderkit.AjaxComponentRendererBase;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.ajax4jsf.resource.InternetResource;
import org.richfaces.component.UIToolTip;
import org.richfaces.skin.Skin;
+import com.sun.el.lang.FunctionMapperImpl.Function;
+
public class ToolTipRenderer extends AjaxComponentRendererBase{
//
@@ -167,10 +170,7 @@
}
- public String insertAjaxFunction(FacesContext context, UIComponent component){
- JSFunction function = AjaxRendererUtils.buildAjaxFunction(component, context);
- component.getClientId(context);
-
+ public Map buildEventOptions(FacesContext context, UIComponent component){
Map eventOptions = AjaxRendererUtils.buildEventOptions(context, component);
//after element is subsituted in DOM tree, we have to re-create
@@ -200,11 +200,18 @@
eventOptions.put("oncomplete", onComplete);
}
- function.addParameter(eventOptions);
+ return eventOptions;
+ }
+ /*
+ public JSFunction insertAjaxFunction(FacesContext context, UIComponent component){
+ JSFunction function = AjaxRendererUtils.buildAjaxFunction(component, context);
+ component.getClientId(context);
+// function.addParameter(eventOptions);
+ //function.
return function.toScript();
}
-
+ */
public void insertScript(FacesContext context, UIComponent component) throws IOException{
@@ -246,6 +253,14 @@
//"\",delay:" + toolTip.getDelay() + ",jsVarName:\"" + getJsVarName(context, component) + "\"}";
"\",delay:" + toolTip.getDelay() + "}";
+
+ JSFunction function = AjaxRendererUtils.buildAjaxFunction(component, context);
+ JSReference ref = new JSReference("ajaxOptions");
+ function.addParameter(ref);
+ String ajaxFunc = function.toScript();
+
+ Map ajaxOptions = buildEventOptions(context, toolTip);
+
ret.append("new ToolTip(" + events).append(comma).append(quot).append( toolTip.getClientId(context)).append(quot).append(comma).
append(quot).append(parentClientId).append(quot).append(comma).
append(quot).append(toolTip.getMode()).append(quot).append(comma).
@@ -254,7 +269,7 @@
append(toolTip.isFollowMouse()).append(comma).
append(toolTip.getHorizontalOffset()).append(comma).
append(toolTip.getVerticalOffset()).append(comma).
- append("\"").append(insertAjaxFunction(context, component)).append("\")");
+ append("\"").append(ajaxFunc).append("\"").append(comma).append(ScriptUtils.toScript(ajaxOptions)).append(");");
return ret.toString();
}
Modified: trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
===================================================================
--- trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2007-08-08 17:38:09 UTC (rev 2157)
+++ trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2007-08-08 19:04:21 UTC (rev 2158)
@@ -5,13 +5,12 @@
ToolTip = Class.create();
ToolTip.prototype = {
- initialize:function(events, id, parentId, mode, disabled, direction, followMouse, horizontalOffset, verticalOffset, ajaxFunction){
+ initialize:function(events, id, parentId, mode, disabled, direction, followMouse, horizontalOffset, verticalOffset, ajaxFunction, ajaxOptions){
this.event = events.event;
this.onshow = events.onshow;
this.oncomplete = events.oncomplete;
this.onhide = events.onhide;
this.delay = events.delay;
- //this.jsVarName = events.jsVarName;
this.id = id;
this.parentId = parentId;
@@ -21,7 +20,11 @@
this.followMouse = followMouse;
this.horizontalOffset = horizontalOffset;
this.verticalOffset = verticalOffset;
+
this.ajaxExecuteString = ajaxFunction;
+ this.ajaxOptions = ajaxOptions;
+ this.clientAjaxParams = {};
+
this.toolTip = $(id);
this.toolTipContent = $(id + 'content');
@@ -124,6 +127,10 @@
this.toolTipContent.innerHTML = this.toolTipDefaultContent.innerHTML;
}
var event = e;
+ var ajaxOptions = this.ajaxOptions;
+ if(this.clientAjaxParams){
+ Object.extend(ajaxOptions['parameters'], this.clientAjaxParams);
+ }
eval(this.ajaxExecuteString);
}
if(this.delay > 0){
18 years, 9 months
JBoss Rich Faces SVN: r2157 - in trunk/samples/richfaces-demo/src/main/webapp: richfaces and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: dbiatenia
Date: 2007-08-08 13:38:09 -0400 (Wed, 08 Aug 2007)
New Revision: 2157
Modified:
trunk/samples/richfaces-demo/src/main/webapp/css/common.css
trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxListener.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/bundle.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropSupport.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/form.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelBar.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/region.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/script.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/separator.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/status.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/style.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/support.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml
Log:
new attribute 'headerClass' added to tabPanel
Modified: trunk/samples/richfaces-demo/src/main/webapp/css/common.css
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/css/common.css 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/css/common.css 2007-08-08 17:38:09 UTC (rev 2157)
@@ -247,6 +247,11 @@
.top_tab .dr-tbpnl-tbtopbrdr{
}
+
+.header_tabs_class{
+ border-width:0px;
+}
+
.source_frame {
border: 1px solid #ACBECE;
margin: 8px 0px 15px 0px;
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Action Parameter</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/actionparam/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxListener.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxListener.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxListener.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Listener</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/ajaxListener/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/bundle.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/bundle.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/bundle.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Load Bundle</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/bundle/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Button</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/commandButton/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Link</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/commandLink/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Data FIlter Slider</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/dataFilterSlider/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Data table</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/dataTable/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Table Scroller</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/dataTableScroller/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Drag-n-Drop. Drag Indicator</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/dragSupport/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Drag-n-Drop. DragSupport</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/dragSupport/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Drop Down Menu Component</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/dropDownMenu/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropSupport.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropSupport.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropSupport.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Drag-n-Drop. DragSupport</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/dragSupport/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/form.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/form.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/form.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Form</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/form/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -8,7 +8,7 @@
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Google Map Component</ui:define>
<ui:define name="body">
<f:view contentType="text/html">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/gmap/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -8,7 +8,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - InputNumberSlider</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/inputNumberSlider/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -8,7 +8,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - InputNumberSpinner</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="ajax" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="ajax" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/inputNumberSpinner/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Keep Bean Alive</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/keepAlive/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Modal Panel</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/modalPanel/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Paint 2D Graphic</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/paint2D/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -9,7 +9,7 @@
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Panel</ui:define>
<ui:define name="current">panel</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" headerClass="header_tabs_class" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/panel/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelBar.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelBar.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelBar.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -9,7 +9,7 @@
<ui:define name="title">RichFaces - Open Source Rich JSF Components - PanelBar</ui:define>
<ui:define name="current">panel</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/panelBar/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/poll.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Poll</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/poll/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/region.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/region.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/region.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Region</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/region/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/script.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/script.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/script.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Load Script</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/script/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/separator.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/separator.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/separator.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -8,7 +8,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Separator</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="ajax" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="ajax" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/separator/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Simple Toggle Panel</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/simpleTogglePanel/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -8,7 +8,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Spacer</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="ajax" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="ajax" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/spacer/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/status.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/status.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/status.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Status</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/status/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/style.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/style.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/style.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Load Style</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/style/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Suggestion Box</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/suggestionBox/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/support.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/support.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/support.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -8,7 +8,7 @@
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Support</ui:define>
<ui:define name="body">
<ui:remove>
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/support/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - TabPanel</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/tabPanel/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -9,7 +9,7 @@
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Toggle Panel</ui:define>
<ui:define name="current">panel</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/togglePanel/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -9,7 +9,7 @@
<ui:define name="title">RichFaces - Open Source Rich JSF Components - PanelBar</ui:define>
<ui:define name="current">panel</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/toolBar/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -9,7 +9,7 @@
<ui:define name="title">RichFaces - Open Source Rich JSF Components - PanelBar</ui:define>
<ui:define name="current">panel</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="ajax" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="ajax" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/toolTip/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml 2007-08-08 17:21:00 UTC (rev 2156)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml 2007-08-08 17:38:09 UTC (rev 2157)
@@ -9,7 +9,7 @@
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Tree</ui:define>
<ui:define name="current">panel</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/tree/usage.xhtml"/>
</rich:tab>
18 years, 9 months