January 2011 - richfaces-svn-commits

JBoss Rich Faces SVN: r21195 - trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar/model.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2011-01-25 07:06:37 -0500 (Tue, 25 Jan 2011) New Revision: 21195 Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar/model/CalendarModel.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar/model/CalendarModelItem.java Log: Removed @Override annotations from showcase code Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar/model/CalendarModel.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar/model/CalendarModel.java 2011-01-25 12:02:33 UTC (rev 21194) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar/model/CalendarModel.java 2011-01-25 12:06:37 UTC (rev 21195) @@ -52,7 +52,6 @@ return modelItems; } - @Override public Object getToolTip(Date date) { // TODO Auto-generated method stub return null; Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar/model/CalendarModelItem.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar/model/CalendarModelItem.java 2011-01-25 12:02:33 UTC (rev 21194) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar/model/CalendarModelItem.java 2011-01-25 12:06:37 UTC (rev 21195) @@ -22,25 +22,21 @@ return styleClass; } - @Override public Object getData() { // TODO Auto-generated method stub return null; } - @Override public boolean hasToolTip() { // TODO Auto-generated method stub return false; } - @Override public Object getToolTip() { // TODO Auto-generated method stub return null; } - @Override public int getDay() { // TODO Auto-generated method stub return 0;

13 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r21194 - in modules/tests/metamer/trunk: ftest/src/test/resources and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-01-25 07:02:33 -0500 (Tue, 25 Jan 2011) New Revision: 21194 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/CommandButtonBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/HDataTableBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/MediaData.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/Model.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/PhasesBean.java 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/RichCalendarBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnGroupBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSelectBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarGroupBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TimeBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/UiRepeatBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/UserBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/VersionBean.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml Log: * added popup panel to TestNG descriptor * fixed 3 tests for menu group * refactoring Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/CommandButtonBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/CommandButtonBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/CommandButtonBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -22,11 +22,13 @@ package org.richfaces.tests.metamer.bean; import java.io.Serializable; + import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; import javax.faces.component.html.HtmlCommandButton; import javax.faces.event.ActionEvent; + import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/HDataTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/HDataTableBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/HDataTableBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -25,8 +25,8 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; + import javax.annotation.PostConstruct; - import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; import javax.faces.component.html.HtmlDataTable; Property changes on: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/HDataTableBean.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/MediaData.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/MediaData.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/MediaData.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/Model.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/Model.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/Model.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/PhasesBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/PhasesBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/PhasesBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -19,7 +19,6 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *******************************************************************************/ - package org.richfaces.tests.metamer.bean; import java.util.ArrayList; 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-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -40,8 +40,8 @@ import javax.faces.event.ValueChangeEvent; import javax.faces.model.SelectItem; import javax.servlet.http.HttpSession; + import org.richfaces.event.ItemChangeEvent; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -30,8 +30,8 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; import javax.faces.event.ValueChangeEvent; + import org.richfaces.component.UICalendar; - import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnGroupBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnGroupBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnGroupBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -22,12 +22,12 @@ package org.richfaces.tests.metamer.bean; import java.io.Serializable; + import javax.annotation.PostConstruct; - import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; + import org.richfaces.component.UIColumnGroup; - import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +46,7 @@ private static Logger logger; private Attributes attributes; private int page = 1; - + /** * Initializes the managed bean. */ Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -23,8 +23,8 @@ package org.richfaces.tests.metamer.bean; import java.io.Serializable; + import javax.annotation.PostConstruct; - import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSelectBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSelectBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSelectBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarGroupBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarGroupBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarGroupBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -22,9 +22,11 @@ package org.richfaces.tests.metamer.bean; import java.io.Serializable; + import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; + import org.richfaces.component.UIToolbarGroup; import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TimeBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TimeBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TimeBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/UiRepeatBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/UiRepeatBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/UiRepeatBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Property changes on: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/UiRepeatBean.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/UserBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/UserBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/UserBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/VersionBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/VersionBean.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/VersionBean.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml =================================================================== --- modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml 2011-01-25 12:02:33 UTC (rev 21194) @@ -7,6 +7,7 @@ <package name="org.richfaces.tests.metamer.ftest.richAccordionItem" /> <package name="org.richfaces.tests.metamer.ftest.richCollapsiblePanel" /> <package name="org.richfaces.tests.metamer.ftest.richPanel" /> + <package name="org.richfaces.tests.metamer.ftest.richPopupPanel" /> <package name="org.richfaces.tests.metamer.ftest.richProgressBar" /> <package name="org.richfaces.tests.metamer.ftest.richTab" /> <package name="org.richfaces.tests.metamer.ftest.richTabPanel" /> Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java 2011-01-25 11:59:09 UTC (rev 21193) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java 2011-01-25 12:02:33 UTC (rev 21194) @@ -71,7 +71,7 @@ assertFalse(selenium.isVisible(group), "Menu group \"Save As...\" should not be visible on the page."); assertFalse(selenium.isDisplayed(fileMenuList), "Menu should not be expanded."); - guardNoRequest(selenium).click(fileMenu); + guardNoRequest(selenium).mouseOver(fileMenu); assertTrue(selenium.isDisplayed(fileMenuList), "Menu should be expanded."); assertTrue(selenium.isElementPresent(group), "Menu group \"Save As...\" should be present on the page."); @@ -193,7 +193,7 @@ selenium.type(pjq("input[id$=onhideInput]"), "metamerEvents += \"hide \""); selenium.waitForPageToLoad(TIMEOUT); - selenium.click(fileMenu); + selenium.mouseOver(fileMenu); waitGui.failWith("Menu was not open.").until(isDisplayed.locator(fileMenuList)); selenium.mouseOver(group); waitGui.failWith("Submenu was not open").until(isDisplayed.locator(groupList)); @@ -247,7 +247,7 @@ selenium.type(pjq("input[id$=onshowInput]"), "metamerEvents += \"show \""); selenium.waitForPageToLoad(TIMEOUT); - selenium.click(fileMenu); + selenium.mouseOver(fileMenu); waitGui.failWith("Menu was not open.").until(isDisplayed.locator(fileMenuList)); selenium.mouseOver(group); waitGui.failWith("Submenu was not open").until(isDisplayed.locator(groupList));

13 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r21193 - in trunk/ui/output/ui/src: main/templates and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2011-01-25 06:59:09 -0500 (Tue, 25 Jan 2011) New Revision: 21193 Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menugroup.js trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_ajaxMode.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_serverMode.xmlunit.xml Log: https://issues.jboss.org/browse/RF-10235 DropDownMenu: popup is never getting hidden in IE and Google Chrome Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js 2011-01-25 11:16:55 UTC (rev 21192) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu-base.js 2011-01-25 11:59:09 UTC (rev 21193) @@ -49,8 +49,7 @@ this.selectedGroup = null; - rf.Event.bindById(this.id, this.options.showEvent, $.proxy( - this.__showHandler, this), this); + rf.Event.bindById(this.id, "mouseenter", $.proxy(this.__overHandler, this), this); rf.Event.bindById(this.id, "mouseleave", $.proxy(this.__leaveHandler, @@ -114,11 +113,13 @@ }, __hidePopup : function() { + window.clearTimeout(this.showTimeoutId); + this.showTimeoutId=null; if (this.__isShown()) { this.invokeEvent("hide", rf.getDomElement(this.id), null); this.__closeChildGroups(); this.popup.hide(); - this.displayed = false; + this.displayed = false; this.__deselectCurrentItem(); this.currentSelectedItemIndex = -1; jqueryParentMenu = this.__getParentMenu(); @@ -195,7 +196,6 @@ __selectItem : function(item) { if (!rf.$(item).isSelected) { - rf.$(item).select(); } }, @@ -205,14 +205,18 @@ e.currentTarget).eq(0); }, - __showHandler : function() { - this.showTimeoutId = window.setTimeout($.proxy(function() { - this.show(); - }, this), this.options.showDelay); + __showHandler : function(e) { + if (!this.__isShown()){ + this.showTimeoutId = window.setTimeout($.proxy(function() { + this.show(); + }, this), this.options.showDelay); + } + + }, __leaveHandler : function() { - window.clearTimeout(this.showTimeoutId); + //console.log('__leaveHandler showTimeoutId:'+ this.showTimeoutId); this.hideTimeoutId = window.setTimeout($.proxy(function() { this.hide(); }, this), this.options.hideDelay); Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js 2011-01-25 11:16:55 UTC (rev 21192) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js 2011-01-25 11:59:09 UTC (rev 21193) @@ -30,7 +30,10 @@ this.namespace = this.namespace || "." + rf.Event.createNamespace(this.name, this.id); this.groupList = new Array(); - + + rf.Event.bindById(this.id+"_label", this.options.showEvent, $.proxy( + this.__showHandler, this), this); + this.attachToDom(componentId); if (!rf.ui.MenuManager) rf.ui.MenuManager = {}; @@ -68,11 +71,11 @@ } }, - show : function() { + show : function(e) { if (this.menuManager.openedMenu != this.id) { this.menuManager.shutdownMenu(); this.menuManager.addMenuId(this.id); - this.__showPopup(); + this.__showPopup(e); } }, Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menugroup.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menugroup.js 2011-01-25 11:16:55 UTC (rev 21192) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menugroup.js 2011-01-25 11:59:09 UTC (rev 21193) @@ -21,7 +21,10 @@ this.namespace = this.namespace || "." + rf.Event.createNamespace(this.name, this.id); this.attachToDom(componentId); - + + rf.Event.bindById(this.id, this.options.showEvent, $.proxy( + this.__showHandler, this), this); + this.rootMenu = rf.$(this.options.rootMenuId); this.shown = false; Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js 2011-01-25 11:16:55 UTC (rev 21192) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js 2011-01-25 11:59:09 UTC (rev 21193) @@ -49,7 +49,7 @@ __clickHandler : function (e) { var parentMenu = this.__getParentMenu(); if (parentMenu) { - this.__getParentMenu().processItem(this.element); + parentMenu.processItem(this.element); } this.__submitForm(rf.getDomElement(this.id), e, this.options.params); Modified: trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml =================================================================== --- trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml 2011-01-25 11:16:55 UTC (rev 21192) +++ trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml 2011-01-25 11:59:09 UTC (rev 21193) @@ -23,7 +23,7 @@ <div id="#{clientId}" class="rf-ddm-lbl #{isDisabled ? 'rf-ddm-lbl-dis' : 'rf-ddm-lbl-unsel '+styleClass} " style="#{style}" cdk:passThroughWithExclusions=""> - <div class="#{isDisabled ? 'rf-ddm-lbl-dis' : 'rf-ddm-lbl-dec'}"> + <div id="#{clientId}_label" class="#{isDisabled ? 'rf-ddm-lbl-dis' : 'rf-ddm-lbl-dec'}"> <c:choose> <c:when test="#{label != null and label.isRendered()}"> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_ajaxMode.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_ajaxMode.xmlunit.xml 2011-01-25 11:16:55 UTC (rev 21192) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_ajaxMode.xmlunit.xml 2011-01-25 11:59:09 UTC (rev 21193) @@ -1,5 +1,5 @@ <div class="rf-ddm-lbl rf-ddm-lbl-unsel " id="form:ddmenu"> - <div class="rf-ddm-lbl-dec"> + <div id="form:ddmenu_label" class="rf-ddm-lbl-dec"> <img src="/images/ddmenu/copy.gif" class="pic"/> File </div> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_serverMode.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_serverMode.xmlunit.xml 2011-01-25 11:16:55 UTC (rev 21192) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_serverMode.xmlunit.xml 2011-01-25 11:59:09 UTC (rev 21193) @@ -1,5 +1,5 @@ <div class="rf-ddm-lbl rf-ddm-lbl-unsel " id="form:ddmenu"> - <div class="rf-ddm-lbl-dec"> + <div id="form:ddmenu_label" class="rf-ddm-lbl-dec"> <img src="/images/ddmenu/copy.gif" class="pic"/> File </div>

13 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r21192 - in trunk/examples/richfaces-showcase/src/main/webapp: richfaces/region/samples and 3 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ilya_shaikovsky Date: 2011-01-25 06:16:55 -0500 (Tue, 25 Jan 2011) New Revision: 21192 Modified: trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/standardSkinning/standardSkinning.xhtml trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml Log: https://issues.jboss.org/browse/RF-10151 Modified: trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss 2011-01-25 11:00:14 UTC (rev 21191) +++ trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss 2011-01-25 11:16:55 UTC (rev 21192) @@ -1,4 +1,4 @@ -.rich-panel { +.rf-p-c{ border-width: 1px; border-style: solid; padding: 1px; @@ -9,7 +9,7 @@ border-color: '#{richSkin.panelBorderColor}'; } -.rich-panel-header { +.rf-p-c .rf-p-hdr { padding: 7px 20px; border-width: 1px; border-style: solid; @@ -23,6 +23,6 @@ color: '#{richSkin.headerTextColor}'; } -.rich-panel-body { +.rf-p-c .rf-p-b { padding: 10px; } \ No newline at end of file Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml 2011-01-25 11:00:14 UTC (rev 21191) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml 2011-01-25 11:16:55 UTC (rev 21192) @@ -3,8 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/org.richfaces.showcase"> + xmlns:a4j="http://richfaces.org/a4j"> <ui:composition> <h:form> Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/standardSkinning/standardSkinning.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/standardSkinning/standardSkinning.xhtml 2011-01-25 11:00:14 UTC (rev 21191) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/standardSkinning/standardSkinning.xhtml 2011-01-25 11:16:55 UTC (rev 21192) @@ -4,7 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/org.richfaces.showcase"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition> <p>This section overviews main principles of standard components Modified: trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml 2011-01-25 11:00:14 UTC (rev 21191) +++ trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml 2011-01-25 11:16:55 UTC (rev 21192) @@ -3,8 +3,8 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/org.richfaces.showcase"> - <rich:panel style="width:300px" bodyClass=""> + xmlns:rich="http://richfaces.org/rich"> + <rich:panel style="width:300px" styleClass="rf-p-c"> <f:facet name="header"> <h:outputText value="Navigation" /> </f:facet> Modified: trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml 2011-01-25 11:00:14 UTC (rev 21191) +++ trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml 2011-01-25 11:16:55 UTC (rev 21192) @@ -4,10 +4,10 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/org.richfaces.showcase"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition> - <rich:panel styleClass="skin-chooser"> + <rich:panel styleClass="skin-chooser .rf-p-c"> <a4j:repeat var="skin" value="#{skinBean.skins}" iterationStatusVar="iterStatus"> <h:link value="#{skin}" includeViewParams="true"> <f:param name="skin" value="#{skin}"/> Modified: trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-01-25 11:00:14 UTC (rev 21191) +++ trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-01-25 11:16:55 UTC (rev 21192) @@ -3,7 +3,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:rich="http://java.sun.com/jsf/composite/org.richfaces.showcase" xmlns:a4j="http://richfaces.org/a4j"> <f:view contentType="text/html"> <ui:insert name="demoSampleParameters"/> @@ -24,6 +23,7 @@ </h:head> <h:body> <h:outputStylesheet library="org.richfaces.showcase" name="page.ecss" /> + <h:outputStylesheet library="org.richfaces.showcase" name="panel.ecss" /> <table border="0" cellpadding="0" cellspacing="0" class="rich-page header_bg #{cc.attrs.pageClass}"> <tbody>

13 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r21191 - in trunk/examples/richfaces-showcase/src/main: resources/org/richfaces/demo/data/common and 5 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ilya_shaikovsky Date: 2011-01-25 06:00:14 -0500 (Tue, 25 Jan 2011) New Revision: 21191 Added: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/dataTableEdit-sample.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/hashOptionsPopup.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/samples/ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/samples/hashOptionsPopup-sample.xhtml Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsBean.java trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/dataTableEdit.xhtml Log: https://issues.jboss.org/browse/RFPL-736 + new dataTable sample Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsBean.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsBean.java 2011-01-25 10:44:54 UTC (rev 21190) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsBean.java 2011-01-25 11:00:14 UTC (rev 21191) @@ -32,7 +32,12 @@ private static final int ROUNDING_MODE = BigDecimal.ROUND_HALF_UP; private List<InventoryItem> allInventoryItems = null; private List<InventoryVendorList> inventoryVendorLists = null; + private InventoryItem currentCar; + public void remove() { + allInventoryItems.remove(currentCar); + } + public List<SelectItem> getVendorOptions() { List<SelectItem> result = new ArrayList<SelectItem>(); result.add(new SelectItem("", "")); @@ -191,4 +196,13 @@ return iiList; } + + public InventoryItem getCurrentCar() { + return currentCar; + } + + public void setCurrentCar(InventoryItem currentCar) { + this.currentCar = currentCar; + } + } Modified: trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml =================================================================== --- trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2011-01-25 10:44:54 UTC (rev 21190) +++ trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2011-01-25 11:00:14 UTC (rev 21191) @@ -200,7 +200,7 @@ </sample> </samples> </demo> - <demo> + <demo new="true"> <id>dataTable</id> <name>rich:dataTable</name> <samples> @@ -227,6 +227,10 @@ <id>tableFiltering</id> <name>Data Table Filtering</name> </sample> + <sample new="true"> + <id>dataTableEdit</id> + <name>Data Table Edit</name> + </sample> </samples> </demo> <demo> @@ -607,6 +611,16 @@ </sample> </samples> </demo> + <demo new="true"> + <id>hashParam</id> + <name>rich:hashParam</name> + <samples> + <sample> + <id>hashOptionsPopup</id> + <name>Passing hash options to rich:popupPanel</name> + </sample> + </samples> + </demo> <demo> <id>jquery</id> <name>rich:jQuery</name> Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml 2011-01-25 10:44:54 UTC (rev 21190) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml 2011-01-25 11:00:14 UTC (rev 21191) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:rich="http://java.sun.com/jsf/composite/org.richfaces.showcase"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/main.xhtml"> <ui:define name="demoSampleParameters"> Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/dataTableEdit.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/dataTableEdit.xhtml 2011-01-25 10:44:54 UTC (rev 21190) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/dataTableEdit.xhtml 2011-01-25 11:00:14 UTC (rev 21191) @@ -6,35 +6,7 @@ xmlns:a4j="http://richfaces.org/a4j"> <ui:composition> - <h:form> - <h:dataTable value="#{carsBean.allCars}" var="car" id="table"> - <h:column> - <f:facet name="header"> - <h:outputText value="Make" /> - </f:facet> - <h:outputText value="#{car.make}"/> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="Model" /> - </f:facet> - <h:outputText value="#{car.model}"/> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="Price" /> - </f:facet> - <h:outputText value="#{car.price}"/> - </h:column> - <h:column> - <f:facet name="header"> - Actions - </f:facet> - <a4j:commandLink value="Edit" action="#{carsBean.edit}" render="table"/> - <h:outputText value=" " /> - <a4j:commandLink value="Remove" action="#{carsBean.remove}" render="table"/> - </h:column> - </h:dataTable> - </h:form> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + </ui:composition> </html> \ No newline at end of file Added: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/dataTableEdit-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/dataTableEdit-sample.xhtml (rev 0) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/dataTableEdit-sample.xhtml 2011-01-25 11:00:14 UTC (rev 21191) @@ -0,0 +1,78 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form id="form"> + <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" + id="table" rows="15"> + <f:facet name="noData"> + Nothing found + </f:facet> + <rich:column> + <f:facet name="header">Vendor</f:facet> + <h:outputText value="#{car.vendor}" /> + </rich:column> + <rich:column> + <f:facet name="header">Model</f:facet> + <h:outputText value="#{car.model}" /> + </rich:column> + <rich:column> + <f:facet name="header">Price</f:facet> + <h:outputText value="#{car.price}" /> + </rich:column> + <rich:column> + <f:facet name="header">Mileage</f:facet> + <h:outputText value="#{car.mileage}" /> + </rich:column> + <rich:column> + <f:facet name="header">VIN</f:facet> + <h:outputText value="#{car.vin}" /> + </rich:column> + <rich:column> + <f:facet name="header">Actions</f:facet> + <h:commandLink action="#{carsBean.remove}"> + <h:graphicImage value="/images/icons/delete.gif"/> + <a4j:ajax render="table" execute="@this" /> + <f:setPropertyActionListener target="#{carsBean.currentCar}" + value="#{car}" /> + </h:commandLink> + <h:commandLink> + <h:graphicImage value="/images/icons/edit.gif"/> + <a4j:ajax render="edit" execute="@this" + oncomplete="#{rich:component('editPane')}.show()" /> + <f:setPropertyActionListener target="#{carsBean.currentCar}" + value="#{car}" /> + </h:commandLink> + </rich:column> + <f:facet name="footer"> + <rich:dataScroller/> + </f:facet> + </rich:dataTable> + </h:form> + <rich:popupPanel header="Edit Car Details" id="editPane"> + <h:form> + <h:panelGrid columns="3"> + <h:outputText value="Vendor" /> + <h:outputText value="#{carsBean.currentCar.vendor}" /> + <h:panelGroup /> + <h:outputText value="Model" /> + <h:outputText value="#{carsBean.currentCar.model}" /> + <h:panelGroup /> + <h:outputText value="Price" /> + <h:inputText value="#{carsBean.currentCar.price}" id="price" /> + <rich:message for="price" /> + <h:outputText value="Mileage" /> + <h:inputText value="#{carsBean.currentCar.mileage}" id="mage" /> + <rich:message for="mage" /> + <h:outputText value="VIN" /> + <h:inputText value="#{carsBean.currentCar.vin}" id="vin" /> + <rich:message for="vin" /> + </h:panelGrid> + <a4j:commandButton value="Store"/> + <a4j:commandButton value="Cancel" onclick="#{rich:component('editPane')}.hide(); return false;"/> + </h:form> + </rich:popupPanel> +</ui:composition> \ No newline at end of file Added: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/hashOptionsPopup.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/hashOptionsPopup.xhtml (rev 0) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/hashOptionsPopup.xhtml 2011-01-25 11:00:14 UTC (rev 21191) @@ -0,0 +1,26 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + <p><b>rich:hashParam</b> allows you to group client side parameters + into hash map in order to pass to client API functions of any + components.</p> + <p>Press "Show Popup" betton in order to call the pabel. All the + parameters for show method passed from component control nested + a4j:param's instead of to be defined with attributes in static way. As + the show() method accepts event and options hash - all the param's + except event grouped using <b>rich:hashParam</b> component and passed + as hash</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> + +</html> \ No newline at end of file Added: 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 (rev 0) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/hashParam/samples/hashOptionsPopup-sample.xhtml 2011-01-25 11:00:14 UTC (rev 21191) @@ -0,0 +1,54 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + + <rich:popupPanel id="pp" resizeable="true" + header="Popup panel shown using rich:componentControl and rich:hashParam"> + <f:facet name="controls"> + <h:outputLink value="#" + onclick="#{rich:component('pp')}.hide(); return false;"> + X + </h:outputLink> + </f:facet> + <h:outputText value="Settings applied by hashParam tag:" /> + <h:panelGrid columns="2"> + <h:outputText value="Width:" /> + <h:outputText value="500px" /> + <h:outputText value="Height:" /> + <h:outputText value="300px" /> + <h:outputText value="minWidth:" /> + <h:outputText value="300px" /> + <h:outputText value="minHeight:" /> + <h:outputText value="150px" /> + </h:panelGrid> + <p>Also panel getting centered by using:</p> + <p><a4j:param noEscape="true" name="left" + value="(screen.width/2)-250"/></p> + <p><a4j:param noEscape="true" name="top" + value="(screen.height/2)-150"/></p> + <fieldset><legend><b>NOTE:</b></legend> + <p>Pay your attention that show() api method requires event + parameter to be first according to signature. So we passed it before + hashParam.</p> + </fieldset> + </rich:popupPanel> + + <h:commandButton value="Show popup"> + <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" /> + <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> + </rich:componentControl> + </h:commandButton> + +</ui:composition> \ No newline at end of file

13 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r21190 - in trunk: ui/output/ui/src/main/resources/META-INF/resources/org.richfaces and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2011-01-25 05:44:54 -0500 (Tue, 25 Jan 2011) New Revision: 21190 Modified: trunk/examples/output-demo/src/main/webapp/examples/dropDownMenu.xhtml trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js trunk/ui/output/ui/src/main/templates/menuitem.template.xml Log: RF-10236 Drop down menu: f:param is not working inside menuitem Modified: trunk/examples/output-demo/src/main/webapp/examples/dropDownMenu.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/dropDownMenu.xhtml 2011-01-25 01:09:50 UTC (rev 21189) +++ trunk/examples/output-demo/src/main/webapp/examples/dropDownMenu.xhtml 2011-01-25 10:44:54 UTC (rev 21190) @@ -46,7 +46,10 @@ <h:outputText style="font-weight:bold" value="#{menuBean.current}"></h:outputText> </a4j:outputPanel> <br /> - <ddm:dropDownMenu hideDelay="600" showEvent="click" jointPoint="bottomLeft" direction="autoRight" id="ddmenu" disabled="#{menuBean.disabled}" mode="#{menuBean.mode}"> + <ddm:dropDownMenu hideDelay="600" showEvent="click" + jointPoint="bottomLeft" direction="autoRight" + id="ddmenu" disabled="#{menuBean.disabled}" + mode="#{menuBean.mode}"> <f:facet name="label"> <h:panelGroup> <h:graphicImage value="/images/ddmenu/copy.gif" styleClass="pic"/> @@ -64,6 +67,8 @@ <f:facet name="icon"> <h:selectBooleanCheckbox id="checkbox" value="#{menuBean.checkbox}"/> </f:facet> + <f:param name="myParam" value="12345"/> + <f:param name="myParam2" value="${222}"/> </ddm:menuItem> <ddm:menuItem label="Open" action="#{menuBean.doOpen}"> <f:facet name="icon"> Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js 2011-01-25 01:09:50 UTC (rev 21189) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menuitem.js 2011-01-25 10:44:54 UTC (rev 21190) @@ -52,17 +52,18 @@ this.__getParentMenu().processItem(this.element); } - this.__submitForm(rf.getDomElement(this.id), e); + this.__submitForm(rf.getDomElement(this.id), e, this.options.params); }, /** * * @param item DOM element */ - __submitForm : function(item, e) { + __submitForm : function(item, e, params) { var form = this.__getParentForm(item); var itemId = {}; itemId[item.id] = item.id; + $.extend(itemId, params || {}); if (this.options.mode == "server") { rf.submitForm(form, itemId); } Modified: trunk/ui/output/ui/src/main/templates/menuitem.template.xml =================================================================== --- trunk/ui/output/ui/src/main/templates/menuitem.template.xml 2011-01-25 01:09:50 UTC (rev 21189) +++ trunk/ui/output/ui/src/main/templates/menuitem.template.xml 2011-01-25 10:44:54 UTC (rev 21190) @@ -19,7 +19,7 @@ <cdk:resource-dependency name="richfaces-event.js" /> <cdk:resource-dependency name="menuitem.js" library="org.richfaces" /> - + <cdk:import package="org.richfaces.renderkit.util" names="RendererUtils" /> </cc:interface> <cc:implementation> @@ -80,6 +80,7 @@ <c:when test="#{not isDisabled}"> <script type="text/javascript"> <cdk:scriptObject name="options"> + <cdk:scriptOption name="params" value="${RendererUtils.getInstance().createParametersMap(facesContext, component)}"/> <cdk:scriptOption name="mode" value="#{getSubmitMode(component)}" defaultValue="org.richfaces.component.Mode.server"/> <cdk:scriptOption name="submitFunction" value="#{getOnClickFunction(facesContext, component)}" wrapper="eventHandler"/> </cdk:scriptObject>

13 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r21189 - in trunk/ui/output/ui/src: main/java/org/richfaces/renderkit/html/iconimages and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2011-01-24 20:09:50 -0500 (Mon, 24 Jan 2011) New Revision: 21189 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconBasic.java trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-groupDis.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml Log: https://issues.jboss.org/browse/RF-10158 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-01-25 00:26:19 UTC (rev 21188) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-01-25 01:09:50 UTC (rev 21189) @@ -119,7 +119,8 @@ writer.startElement(DIV_ELEM, null); writer.writeAttribute(ID_ATTRIBUTE, menuGroup.getClientId(context) + ":hdr", null); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses(getCssClass(menuGroup, "-hdr"), - "rf-pm-hdr-" + (menuGroup.isExpanded() ? "exp" : "colps")), null); + "rf-pm-hdr-" + (menuGroup.isExpanded() ? "exp" : "colps"), + menuGroup.isDisabled() ? getCssClass(menuGroup, "-hdr-dis") : null), null); (menuGroup.isTopItem() ? topHeaderRenderer : headerRenderer).encodeHeader(writer, context, menuGroup); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconBasic.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconBasic.java 2011-01-25 00:26:19 UTC (rev 21188) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconBasic.java 2011-01-25 01:09:50 UTC (rev 21189) @@ -21,12 +21,6 @@ package org.richfaces.renderkit.html.iconimages; -import org.richfaces.resource.AbstractJava2DUserResource; -import org.richfaces.resource.StateHolderResource; -import org.richfaces.skin.Skin; -import org.richfaces.skin.SkinFactory; - -import javax.faces.context.FacesContext; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; @@ -35,18 +29,22 @@ import java.io.DataOutput; import java.io.IOException; +import javax.faces.context.FacesContext; + +import org.richfaces.resource.AbstractJava2DUserResource; +import org.richfaces.resource.PostConstructResource; +import org.richfaces.resource.StateHolderResource; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; + /** * @author Alex.Kolonitsky */ public abstract class PanelMenuIconBasic extends AbstractJava2DUserResource implements StateHolderResource { - private static final String TOP_BULLET_COLOR = Skin.HEADER_TEXT_COLOR; - private static final String ORDINAL_BULLET_COLOR = Skin.HEADER_BACKGROUND_COLOR; private static final Dimension DIMENSION = new Dimension(16, 16); private Color color; - private Color topBulletColor; - private Color ordinalBulletColor; protected PanelMenuIconBasic() { super(DIMENSION); @@ -72,17 +70,19 @@ return false; } - public void writeState(FacesContext context, DataOutput dataOutput) throws IOException { + @PostConstructResource + public void initialize() { + FacesContext context = FacesContext.getCurrentInstance(); Skin skin = SkinFactory.getInstance(context).getSkin(context); - dataOutput.writeInt(skin.getColorParameter(context, Skin.SELECT_CONTROL_COLOR)); - dataOutput.writeInt(skin.getColorParameter(context, TOP_BULLET_COLOR)); - dataOutput.writeInt(skin.getColorParameter(context, ORDINAL_BULLET_COLOR)); + color = new Color(skin.getColorParameter(context, "tabDisabledTextColor")); } + + public void writeState(FacesContext context, DataOutput dataOutput) throws IOException { + dataOutput.writeInt(color.getRGB()); + } public void readState(FacesContext context, DataInput dataInput) throws IOException { color = new Color(dataInput.readInt()); - topBulletColor = new Color(dataInput.readInt()); - ordinalBulletColor = new Color(dataInput.readInt()); } } Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss 2011-01-25 00:26:19 UTC (rev 21188) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss 2011-01-25 01:09:50 UTC (rev 21189) @@ -62,10 +62,6 @@ margin: 0px 3px; } -.rf-pm-itm-dis { - color: #BED6F8; -} - .rf-pm-itm-hov { background-color: '#{richSkin.additionalBackgroundColor}'; } @@ -81,10 +77,6 @@ border-top-color: '#{richSkin.panelBorderColor}'; } -.rf-pm-gr-dis { - color: #BED6F8; -} - .rf-pm-gr-hov { background: '#{richSkin.additionalBackgroundColor}'; @@ -175,10 +167,6 @@ margin: 0px 3px; } -.rf-pm-top-itm-dis { - color: #BED6F8; -} - .rf-pm-top-itm-hov { background-color:#ffd700; } @@ -195,10 +183,6 @@ margin-bottom: 3px } -.rf-pm-top-gr-dis { - color: #BED6F8; -} - .rf-pm-top-gr-hov { background-color: green; color: white; /*TODO skin?*/ @@ -226,6 +210,11 @@ font-weight: bold; } +.rf-pm-top-gr-hdr-dis, .rf-pm-gr-hdr-dis, .rf-pm-itm-dis, .rf-pm-top-itm-dis { + color: '#{richSkin.tabDisabledTextColor}'; + cursor: default; +} + .rf-pm-top-gr-cnt { } Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-groupDis.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-groupDis.xmlunit.xml 2011-01-25 00:26:19 UTC (rev 21188) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-groupDis.xmlunit.xml 2011-01-25 01:09:50 UTC (rev 21189) @@ -1,6 +1,6 @@ <div id="f:panelMenuGroup-dis" class="rf-pm-gr groupClass rf-pm-gr-dis groupDisableClass"> <input id="f:panelMenuGroup-dis:expanded" name="f:panelMenuGroup-dis:expanded" type="hidden" value="false"/> - <div id="f:panelMenuGroup-dis:hdr" class="rf-pm-gr-hdr rf-pm-hdr-colps"> + <div id="f:panelMenuGroup-dis:hdr" class="rf-pm-gr-hdr rf-pm-hdr-colps rf-pm-gr-hdr-dis"> <table class="rf-pm-gr-gr"> <tbody> <tr> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml 2011-01-25 00:26:19 UTC (rev 21188) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml 2011-01-25 01:09:50 UTC (rev 21189) @@ -1,6 +1,6 @@ <div id="f:panelMenuGroup-topDis" class="rf-pm-top-gr topGroupClass rf-pm-top-gr-dis topGroupClassDisabled"> <input id="f:panelMenuGroup-topDis:expanded" name="f:panelMenuGroup-topDis:expanded" type="hidden" value="false"/> - <div id="f:panelMenuGroup-topDis:hdr" class="rf-pm-top-gr-hdr rf-pm-hdr-colps"> + <div id="f:panelMenuGroup-topDis:hdr" class="rf-pm-top-gr-hdr rf-pm-hdr-colps rf-pm-top-gr-hdr-dis"> <table class="rf-pm-top-gr-gr"> <tbody> <tr>

13 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r21188 - trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2011-01-24 19:26:19 -0500 (Mon, 24 Jan 2011) New Revision: 21188 Added: trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/error.png trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/fatal.png trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/info.png trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/msg.ecss trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/warning.png Log: CODING IN PROGRESS - issue RF-10064: Finish rich:message HTML design https://issues.jboss.org/browse/RF-10064 Added: trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/error.png =================================================================== (Binary files differ) Property changes on: trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/error.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/fatal.png =================================================================== (Binary files differ) Property changes on: trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/fatal.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/info.png =================================================================== (Binary files differ) Property changes on: trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/info.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/msg.ecss =================================================================== --- trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/msg.ecss (rev 0) +++ trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/msg.ecss 2011-01-25 00:26:19 UTC (rev 21188) @@ -0,0 +1,14 @@ +.rf-msg { +} +.rf-msg-err { + list-style-image: url(#{resource['org.richfaces:error.png']}); +} +.rf-msg-ftl { + list-style-image: url(#{resource['org.richfaces:error.png']}); +} +.rf-msg-inf { + list-style-image: url(#{resource['org.richfaces:error.png']}); +} +.rf-msg-ftl { + list-style-image: url(#{resource['org.richfaces:error.png']}); +} \ No newline at end of file Added: trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/warning.png =================================================================== (Binary files differ) Property changes on: trunk/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/warning.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

13 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r21187 - trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2011-01-24 18:51:05 -0500 (Mon, 24 Jan 2011) New Revision: 21187 Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss Log: Removed parasite 3px margin in panel menu Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss 2011-01-24 23:50:32 UTC (rev 21186) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss 2011-01-24 23:51:05 UTC (rev 21187) @@ -79,8 +79,6 @@ border-top-width: 1px; border-top-style: solid; border-top-color: '#{richSkin.panelBorderColor}'; - - margin-bottom: 3px } .rf-pm-gr-dis {

13 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r21186 - in trunk/ui/output/ui/src/main/java/org/richfaces: renderkit/html and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2011-01-24 18:50:32 -0500 (Mon, 24 Jan 2011) New Revision: 21186 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java Log: https://issues.jboss.org/browse/RF-10270 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-01-24 20:28:24 UTC (rev 21185) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-01-24 23:50:32 UTC (rev 21186) @@ -23,13 +23,6 @@ package org.richfaces.component; -import org.richfaces.PanelMenuMode; -import org.richfaces.cdk.annotations.*; -import org.richfaces.event.ItemChangeEvent; -import org.richfaces.event.ItemChangeListener; -import org.richfaces.event.ItemChangeSource; -import org.richfaces.renderkit.util.PanelIcons; - import javax.el.MethodExpression; import javax.el.ValueExpression; import javax.faces.component.UIComponent; @@ -39,6 +32,18 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; +import org.richfaces.PanelMenuMode; +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.event.ItemChangeEvent; +import org.richfaces.event.ItemChangeListener; +import org.richfaces.event.ItemChangeSource; +import org.richfaces.renderkit.util.PanelIcons; + /** * @author akolonitsky * @since 2010-10-25 @@ -174,10 +179,10 @@ @Attribute public abstract boolean isDisabled(); - @Attribute(defaultValue = "click") + @Attribute public abstract String getExpandEvent(); - @Attribute(defaultValue = "click") + @Attribute public abstract String getCollapseEvent(); @Attribute(defaultValue = "PanelMenuMode.client") Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-01-24 20:28:24 UTC (rev 21185) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-01-24 23:50:32 UTC (rev 21186) @@ -23,17 +23,21 @@ package org.richfaces.component; -import org.richfaces.PanelMenuMode; -import org.richfaces.cdk.annotations.*; -import org.richfaces.event.ItemChangeEvent; -import org.richfaces.event.PanelToggleEvent; - import javax.el.MethodExpression; import javax.el.ValueExpression; import javax.faces.context.FacesContext; import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; +import org.richfaces.PanelMenuMode; +import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.annotations.EventName; +import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; +import org.richfaces.event.ItemChangeEvent; +import org.richfaces.event.PanelToggleEvent; + /** * @author akolonitsky * @since 2010-10-25 @@ -161,35 +165,12 @@ @Attribute(defaultValue = "getPanelMenu().isExpandSingle()") public abstract boolean isExpandSingle(); - @Attribute(generate = false) - public String getCollapseEvent() { - String value = (String) getStateHelper().eval(Properties.collapseEvent); - if (value != null) { - return value; - } + @Attribute + public abstract String getCollapseEvent(); - return getPanelMenu().getCollapseEvent(); - } + @Attribute + public abstract String getExpandEvent(); - public void setCollapseEvent(String collapseEvent) { - getStateHelper().put(Properties.collapseEvent, collapseEvent); - } - - - @Attribute(generate = false) - public String getExpandEvent() { - String value = (String) getStateHelper().eval(Properties.expandEvent); - if (value != null) { - return value; - } - - return getPanelMenu().getExpandEvent(); - } - - public void setExpandEvent(String expandEvent) { - getStateHelper().put(Properties.expandEvent, expandEvent); - } - @Attribute(defaultValue = "getPanelMenu().isBubbleSelection()") public abstract boolean isBubbleSelection(); @@ -199,7 +180,7 @@ // ------------------------------------------------ Html Attributes enum Properties { - leftIconDisabled, leftIconExpanded, rightIconCollapsed, rightIconDisabled, rightIconExpanded, disabledClass, styleClass, expandEvent, collapseEvent, leftIconCollapsed + leftIconDisabled, leftIconExpanded, rightIconCollapsed, rightIconDisabled, rightIconExpanded, disabledClass, styleClass, leftIconCollapsed } @Attribute(generate = false) Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-01-24 20:28:24 UTC (rev 21185) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-01-24 23:50:32 UTC (rev 21186) @@ -47,6 +47,8 @@ import org.richfaces.component.AbstractPanelMenuGroup; import org.richfaces.component.AbstractPanelMenuItem; +import com.google.common.base.Strings; + /** * @author akolonitsky * @since 2010-10-25 @@ -64,6 +66,8 @@ //TODO nick - shouldn't this be rf-pm-gr-top? private static final String TOP_CSS_CLASS_PREFIX = "rf-pm-top-gr"; + private static final String DEFAULT_EXPAND_EVENT = "click"; + private static final String DEFAULT_COLLAPSE_EVENT = "click"; private final TableIconsRendererHelper<AbstractPanelMenuGroup> headerRenderer = new PanelMenuGroupHeaderRenderer(CSS_CLASS_PREFIX); private final TableIconsRendererHelper<AbstractPanelMenuGroup> topHeaderRenderer = new PanelMenuGroupHeaderRenderer(TOP_CSS_CLASS_PREFIX); @@ -154,6 +158,28 @@ component.getClientId(context), getScriptObjectOptions(context, component)); } + private String getExpandEvent(AbstractPanelMenuGroup group) { + String expandEvent = group.getExpandEvent(); + if (Strings.isNullOrEmpty(expandEvent)) { + expandEvent = group.getPanelMenu().getExpandEvent(); + } + if (Strings.isNullOrEmpty(expandEvent)) { + expandEvent = DEFAULT_EXPAND_EVENT; + } + return expandEvent; + } + + private String getCollapseEvent(AbstractPanelMenuGroup group) { + String collapseEvent = group.getCollapseEvent(); + if (Strings.isNullOrEmpty(collapseEvent)) { + collapseEvent = group.getPanelMenu().getCollapseEvent(); + } + if (Strings.isNullOrEmpty(collapseEvent)) { + collapseEvent = DEFAULT_COLLAPSE_EVENT; + } + return collapseEvent; + } + @Override protected Map<String, Object> getScriptObjectOptions(FacesContext context, UIComponent component) { AbstractPanelMenuGroup panelMenuGroup = (AbstractPanelMenuGroup) component; @@ -164,8 +190,8 @@ options.put("name", panelMenuGroup.getName()); options.put("mode", panelMenuGroup.getMode()); options.put("disabled", panelMenuGroup.isDisabled()); - options.put("expandEvent", panelMenuGroup.getExpandEvent()); - options.put("collapseEvent", panelMenuGroup.getCollapseEvent()); + options.put("expandEvent", getExpandEvent(panelMenuGroup)); + options.put("collapseEvent", getCollapseEvent(panelMenuGroup)); options.put("expandSingle", panelMenuGroup.isExpandSingle()); options.put("bubbleSelection", panelMenuGroup.isBubbleSelection()); options.put("expanded", panelMenuGroup.isExpanded());

13 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits January 2011