JBoss Rich Faces SVN: r21763 - trunk/core/impl/src/main/resources/META-INF.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2011-02-18 09:08:26 -0500 (Fri, 18 Feb 2011)
New Revision: 21763
Removed:
trunk/core/impl/src/main/resources/META-INF/components.faces-config.xml
trunk/core/impl/src/main/resources/META-INF/global-resources.faces-config.xml
trunk/core/impl/src/main/resources/META-INF/initialization-listener.faces-config.xml
trunk/core/impl/src/main/resources/META-INF/resource-handler.faces-config.xml
trunk/core/impl/src/main/resources/META-INF/resource-library.faces-config.xml
Modified:
trunk/core/impl/src/main/resources/META-INF/
trunk/core/impl/src/main/resources/META-INF/faces-config.xml
Log:
https://issues.jboss.org/browse/RF-10543
Property changes on: trunk/core/impl/src/main/resources/META-INF
___________________________________________________________________
Modified: svn:ignore
- target
.settings
.project
.classpath
.clover
+ target
.settings
.project
.classpath
.clover
*.jsfdia
Deleted: trunk/core/impl/src/main/resources/META-INF/components.faces-config.xml
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/components.faces-config.xml 2011-02-18 14:05:19 UTC (rev 21762)
+++ trunk/core/impl/src/main/resources/META-INF/components.faces-config.xml 2011-02-18 14:08:26 UTC (rev 21763)
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0">
- <factory>
- <external-context-factory>org.richfaces.context.SkinningExternalContextFactory</external-context-factory>
- <partial-view-context-factory>org.richfaces.context.ExtendedPartialViewContextFactoryImpl</partial-view-context-factory>
- </factory>
-
- <application>
- <system-event-listener>
- <system-event-listener-class>org.richfaces.context.PartialViewContextAjaxOutputTracker
- </system-event-listener-class>
- <system-event-class>javax.faces.event.PreRemoveFromViewEvent
- </system-event-class>
- </system-event-listener>
- <system-event-listener>
- <system-event-listener-class>org.richfaces.context.PartialViewContextAjaxOutputTracker
- </system-event-listener-class>
- <system-event-class>javax.faces.event.PostAddToViewEvent
- </system-event-class>
- </system-event-listener>
- </application>
- <component>
- <component-type>org.richfaces.Scripts</component-type>
- <component-class>org.richfaces.component.UIScripts</component-class>
- </component>
-
-</faces-config>
Modified: trunk/core/impl/src/main/resources/META-INF/faces-config.xml
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/faces-config.xml 2011-02-18 14:05:19 UTC (rev 21762)
+++ trunk/core/impl/src/main/resources/META-INF/faces-config.xml 2011-02-18 14:08:26 UTC (rev 21763)
@@ -1,71 +1,81 @@
<?xml version="1.0"?>
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="2.0">
- <application>
- <!-- system-event-listener>
- <system-event-listener-class>org.ajax4jsf.component.RenderPhaseUIDataAdaptorVisitor</system-event-listener-class>
- <system-event-class>javax.faces.event.PreRenderComponentEvent</system-event-class>
- <source-class>org.ajax4jsf.component.UIDataAdaptor</source-class>
- </system-event-listener -->
- <!--
- <view-handler>org.ajax4jsf.application.AjaxViewHandler</view-handler>
- -->
- <!-- state-manager>org.ajax4jsf.application.AjaxStateManager</state-manager -->
- <el-resolver>org.richfaces.skin.SkinPropertiesELResolver</el-resolver>
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">
+
+ <name>richfaces_core</name>
+
+ <application>
<system-event-listener>
+ <system-event-listener-class>org.richfaces.application.InitializationListener</system-event-listener-class>
+ <system-event-class>javax.faces.event.PreDestroyApplicationEvent</system-event-class>
+ </system-event-listener>
+ <system-event-listener>
+ <system-event-listener-class>org.richfaces.application.InitializationListener</system-event-listener-class>
+ <system-event-class>javax.faces.event.PostConstructApplicationEvent</system-event-class>
+ </system-event-listener>
+ <system-event-listener>
<system-event-listener-class>org.richfaces.skin.SkinFactoryPreRenderViewListener</system-event-listener-class>
<system-event-class>javax.faces.event.PreRenderViewEvent</system-event-class>
</system-event-listener>
- </application>
+ <system-event-listener>
+ <system-event-listener-class>org.richfaces.context.PartialViewContextAjaxOutputTracker
+ </system-event-listener-class>
+ <system-event-class>javax.faces.event.PreRemoveFromViewEvent</system-event-class>
+ </system-event-listener>
+ <system-event-listener>
+ <system-event-listener-class>org.richfaces.context.PartialViewContextAjaxOutputTracker</system-event-listener-class>
+ <system-event-class>javax.faces.event.PostAddToViewEvent</system-event-class>
+ </system-event-listener>
+ <view-handler>org.richfaces.application.GlobalResourcesViewHandler</view-handler>
+ <resource-handler>org.richfaces.resource.ResourceHandlerImpl</resource-handler>
+ <el-resolver>org.richfaces.skin.SkinPropertiesELResolver</el-resolver>
+ <el-resolver>org.richfaces.resource.ResourceParameterELResolver</el-resolver>
+ </application>
+
+ <factory>
+ <external-context-factory>org.richfaces.context.SkinningExternalContextFactory</external-context-factory>
+ <partial-view-context-factory>org.richfaces.context.ExtendedPartialViewContextFactoryImpl</partial-view-context-factory>
+ </factory>
+
<managed-bean>
- <managed-bean-name>a4j</managed-bean-name>
- <managed-bean-class>org.richfaces.VersionBean</managed-bean-class>
- <managed-bean-scope>application</managed-bean-scope>
+ <managed-bean-name>a4j</managed-bean-name>
+ <managed-bean-class>org.richfaces.VersionBean
+ </managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
</managed-bean>
<managed-bean>
- <managed-bean-name>a4jSkin</managed-bean-name>
- <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class>
- <managed-bean-scope>application</managed-bean-scope>
+ <managed-bean-name>a4jSkin</managed-bean-name>
+ <managed-bean-class>org.richfaces.skin.SkinBean
+ </managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
</managed-bean>
<managed-bean>
- <managed-bean-name>richSkin</managed-bean-name>
- <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class>
- <managed-bean-scope>application</managed-bean-scope>
+ <managed-bean-name>richSkin</managed-bean-name>
+ <managed-bean-class>org.richfaces.skin.SkinBean
+ </managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
</managed-bean>
- <!-- component>
- <component-type>javax.faces.ViewRoot</component-type>
- <component-class>org.ajax4jsf.component.AjaxViewRoot</component-class>
+ <component>
+ <component-type>org.richfaces.Scripts</component-type>
+ <component-class>org.richfaces.component.UIScripts</component-class>
+ </component>
+
+ <render-kit>
+ <renderer>
+ <component-family>org.richfaces.Script</component-family>
+ <renderer-type>org.richfaces.renderer.ScriptsRenderer</renderer-type>
+ <renderer-class>org.richfaces.renderkit.html.ScriptsRenderer
+ </renderer-class>
+ </renderer>
+ <renderer>
+ <component-family>javax.faces.Output</component-family>
+ <renderer-type>org.richfaces.renderkit.ResourceLibraryRenderer
+ </renderer-type>
+ <renderer-class>org.richfaces.renderkit.html.ResourceLibraryRenderer
+ </renderer-class>
+ </renderer>
+ </render-kit>
- <component-extension>
- <component-family>javax.faces.ViewRoot</component-family>
- </component-extension>
-
- </component -->
-
- <!-- render-kit>
-
- <renderer>
- <description>
- override the viewroot
- </description>
- <component-family>javax.faces.ViewRoot</component-family>
- <renderer-type>javax.faces.ViewRoot</renderer-type>
- <renderer-class>org.ajax4jsf.renderkit.AjaxViewRootRenderer</renderer-class>
- </renderer -->
- <!--
- <renderer>
- <component-family>javax.faces.Form</component-family>
- <renderer-type>javax.faces.Form</renderer-type>
- <renderer-class>org.ajax4jsf.renderkit.html.AjaxFormRenderer</renderer-class>
- </renderer>
- <renderer>
- <component-family>javax.faces.Command</component-family>
- <renderer-type>javax.faces.Link</renderer-type>
- <renderer-class>org.ajax4jsf.renderkit.html.HtmlCommandLinkRenderer</renderer-class>
- </renderer>
- -->
- <!-- /render-kit -->
-
</faces-config>
Deleted: trunk/core/impl/src/main/resources/META-INF/global-resources.faces-config.xml
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/global-resources.faces-config.xml 2011-02-18 14:05:19 UTC (rev 21762)
+++ trunk/core/impl/src/main/resources/META-INF/global-resources.faces-config.xml 2011-02-18 14:08:26 UTC (rev 21763)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee" version="2.0">
- <name>richfaces</name>
-
- <application>
- <view-handler>org.richfaces.application.GlobalResourcesViewHandler</view-handler>
- </application>
-
-</faces-config>
\ No newline at end of file
Deleted: trunk/core/impl/src/main/resources/META-INF/initialization-listener.faces-config.xml
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/initialization-listener.faces-config.xml 2011-02-18 14:05:19 UTC (rev 21762)
+++ trunk/core/impl/src/main/resources/META-INF/initialization-listener.faces-config.xml 2011-02-18 14:08:26 UTC (rev 21763)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee" version="2.0">
- <name>richfaces</name>
- <application>
- <system-event-listener>
- <system-event-listener-class>org.richfaces.application.InitializationListener</system-event-listener-class>
- <system-event-class>javax.faces.event.PreDestroyApplicationEvent</system-event-class>
- </system-event-listener>
- <system-event-listener>
- <system-event-listener-class>org.richfaces.application.InitializationListener</system-event-listener-class>
- <system-event-class>javax.faces.event.PostConstructApplicationEvent</system-event-class>
- </system-event-listener>
- </application>
-
-
-</faces-config>
\ No newline at end of file
Deleted: trunk/core/impl/src/main/resources/META-INF/resource-handler.faces-config.xml
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/resource-handler.faces-config.xml 2011-02-18 14:05:19 UTC (rev 21762)
+++ trunk/core/impl/src/main/resources/META-INF/resource-handler.faces-config.xml 2011-02-18 14:08:26 UTC (rev 21763)
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
- version="2.0">
- <name>richfaces</name>
-
- <application>
- <resource-handler>org.richfaces.resource.ResourceHandlerImpl</resource-handler>
- <el-resolver>org.richfaces.resource.ResourceParameterELResolver</el-resolver>
- </application>
-</faces-config>
Deleted: trunk/core/impl/src/main/resources/META-INF/resource-library.faces-config.xml
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/resource-library.faces-config.xml 2011-02-18 14:05:19 UTC (rev 21762)
+++ trunk/core/impl/src/main/resources/META-INF/resource-library.faces-config.xml 2011-02-18 14:08:26 UTC (rev 21763)
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
- version="2.0">
- <name>richfaces</name>
-
- <render-kit>
- <renderer>
- <component-family>org.richfaces.Script</component-family>
- <renderer-type>org.richfaces.renderer.ScriptsRenderer</renderer-type>
- <renderer-class>org.richfaces.renderkit.html.ScriptsRenderer
- </renderer-class>
- </renderer>
- <renderer>
- <component-family>javax.faces.Output</component-family>
- <renderer-type>org.richfaces.renderkit.ResourceLibraryRenderer
- </renderer-type>
- <renderer-class>org.richfaces.renderkit.html.ResourceLibraryRenderer
- </renderer-class>
- </renderer>
- </render-kit>
-
-</faces-config>
15 years, 2 months
JBoss Rich Faces SVN: r21762 - trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2011-02-18 09:05:19 -0500 (Fri, 18 Feb 2011)
New Revision: 21762
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tooltip.js
Log:
https://issues.jboss.org/browse/RF-10522 Tooltip - @showDelay does not work correctly
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tooltip.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tooltip.js 2011-02-18 13:41:01 UTC (rev 21761)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tooltip.js 2011-02-18 14:05:19 UTC (rev 21762)
@@ -111,6 +111,7 @@
this.mode = this.options.mode;
this.target = this.options.target;
+ this.shown = false;
this.__addUserEventHandler("hide");
this.__addUserEventHandler("show");
@@ -132,6 +133,8 @@
rf.Event.bindById(this.target, handlers, this);
+
+
if (this.options.hideEvent == 'mouseleave') {
rf.Event.bindById(this.id, this.options.hideEvent + this.namespace, this.__hideHandler, this);
}
@@ -165,8 +168,9 @@
this.hide();
if (this.options.followMouse) {
- rf.Event.unbindById(this.target, "mousemove" + this.namespace);
+ rf.Event.unbindById(this.target, "mousemove" + this.namespace);
}
+
},
/**
@@ -177,18 +181,23 @@
var tooltip = this;
this.__delay(this.options.hideDelay, function () {
tooltip.popup.hide();
+ tooltip.shown = false;
});
},
__mouseMoveHandler: function(event) {
- this.popup.show(event);
+ this.saveShowEvent=event;
+ if(this.shown){
+ this.popup.show(this.saveShowEvent);
+ }
},
__showHandler: function(event) {
this.show(event);
+ var tooltip = this;
- if (this.options.followMouse) {
- rf.Event.bindById(this.target, "mousemove"+ this.namespace, this.__mouseMoveHandler, this);
+ if (tooltip.options.followMouse) {
+ rf.Event.bindById(tooltip.target, "mousemove" + tooltip.namespace, tooltip.__mouseMoveHandler, tooltip);
}
},
@@ -223,19 +232,31 @@
__show: function (event) {
var tooltip = this;
this.__delay(this.options.showDelay, function () {
- tooltip.popup.show(event);
+ if (!tooltip.options.followMouse) {
+ tooltip.popup.show(event);
+ } else if (!tooltip.shown) {
+ {
+ tooltip.popup.show(tooltip.saveShowEvent);
+ }
+ }
+ tooltip.shown = true;
});
},
/***************************** Private Methods ****************************************************************/
__delay : function (delay, action) {
+ var tooltip = this;
+ if (tooltip.hidingTimerHandle) {
+ window.clearTimeout(tooltip.hidingTimerHandle);
+ tooltip.hidingTimerHandle = undefined;
+ }
if (delay > 0) {
- var hidingTimerHandle = window.setTimeout(function() {
+ tooltip.hidingTimerHandle = window.setTimeout(function() {
action();
- if (hidingTimerHandle) {
- window.clearTimeout(hidingTimerHandle);
- hidingTimerHandle = undefined;
+ if (tooltip.hidingTimerHandle) {
+ window.clearTimeout(tooltip.hidingTimerHandle);
+ tooltip.hidingTimerHandle = undefined;
}
}, delay);
} else {
15 years, 2 months
JBoss Rich Faces SVN: r21761 - trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/samples.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2011-02-18 08:41:01 -0500 (Fri, 18 Feb 2011)
New Revision: 21761
Modified:
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/samples/hashOptionsPopup-sample.xhtml
Log:
https://issues.jboss.org/browse/RF-10516
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/samples/hashOptionsPopup-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/samples/hashOptionsPopup-sample.xhtml 2011-02-18 13:18:31 UTC (rev 21760)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/samples/hashOptionsPopup-sample.xhtml 2011-02-18 13:41:01 UTC (rev 21761)
@@ -17,13 +17,13 @@
<h:outputText value="Settings applied by hashParam tag:" />
<h:panelGrid columns="2">
<h:outputText value="Width:" />
- <h:outputText value="500px" />
+ <h:outputText value="500" />
<h:outputText value="Height:" />
- <h:outputText value="300px" />
+ <h:outputText value="300" />
<h:outputText value="minWidth:" />
- <h:outputText value="300px" />
+ <h:outputText value="300" />
<h:outputText value="minHeight:" />
- <h:outputText value="150px" />
+ <h:outputText value="150" />
</h:panelGrid>
<p>Also panel getting centered by using:</p>
<p><a4j:param noEscape="true" name="left"
@@ -41,10 +41,10 @@
<rich:componentControl target="pp" operation="show">
<a4j:param noEscape="true" value="event" />
<rich:hashParam>
- <f:param name="width" value="500px" />
- <f:param name="height" value="300px" />
- <f:param name="minWidth" value="300px" />
- <f:param name="minHeight" value="150px" />
+ <f:param name="width" value="500" />
+ <f:param name="height" value="300" />
+ <f:param name="minWidth" value="300" />
+ <f:param name="minHeight" value="150" />
<a4j:param noEscape="true" name="left" value="(jQuery(window).width()/2)-250" />
<a4j:param noEscape="true" name="top" value="(jQuery(window).height()/2)-150" />
</rich:hashParam>
15 years, 2 months
JBoss Rich Faces SVN: r21760 - modules/tests/metamer/trunk/application/src/main/webapp/components/richTab.
by richfaces-svn-commits@lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-18 08:18:31 -0500 (Fri, 18 Feb 2011)
New Revision: 21760
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml
Log:
rich:tab sample - added actionListener, action, bypassUpdaes and immediate + added itemChangeListener to tabPanel
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml 2011-02-18 13:14:12 UTC (rev 21759)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml 2011-02-18 13:18:31 UTC (rev 21760)
@@ -38,9 +38,15 @@
<ui:define name="component">
- <rich:tabPanel id="tabPanel">
+ <rich:tabPanel id="tabPanel"
+ itemChangeListener="#{richBean.itemChangeListener}">
+
<rich:tab id="tab1"
+ action="#{richBean.dummyAction}"
+ actionListener="#{richBean.dummyActionListener}"
+
contentClass="#{richTabBean.attributes['contentClass'].value}"
+ bypassUpdates="#{richTabBean.attributes['bypassUpdates'].value}"
dir="#{richTabBean.attributes['dir'].value}"
disabled="#{richTabBean.attributes['disabled'].value}"
header="#{richTabBean.attributes['header'].value}"
@@ -49,6 +55,7 @@
headerDisabledClass="#{richTabBean.attributes['headerDisabledClass'].value}"
headerInactiveClass="#{richTabBean.attributes['headerInactiveClass'].value}"
headerStyle="#{richTabBean.attributes['headerStyle'].value}"
+ immediate="#{richTabBean.attributes['immediate'].value}"
lang="#{richTabBean.attributes['lang'].value}"
name="#{richTabBean.attributes['name'].value}"
onclick="#{richTabBean.attributes['onclick'].value}"
15 years, 2 months
JBoss Rich Faces SVN: r21759 - trunk/ui/common/ui/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2011-02-18 08:14:12 -0500 (Fri, 18 Feb 2011)
New Revision: 21759
Modified:
trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RenderKitUtils.java
Log:
https://issues.jboss.org/browse/RF-10560
Modified: trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RenderKitUtils.java
===================================================================
--- trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RenderKitUtils.java 2011-02-18 13:13:49 UTC (rev 21758)
+++ trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RenderKitUtils.java 2011-02-18 13:14:12 UTC (rev 21759)
@@ -33,6 +33,7 @@
import java.util.Set;
import java.util.TreeSet;
+import javax.faces.application.Application;
import javax.faces.application.Resource;
import javax.faces.application.ResourceHandler;
import javax.faces.component.UIComponent;
@@ -709,11 +710,16 @@
return null;
}
+ Application application = context.getApplication();
+ ExternalContext externalContext = context.getExternalContext();
+
String value = url;
- value = context.getApplication().getViewHandler().getResourceURL(context, value);
+ if (value.length() == 0 || value.charAt(0) != '/' || !value.startsWith(externalContext.getRequestContextPath())) {
+ value = application.getViewHandler().getResourceURL(context, value);
+ }
- return context.getExternalContext().encodeResourceURL(value);
+ return externalContext.encodeResourceURL(value);
}
public static Object getFirstNonEmptyAttribute(String attributeName, UIComponent component) {
15 years, 2 months
JBoss Rich Faces SVN: r21758 - trunk/ui/output/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits@lists.jboss.org
Author: artdaw
Date: 2011-02-18 08:13:49 -0500 (Fri, 18 Feb 2011)
New Revision: 21758
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItem.java
Log:
RF-10566: @switchType is fixed for rich:accordionItem, rich:togglePanelItem, and rich:tab
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java 2011-02-18 13:05:10 UTC (rev 21757)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java 2011-02-18 13:13:49 UTC (rev 21758)
@@ -22,15 +22,11 @@
package org.richfaces.component;
+import org.richfaces.cdk.annotations.*;
+
import javax.faces.component.UIComponent;
import javax.faces.component.behavior.ClientBehaviorHolder;
-import org.richfaces.cdk.annotations.Attribute;
-import org.richfaces.cdk.annotations.JsfComponent;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.cdk.annotations.Tag;
-import org.richfaces.cdk.annotations.TagType;
-
/**
* @author akolonitsky
* @since 2010-08-13
@@ -189,7 +185,7 @@
@Attribute(generate = false)
public SwitchType getSwitchType() {
- SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType, SwitchType.DEFAULT);
+ SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType);
if (switchType == null) {
switchType = getParentPanel().getSwitchType();
}
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java 2011-02-18 13:05:10 UTC (rev 21757)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java 2011-02-18 13:13:49 UTC (rev 21758)
@@ -22,17 +22,12 @@
package org.richfaces.component;
+import org.richfaces.cdk.annotations.*;
+import org.richfaces.renderkit.html.DivPanelRenderer;
+
import javax.faces.component.UIComponent;
import javax.faces.component.behavior.ClientBehaviorHolder;
-import org.richfaces.cdk.annotations.Attribute;
-import org.richfaces.cdk.annotations.JsfComponent;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.cdk.annotations.Tag;
-import org.richfaces.cdk.annotations.TagType;
-import org.richfaces.component.AbstractAccordionItem.Properties;
-import org.richfaces.renderkit.html.DivPanelRenderer;
-
/**
* @author akolonitsky
* @since 2010-10-19
@@ -207,7 +202,7 @@
@Attribute(generate = false)
public SwitchType getSwitchType() {
- SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType, SwitchType.DEFAULT);
+ SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType);
if (switchType == null) {
switchType = getParentPanel().getSwitchType();
}
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-02-18 13:05:10 UTC (rev 21757)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-02-18 13:13:49 UTC (rev 21758)
@@ -22,10 +22,16 @@
package org.richfaces.component;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import com.google.common.base.Strings;
+import org.richfaces.application.MessageFactory;
+import org.richfaces.application.ServiceTracker;
+import org.richfaces.appplication.FacesMessages;
+import org.richfaces.cdk.annotations.*;
+import org.richfaces.component.util.MessageUtil;
+import org.richfaces.event.ItemChangeEvent;
+import org.richfaces.event.ItemChangeListener;
+import org.richfaces.event.ItemChangeSource;
+import org.richfaces.renderkit.util.RendererUtils;
import javax.el.ELException;
import javax.el.MethodExpression;
@@ -36,31 +42,12 @@
import javax.faces.component.UIOutput;
import javax.faces.component.UpdateModelException;
import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ExceptionQueuedEvent;
-import javax.faces.event.ExceptionQueuedEventContext;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PostValidateEvent;
-import javax.faces.event.PreValidateEvent;
+import javax.faces.event.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
-import org.richfaces.application.MessageFactory;
-import org.richfaces.application.ServiceTracker;
-import org.richfaces.appplication.FacesMessages;
-import org.richfaces.cdk.annotations.Attribute;
-import org.richfaces.cdk.annotations.EventName;
-import org.richfaces.cdk.annotations.JsfComponent;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.cdk.annotations.Tag;
-import org.richfaces.cdk.annotations.TagType;
-import org.richfaces.component.util.MessageUtil;
-import org.richfaces.event.ItemChangeEvent;
-import org.richfaces.event.ItemChangeListener;
-import org.richfaces.event.ItemChangeSource;
-import org.richfaces.renderkit.util.RendererUtils;
-
-import com.google.common.base.Strings;
-
/**
* @author akolonitsky
* @version 1.0
@@ -616,7 +603,7 @@
@Attribute(generate = false)
public SwitchType getSwitchType() {
- SwitchType switchType = (SwitchType) getStateHelper().eval(PropertyKeys.switchType, SwitchType.DEFAULT);
+ SwitchType switchType = (SwitchType) getStateHelper().eval(PropertyKeys.switchType);
if (switchType == null) {
switchType = SwitchType.DEFAULT;
}
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItem.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItem.java 2011-02-18 13:05:10 UTC (rev 21757)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItem.java 2011-02-18 13:13:49 UTC (rev 21758)
@@ -22,12 +22,7 @@
package org.richfaces.component;
-import org.richfaces.cdk.annotations.Attribute;
-import org.richfaces.cdk.annotations.JsfComponent;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.cdk.annotations.Tag;
-import org.richfaces.cdk.annotations.TagType;
-import org.richfaces.component.AbstractAccordionItem.Properties;
+import org.richfaces.cdk.annotations.*;
import javax.faces.component.UIOutput;
@@ -87,7 +82,7 @@
@Attribute(generate = false)
public SwitchType getSwitchType() {
- SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType, SwitchType.DEFAULT);
+ SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType);
if (switchType == null) {
switchType = getParentPanel().getSwitchType();
}
15 years, 2 months
JBoss Rich Faces SVN: r21757 - in modules/tests/metamer/trunk/application/src/main: webapp/components/richDropTarget and 3 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-18 08:05:10 -0500 (Fri, 18 Feb 2011)
New Revision: 21757
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml
Log:
added common ajax attributes bindings for dropTarget + fixed panelMenu itemChangeListener output and activeItem bindings
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-02-18 11:31:54 UTC (rev 21756)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-02-18 13:05:10 UTC (rev 21757)
@@ -371,6 +371,7 @@
/**
* An action that does nothing.
+ *
* @return null
*/
public String dummyAction() {
@@ -380,7 +381,7 @@
/**
* An action listener that does nothing.
- *
+ *
* @param event
* an event representing the activation of a user interface component (not used)
*/
@@ -390,7 +391,7 @@
/**
* An action listener that does nothing.
- *
+ *
* @param event
* an event representing the activation of a user interface component (not used)
*/
@@ -400,28 +401,29 @@
/**
* An item change listener that logs to the page old and new value.
- *
+ *
* @param event
* an event representing the activation of a user interface component
*/
public void itemChangeListener(ItemChangeEvent event) {
- logToPage("* item changed: " + event.getOldItem().getId() + " -> " + event.getNewItem().getId());
+ logToPage("* item changed: " + (event.getOldItem() == null ? null : event.getOldItem().getId()) + " -> "
+ + event.getNewItem().getId());
}
/**
* A value change listener that logs to the page old and new value.
- *
+ *
* @param event
* an event representing the activation of a user interface component
*/
public void valueChangeListener(ValueChangeEvent event) {
logToPage("* value changed: " + event.getOldValue() + " -> " + event.getNewValue());
}
-
+
public boolean getExecuteChecker() {
return true;
}
-
+
public void setExecuteChecker(boolean executeChecker) {
logToPage("* executeChecker");
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java 2011-02-18 11:31:54 UTC (rev 21756)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java 2011-02-18 13:05:10 UTC (rev 21757)
@@ -46,7 +46,7 @@
private static final long serialVersionUID = -1L;
private static Logger logger;
private Attributes attributes;
-
+
private Object activeItem;
/**
@@ -56,9 +56,9 @@
public void init() {
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
-
+
attributes = Attributes.getComponentAttributesFromFacesConfig(UIPanelMenu.class, getClass());
-
+
attributes.setAttribute("rendered", true);
attributes.setAttribute("style", "width: 200px;");
@@ -83,13 +83,14 @@
*/
public void itemChangeListener(ItemChangeEvent event) {
activeItem = event.getNewItem();
- RichBean.logToPage("* item changed: " + event.getOldItem() + " -> " + event.getNewItem());
+ RichBean.logToPage("* item changed: " + (event.getOldItem() == null ? null : event.getOldItem().getId())
+ + " -> " + event.getNewItem().getId());
}
-
+
public void setActiveItem(Object activeItem) {
this.activeItem = activeItem;
}
-
+
public Object getActiveItem() {
return activeItem;
}
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml 2011-02-18 11:31:54 UTC (rev 21756)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml 2011-02-18 13:05:10 UTC (rev 21757)
@@ -86,10 +86,16 @@
acceptedTypes="#{richDropTargetBean.attributes['acceptedTypes'].value}"
bypassUpdates="#{richDropTargetBean.attributes['bypassUpdates'].value}"
+ data="#{richDropTargetBean.attributes['data'].value}"
immediate="#{richDropTargetBean.attributes['immediate'].value}"
execute="#{richDropTargetBean.attributes['execute'].value}"
+ limitRender="#{richDropTargetBean.attributes['limitRender'].value}"
+ onbegin="#{richDropTargetBean.attributes['onbegin'].value}"
+ onbeforedomupdate="#{richDropTargetBean.attributes['onbeforedomupdate'].value}"
+ oncomplete="#{richDropTargetBean.attributes['oncomplete'].value}"
render="#{richDropTargetBean.attributes['render'].value}"
rendered="#{richDropTargetBean.attributes['rendered'].value}"
+ status="#{richDropTargetBean.attributes['status'].value}"
value="#{richDropTargetBean.attributes['value'].value}"
/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2011-02-18 11:31:54 UTC (rev 21756)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2011-02-18 13:05:10 UTC (rev 21757)
@@ -153,7 +153,7 @@
<legend>selected item</legend>
<a4j:outputPanel id="selectedPanel" ajaxRendered="true">
- <h:outputText id="current" value="#{richPanelMenuBean.activeItem}" />
+ <h:outputText id="current" value="#{richPanelMenuBean.activeItem.id}" />
</a4j:outputPanel>
</fieldset>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml 2011-02-18 11:31:54 UTC (rev 21756)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml 2011-02-18 13:05:10 UTC (rev 21757)
@@ -175,7 +175,7 @@
<legend>selected item</legend>
<a4j:outputPanel id="selectedPanel" ajaxRendered="true">
- <h:outputText id="current" value="#{richPanelMenuBean.attributes['activeItem'].value}" />
+ <h:outputText id="current" value="#{richPanelMenuBean.activeItem.id}" />
</a4j:outputPanel>
</fieldset>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml 2011-02-18 11:31:54 UTC (rev 21756)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml 2011-02-18 13:05:10 UTC (rev 21757)
@@ -94,7 +94,7 @@
<legend>selected item</legend>
<a4j:outputPanel id="selectedPanel" ajaxRendered="true">
- <h:outputText id="current" value="#{richPanelMenuBean.attributes['activeItem'].value}" />
+ <h:outputText id="current" value="#{richPanelMenuBean.activeItem.id}" />
</a4j:outputPanel>
</fieldset>
15 years, 2 months
JBoss Rich Faces SVN: r21756 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: richTogglePanel and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-18 06:31:54 -0500 (Fri, 18 Feb 2011)
New Revision: 21756
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java
Log:
removed issue tracking RF-10054
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-18 11:31:15 UTC (rev 21755)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-18 11:31:54 UTC (rev 21756)
@@ -140,7 +140,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10054")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10054")
public void testBypassUpdates() {
selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]"));
selenium.waitForPageToLoad();
@@ -184,7 +184,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10054")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10054")
public void testImmediate() {
selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]"));
selenium.waitForPageToLoad();
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-02-18 11:31:15 UTC (rev 21755)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-02-18 11:31:54 UTC (rev 21756)
@@ -185,7 +185,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10054")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10054")
public void testBypassUpdates() {
selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]"));
selenium.waitForPageToLoad();
@@ -215,7 +215,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10054")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10054")
public void testImmediate() {
selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]"));
selenium.waitForPageToLoad();
15 years, 2 months
JBoss Rich Faces SVN: r21755 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-18 06:31:15 -0500 (Fri, 18 Feb 2011)
New Revision: 21755
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java
Log:
richAccordion - fixed itemChangeListener which changed the expected output of UIComponent.toString()
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-02-18 11:30:20 UTC (rev 21754)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-02-18 11:31:15 UTC (rev 21755)
@@ -405,7 +405,7 @@
* an event representing the activation of a user interface component
*/
public void itemChangeListener(ItemChangeEvent event) {
- logToPage("* item changed: " + event.getOldItem() + " -> " + event.getNewItem());
+ logToPage("* item changed: " + event.getOldItem().getId() + " -> " + event.getNewItem().getId());
}
/**
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-18 11:30:20 UTC (rev 21754)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-18 11:31:15 UTC (rev 21755)
@@ -29,9 +29,7 @@
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotSame;
import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
import java.net.URL;
@@ -58,19 +56,19 @@
public class TestRichAccordion extends AbstractMetamerTest {
private JQueryLocator accordion = pjq("div[id$=accordion]");
- private JQueryLocator[] itemHeaders = {pjq("div[id$=item1:header]"), pjq("div[id$=item2:header]"),
- pjq("div[id$=item3:header]"), pjq("div[id$=item4:header]"), pjq("div[id$=item5:header]")};
- private JQueryLocator[] itemContents = {pjq("div[id$=item1:content]"), pjq("div[id$=item2:content]"),
- pjq("div[id$=item3:content]"), pjq("div[id$=item4:content]"), pjq("div[id$=item5:content]")};
- private JQueryLocator[] activeHeaders = {pjq("div[id$=item1:header] div.rf-ac-itm-lbl-act"),
+ private JQueryLocator[] itemHeaders = { pjq("div[id$=item1:header]"), pjq("div[id$=item2:header]"),
+ pjq("div[id$=item3:header]"), pjq("div[id$=item4:header]"), pjq("div[id$=item5:header]") };
+ private JQueryLocator[] itemContents = { pjq("div[id$=item1:content]"), pjq("div[id$=item2:content]"),
+ pjq("div[id$=item3:content]"), pjq("div[id$=item4:content]"), pjq("div[id$=item5:content]") };
+ private JQueryLocator[] activeHeaders = { pjq("div[id$=item1:header] div.rf-ac-itm-lbl-act"),
pjq("div[id$=item2:header] div.rf-ac-itm-lbl-act"), pjq("div[id$=item3:header] div.rf-ac-itm-lbl-act"),
- pjq("div[id$=item4:header] div.rf-ac-itm-lbl-act"), pjq("div[id$=item5:header] div.rf-ac-itm-lbl-act")};
- private JQueryLocator[] inactiveHeaders = {pjq("div[id$=item1:header] div.rf-ac-itm-lbl-inact"),
+ pjq("div[id$=item4:header] div.rf-ac-itm-lbl-act"), pjq("div[id$=item5:header] div.rf-ac-itm-lbl-act") };
+ private JQueryLocator[] inactiveHeaders = { pjq("div[id$=item1:header] div.rf-ac-itm-lbl-inact"),
pjq("div[id$=item2:header] div.rf-ac-itm-lbl-inact"), pjq("div[id$=item3:header] div.rf-ac-itm-lbl-inact"),
- pjq("div[id$=item4:header] div.rf-ac-itm-lbl-inact"), pjq("div[id$=item5:header] div.rf-ac-itm-lbl-inact")};
- private JQueryLocator[] disabledHeaders = {pjq("div[id$=item1:header] div.rf-ac-itm-lbl-dis"),
+ pjq("div[id$=item4:header] div.rf-ac-itm-lbl-inact"), pjq("div[id$=item5:header] div.rf-ac-itm-lbl-inact") };
+ private JQueryLocator[] disabledHeaders = { pjq("div[id$=item1:header] div.rf-ac-itm-lbl-dis"),
pjq("div[id$=item2:header] div.rf-ac-itm-lbl-dis"), pjq("div[id$=item3:header] div.rf-ac-itm-lbl-dis"),
- pjq("div[id$=item4:header] div.rf-ac-itm-lbl-dis"), pjq("div[id$=item5:header] div.rf-ac-itm-lbl-dis")};
+ pjq("div[id$=item4:header] div.rf-ac-itm-lbl-dis"), pjq("div[id$=item5:header] div.rf-ac-itm-lbl-dis") };
private JQueryLocator leftIcon = pjq("div[id$=item{0}] td.rf-ac-itm-ico");
private JQueryLocator rightIcon = pjq("div[id$=item{0}] td.rf-ac-itm-exp-ico");
@@ -134,7 +132,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10054")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10054")
public void testBypassUpdates() {
selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]"));
selenium.waitForPageToLoad();
@@ -143,7 +141,7 @@
waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2]));
phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS,
- PhaseId.RENDER_RESPONSE);
+ PhaseId.RENDER_RESPONSE);
phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "item changed: item1 -> item3");
}
@@ -228,7 +226,8 @@
// icon=null
for (int i = 1; i < 6; i++) {
- assertFalse(selenium.isElementPresent(leftIcon.format(i)), "Left icon of item" + i + " should not be present on the page.");
+ assertFalse(selenium.isElementPresent(leftIcon.format(i)), "Left icon of item" + i
+ + " should not be present on the page.");
}
verifyStandardIcons(input, icon, image, "-hdr");
@@ -242,7 +241,8 @@
// icon=null
for (int i = 1; i < 6; i++) {
- assertFalse(selenium.isElementPresent(rightIcon.format(i)), "Right icon of item" + i + " should not be present on the page.");
+ assertFalse(selenium.isElementPresent(rightIcon.format(i)), "Right icon of item" + i
+ + " should not be present on the page.");
}
verifyStandardIcons(input, icon, image, "-hdr");
@@ -337,7 +337,8 @@
guardXhr(selenium).click(itemHeaders[1]);
waitGui.failWith("Item 2 is not displayed.").until(isDisplayed.locator(itemContents[1]));
- waitGui.failWith("onbeforeitemchange attribute does not work correctly").until(new EventFiredCondition(new Event("beforeitemchange")));
+ waitGui.failWith("onbeforeitemchange attribute does not work correctly").until(
+ new EventFiredCondition(new Event("beforeitemchange")));
}
@Test
@@ -358,7 +359,8 @@
guardXhr(selenium).click(itemHeaders[1]);
waitGui.failWith("Item 2 is not displayed.").until(isDisplayed.locator(itemContents[1]));
- waitGui.failWith("onitemchange attribute does not work correctly").until(new EventFiredCondition(new Event("itemchange")));
+ waitGui.failWith("onitemchange attribute does not work correctly").until(
+ new EventFiredCondition(new Event("itemchange")));
}
@Test
@@ -475,38 +477,56 @@
selenium.select(input, optionLabel("chevronDown"));
selenium.waitForPageToLoad();
- assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-down" + classSuffix), "Div should have set class rf-ico-chevron-down" + classSuffix + ".");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronDown" + imageNameSuffix + ".png"), "Icon should contain a chevron down.");
+ assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-down" + classSuffix),
+ "Div should have set class rf-ico-chevron-down" + classSuffix + ".");
+ assertTrue(
+ selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronDown" + imageNameSuffix + ".png"),
+ "Icon should contain a chevron down.");
selenium.select(input, optionLabel("chevronUp"));
selenium.waitForPageToLoad();
- assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-up" + classSuffix), "Div should have set class rf-ico-chevron-up" + classSuffix + ".");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronUp" + imageNameSuffix + ".png"), "Icon should contain a chevron up.");
+ assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-up" + classSuffix),
+ "Div should have set class rf-ico-chevron-up" + classSuffix + ".");
+ assertTrue(
+ selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronUp" + imageNameSuffix + ".png"),
+ "Icon should contain a chevron up.");
selenium.select(input, optionLabel("disc"));
selenium.waitForPageToLoad();
- assertTrue(selenium.belongsClass(icon, "rf-ico-disc" + classSuffix), "Div should have set class rf-ico-disc" + classSuffix + ".");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Disc" + imageNameSuffix + ".png"), "Icon should contain a disc.");
+ assertTrue(selenium.belongsClass(icon, "rf-ico-disc" + classSuffix), "Div should have set class rf-ico-disc"
+ + classSuffix + ".");
+ assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Disc" + imageNameSuffix + ".png"),
+ "Icon should contain a disc.");
selenium.select(input, optionLabel("grid"));
selenium.waitForPageToLoad();
- assertTrue(selenium.belongsClass(icon, "rf-ico-grid" + classSuffix), "Div should have set class rf-ico-grid" + classSuffix + ".");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Grid" + imageNameSuffix + ".png"), "Icon should contain a grid.");
+ assertTrue(selenium.belongsClass(icon, "rf-ico-grid" + classSuffix), "Div should have set class rf-ico-grid"
+ + classSuffix + ".");
+ assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Grid" + imageNameSuffix + ".png"),
+ "Icon should contain a grid.");
selenium.select(input, optionLabel("triangle"));
selenium.waitForPageToLoad();
- assertTrue(selenium.belongsClass(icon, "rf-ico-triangle" + classSuffix), "Div should have set class rf-ico-triangle" + classSuffix + ".");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Triangle" + imageNameSuffix + ".png"), "Icon should contain a triangle.");
+ assertTrue(selenium.belongsClass(icon, "rf-ico-triangle" + classSuffix),
+ "Div should have set class rf-ico-triangle" + classSuffix + ".");
+ assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE)
+ .contains("Triangle" + imageNameSuffix + ".png"), "Icon should contain a triangle.");
selenium.select(input, optionLabel("triangleDown"));
selenium.waitForPageToLoad();
- assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-down" + classSuffix), "Div should have set class rf-ico-triangle-down" + classSuffix + ".");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("TriangleDown" + imageNameSuffix + ".png"), "Icon should contain a triangle down.");
+ assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-down" + classSuffix),
+ "Div should have set class rf-ico-triangle-down" + classSuffix + ".");
+ assertTrue(
+ selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("TriangleDown" + imageNameSuffix + ".png"),
+ "Icon should contain a triangle down.");
selenium.select(input, optionLabel("triangleUp"));
selenium.waitForPageToLoad();
- assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-up" + classSuffix), "Div should have set class rf-ico-triangle-up" + classSuffix + ".");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("TriangleUp" + imageNameSuffix + ".png"), "Icon should contain a triangle up.");
+ assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-up" + classSuffix),
+ "Div should have set class rf-ico-triangle-up" + classSuffix + ".");
+ assertTrue(
+ selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("TriangleUp" + imageNameSuffix + ".png"),
+ "Icon should contain a triangle up.");
selenium.select(input, optionLabel("none"));
selenium.waitForPageToLoad();
@@ -516,12 +536,14 @@
selenium.waitForPageToLoad();
assertFalse(selenium.isElementPresent(icon), "Icon's div should not be present when icon=star.");
assertTrue(selenium.isElementPresent(image), "Icon's image should be rendered.");
- assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("star.png"), "Icon's src attribute should contain star.png.");
+ assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("star.png"),
+ "Icon's src attribute should contain star.png.");
selenium.select(input, optionLabel("nonexisting"));
selenium.waitForPageToLoad();
assertFalse(selenium.isElementPresent(icon), "Icon's div should not be present when icon=nonexisting.");
assertTrue(selenium.isElementPresent(image), "Icon's image should be rendered.");
- assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("nonexisting"), "Icon's src attribute should contain nonexisting.");
+ assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("nonexisting"),
+ "Icon's src attribute should contain nonexisting.");
}
}
15 years, 2 months
JBoss Rich Faces SVN: r21754 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel.
by richfaces-svn-commits@lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-18 06:30:20 -0500 (Fri, 18 Feb 2011)
New Revision: 21754
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java
Log:
fixed rich:collapsiblePanel test @bypassUpdates + removed issue tracking (RF-10054)
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-02-18 10:45:03 UTC (rev 21753)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-02-18 11:30:20 UTC (rev 21754)
@@ -30,7 +30,6 @@
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
import java.net.URL;
@@ -81,7 +80,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10054")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10054")
public void testBypassUpdates() {
selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]"));
selenium.waitForPageToLoad();
@@ -91,8 +90,8 @@
waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time));
phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS,
- PhaseId.RENDER_RESPONSE);
- phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "panel collapsed");
+ PhaseId.RENDER_RESPONSE);
+ phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "panel collapsed");
}
@Test
@@ -155,8 +154,10 @@
JQueryLocator image = leftIcon.getChild(jq("img:nth-child(1)"));
// icon=null
- assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-up-hdr"), "Div should have set class rf-ico-chevron-up-hdr.");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronUp.png"), "Icon should contain a chevron up.");
+ assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-up-hdr"),
+ "Div should have set class rf-ico-chevron-up-hdr.");
+ assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronUp.png"),
+ "Icon should contain a chevron up.");
verifyStandardIcons(input, icon, image);
}
@@ -168,8 +169,10 @@
JQueryLocator image = leftIcon.getChild(jq("img:nth-child(2)"));
// icon=null
- assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-down-hdr"), "Div should have set class rf-ico-chevron-down-hdr.");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronDown.png"), "Icon should contain a chevron down.");
+ assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-down-hdr"),
+ "Div should have set class rf-ico-chevron-down-hdr.");
+ assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronDown.png"),
+ "Icon should contain a chevron down.");
verifyStandardIcons(input, icon, image);
}
@@ -384,38 +387,49 @@
private void verifyStandardIcons(JQueryLocator input, JQueryLocator icon, JQueryLocator image) {
selenium.select(input, optionLabel("chevronDown"));
selenium.waitForPageToLoad();
- assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-down-hdr"), "Div should have set class rf-ico-chevron-down-hdr.");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronDown.png"), "Icon should contain a chevron down.");
+ assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-down-hdr"),
+ "Div should have set class rf-ico-chevron-down-hdr.");
+ assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronDown.png"),
+ "Icon should contain a chevron down.");
selenium.select(input, optionLabel("chevronUp"));
selenium.waitForPageToLoad();
- assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-up-hdr"), "Div should have set class rf-ico-chevron-up-hdr.");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronUp.png"), "Icon should contain a chevron up.");
+ assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-up-hdr"),
+ "Div should have set class rf-ico-chevron-up-hdr.");
+ assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronUp.png"),
+ "Icon should contain a chevron up.");
selenium.select(input, optionLabel("disc"));
selenium.waitForPageToLoad();
assertTrue(selenium.belongsClass(icon, "rf-ico-disc-hdr"), "Div should have set class rf-ico-disc-hdr.");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Disc.png"), "Icon should contain a disc.");
+ assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Disc.png"),
+ "Icon should contain a disc.");
selenium.select(input, optionLabel("grid"));
selenium.waitForPageToLoad();
assertTrue(selenium.belongsClass(icon, "rf-ico-grid-hdr"), "Div should have set class rf-ico-grid-hdr.");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Grid.png"), "Icon should contain a grid.");
+ assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Grid.png"),
+ "Icon should contain a grid.");
selenium.select(input, optionLabel("triangle"));
selenium.waitForPageToLoad();
assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-hdr"), "Div should have set class rf-ico-triangle-hdr.");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Triangle.png"), "Icon should contain a triangle.");
+ assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Triangle.png"),
+ "Icon should contain a triangle.");
selenium.select(input, optionLabel("triangleDown"));
selenium.waitForPageToLoad();
- assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-down-hdr"), "Div should have set class rf-ico-triangle-down-hdr.");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("TriangleDown.png"), "Icon should contain a triangle down.");
+ assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-down-hdr"),
+ "Div should have set class rf-ico-triangle-down-hdr.");
+ assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("TriangleDown.png"),
+ "Icon should contain a triangle down.");
selenium.select(input, optionLabel("triangleUp"));
selenium.waitForPageToLoad();
- assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-up-hdr"), "Div should have set class rf-ico-triangle-up-hdr.");
- assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("TriangleUp.png"), "Icon should contain a triangle up.");
+ assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-up-hdr"),
+ "Div should have set class rf-ico-triangle-up-hdr.");
+ assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("TriangleUp.png"),
+ "Icon should contain a triangle up.");
selenium.select(input, optionLabel("none"));
selenium.waitForPageToLoad();
@@ -425,12 +439,14 @@
selenium.waitForPageToLoad();
assertFalse(selenium.isElementPresent(icon), "Icon's div should not be present when icon=star.");
assertTrue(selenium.isElementPresent(image), "Icon's image should be rendered.");
- assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("star.png"), "Icon's src attribute should contain star.png.");
+ assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("star.png"),
+ "Icon's src attribute should contain star.png.");
selenium.select(input, optionLabel("nonexisting"));
selenium.waitForPageToLoad();
assertFalse(selenium.isElementPresent(icon), "Icon's div should not be present when icon=nonexisting.");
assertTrue(selenium.isElementPresent(image), "Icon's image should be rendered.");
- assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("nonexisting"), "Icon's src attribute should contain nonexisting.");
+ assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("nonexisting"),
+ "Icon's src attribute should contain nonexisting.");
}
}
15 years, 2 months