JBoss Rich Faces SVN: r3476 - in trunk/ui: paint2D/src/main/java/org/richfaces/renderkit/html and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-10-22 20:15:11 -0400 (Mon, 22 Oct 2007)
New Revision: 3476
Modified:
trunk/ui/assembly/pom.xml
trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java
trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
Log:
Fix errors in the Javadoc build.
Modified: trunk/ui/assembly/pom.xml
===================================================================
--- trunk/ui/assembly/pom.xml 2007-10-22 18:03:51 UTC (rev 3475)
+++ trunk/ui/assembly/pom.xml 2007-10-23 00:15:11 UTC (rev 3476)
@@ -113,7 +113,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
+ <!--version>2.2</version-->
<executions>
<execution>
<id>attach-javadoc</id>
@@ -122,6 +122,9 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <javadocVersion>1.5</javadocVersion>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java
===================================================================
--- trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java 2007-10-22 18:03:51 UTC (rev 3475)
+++ trunk/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java 2007-10-23 00:15:11 UTC (rev 3476)
@@ -151,7 +151,7 @@
return new Dimension(1,1);
}
/**
- * Secondary calculation is used basically by {@link getImage} method
+ * Secondary calculation is used basically by getImage method
* @param resourceContext
* @return
*/
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2007-10-22 18:03:51 UTC (rev 3475)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2007-10-23 00:15:11 UTC (rev 3476)
@@ -12,11 +12,12 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import org.ajax4jsf.component.UIDataAdaptor;
import org.ajax4jsf.context.AjaxContext;
import org.richfaces.component.UIScrollableDataTable;
/**
- * bean to store current {@link com.exadel.vcp.components.datagrid.UIDataGrid } information
+ * bean to store current {@link UIDataAdaptor } information
* in request map. For nested grids, it support push/pop state saving.
* In {@link javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)} method
* must be created instance of this bean , or, if it already exist in request map - push information.
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-10-22 18:03:51 UTC (rev 3475)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-10-23 00:15:11 UTC (rev 3476)
@@ -177,7 +177,7 @@
/**
* Create iterator for all rendered tabs in this component
- * {@link Iterator#next()} method will return tab model - {@link Tab}
+ * {@link Iterator#next()} method will return tab model - {@link UITab}
*
* @return Iterator
*/
17 years, 2 months
JBoss Rich Faces SVN: r3475 - trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-10-22 14:03:51 -0400 (Mon, 22 Oct 2007)
New Revision: 3475
Modified:
trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java
Log:
Latest changes for JSF 1.2/reverted back to MethodBinding
Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java 2007-10-22 17:38:48 UTC (rev 3474)
+++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java 2007-10-22 18:03:51 UTC (rev 3475)
@@ -428,7 +428,7 @@
}
// TODO - check existing property for compability with this listener.
listenerProperty
- .setClassname("javax.el.MethodExpression");
+ .setClassname("javax.faces.el.MethodBinding");
listenerProperty.setEl(true);
listenerProperty.setElonly(true);
listenerProperty.setAttachedstate(true);
17 years, 2 months
JBoss Rich Faces SVN: r3474 - in trunk/cdk/generator/src/main: resources/META-INF/templates12 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-10-22 13:38:48 -0400 (Mon, 22 Oct 2007)
New Revision: 3474
Modified:
trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java
trunk/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm
Log:
Latest changes for JSF 1.2
Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java 2007-10-22 15:57:44 UTC (rev 3473)
+++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java 2007-10-22 17:38:48 UTC (rev 3474)
@@ -428,7 +428,7 @@
}
// TODO - check existing property for compability with this listener.
listenerProperty
- .setClassname("javax.faces.el.MethodBinding");
+ .setClassname("javax.el.MethodExpression");
listenerProperty.setEl(true);
listenerProperty.setElonly(true);
listenerProperty.setAttachedstate(true);
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm 2007-10-22 15:57:44 UTC (rev 3473)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm 2007-10-22 17:38:48 UTC (rev 3474)
@@ -40,7 +40,7 @@
<required>true</required>
#end
#if(${prop.el})
- #if( !$prop.isInstanceof("javax.faces.el.MethodBinding") )
+ #if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.el.MethodExpression") )
<deferred-value>
<type>${prop.classname}</type>
</deferred-value>
17 years, 2 months
JBoss Rich Faces SVN: r3473 - in branches/3.1.x/ui/tooltip/src/main: java/org/richfaces/component and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-10-22 11:57:44 -0400 (Mon, 22 Oct 2007)
New Revision: 3473
Modified:
branches/3.1.x/ui/tooltip/src/main/config/component/toolTip.xml
branches/3.1.x/ui/tooltip/src/main/java/org/richfaces/component/UIToolTip.java
branches/3.1.x/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
branches/3.1.x/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
Log:
http://jira.jboss.com/jira/browse/RF-1124
Modified: branches/3.1.x/ui/tooltip/src/main/config/component/toolTip.xml
===================================================================
--- branches/3.1.x/ui/tooltip/src/main/config/component/toolTip.xml 2007-10-22 15:24:55 UTC (rev 3472)
+++ branches/3.1.x/ui/tooltip/src/main/config/component/toolTip.xml 2007-10-22 15:57:44 UTC (rev 3473)
@@ -42,11 +42,17 @@
<defaultvalue><![CDATA["inline"]]></defaultvalue>
</property>
<property>
- <name>delay</name>
+ <name>showDelay</name>
<classname>int</classname>
<description>Delay in milliseconds before tooltip will be displayed.</description>
<defaultvalue><![CDATA[0]]></defaultvalue>
- </property>
+ </property>
+ <property>
+ <name>hideDelay</name>
+ <classname>int</classname>
+ <description>Delay in milliseconds before tooltip will be hidden.</description>
+ <defaultvalue><![CDATA[0]]></defaultvalue>
+ </property>
<property>
<name>zorder</name>
<classname>int</classname>
Modified: branches/3.1.x/ui/tooltip/src/main/java/org/richfaces/component/UIToolTip.java
===================================================================
--- branches/3.1.x/ui/tooltip/src/main/java/org/richfaces/component/UIToolTip.java 2007-10-22 15:24:55 UTC (rev 3472)
+++ branches/3.1.x/ui/tooltip/src/main/java/org/richfaces/component/UIToolTip.java 2007-10-22 15:57:44 UTC (rev 3473)
@@ -93,10 +93,14 @@
public abstract void setOnmouseover(String onmouseover);
- public abstract int getDelay();
+ public abstract int getShowDelay();
- public abstract void setDelay(int delay);
+ public abstract void setShowDelay(int delay);
+
+ public abstract int getHideDelay();
+ public abstract void setHideDelay(int delay);
+
public abstract int getZorder();
public abstract void setZorder(int delay);
Modified: branches/3.1.x/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
===================================================================
--- branches/3.1.x/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-10-22 15:24:55 UTC (rev 3472)
+++ branches/3.1.x/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-10-22 15:57:44 UTC (rev 3473)
@@ -221,7 +221,8 @@
eventsMap.put(new JSReference("onshow"), toolTip.getOnshow());
eventsMap.put(new JSReference("oncomplete"), toolTip.getOncomplete());
eventsMap.put(new JSReference("onhide"), toolTip.getOnhide());
- eventsMap.put(new JSReference("delay"), new Integer(toolTip.getDelay()));
+ eventsMap.put(new JSReference("delay"), new Integer(toolTip.getShowDelay()));
+ eventsMap.put(new JSReference("hideDelay"), new Integer(toolTip.getHideDelay()));
JSFunction function = AjaxRendererUtils.buildAjaxFunction(component, context);
JSReference ref = new JSReference("ajaxOptions");
Modified: branches/3.1.x/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
===================================================================
--- branches/3.1.x/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2007-10-22 15:24:55 UTC (rev 3472)
+++ branches/3.1.x/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2007-10-22 15:57:44 UTC (rev 3473)
@@ -11,6 +11,7 @@
this.oncomplete = new Function('event', events.oncomplete + ';return true;');
this.onhide = new Function('event', events.onhide + ';return true;');
this.delay = events.delay;
+ this.hideDelay = events.hideDelay;
this.id = id;
this.parentId = parentId;
@@ -61,7 +62,13 @@
this.attachOnLoadEventsListner = this.attachOnLoadEvents.bindAsEventListener(this);
this.setToolTipPositionListner = this.setToolTipPosition.bindAsEventListener(this);
- this.doHideListner = this.doHide.bindAsEventListener(this);
+
+ if (this.hideDelay > 0) {
+ this.doHideListner = this.customHideHandler.bindAsEventListener(this);
+ } else {
+ this.doHideListner = this.doHide.bindAsEventListener(this);
+ }
+
this.leaveToolTipListner = this.leaveToolTip.bindAsEventListener(this);
if (Richfaces.tooltips[parentId])
@@ -119,11 +126,23 @@
this.eventCopy = A4J.AJAX.CloneObject(event, false);
- this.activationTimerHandle = setTimeout(function() {
+ this.activationTimerHandle = window.setTimeout(function() {
this.doShow(this.eventCopy);
- }.bind(this), this.delay);
+ }.bindAsEventListener(this), this.delay);
},
+ customHideHandler: function(event) {
+ if (this.hidingTimerHandle) {
+ return ;
+ }
+
+ this.eventCopy = A4J.AJAX.CloneObject(event, false);
+
+ this.hidingTimerHandle = window.setTimeout(function() {
+ this.doHide(this.eventCopy);
+ }.bindAsEventListener(this), this.hideDelay);
+ },
+
attachParentEvents: function(){
if(this.followMouse){
Event.observe(this.parent, 'mousemove', this.setToolTipPositionListner, false);
@@ -251,7 +270,7 @@
if(!needToHide) return;
if (this.activationTimerHandle) {
- clearTimeout(this.activationTimerHandle);
+ window.clearTimeout(this.activationTimerHandle);
this.activationTimerHandle = undefined;
}
@@ -272,6 +291,11 @@
this.isMouseOvered = false;
this.onhide(e);
}
+
+ if (this.hidingTimerHandle) {
+ window.clearTimeout(this.hidingTimerHandle);
+ this.hidingTimerHandle = undefined;
+ }
},
doEnable: function(){
@@ -459,4 +483,4 @@
}
}
-}
\ No newline at end of file
+}
17 years, 2 months
JBoss Rich Faces SVN: r3472 - branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-10-22 11:24:55 -0400 (Mon, 22 Oct 2007)
New Revision: 3472
Modified:
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-1154
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2007-10-22 15:11:12 UTC (rev 3471)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2007-10-22 15:24:55 UTC (rev 3472)
@@ -15,7 +15,7 @@
<rich:menuItem submitMode="ajax" value="Open" action="#{ddmenu.doOpen}"/>
<rich:menuGroup value="Save As...">
<rich:menuItem submitMode="ajax" value="Text File" action="#{ddmenu.doSaveText}"/>
- <rich:menuItem submitMode="ajax" value="PDF File" action="#{ddmenu.doPDF}"/>
+ <rich:menuItem submitMode="ajax" value="PDF File" action="#{ddmenu.doSavePDF}"/>
</rich:menuGroup>
<rich:menuItem submitMode="ajax" value="Close" action="#{ddmenu.doClose}"/>
<rich:menuSeparator id="menuSeparator11"/>
@@ -58,4 +58,4 @@
<h:outputText style="font-weight:bold" value="#{ddmenu.current}"></h:outputText>
</a4j:outputPanel>
-</ui:composition>
\ No newline at end of file
+</ui:composition>
17 years, 2 months
JBoss Rich Faces SVN: r3471 - branches/3.1.x/ui/togglePanel/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-10-22 11:11:12 -0400 (Mon, 22 Oct 2007)
New Revision: 3471
Modified:
branches/3.1.x/ui/togglePanel/src/main/templates/togglePanel.jspx
Log:
http://jira.jboss.com/jira/browse/RF-1157
Modified: branches/3.1.x/ui/togglePanel/src/main/templates/togglePanel.jspx
===================================================================
--- branches/3.1.x/ui/togglePanel/src/main/templates/togglePanel.jspx 2007-10-22 15:05:15 UTC (rev 3470)
+++ branches/3.1.x/ui/togglePanel/src/main/templates/togglePanel.jspx 2007-10-22 15:11:12 UTC (rev 3471)
@@ -18,9 +18,10 @@
<![CDATA[org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);]]>
</jsp:scriptlet>
- <div id="#{clientId}">
+ <div id="#{clientId}" style="#{component.attributes['style']}"
+ class="rich-toggle-panel #{component.attributes['styleClass']}" >
<vcp:body/>
<f:call name="handleFacets"/>
<f:call name="setValue"/>
</div>
-</f:root>
\ No newline at end of file
+</f:root>
17 years, 2 months
JBoss Rich Faces SVN: r3470 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-10-22 11:05:15 -0400 (Mon, 22 Oct 2007)
New Revision: 3470
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-1154
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2007-10-22 14:54:12 UTC (rev 3469)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2007-10-22 15:05:15 UTC (rev 3470)
@@ -15,7 +15,7 @@
<rich:menuItem submitMode="ajax" value="Open" action="#{ddmenu.doOpen}"/>
<rich:menuGroup value="Save As...">
<rich:menuItem submitMode="ajax" value="Text File" action="#{ddmenu.doSaveText}"/>
- <rich:menuItem submitMode="ajax" value="PDF File" action="#{ddmenu.doPDF}"/>
+ <rich:menuItem submitMode="ajax" value="PDF File" action="#{ddmenu.doSavePDF}"/>
</rich:menuGroup>
<rich:menuItem submitMode="ajax" value="Close" action="#{ddmenu.doClose}"/>
<rich:menuSeparator id="menuSeparator11"/>
17 years, 2 months
JBoss Rich Faces SVN: r3469 - trunk/ui/togglePanel/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-10-22 10:54:12 -0400 (Mon, 22 Oct 2007)
New Revision: 3469
Modified:
trunk/ui/togglePanel/src/main/templates/togglePanel.jspx
Log:
http://jira.jboss.com/jira/browse/RF-1157
Modified: trunk/ui/togglePanel/src/main/templates/togglePanel.jspx
===================================================================
--- trunk/ui/togglePanel/src/main/templates/togglePanel.jspx 2007-10-22 14:40:15 UTC (rev 3468)
+++ trunk/ui/togglePanel/src/main/templates/togglePanel.jspx 2007-10-22 14:54:12 UTC (rev 3469)
@@ -19,7 +19,7 @@
</jsp:scriptlet>
<div id="#{clientId}" style="#{component.attributes['style']}"
- class="#{component.attributes['styleClass']}" >
+ class="rich-toggle-panel #{component.attributes['styleClass']}" >
<vcp:body/>
<f:call name="handleFacets"/>
</div>
17 years, 2 months
JBoss Rich Faces SVN: r3468 - trunk/framework/impl/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-10-22 10:40:15 -0400 (Mon, 22 Oct 2007)
New Revision: 3468
Modified:
trunk/framework/impl/src/main/java/org/richfaces/component/UISwitchablePanel.java
Log:
Modified: trunk/framework/impl/src/main/java/org/richfaces/component/UISwitchablePanel.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/component/UISwitchablePanel.java 2007-10-22 14:39:40 UTC (rev 3467)
+++ trunk/framework/impl/src/main/java/org/richfaces/component/UISwitchablePanel.java 2007-10-22 14:40:15 UTC (rev 3468)
@@ -100,8 +100,8 @@
public void broadcast(FacesEvent facesEvent) throws AbortProcessingException {
if(facesEvent instanceof ActionEvent){
- FacesContext facesContext = FacesContext.getCurrentInstance();
if(isImmediate()){
+ FacesContext facesContext = FacesContext.getCurrentInstance();
facesContext.renderResponse();
}
}
17 years, 2 months
JBoss Rich Faces SVN: r3467 - trunk/framework/impl/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-10-22 10:39:40 -0400 (Mon, 22 Oct 2007)
New Revision: 3467
Modified:
trunk/framework/impl/src/main/java/org/richfaces/component/UISwitchablePanel.java
Log:
RF-1128 rendenderResponse if ActionEvent occure and component immediate
Modified: trunk/framework/impl/src/main/java/org/richfaces/component/UISwitchablePanel.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/component/UISwitchablePanel.java 2007-10-22 14:38:03 UTC (rev 3466)
+++ trunk/framework/impl/src/main/java/org/richfaces/component/UISwitchablePanel.java 2007-10-22 14:39:40 UTC (rev 3467)
@@ -28,6 +28,7 @@
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.ValueChangeEvent;
@@ -97,6 +98,14 @@
}
public void broadcast(FacesEvent facesEvent) throws AbortProcessingException {
+
+ if(facesEvent instanceof ActionEvent){
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ if(isImmediate()){
+ facesContext.renderResponse();
+ }
+ }
+
if (facesEvent instanceof SwitchablePanelSwitchEvent) {
if (isRendered()) {
FacesContext facesContext = FacesContext.getCurrentInstance();
@@ -126,9 +135,6 @@
this,
this.getId());
}
- if(isImmediate()){
- facesContext.renderResponse();
- }
}
} else /* component should throw IllegalArgumentException for unknown events - RF-30 */ {
super.broadcast(facesEvent);
@@ -174,7 +180,7 @@
//when immediate
//
// set context.renderResponse() in broadcast method if component is immediate
-// and SwitchablePanelSwitchEvent is occured (RF-1032)
+// and ActionEvent is occured (RF-1032)
// context.renderResponse();
}
} catch (RuntimeException e) {
17 years, 2 months