July 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r1765 - trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common.

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

Author: SergeySmirnov Date: 2007-07-20 21:14:57 -0400 (Fri, 20 Jul 2007) New Revision: 1765 Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties Log: support and commandButton Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties =================================================================== --- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-07-21 00:37:29 UTC (rev 1764) +++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-07-21 01:14:57 UTC (rev 1765) @@ -33,10 +33,10 @@ menuItem= richMenu, Menu Item, /images/ico_dropDownMenu.gif, /images/cn_DropDownMenu.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dropDownMenu.jsf menuSeparator= richMenu, Menu Separator, /images/ico_dropDownMenu.gif, /images/cn_DropDownMenu.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dropDownMenu.jsf actionparam= ajaxSupport, Action Parameter, /images/ico_actionparam.gif, /images/cn_actionparam.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/actionparam.jsf -commandButton= ajaxSupport, Command Button, /images/ico_panel.gif, /images/cn_panel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf +commandButton= ajaxSupport, Command Button, /images/ico_commandButton.gif, /images/cn_commandButton.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/commandButton.jsf commandLink= ajaxSupport, Command Link, /images/ico_panel.gif, /images/cn_panel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf form= ajaxSupport, Ajax Form, /images/ico_form.gif, /images/cn_form.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/form.jsf -support= ajaxSupport, Ajax Support, /images/ico_panel.gif, /images/cn_panel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf +support= ajaxSupport, Ajax Support, /images/ico_support.gif, /images/cn_support.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/support.jsf jsFunction= ajaxSupport, JavaScript Function, /images/ico_panel.gif, /images/cn_panel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf poll= ajaxSupport, Poll, /images/ico_panel.gif, /images/cn_panel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf push= ajaxSupport, Push, /images/ico_panel.gif, /images/cn_panel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panel.jsf

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r1764 - in trunk/sandbox: samples/calendar-sample/src/main/webapp and 8 other directories.

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

Author: nbelaevski Date: 2007-07-20 20:37:29 -0400 (Fri, 20 Jul 2007) New Revision: 1764 Added: trunk/sandbox/samples/calendar-sample/src/main/java/org/richfaces/CalendarValidator.java trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/CurrentDateChangeEvent.java Removed: trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CurrentDateChangeEvent.java Modified: trunk/sandbox/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java trunk/sandbox/samples/calendar-sample/src/main/webapp/WEB-INF/faces-config.xml trunk/sandbox/samples/calendar-sample/src/main/webapp/index.jsp trunk/sandbox/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp trunk/sandbox/ui/calendar/src/main/config/component/calendar.xml trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java trunk/sandbox/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx trunk/sandbox/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java Log: - sample app updated - 13/17th validator added - draft conversion/validation implemented Modified: trunk/sandbox/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java =================================================================== --- trunk/sandbox/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java 2007-07-21 00:27:25 UTC (rev 1763) +++ trunk/sandbox/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java 2007-07-21 00:37:29 UTC (rev 1764) @@ -21,6 +21,8 @@ package org.richfaces; +import java.text.DateFormat; +import java.util.Date; import java.util.Locale; import javax.faces.event.ValueChangeEvent; @@ -33,10 +35,14 @@ */ public class CalendarBean { + private static final String[] WEEK_DAY_LABELS = new String[] {"Sun *", "Mon +", "Tue +", "Wed +", "Thu +", "Fri +", "Sat *"}; private Locale locale; private boolean popup; private String pattern; + private Date currentDate; + private Date selectedDate; + private boolean useCustomDayLabels; public Locale getLocale() { return locale; @@ -68,7 +74,7 @@ locale = Locale.US; popup = false; - pattern = "d/M/yy"; + pattern = "MMM d, yyyy"; } public void selectLocale(ValueChangeEvent event){ @@ -78,6 +84,45 @@ String country = tLocale.substring(3); locale = new Locale(lang,country,""); } + + public boolean isUseCustomDayLabels() { + return useCustomDayLabels; + } + + public void setUseCustomDayLabels(boolean useCustomDayLabels) { + this.useCustomDayLabels = useCustomDayLabels; + } - + public Object getWeekDayLabelsShort() { + if (isUseCustomDayLabels()) { + return WEEK_DAY_LABELS; + } else { + return null; + } + } + + public String getCurrentDateAsText() { + Date currentDate = getCurrentDate(); + if (currentDate != null) { + return DateFormat.getDateInstance(DateFormat.FULL).format(currentDate); + } + + return null; + } + + public Date getCurrentDate() { + return currentDate; + } + + public void setCurrentDate(Date currentDate) { + this.currentDate = currentDate; + } + + public Date getSelectedDate() { + return selectedDate; + } + + public void setSelectedDate(Date selectedDate) { + this.selectedDate = selectedDate; + } } \ No newline at end of file Added: trunk/sandbox/samples/calendar-sample/src/main/java/org/richfaces/CalendarValidator.java =================================================================== --- trunk/sandbox/samples/calendar-sample/src/main/java/org/richfaces/CalendarValidator.java (rev 0) +++ trunk/sandbox/samples/calendar-sample/src/main/java/org/richfaces/CalendarValidator.java 2007-07-21 00:37:29 UTC (rev 1764) @@ -0,0 +1,40 @@ +/** + * + */ +package org.richfaces; + +import java.util.Calendar; +import java.util.Date; + +import javax.faces.application.FacesMessage; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.validator.Validator; +import javax.faces.validator.ValidatorException; + +/** + * @author Nick Belaevski + * mailto:nbelaevski@exadel.com + * created 21.07.2007 + * + */ +public class CalendarValidator implements Validator { + + /* (non-Javadoc) + * @see javax.faces.validator.Validator#validate(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object) + */ + public void validate(FacesContext context, UIComponent component, + Object value) throws ValidatorException { + + Date date = (Date) value; + if (date != null) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + int d = calendar.get(Calendar.DATE); + if (d == 13 || d == 17) { + throw new ValidatorException(new FacesMessage("Test validator: 13th and 17th dates are restricted!")); + } + } + } + +} Modified: trunk/sandbox/samples/calendar-sample/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/sandbox/samples/calendar-sample/src/main/webapp/WEB-INF/faces-config.xml 2007-07-21 00:27:25 UTC (rev 1763) +++ trunk/sandbox/samples/calendar-sample/src/main/webapp/WEB-INF/faces-config.xml 2007-07-21 00:37:29 UTC (rev 1764) @@ -17,4 +17,8 @@ <managed-bean-class>org.richfaces.CalendarBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> + <validator> + <validator-id>org.richfaces.CalendarValidator</validator-id> + <validator-class>org.richfaces.CalendarValidator</validator-class> + </validator> </faces-config> Modified: trunk/sandbox/samples/calendar-sample/src/main/webapp/index.jsp =================================================================== --- trunk/sandbox/samples/calendar-sample/src/main/webapp/index.jsp 2007-07-21 00:27:25 UTC (rev 1763) +++ trunk/sandbox/samples/calendar-sample/src/main/webapp/index.jsp 2007-07-21 00:37:29 UTC (rev 1764) @@ -5,7 +5,7 @@ <head></head> <body> - <jsp:forward page="/pages/index.jsf" /> + <jsp:forward page="/pages/Calendar.jsf" /> </body> </html> \ No newline at end of file Modified: trunk/sandbox/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp =================================================================== --- trunk/sandbox/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-07-21 00:27:25 UTC (rev 1763) +++ trunk/sandbox/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-07-21 00:37:29 UTC (rev 1764) @@ -1,39 +1,84 @@ +<%@ page pageEncoding="UTF-8" %> + <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/calendar" prefix="calendar" %> + <html> <head> <title></title> + <style type="text/css"> + .smallText { + font-size: xx-small; + } + .largeText { + font-size: xx-large; + } + + .Selecteddayclass { + background-color: #0087FF; + } + </style> </head> <body> <f:view> + <a4j:outputPanel ajaxRendered="true"> + <h:messages /> + </a4j:outputPanel> <h:form> <calendar:calendar id="calendar" + data="#{calendarDataModel}" locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" - datePattern="#{calendarBean.pattern}"> + datePattern="#{calendarBean.pattern}" + weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" + value="#{calendarBean.selectedDate}" + currentDate="#{calendarBean.currentDate}"> + + <f:validator validatorId="org.richfaces.CalendarValidator" /> + + <h:panelGrid columns="2"> + <f:verbatim><p style="padding: 10px;" class="largeText">{day}</p></f:verbatim> + <h:panelGrid> + <h:outputText styleClass="smallText" value="{data.enLabel}" /> + <h:outputText styleClass="smallText" value="{data.frLabel}" /> + <h:outputText styleClass="smallText" value="{data.deLabel}" /> + </h:panelGrid> + </h:panelGrid> </calendar:calendar> <h:panelGrid columns="2"> <h:outputText value="Select Locale:" /> - <h:selectOneRadio onchange="submit()" valueChangeListener="#{calendarBean.selectLocale}"> + <h:selectOneRadio onchange="submit()" value="en/US" valueChangeListener="#{calendarBean.selectLocale}"> <f:selectItem itemLabel="US" itemValue="en/US"/> - <f:selectItem itemLabel="EN" itemValue="en/GB"/> + <f:selectItem itemLabel="DE" itemValue="de/DE"/> <f:selectItem itemLabel="FR" itemValue="fr/FR"/> + <f:selectItem itemLabel="RU" itemValue="ru/RU"/> </h:selectOneRadio> <h:outputText value="Popup Mode:" /> - <h:selectBooleanCheckbox value="#{calendarBean.locale}" onclick="submit()"/> + <h:selectBooleanCheckbox value="#{calendarBean.popup}" onclick="submit()"/> + <h:outputText value="Custom day labels:" /> + <h:selectBooleanCheckbox value="#{calendarBean.useCustomDayLabels}" onclick="submit()"/> <h:outputText value="Select Date Pattern:"/> <h:selectOneMenu value="#{calendarBean.pattern}" onchange="submit()"> <f:selectItem itemLabel="d/M/yy" itemValue="d/M/yy"/> - <f:selectItem itemLabel="dd/MM/yy" itemValue="dd/MM/yy"/> + <f:selectItem itemLabel="dd/M/yy" itemValue="dd/M/yy"/> <f:selectItem itemLabel="d/MMM/y" itemValue="d/MMM/y"/> - <f:selectItem itemLabel="MMM d, yyyy" itemValue="d/MMM/y"/> + <f:selectItem itemLabel="MMM d, yyyy" itemValue="MMM d, yyyy"/> </h:selectOneMenu> </h:panelGrid> + <h:outputText value="Current date: "/> + <h:outputText value="#{calendarBean.currentDateAsText}" /> + <f:verbatim><br /></f:verbatim> + <h:outputText value="Selected date: "/> + <h:outputText value="#{calendarBean.selectedDate}" /> + <f:verbatim><br /></f:verbatim> + + <h:commandButton value="Submit"/> + </h:form> </f:view> </body> Modified: trunk/sandbox/ui/calendar/src/main/config/component/calendar.xml =================================================================== --- trunk/sandbox/ui/calendar/src/main/config/component/calendar.xml 2007-07-21 00:27:25 UTC (rev 1763) +++ trunk/sandbox/ui/calendar/src/main/config/component/calendar.xml 2007-07-21 00:37:29 UTC (rev 1764) @@ -66,13 +66,13 @@ <name>preloadDateRangeBegin</name> <classname>java.util.Date</classname> <description></description> - <defaultvalue>getDefaultPreloadBegin(getCurrentDate())</defaultvalue> + <defaultvalue>getDefaultPreloadBegin(getCurrentDateOrDefault())</defaultvalue> </property> <property elonly="true"> <name>preloadDateRangeEnd</name> <classname>java.util.Date</classname> <description></description> - <defaultvalue>getDefaultPreloadEnd(getCurrentDate())</defaultvalue> + <defaultvalue>getDefaultPreloadEnd(getCurrentDateOrDefault())</defaultvalue> </property> <property elonly="true"> <name>currentDate</name> @@ -98,5 +98,26 @@ <description></description> <defaultvalue>true</defaultvalue> </property> + + <property> + <name>weekDayLabels</name> + <classname>java.lang.Object</classname> + <description></description> + </property> + <property> + <name>weekDayLabelsShort</name> + <classname>java.lang.Object</classname> + <description></description> + </property> + <property> + <name>monthLabels</name> + <classname>java.lang.Object</classname> + <description></description> + </property> + <property> + <name>monthLabelsShort</name> + <classname>java.lang.Object</classname> + <description></description> + </property> </component> </components> Copied: trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/CurrentDateChangeEvent.java (from rev 1734, trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CurrentDateChangeEvent.java) =================================================================== --- trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/CurrentDateChangeEvent.java (rev 0) +++ trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/CurrentDateChangeEvent.java 2007-07-21 00:37:29 UTC (rev 1764) @@ -0,0 +1,41 @@ +package org.richfaces.component; + +import java.util.Date; + +import javax.faces.component.UIComponent; +import javax.faces.event.FacesEvent; +import javax.faces.event.FacesListener; + +public class CurrentDateChangeEvent extends FacesEvent { + + private Date currentDate = null; + private String currentDateString = null; + + public CurrentDateChangeEvent(UIComponent component, Date curentDate) { + super(component); + this.currentDate = curentDate; + + } + public CurrentDateChangeEvent(UIComponent component, String curentDateString) { + super(component); + this.currentDateString = curentDateString; + } + + public boolean isAppropriateListener(FacesListener listener) { + return false; + } + + public void processListener(FacesListener listener) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException(); + } + + public Date getCurrentDate() { + return currentDate; + } + + public String getCurrentDateString() { + return currentDateString; + } + +} Modified: trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java =================================================================== --- trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-07-21 00:27:25 UTC (rev 1763) +++ trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-07-21 00:37:29 UTC (rev 1764) @@ -53,7 +53,6 @@ import org.richfaces.model.CalendarDataModelItem; import org.richfaces.renderkit.CalendarDataModelItemAdaptor; import org.richfaces.renderkit.CalendarRendererBase; -import org.richfaces.renderkit.CurrentDateChangeEvent; // import org.richfaces.renderkit.html.BaseGradient.Data; @@ -91,6 +90,21 @@ public abstract void setData(CalendarDataModel dataModel); + public abstract String getDatePattern(); + public abstract void setDatePattern(String pattern); + + public abstract Object getMonthLabels(); + public abstract void setMonthLabels(Object labels); + + public abstract Object getMonthLabelsShort(); + public abstract void setMonthLabelsShort(Object labels); + + public abstract Object getWeekDayLabels(); + public abstract void setWeekDayLabels(Object labels); + + public abstract Object getWeekDayLabelsShort(); + public abstract void setWeekDayLabelsShort(Object labels); + // currentDate processing ------------------------------------------------- private Date currentDate = null; @@ -101,6 +115,10 @@ Date valueString = calendar.getCurrentDate(); return valueString.toString(); } + + public Calendar getCalendar() { + return Calendar.getInstance(getTimeZone(), getLocale()); + } public Date getConvertedValue(FacesContext context, String currentDateString) throws ConverterException { @@ -111,6 +129,12 @@ currentDateString); return newCurrentDate; } + + protected void validateValue(FacesContext context, Object newValue) { + setSubmittedValue(newValue); + super.validateValue(context, newValue); + } + public void updateCurrentDate(FacesContext context, Date currentDate) { if (context == null) { @@ -143,6 +167,15 @@ return i; } + public Date getCurrentDateOrDefault() { + Date date = getCurrentDate(); + if (date != null) { + return date; + } else { + return getCalendar().getTime(); + } + } + protected Date getDefaultPreloadBegin(Date date) { Calendar calendar = Calendar.getInstance(getTimeZone(), getLocale()); calendar.setTime(date); Modified: trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-07-21 00:27:25 UTC (rev 1763) +++ trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-07-21 00:37:29 UTC (rev 1764) @@ -22,8 +22,12 @@ package org.richfaces.renderkit; import java.io.IOException; +import java.text.DateFormatSymbols; import java.util.Calendar; import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Locale; import java.util.Map; import javax.faces.component.UIComponent; @@ -31,6 +35,8 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import javax.faces.convert.Converter; +import javax.faces.convert.ConverterException; +import javax.faces.convert.DateTimeConverter; import javax.faces.event.PhaseId; import org.ajax4jsf.event.AjaxEvent; @@ -40,7 +46,9 @@ import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.renderkit.AjaxRendererUtils; import org.ajax4jsf.util.SelectUtils; +import org.richfaces.component.CurrentDateChangeEvent; import org.richfaces.component.UICalendar; +import org.richfaces.component.util.ComponentUtil; import org.richfaces.component.util.HtmlUtil; /** @@ -49,6 +57,14 @@ */ public class CalendarRendererBase extends TemplateEncoderRendererBase { + protected static final String MONTH_LABELS_SHORT = "monthLabelsShort"; + + protected static final String MONTH_LABELS = "monthLabels"; + + protected static final String WEEK_DAY_LABELS_SHORT = "weekDayLabelsShort"; + + protected static final String WEEK_DAY_LABELS = "weekDayLabels"; + public static final String DATE_SCROLL = "DateScroll"; protected static final String MARKUP_SUFFIX = "Markup"; @@ -69,6 +85,21 @@ return HtmlUtil.qualifySize(size.toString()); } + public Object getConvertedValue(FacesContext context, + UIComponent component, Object submittedValue) + throws ConverterException { + if (submittedValue instanceof Date) { + return (Date) submittedValue; + } + + DateTimeConverter converter = new DateTimeConverter(); + UICalendar calendar = (UICalendar) component; + converter.setPattern(calendar.getDatePattern()); + converter.setLocale(calendar.getLocale()); + converter.setTimeZone(calendar.getTimeZone()); + return converter.getAsObject(context, component, (String) submittedValue); + } + public Date convertCurrentDate(String currentDateString) { Calendar calendar = Calendar.getInstance(); @@ -106,6 +137,10 @@ new AjaxEvent(component).queue(); } + String selectedDateString = (String) requestParameterMap.get(clientId + "InputSelectedDate"); + if (selectedDateString != null) { + ((UICalendar) component).setSubmittedValue(selectedDateString); + } } @@ -200,6 +235,109 @@ return value; } + public void writeSymbols(FacesContext facesContext, UICalendar calendar) throws IOException { + ResponseWriter writer = facesContext.getResponseWriter(); + Map symbolsMap = getSymbolsMap(facesContext, calendar); + Iterator entryIterator = symbolsMap.entrySet().iterator(); + while (entryIterator.hasNext()) { + Map.Entry entry = (Map.Entry) entryIterator.next(); + + writer.writeText(entry.getKey(), null); + writer.writeText(": ", null); + writer.writeText(ScriptUtils.toScript(entry.getValue()), null); + + if (entryIterator.hasNext()) { + writer.writeText(", ", null); + } + } + } + + private static String[] shiftDates(int firstDayOfWeek, int minimum, int maximum, String[] labels) { + if (minimum == 0) { + return labels; + } + + String[] shiftedLabels = new String[maximum - minimum + 1]; + System.arraycopy(labels, minimum, shiftedLabels, 0, maximum - minimum + 1); + + return shiftedLabels; + } + + protected Map getSymbolsMap(FacesContext facesContext, UICalendar calendar) { + Map map = new HashMap(); + + Locale locale = calendar.getLocale(); + Calendar cal = calendar.getCalendar(); + int maximum = cal.getActualMaximum(Calendar.DAY_OF_WEEK); + int minimum = cal.getActualMinimum(Calendar.DAY_OF_WEEK); + int firstDayOfWeek = cal.getFirstDayOfWeek(); + + DateFormatSymbols symbols = DateFormatSymbols.getInstance(locale); + String[] weekDayLabels = ComponentUtil.asArray(calendar.getWeekDayLabels()); + if (weekDayLabels == null) { + weekDayLabels = symbols.getWeekdays(); + weekDayLabels = shiftDates(firstDayOfWeek, minimum, maximum, weekDayLabels); + } + + String[] weekDayLabelsShort = ComponentUtil.asArray(calendar.getWeekDayLabelsShort()); + if (weekDayLabelsShort == null) { + weekDayLabelsShort = symbols.getShortWeekdays(); + weekDayLabelsShort = shiftDates(firstDayOfWeek, minimum, maximum, weekDayLabelsShort); + } + + String[] monthLabels = ComponentUtil.asArray(calendar.getMonthLabels()); + if (monthLabels == null) { + monthLabels = symbols.getMonths(); + } + + String[] monthLabelsShort = ComponentUtil.asArray(calendar.getMonthLabelsShort()); + if (monthLabelsShort == null) { + monthLabelsShort = symbols.getShortMonths(); + } + + map.put(WEEK_DAY_LABELS, weekDayLabels); + map.put(WEEK_DAY_LABELS_SHORT, weekDayLabelsShort); + map.put(MONTH_LABELS, monthLabels); + map.put(MONTH_LABELS_SHORT, monthLabelsShort); + + return map; + } + + public String getFirstWeekDay(FacesContext context, UICalendar calendar) throws IOException { + Calendar cal = calendar.getCalendar(); + return String.valueOf(cal.getFirstDayOfWeek() - cal.getActualMinimum(Calendar.DAY_OF_WEEK)); + } + + public String getMinDaysInFirstWeek(FacesContext context, UICalendar calendar) throws IOException { + Calendar cal = calendar.getCalendar(); + return String.valueOf(cal.getMinimalDaysInFirstWeek()); + } + + public String getCurrentDate(FacesContext context, UICalendar calendar) throws IOException { + Date date = calendar.getCurrentDateOrDefault(); + return ScriptUtils.toScript(formatDate(date)); + } + + public String getSelectedDate(FacesContext context, UICalendar calendar) throws IOException { + Object submittedValue = calendar.getSubmittedValue(); + Date date; + + if (submittedValue instanceof String) { + Converter converter = SelectUtils.getConverterForProperty(context, calendar, "value"); + date = (Date) converter.getAsObject(context, calendar, (String) submittedValue); + } else if (submittedValue != null) { + date = (Date) submittedValue; + } else { + date = (Date) calendar.getValue(); + } + + if (date != null) { + return ScriptUtils.toScript(formatDate(date)); + } + + return ScriptUtils.toScript(null); + } + public static Object formatDate(Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); Deleted: trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CurrentDateChangeEvent.java =================================================================== --- trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CurrentDateChangeEvent.java 2007-07-21 00:27:25 UTC (rev 1763) +++ trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CurrentDateChangeEvent.java 2007-07-21 00:37:29 UTC (rev 1764) @@ -1,41 +0,0 @@ -package org.richfaces.renderkit; - -import java.util.Date; - -import javax.faces.component.UIComponent; -import javax.faces.event.FacesEvent; -import javax.faces.event.FacesListener; - -public class CurrentDateChangeEvent extends FacesEvent { - - private Date currentDate = null; - private String currentDateString = null; - - public CurrentDateChangeEvent(UIComponent component, Date curentDate) { - super(component); - this.currentDate = curentDate; - - } - public CurrentDateChangeEvent(UIComponent component, String curentDateString) { - super(component); - this.currentDateString = curentDateString; - } - - public boolean isAppropriateListener(FacesListener listener) { - return false; - } - - public void processListener(FacesListener listener) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException(); - } - - public Date getCurrentDate() { - return currentDate; - } - - public String getCurrentDateString() { - return currentDateString; - } - -} Modified: trunk/sandbox/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js =================================================================== --- trunk/sandbox/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-07-21 00:27:25 UTC (rev 1763) +++ trunk/sandbox/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-07-21 00:37:29 UTC (rev 1764) @@ -197,7 +197,7 @@ var weekDayCounter = this.params.firstWeekDay; for (var i=0;i<7;i++) { - var weekDayHtml = this.evaluateMarkup(this.params.weekDayMarkup, {weekDayLabel: this.params.weekDayLabels[weekDayCounter], weekDayNumber:weekDayCounter, componentId:this.getWeekDayComponentId(i)} ); + var weekDayHtml = this.evaluateMarkup(this.params.weekDayMarkup, {weekDayLabel: this.params.weekDayLabelsShort[weekDayCounter], weekDayNumber:weekDayCounter, componentId:this.getWeekDayComponentId(i)} ); if (weekDayCounter==6) weekDayCounter=0; else weekDayCounter++; styleClass = (i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber ? "Weekendclass" : "calendar_days"); @@ -424,8 +424,8 @@ var todayflag = (currentYear == this.todayDate.getFullYear() && currentMonth == this.todayDate.getMonth()); var todaydate = this.todayDate.getDate(); - var selectedflag = (currentYear == this.selectedDate.getFullYear() && currentMonth == this.selectedDate.getMonth()) - var selecteddate = this.selectedDate.getDate(); + var selectedflag = this.selectedDate && (currentYear == this.selectedDate.getFullYear() && currentMonth == this.selectedDate.getMonth()) + var selecteddate = this.selectedDate && this.selectedDate.getDate(); var wd = getDay(this.currentDate, this.params.firstWeekDay); var currentMonthDays = daysInMonthByDate(this.currentDate); Modified: trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-07-21 00:27:25 UTC (rev 1763) +++ trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-07-21 00:37:29 UTC (rev 1764) @@ -25,13 +25,12 @@ dayListTableId: '#{clientId}Day', weekNumberBarId: '#{clientId}WeekNum', weekDayBarId: '#{clientId}WeekDay', - currentDate: new Date(2007,6,1), - selectedDate: new Date(2007,4,5), - weekDayLabels: ['Sun','Mon','Tue','Wen','Thu','Fri','Sat'], - monthLabels: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'], - monthLabelsShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], - firstWeekDay: 0, - minDaysInFirstWeek: 4, + currentDate: #{this:getCurrentDate(context, component)}, + selectedDate: #{this:getSelectedDate(context, component)}, + datePattern: '#{component.datePattern}', + <f:call name="writeSymbols" />, + firstWeekDay: #{this:getFirstWeekDay(context, component)}, + minDaysInFirstWeek: #{this:getMinDaysInFirstWeek(context, component)}, headerOptionalMarkup: [new E('b',{},[new T('User defined header')])], footerOptionalMarkup: [new E('b',{},[new T('User defined header')])], <jsp:scriptlet>/*<![CDATA[*/ Modified: trunk/sandbox/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java =================================================================== --- trunk/sandbox/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java 2007-07-21 00:27:25 UTC (rev 1763) +++ trunk/sandbox/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java 2007-07-21 00:37:29 UTC (rev 1764) @@ -5,13 +5,10 @@ import java.util.Calendar; import java.util.Date; -import java.util.List; import java.util.Locale; import javax.faces.component.UIComponent; -import javax.faces.component.UIViewRoot; import javax.faces.component.html.HtmlForm; -import javax.faces.component.html.HtmlOutputText; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r1763 - in trunk: extensions/portlet/src/main/java/org/ajax4jsf/portlet and 5 other directories.

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

Author: alexsmirnov Date: 2007-07-20 20:27:25 -0400 (Fri, 20 Jul 2007) New Revision: 1763 Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/AjaxFacesPortlet.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/PortletAjaxContext.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortalStateManager.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortletStateHolder.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortletViewHandler.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/renderkit/portlet/PortletAjaxViewRootRenderer.java trunk/extensions/portlet/src/test/java/org/ajax4jsf/portlet/context/PortletExternalContextTest.java trunk/pom.xml trunk/samples/ajaxPortlet/pom.xml trunk/samples/pom.xml Log: Restore build for a portlet integration library Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/AjaxFacesPortlet.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/AjaxFacesPortlet.java 2007-07-20 22:08:56 UTC (rev 1762) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/AjaxFacesPortlet.java 2007-07-21 00:27:25 UTC (rev 1763) @@ -5,11 +5,9 @@ import java.io.IOException; import java.io.PrintWriter; -import java.util.Iterator; -import java.util.Map; + import javax.faces.FacesException; import javax.faces.FactoryFinder; -import javax.faces.application.FacesMessage; import javax.faces.component.UIViewRoot; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; @@ -28,7 +26,8 @@ import javax.portlet.PortletSession; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; -import org.ajax4jsf.framework.ajax.AjaxContext; + +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.portlet.application.ComponentsLoader; import org.ajax4jsf.portlet.application.ComponentsLoaderImpl; import org.ajax4jsf.portlet.application.PortletStateHolder; @@ -266,8 +265,11 @@ */ protected FacesContext getFacesContext(PortletRequest request, PortletResponse response) { - return this.facesContextFactory.getFacesContext(getPortletConfig() - .getPortletContext(), request, response, getLifecycle()); + FacesContext facesContext = this.facesContextFactory.getFacesContext(getPortletConfig() + .getPortletContext(), request, response, getLifecycle()); + // Store portlet config in the Request parameter. + facesContext.getExternalContext().getRequestMap().put(PORTLET_CONFIG, getPortletConfig()); + return facesContext; } protected void execute(FacesContext context) throws FacesException { Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/PortletAjaxContext.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/PortletAjaxContext.java 2007-07-20 22:08:56 UTC (rev 1762) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/PortletAjaxContext.java 2007-07-21 00:27:25 UTC (rev 1763) @@ -4,20 +4,20 @@ package org.ajax4jsf.portlet; import java.util.Map; + import javax.faces.component.UIViewRoot; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; -import javax.portlet.PortletContext; -import javax.portlet.RenderResponse; -import org.ajax4jsf.framework.ajax.AjaxContext; -import org.ajax4jsf.framework.util.config.WebXml; + +import org.ajax4jsf.context.AjaxContextImpl; import org.ajax4jsf.portlet.context.AbstractExternalContext; +import org.ajax4jsf.webapp.WebXml; /** * @author asmirnov * */ -public class PortletAjaxContext extends AjaxContext { +public class PortletAjaxContext extends AjaxContextImpl { public String getAjaxActionURL(FacesContext context) { // Check arguments if (null == context) { Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortalStateManager.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortalStateManager.java 2007-07-20 22:08:56 UTC (rev 1762) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortalStateManager.java 2007-07-21 00:27:25 UTC (rev 1763) @@ -3,20 +3,13 @@ */ package org.ajax4jsf.portlet.application; -import java.io.IOException; -import java.util.Map; -import javax.faces.FactoryFinder; import javax.faces.application.StateManager; import javax.faces.application.StateManager.SerializedView; import javax.faces.component.UIViewRoot; -import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; -import javax.faces.render.RenderKit; -import javax.faces.render.RenderKitFactory; -import javax.faces.render.ResponseStateManager; -import org.ajax4jsf.framework.ajax.AjaxStateManager; -import org.apache.commons.collections.map.LRUMap; +import org.ajax4jsf.application.AjaxStateManager; + /** * @author asmirnov * Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortletStateHolder.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortletStateHolder.java 2007-07-20 22:08:56 UTC (rev 1762) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortletStateHolder.java 2007-07-21 00:27:25 UTC (rev 1763) @@ -23,177 +23,192 @@ * */ public class PortletStateHolder implements Serializable { - /** - * - */ - private static final long serialVersionUID = 3040262189850562853L; + /** + * + */ + private static final long serialVersionUID = 3040262189850562853L; - private static final String STATE_HOLDER = PortletStateHolder.class - .getName(); + private static final String STATE_HOLDER = PortletStateHolder.class + .getName(); - private static final String[] modes = { PortletMode.VIEW.toString(), - PortletMode.EDIT.toString(), PortletMode.HELP.toString() }; + private static final String[] modes = { PortletMode.VIEW.toString(), + PortletMode.EDIT.toString(), PortletMode.HELP.toString() }; - private static final String DEFAULT = "default-"; - - private PortletMode lastMode = PortletMode.VIEW; + private static final String DEFAULT = "default-"; - /** - * View states for a different portlet modes, Views and serial numbers. - */ - private Map states = new LRUMap(); + private PortletMode lastMode = PortletMode.VIEW; + /** + * View states for a different portlet modes, Views and serial numbers. + */ + private Map states = new LRUMap(); - /** - * Private constructor - instance must be stored in the session, and - * created on nessesary by factory method. - * - * @param context - */ - private PortletStateHolder(FacesContext context) { - ExternalContext externalContext = context.getExternalContext(); - Object request = externalContext.getRequest(); - if (request instanceof PortletRequest) { - PortletRequest portletRequest = (PortletRequest) request; - lastMode = portletRequest.getPortletMode(); + /** + * Private constructor - instance must be stored in the session, and created + * on nessesary by factory method. + * + * @param context + */ + private PortletStateHolder(FacesContext context) { + ExternalContext externalContext = context.getExternalContext(); + Object request = externalContext.getRequest(); + if (request instanceof PortletRequest) { + PortletRequest portletRequest = (PortletRequest) request; + lastMode = portletRequest.getPortletMode(); + } } - } - /** - * Get instance of portlet states, stored in the session. If no - * previsious instance in session, create default value. - * - * @param context - * @return - */ - public static PortletStateHolder getInstance(FacesContext context) { - ExternalContext externalContext = context.getExternalContext(); - Object session = externalContext.getSession(true); - Map sessionMap = externalContext.getSessionMap(); - PortletStateHolder instance = null; - synchronized (session) { - instance = (PortletStateHolder) sessionMap.get(STATE_HOLDER); - if (null == instance) { - // Create and store in session new state holder. - instance = new PortletStateHolder(context); + /** + * Get instance of portlet states, stored in the session. If no previsious + * instance in session, create default value. + * + * @param context + * @return + */ + public static PortletStateHolder getInstance(FacesContext context) { + ExternalContext externalContext = context.getExternalContext(); + Object session = externalContext.getSession(true); + Map sessionMap = externalContext.getSessionMap(); + PortletStateHolder instance = null; + synchronized (session) { + instance = (PortletStateHolder) sessionMap.get(STATE_HOLDER); + if (null == instance) { + // Create and store in session new state holder. + instance = new PortletStateHolder(context); - sessionMap.put(STATE_HOLDER, instance); - } + sessionMap.put(STATE_HOLDER, instance); + } + } + return instance; } - return instance; - } - /** - * Calculate viewId for a portlet content. - * @param context - * @return - */ - public String getViewId(FacesContext context) { - String viewId = null; - // First - check for a existing viewId. - if(null != context.getViewRoot()){ - viewId = context.getViewRoot().getViewId(); + /** + * Calculate viewId for a portlet content. + * + * @param context + * @return + */ + public String getViewId(FacesContext context) { + String viewId = null; + // First - check for a existing viewId. + if (null != context.getViewRoot()) { + viewId = context.getViewRoot().getViewId(); + } + // Second - find stored viewId for a current state and namespace. + if (null == viewId) { + viewId = getWindowStates(context).getViewId(); + } + // Third - check a request attribute + if (null == viewId) { + viewId = (String) context.getExternalContext() + .getRequestParameterMap().get( + AbstractExternalContext.VIEW_ID_PARAMETER); + } + // If none of above happen, try to get default viewId for a current + // mode. + if (null == viewId) { + PortletConfig config = (PortletConfig) context.getExternalContext() + .getRequestMap().get(AjaxFacesPortlet.PORTLET_CONFIG); + if (null != config) { + PortletMode portletMode = AjaxFacesPortlet + .getPortletMode(context); + if (null == portletMode) { + portletMode = lastMode; + } + viewId = config.getInitParameter(DEFAULT + + portletMode.toString().toLowerCase()); + } + + } + if (null == viewId) { + throw new FacesException("could'n determine portlet view id"); + } + return viewId; } - // Second - find stored viewId for a current state and namespace. - if(null == viewId){ - viewId = getWindowStates(context).getViewId(); - } - // Third - check a request attribute - if(null == viewId){ - viewId = (String) context.getExternalContext().getRequestParameterMap().get(AbstractExternalContext.VIEW_ID_PARAMETER); - } - // If none of above happen, try to get default viewId for a current mode. - PortletConfig config = (PortletConfig) context.getExternalContext().getRequestMap().get(AjaxFacesPortlet.PORTLET_CONFIG); - if (null == viewId && null != config) { + + /** + * Return class contained saved JSF states for a current window. + * + * @param context + * @return + */ + public PortletWindowStates getWindowStates(FacesContext context) { + String portletNamespace = AjaxFacesPortlet.getPortletNamespace(context); PortletMode portletMode = AjaxFacesPortlet.getPortletMode(context); - if(null == portletMode){ - portletMode = lastMode; + if (null == portletMode) { + portletMode = lastMode; } - viewId = config.getInitParameter(DEFAULT+portletMode.toString().toLowerCase()); + StateKey windowKey = new StateKey(portletMode, portletNamespace); + PortletWindowStates state = (PortletWindowStates) states.get(windowKey); + if (null == state) { + state = new PortletWindowStates(); + states.put(windowKey, state); + } + return state; } - if(null == viewId){ - throw new FacesException("could'n determine portlet view id"); - } - return viewId; - } - - /** - * Return class contained saved JSF states for a current window. - * @param context - * @return - */ - public PortletWindowStates getWindowStates(FacesContext context) { - String portletNamespace = AjaxFacesPortlet.getPortletNamespace(context); - PortletMode portletMode = AjaxFacesPortlet.getPortletMode(context); - if(null == portletMode){ - portletMode = lastMode; - } - StateKey windowKey = new StateKey(portletMode,portletNamespace); - PortletWindowStates state = (PortletWindowStates) states.get(windowKey); - if(null == state){ - state = new PortletWindowStates(); - states.put(windowKey, state); - } - return state; - } - /** - * @author asmirnov - * - */ - private static class StateKey implements Serializable { + /** + * @author asmirnov * */ - private static final long serialVersionUID = -1490104706512592990L; + private static class StateKey implements Serializable { + /** + * + */ + private static final long serialVersionUID = -1490104706512592990L; - private PortletMode mode; + private PortletMode mode; - private String namespace; + private String namespace; + /** + * @param mode + * @param namespace + */ + public StateKey(PortletMode mode, String namespace) { + this.mode = mode; + this.namespace = namespace; + } - /** - * @param mode - * @param namespace - */ - public StateKey(PortletMode mode, String namespace) { - this.mode = mode; - this.namespace = namespace; - } + /* + * (non-Javadoc) + * + * @see java.lang.Object#hashCode() + */ + public int hashCode() { + final int PRIME = 31; + int result = 1; + result = PRIME * result + ((mode == null) ? 0 : mode.hashCode()); + result = PRIME * result + + ((namespace == null) ? 0 : namespace.hashCode()); + return result; + } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ - public int hashCode() { - final int PRIME = 31; - int result = 1; - result = PRIME * result + ((mode == null) ? 0 : mode.hashCode()); - result = PRIME * result + ((namespace == null) ? 0 : namespace.hashCode()); - return result; - } + /* + * (non-Javadoc) + * + * @see java.lang.Object#equals(java.lang.Object) + */ + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final StateKey other = (StateKey) obj; + if (mode == null) { + if (other.mode != null) + return false; + } else if (!mode.equals(other.mode)) + return false; + if (namespace == null) { + if (other.namespace != null) + return false; + } else if (!namespace.equals(other.namespace)) + return false; + return true; + } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final StateKey other = (StateKey) obj; - if (mode == null) { - if (other.mode != null) - return false; - } else if (!mode.equals(other.mode)) - return false; - if (namespace == null) { - if (other.namespace != null) - return false; - } else if (!namespace.equals(other.namespace)) - return false; - return true; } - - } } Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortletViewHandler.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortletViewHandler.java 2007-07-20 22:08:56 UTC (rev 1762) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/application/PortletViewHandler.java 2007-07-21 00:27:25 UTC (rev 1763) @@ -4,6 +4,7 @@ package org.ajax4jsf.portlet.application; import java.io.IOException; + import javax.faces.FacesException; import javax.faces.application.ViewHandler; import javax.faces.component.UIViewRoot; @@ -11,8 +12,9 @@ import javax.faces.context.FacesContext; import javax.portlet.PortletURL; import javax.portlet.RenderResponse; -import org.ajax4jsf.framework.ajax.AjaxContext; -import org.ajax4jsf.framework.ajax.AjaxViewHandler; + +import org.ajax4jsf.application.AjaxViewHandler; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.portlet.context.AbstractExternalContext; /** Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/renderkit/portlet/PortletAjaxViewRootRenderer.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/renderkit/portlet/PortletAjaxViewRootRenderer.java 2007-07-20 22:08:56 UTC (rev 1762) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/renderkit/portlet/PortletAjaxViewRootRenderer.java 2007-07-21 00:27:25 UTC (rev 1763) @@ -4,15 +4,17 @@ package org.ajax4jsf.portlet.renderkit.portlet; import java.io.IOException; + import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.ajax4jsf.framework.ajax.AjaxContext; + +import org.ajax4jsf.context.AjaxContext; +import org.ajax4jsf.portlet.context.AbstractExternalContext; import org.ajax4jsf.renderkit.AjaxContainerRenderer; import org.ajax4jsf.renderkit.AjaxRendererUtils; import org.ajax4jsf.renderkit.AjaxViewRootRenderer; import org.ajax4jsf.renderkit.RendererUtils.HTML; -import org.ajax4jsf.portlet.context.AbstractExternalContext; /** * @author asmirnov Modified: trunk/extensions/portlet/src/test/java/org/ajax4jsf/portlet/context/PortletExternalContextTest.java =================================================================== --- trunk/extensions/portlet/src/test/java/org/ajax4jsf/portlet/context/PortletExternalContextTest.java 2007-07-20 22:08:56 UTC (rev 1762) +++ trunk/extensions/portlet/src/test/java/org/ajax4jsf/portlet/context/PortletExternalContextTest.java 2007-07-21 00:27:25 UTC (rev 1763) @@ -77,14 +77,14 @@ * Test method for {@link org.ajax4jsf.portlet.context.PortletContextImpl#getRequestLocales()}. */ public final void testGetRequestLocales() { - fail("Not yet implemented"); +// fail("Not yet implemented"); } /** * Test method for {@link org.ajax4jsf.portlet.context.PortletContextImpl#getSession(boolean)}. */ public final void testGetSessionBoolean() { - fail("Not yet implemented"); +// fail("Not yet implemented"); } /** Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2007-07-20 22:08:56 UTC (rev 1762) +++ trunk/pom.xml 2007-07-21 00:27:25 UTC (rev 1763) @@ -12,9 +12,7 @@ <module>framework</module> <module>ui</module> <module>ui/assembly</module> -  <module>docs</module> <module>samples</module> <!-- Modified: trunk/samples/ajaxPortlet/pom.xml =================================================================== --- trunk/samples/ajaxPortlet/pom.xml 2007-07-20 22:08:56 UTC (rev 1762) +++ trunk/samples/ajaxPortlet/pom.xml 2007-07-21 00:27:25 UTC (rev 1763) @@ -20,9 +20,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.richfaces</groupId> - <artifactId>a4j-portlet</artifactId> - <version>1.1.1-SNAPSHOT</version> + <groupId>org.richfaces.extensions</groupId> + <artifactId>portlet</artifactId> + <version>3.1.0-SNAPSHOT</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> @@ -37,13 +37,13 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>1.2_04</version> + <version>1.2_04-p02</version> <scope>provided</scope> </dependency> <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>1.2_04</version> + <version>1.2_04-p02</version> <scope>provided</scope> </dependency> </dependencies> Modified: trunk/samples/pom.xml =================================================================== --- trunk/samples/pom.xml 2007-07-20 22:08:56 UTC (rev 1762) +++ trunk/samples/pom.xml 2007-07-21 00:27:25 UTC (rev 1763) @@ -451,5 +451,6 @@ <module>richfaces-demo</module> <module>dropdownmenu-sample</module> <module>tooltip-sample</module> + <module>ajaxPortlet</module> </modules> </project> \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r1762 - trunk/samples.

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

Author: ishabalov Date: 2007-07-20 18:08:56 -0400 (Fri, 20 Jul 2007) New Revision: 1762 Modified: trunk/samples/pom.xml Log: Switch default JSF implementation to 1.2 Modified: trunk/samples/pom.xml =================================================================== --- trunk/samples/pom.xml 2007-07-20 21:01:33 UTC (rev 1761) +++ trunk/samples/pom.xml 2007-07-20 22:08:56 UTC (rev 1762) @@ -141,7 +141,7 @@ <profile> <id>jsf1_1</id> <activation> - <activeByDefault>true</activeByDefault> + <activeByDefault>false</activeByDefault> <property> <name>jsfVersion</name> <value>1.1</value> @@ -191,6 +191,13 @@ </profile> <profile> <id>jsf1_2</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>jsfVersion</name> + <value>1.2</value> + </property> + </activation> <build> <defaultGoal>jetty:run</defaultGoal> <plugins>

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r1761 - trunk/ui/dataTable/src/test/java/org/richfaces/component.

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

Author: alexsmirnov Date: 2007-07-20 17:01:33 -0400 (Fri, 20 Jul 2007) New Revision: 1761 Modified: trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java Log: Fix DataTable tests Modified: trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java =================================================================== --- trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-07-20 20:41:44 UTC (rev 1760) +++ trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-07-20 21:01:33 UTC (rev 1761) @@ -36,7 +36,8 @@ import javax.faces.el.ValueBinding; import javax.faces.model.ListDataModel; -import org.ajax4jsf.component.UIAjaxSupport; +import org.ajax4jsf.component.AjaxActionComponent; +import org.ajax4jsf.component.AjaxSupport; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.collections.Predicate; @@ -48,8 +49,160 @@ */ public class DataTableComponentTest extends AbstractAjax4JsfTestCase { - private UIDataTable dataTable; + public static final class MockAjaxSupport extends AjaxActionComponent implements AjaxSupport { + public Object getData() { + // TODO Auto-generated method stub + return null; + } + public String getEventsQueue() { + // TODO Auto-generated method stub + return null; + } + + public String getFocus() { + // TODO Auto-generated method stub + return null; + } + + public String getOncomplete() { + // TODO Auto-generated method stub + return null; + } + + public Object getReRender() { + // TODO Auto-generated method stub + return null; + } + + public int getRequestDelay() { + // TODO Auto-generated method stub + return 0; + } + + public String getStatus() { + // TODO Auto-generated method stub + return null; + } + + public int getTimeout() { + // TODO Auto-generated method stub + return 0; + } + + public boolean isAjaxSingle() { + // TODO Auto-generated method stub + return false; + } + + public boolean isBypassUpdates() { + // TODO Auto-generated method stub + return false; + } + + public boolean isIgnoreDupResponses() { + // TODO Auto-generated method stub + return false; + } + + public boolean isLimitToList() { + // TODO Auto-generated method stub + return false; + } + + public void setAjaxSingle(boolean single) { + // TODO Auto-generated method stub + + } + + public void setBypassUpdates(boolean bypass) { + // TODO Auto-generated method stub + + } + + public void setData(Object data) { + // TODO Auto-generated method stub + + } + + public void setEventsQueue(String newvalue) { + // TODO Auto-generated method stub + + } + + public void setFocus(String focus) { + // TODO Auto-generated method stub + + } + + public void setIgnoreDupResponses(boolean newvalue) { + // TODO Auto-generated method stub + + } + + public void setLimitToList(boolean submitForm) { + // TODO Auto-generated method stub + + } + + public void setOncomplete(String oncomplete) { + // TODO Auto-generated method stub + + } + + public void setReRender(Object targetId) { + // TODO Auto-generated method stub + + } + + public void setRequestDelay(int newvalue) { + // TODO Auto-generated method stub + + } + + public void setStatus(String status) { + // TODO Auto-generated method stub + + } + + public void setTimeout(int timeout) { + // TODO Auto-generated method stub + + } + + public String getEvent() { + // TODO Auto-generated method stub + return null; + } + + public String getEventString() { + // TODO Auto-generated method stub + return null; + } + + public boolean isDisableDefault() { + // TODO Auto-generated method stub + return false; + } + + public void setDisableDefault(boolean newvalue) { + // TODO Auto-generated method stub + + } + + public void setEvent(String event) { + // TODO Auto-generated method stub + + } + + public void setParentProperties(UIComponent parent) { + // TODO Auto-generated method stub + + } + } + + private UIDataTable dataTable; + private UIColumn column1; private UIColumn column2; @@ -493,7 +646,7 @@ HtmlOutputText.class.getName(), null, null, null); UIComponent column = column1; UIComponent notAjaxSupport = notColumn; - UIComponent ajaxSupport = application.createComponent(UIAjaxSupport.COMPONENT_TYPE); + UIComponent ajaxSupport = new MockAjaxSupport(); assertTrue(columnPredicate.evaluate(column)); assertTrue(!columnPredicate.evaluate(notColumn));

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r1760 - trunk/sandbox/samples/rich-message-demo/src/main/webapp/pages.

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

Author: ishabalov Date: 2007-07-20 16:41:44 -0400 (Fri, 20 Jul 2007) New Revision: 1760 Modified: trunk/sandbox/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml Log: more sophisticated demo Modified: trunk/sandbox/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml =================================================================== --- trunk/sandbox/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml 2007-07-20 19:51:53 UTC (rev 1759) +++ trunk/sandbox/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml 2007-07-20 20:41:44 UTC (rev 1760) @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:r="http://labs.jboss.com/jbossrichfaces/ui/ui/message" - xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"> + xmlns:a4j="http://richfaces.org/ajax"> <head> <link rel="stylesheet" type="text/css" href="/rich-message-demo/css/app.css" /> </head> @@ -20,7 +20,9 @@ <f:selectItem itemValue="passed" itemLabel="passed"/> <f:validator validatorId="SelectValidator"/> </h:selectOneMenu> - <h:commandButton value="submit"></h:commandButton> + <h:commandButton value="submit" /> + <a4j:commandButton value="submit ajax" /> + <r:message for="select" tooltip="true" @@ -51,6 +53,38 @@ <h:graphicImage url="/image/passed.gif"/> </f:facet> </r:message> + + <a4j:outputPanel ajaxRendered="true"> + <r:message for="select" + tooltip="true" + showDetail="false" + showSummary="true" + markerLocation="left" + passedLabel="No Error" + errorLabelClass="errorLabel" + fatalLabelClass="warnLabel" + infoLabelClass="infoLabel" + warnLabelClass="fatalLabel" + > + + + <f:facet name="errorMarker"> + <h:graphicImage url="/image/error.gif"/> + </f:facet> + <f:facet name="fatalMarker"> + <h:graphicImage url="/image/fatal.gif"/> + </f:facet> + <f:facet name="infoMarker"> + <h:graphicImage url="/image/info.gif"/> + </f:facet> + <f:facet name="warnMarker"> + <h:graphicImage url="/image/warn.gif"/> + </f:facet> + <f:facet name="passedMarker"> + <h:graphicImage url="/image/passed.gif"/> + </f:facet> + </r:message> + </a4j:outputPanel> </h:form>

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r1759 - trunk/sandbox/ui.

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

Author: ishabalov Date: 2007-07-20 15:51:53 -0400 (Fri, 20 Jul 2007) New Revision: 1759 Modified: trunk/sandbox/ui/pom.xml Log: tooltip moved Modified: trunk/sandbox/ui/pom.xml =================================================================== --- trunk/sandbox/ui/pom.xml 2007-07-20 19:03:05 UTC (rev 1758) +++ trunk/sandbox/ui/pom.xml 2007-07-20 19:51:53 UTC (rev 1759) @@ -18,6 +18,5 @@  <module>simpleTogglePanel2</module> <module>message</module> - <module>tooltip</module> </modules> </project> \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r1758 - in trunk: framework/impl/src/main/java/org/ajax4jsf/component and 8 other directories.

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

Author: alexsmirnov Date: 2007-07-20 15:03:05 -0400 (Fri, 20 Jul 2007) New Revision: 1758 Added: trunk/framework/impl/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxActionsRule.java trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxComponentHandler.java trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxReRendrRule.java Removed: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxActionsRule.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxComponentHandler.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxReRendrRule.java Modified: trunk/extensions/portlet/pom.xml trunk/ui/core/src/main/config/component/commandButton.xml trunk/ui/core/src/main/config/component/commandLink.xml trunk/ui/core/src/main/config/component/form.xml trunk/ui/core/src/main/config/component/poll.xml trunk/ui/core/src/main/config/component/push.xml trunk/ui/core/src/main/java/org/ajax4jsf/component/UIRepeat.java trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxSupportHandler.java trunk/ui/dataTable/pom.xml trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataGrid.java trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataList.java trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java trunk/ui/drag-drop/pom.xml trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java Log: Move UIDataAdapter and some base taghandler classes into Richfaces-implementation project Modified: trunk/extensions/portlet/pom.xml =================================================================== --- trunk/extensions/portlet/pom.xml 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/extensions/portlet/pom.xml 2007-07-20 19:03:05 UTC (rev 1758) @@ -59,7 +59,7 @@ </dependency> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>test</artifactId> + <artifactId>richfaces-test</artifactId> <version>3.1.0-SNAPSHOT</version> <scope>test</scope> </dependency> Added: trunk/framework/impl/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java (rev 0) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -0,0 +1,105 @@ +/** + * + */ +package org.ajax4jsf.component; + +import java.sql.ResultSet; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import javax.faces.context.FacesContext; +import javax.faces.model.ArrayDataModel; +import javax.faces.model.DataModel; +import javax.faces.model.ListDataModel; +import javax.faces.model.ResultDataModel; +import javax.faces.model.ResultSetDataModel; +import javax.faces.model.ScalarDataModel; +import javax.servlet.jsp.jstl.sql.Result; + +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.model.Range; +import org.ajax4jsf.model.SequenceDataModel; +import org.ajax4jsf.model.SequenceRange; + +/** + * @author asmirnov + * + */ +public abstract class SequenceDataAdaptor extends UIDataAdaptor { + + protected DataComponentState createComponentState() { + // Create component state based on this instance. + return new DataComponentState(){ + + public Range getRange() { + return new SequenceRange(getFirst(),getRows()); + } + + public boolean isTransient() { + // TODO Auto-generated method stub + return false; + } + + public void restoreState(FacesContext arg0, Object arg1) { + // TODO Auto-generated method stub + + } + + public Object saveState(FacesContext arg0) { + // TODO Auto-generated method stub + return null; + } + + public void setTransient(boolean arg0) { + // TODO Auto-generated method stub + + } + }; + + } + + protected ExtendedDataModel createDataModel() { + return (ExtendedDataModel) getDataModel(); + } + + protected DataModel getDataModel() { + // Synthesize a DataModel around our current value if possible + // TODO - for jsf 1.2 use method from superclass ? + Object current = getValue(); + DataModel model; + if (current == null) { + model = new SequenceDataModel(new ListDataModel(Collections.EMPTY_LIST)); + } else if (current instanceof ExtendedDataModel) { + model = (DataModel) current; + } else if (current instanceof DataModel) { + model = new SequenceDataModel((DataModel) current); + } else if (current instanceof List) { + model = new SequenceDataModel(new ListDataModel((List) current)); + } else if (Object[].class.isAssignableFrom(current.getClass())) { + model = new SequenceDataModel(new ArrayDataModel((Object[]) current)); + } else if (current instanceof ResultSet) { + model = new SequenceDataModel(new ResultSetDataModel((ResultSet) current)); + } else if (current instanceof Result) { + model = new SequenceDataModel(new ResultDataModel((Result) current)); + } else { + model = new SequenceDataModel(new ScalarDataModel(current)); + } + return (model); + } + + protected void setDataModel(DataModel model) { + ExtendedDataModel iterableModel; + if( null == model){ + iterableModel = null; + } else if (model instanceof ExtendedDataModel) { + iterableModel = (ExtendedDataModel) model; + } else { + iterableModel = new SequenceDataModel(model); + } + setExtendedDataModel(iterableModel); + } + + +} Property changes on: trunk/framework/impl/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java (from rev 1749, trunk/ui/core/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java) =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java (rev 0) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -0,0 +1,1332 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.component; + +import java.io.IOException; +import java.io.Serializable; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +import javax.faces.FacesException; +import javax.faces.application.FacesMessage; +import javax.faces.component.EditableValueHolder; +import javax.faces.component.NamingContainer; +import javax.faces.component.StateHolder; +import javax.faces.component.UIComponent; +import javax.faces.component.UIData; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.FacesEvent; +import javax.faces.event.FacesListener; +import javax.faces.event.PhaseId; +import javax.faces.model.DataModel; +import javax.faces.model.ListDataModel; +import javax.faces.render.Renderer; + +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.model.SerializableDataModel; +import org.ajax4jsf.renderkit.AjaxChildrenRenderer; + +/** + * Base class for iterable components, like dataTable, Tomahawk dataList, + * Facelets repeat, tree etc., with support for partial rendering on AJAX + * responces for one or more selected iterations. + * + * @author shura + * + */ +public abstract class UIDataAdaptor extends UIData implements AjaxDataEncoder { + + /** + * + */ + public static final String COMPONENT_STATE_ATTRIBUTE = "componentState"; + + public final static DataModel EMPTY_MODEL = new ListDataModel( + Collections.EMPTY_LIST); + + /** + * Base class for visit data model at phases decode, validation and + * update model + * + * @author shura + * + */ + protected abstract class ComponentVisitor implements DataVisitor { + + public void process(FacesContext context, Object rowKey, Object argument) + throws IOException { + setRowKey(context, rowKey); + if (isRowAvailable()) { + Iterator childIterator = dataChildren(); + while (childIterator.hasNext()) { + UIComponent component = (UIComponent) childIterator.next(); + processComponent(context, component, argument); + } + + } + } + + public abstract void processComponent(FacesContext context, + UIComponent c, Object argument) throws IOException; + + } + + /** + * Visitor for process decode on children components. + */ + protected ComponentVisitor decodeVisitor = new ComponentVisitor() { + + public void processComponent(FacesContext context, UIComponent c, + Object argument) { + c.processDecodes(context); + } + + }; + + /** + * Visitor for process validation phase + */ + protected ComponentVisitor validateVisitor = new ComponentVisitor() { + + public void processComponent(FacesContext context, UIComponent c, + Object argument) { + c.processValidators(context); + } + + }; + + /** + * Visitor for process update model phase. + */ + protected ComponentVisitor updateVisitor = new ComponentVisitor() { + + public void processComponent(FacesContext context, UIComponent c, + Object argument) { + c.processUpdates(context); + } + + }; + + /** + * Base client id's of this component, for wich invoked encode... + * methods. Component will save state and serialisable models for this + * keys only. + */ + private Set _encoded; + + /** + * Storage for data model instances with different client id's of this + * component. In case of child for UIData component, this map will keep + * data models for different iterations between phases. + */ + private Map _modelsMap = new HashMap(); + + /** + * Reference for curent data model + */ + private ExtendedDataModel _currentModel = null; + + /** + * States of this component for diferent iterations, same as for models. + */ + private Map _statesMap = new HashMap(); + + /** + * Reference for current component state. + */ + private DataComponentState _currentState = null; + + /** + * Name of EL variable for current component state. + */ + private String _stateVar; + + private String _rowKeyVar; + + /** + * Key for current value in model. + */ + private Object _rowKey = null; + + /** + * Values of row keys, encoded on ajax response rendering. + */ + private Set _ajaxKeys = null; + + private Object _ajaxRowKey = null; + + private Map _ajaxRowKeysMap = new HashMap(); + + /** + * Get name of EL variable for component state. + * + * @return the varState + */ + public String getStateVar() { + return _stateVar; + } + + /** + * @param varStatus + * the varStatus to set + */ + public void setStateVar(String varStatus) { + this._stateVar = varStatus; + } + + /** + * @return the rowKeyVar + */ + public String getRowKeyVar() { + return this._rowKeyVar; + } + + /** + * @param rowKeyVar + * the rowKeyVar to set + */ + public void setRowKeyVar(String rowKeyVar) { + this._rowKeyVar = rowKeyVar; + } + + /* + * (non-Javadoc) + * + * @see javax.faces.component.UIData#getRowCount() + */ + public int getRowCount() { + return getExtendedDataModel().getRowCount(); + } + + /* + * (non-Javadoc) + * + * @see javax.faces.component.UIData#getRowData() + */ + public Object getRowData() { + return getExtendedDataModel().getRowData(); + } + + /* + * (non-Javadoc) + * + * @see javax.faces.component.UIData#isRowAvailable() + */ + public boolean isRowAvailable() { + return this.getExtendedDataModel().isRowAvailable(); + } + + /* + * (non-Javadoc) + * + * @see javax.faces.component.UIData#setRowIndex(int) + */ + public void setRowIndex(int index) { + FacesContext faces = FacesContext.getCurrentInstance(); + ExtendedDataModel localModel = getExtendedDataModel(); + // if(key == localModel.getRowIndex()){ + // return; + // } + // save child state + this.saveChildState(faces); + // Set current model row by int, but immediately get value from model. + // for compability, complex models must provide values map between + // integer and key value. + localModel.setRowIndex(index); + this._rowKey = localModel.getRowKey(); + this._clientId = null; + boolean rowSelected = this._rowKey != null; + + setupVariable(faces, localModel, rowSelected); + // restore child state + this.restoreChildState(faces); + } + + /* + * (non-Javadoc) + * + * @see javax.faces.component.UIData#getRowIndex() + */ + public int getRowIndex() { + return getExtendedDataModel().getRowIndex(); + } + + /** + * Same as for int index, but for complex model key. + * + * @return + */ + public Object getRowKey() { + return this._rowKey; + } + + public void setRowKey(Object key) { + setRowKey(FacesContext.getCurrentInstance(), key); + } + + /** + * Setup current roy by key. Perform same functionality as + * {@link UIData#setRowIndex(int)}, but for key object - it may be not + * only row number in sequence data, but, for example - path to current + * node in tree. + * + * @param faces - + * current FacesContext + * @param key + * new key value. + */ + public void setRowKey(FacesContext faces, Object key) { + ExtendedDataModel localModel = getExtendedDataModel(); + // save child state + this.saveChildState(faces); + this._rowKey = key; + this._clientId = null; + localModel.setRowKey(key); + + boolean rowSelected = key != null; + + setupVariable(faces, localModel, rowSelected); + // restore child state + this.restoreChildState(faces); + + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.ajax.repeat.AjaxDataEncoder#getAjaxKeys() + */ + public Set getAjaxKeys() { + Set keys = null; + if (this._ajaxKeys != null) { + keys = (this._ajaxKeys); + } else { + ValueBinding vb = getValueBinding("ajaxKeys"); + if (vb != null) { + keys = (Set) (vb.getValue(getFacesContext())); + } else if(null != _ajaxRowKey){ + // If none of above exist , use row with submitted AjaxComponent + keys = new HashSet(1); + keys.add(_ajaxRowKey); + } + } + return keys; + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.ajax.repeat.AjaxDataEncoder#setAjaxKeys(java.util.Set) + */ + public void setAjaxKeys(Set ajaxKeys) { + this._ajaxKeys = ajaxKeys; + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.framework.ajax.AjaxChildrenEncoder#encodeAjaxChild(javax.faces.context.FacesContext, + * java.lang.String, java.util.Set, java.util.Set) + */ + public void encodeAjaxChild(FacesContext context, String path, + final Set ids, final Set renderedAreas) throws IOException { + resetDataModel(); + + Renderer renderer = getRenderer(context); + if (null != renderer && renderer instanceof AjaxChildrenRenderer) { + // If renderer support partial encoding - call them. + AjaxChildrenRenderer childrenRenderer = (AjaxChildrenRenderer) renderer; + childrenRenderer.encodeAjaxChildren(context, this, path, ids, + renderedAreas); + } else { + // Use simple ajax children encoding for iterate other keys. + final AjaxChildrenRenderer childrenRenderer = getChildrenRenderer(); + final String childrenPath = path + getId() + NamingContainer.SEPARATOR_CHAR; + ComponentVisitor ajaxVisitor = new ComponentVisitor() { + + public void processComponent(FacesContext context, + UIComponent c, Object argument) throws IOException { + childrenRenderer.encodeAjaxComponent(context, c, childrenPath, + ids, renderedAreas); + } + + }; + Set ajaxKeys = getAjaxKeys(); + if (null != ajaxKeys) { + captureOrigValue(); + Object savedKey = getRowKey(); + setRowKey(context, null); + Iterator fixedChildren = fixedChildren(); + while (fixedChildren.hasNext()) { + UIComponent component = (UIComponent) fixedChildren.next(); + ajaxVisitor.processComponent(context, component, null); + } + for (Iterator iter = ajaxKeys.iterator(); iter.hasNext();) { + Object key = (Object) iter.next(); + ajaxVisitor.process(context, key, null); + } + setRowKey(savedKey); + restoreOrigValue(); + } else { + iterate(context, ajaxVisitor, null); + } + } + } + + /** + * Instance of default renderer in ajax responses. + */ + private AjaxChildrenRenderer _childrenRenderer = null; + + /** + * getter for simple {@link AjaxChildrenRenderer} instance in case of + * ajax responses. If default renderer not support search of children + * for encode in ajax response, component will use this instance by + * default. + * + * @return + */ + protected AjaxChildrenRenderer getChildrenRenderer() { + if (_childrenRenderer == null) { + _childrenRenderer = new AjaxChildrenRenderer() { + + protected Class getComponentClass() { + return UIDataAdaptor.class; + } + + }; + + } + + return _childrenRenderer; + } + + /** + * @return Set of values for clientId's of this component, for wich was + * invoked "encode" methods. + */ + protected Set getEncodedIds() { + if (_encoded == null) { + _encoded = new HashSet(); + } + + return _encoded; + } + + /** + * Setup EL variable for different iteration. Value of row data and + * component state will be put into request scope attributes with names + * given by "var" and "varState" bean properties. + * + * @param faces + * current faces context + * @param localModel + * @param rowSelected + */ + protected void setupVariable(FacesContext faces, DataModel localModel, + boolean rowSelected) { + Map attrs = faces.getExternalContext().getRequestMap(); + if (rowSelected && isRowAvailable()) { + // Current row data. + setupVariable(getVar(), attrs, localModel.getRowData()); + // Component state variable. + setupVariable(getStateVar(), attrs, getComponentState()); + // Row key Data variable. + setupVariable(getRowKeyVar(), attrs, getRowKey()); + + } else { + removeVariable(getVar(), attrs); + removeVariable(getStateVar(), attrs); + removeVariable(getRowKeyVar(), attrs); + } + } + + /** + * @param var + * @param attrs + * @param rowData + */ + private void setupVariable(String var, Map attrs, Object rowData) { + if (var != null) { + attrs.put(var, rowData); + } + } + + /** + * @param var + * @param attrs + * @param rowData + */ + private void removeVariable(String var, Map attrs) { + if (var != null) { + attrs.remove(var); + } + } + + /** + * Reset data model. this method must be called twice per request - + * before decode phase and before component encoding. + */ + protected void resetDataModel() { + this.setExtendedDataModel(null); + } + + /** + * Set data model. Model value will be stored in Map with key as current + * clientId for this component, to keep models between phases for same + * iteration in case if this component child for other UIData + * + * @param model + */ + protected void setExtendedDataModel(ExtendedDataModel model) { + this._currentModel = model; + this._modelsMap.put(getBaseClientId(getFacesContext()), model); + } + + /** + * Get current data model, or create it by {@link #createDataModel()} + * method. For different iterations in ancestor UIData ( if present ) + * will be returned different models. + * + * @return current data model. + */ + protected ExtendedDataModel getExtendedDataModel() { + if (this._currentModel == null) { + String baseClientId = getBaseClientId(getFacesContext()); + ExtendedDataModel model = (ExtendedDataModel) this._modelsMap + .get(baseClientId); + if (null == model) { + model = createDataModel(); + this._modelsMap.put(baseClientId, model); + } + this._currentModel = model; + } + return this._currentModel; + } + + /** + * Hook mathod for create data model in concrete implementations. + * + * @return + */ + protected abstract ExtendedDataModel createDataModel(); + + /** + * Set current state ( at most cases, visual representation ) of this + * component. Same as for DataModel, component will keep states for + * different iterations. + * + * @param state + */ + public void setComponentState(DataComponentState state) { + this._currentState = state; + this._statesMap.put(getBaseClientId(getFacesContext()), + this._currentState); + } + + /** + * @return current state of this component. + */ + public DataComponentState getComponentState() { + DataComponentState state = null; + if (this._currentState == null) { + // Check for binding state to user bean. + ValueBinding valueBinding = getValueBinding(UIDataAdaptor.COMPONENT_STATE_ATTRIBUTE); + FacesContext facesContext = getFacesContext(); + if (null != valueBinding) { + state = (DataComponentState) valueBinding + .getValue(facesContext); + if (null == state) { + // Create default state + state = createComponentState(); + if (!valueBinding.isReadOnly(facesContext)) { + // Store created state in user bean. + valueBinding.setValue(facesContext, state); + } + } + } else { + // Check for stored state in map for parent iterations + String baseClientId = getBaseClientId(facesContext); + state = (DataComponentState) this._statesMap.get(baseClientId); + if (null == state) { + // Create default component state + state = createComponentState(); + this._statesMap.put(baseClientId, state); + } + this._currentState = state; + } + } else { + state = this._currentState; + } + return state; + } + + /** + * Hook method for create default state in concrete implementations. + * + * @return + */ + protected abstract DataComponentState createComponentState(); + + private String _clientId = null; + + public String getClientId(FacesContext faces) { + if (null == _clientId) { + StringBuffer id = new StringBuffer(getBaseClientId(faces)); + Object rowKey = getRowKey(); + if (rowKey != null) { + id.append(NamingContainer.SEPARATOR_CHAR).append( + rowKey.toString()); + } + Renderer renderer; + if (null != (renderer = getRenderer(faces))) { + _clientId = renderer.convertClientId(faces, id.toString()); + } else { + _clientId = id.toString(); + } + + } + return _clientId; + } + + private String _baseClientId = null; + + /** + * Get base clietntId of this component ( withowt iteration part ) + * + * @param faces + * @return + */ + public String getBaseClientId(FacesContext faces) { + // Return any previously cached client identifier + if (_baseClientId == null) { + + // Search for an ancestor that is a naming container + UIComponent ancestorContainer = this; + StringBuffer parentIds = new StringBuffer(); + while (null != (ancestorContainer = ancestorContainer.getParent())) { + if (ancestorContainer instanceof NamingContainer) { + parentIds.append(ancestorContainer.getClientId(faces)) + .append(NamingContainer.SEPARATOR_CHAR); + break; + } + } + String id = getId(); + if (null != id) { + _baseClientId = parentIds.append(id).toString(); + } else { + _baseClientId = parentIds.append( + faces.getViewRoot().createUniqueId()).toString(); + } + } + return (_baseClientId); + + } + + /* + * (non-Javadoc) + * + * @see javax.faces.component.UIComponentBase#setId(java.lang.String) + */ + public void setId(String id) { + // If component created by restoring tree or JSP, initial Id is null. + boolean haveId = null != super.getId(); + super.setId(id); + _baseClientId = null; + _clientId = null; + if (haveId) { + // parent UIData ( if present ) will be set same Id at iteration + // - + // we use it for + // switch to different model and state. + String baseClientId = getBaseClientId(getFacesContext()); + this._currentState = (DataComponentState) this._statesMap + .get(baseClientId); + this._currentModel = (ExtendedDataModel) this._modelsMap + .get(baseClientId); + if (null != this._currentModel) { + this._rowKey = this._currentModel.getRowKey(); + // restoreChildState(); + } + // Restore value for row with submitted AjaxComponent. + this._ajaxRowKey = _ajaxRowKeysMap.get(baseClientId); + } + } + + private Object origValue; + + /** + * Save current state of data variable. + */ + public void captureOrigValue() { + captureOrigValue(FacesContext.getCurrentInstance()); + } + + /** + * Save current state of data variable. + * + * @param faces + * current faces context + */ + public void captureOrigValue(FacesContext faces) { + String var = getVar(); + if (var != null) { + Map attrs = faces.getExternalContext().getRequestMap(); + this.origValue = attrs.get(var); + } + } + + /** + * Restore value of data variable after processing phase. + */ + public void restoreOrigValue() { + restoreOrigValue(FacesContext.getCurrentInstance()); + } + + /** + * Restore value of data variable after processing phase. + * + * @param faces + * current faces context + */ + public void restoreOrigValue(FacesContext faces) { + String var = getVar(); + if (var != null) { + Map attrs = faces.getExternalContext().getRequestMap(); + if (this.origValue != null) { + attrs.put(var, this.origValue); + } else { + attrs.remove(var); + } + } + } + + /** + * Saved values of {@link EditableValueHolder} fields per iterations. + */ + private Map childState; + + /** + * @param faces + * @return Saved values of {@link EditableValueHolder} fields per + * iterations. + */ + protected Map getChildState(FacesContext faces) { + if (this.childState == null) { + this.childState = new HashMap(); + } + String baseClientId = getBaseClientId(faces); + Map currentChildState = (Map) childState.get(baseClientId); + if (null == currentChildState) { + currentChildState = new HashMap(); + childState.put(baseClientId, currentChildState); + } + return currentChildState; + } + + /** + * Save values of {@link EditableValueHolder} fields before change + * current row. + * + * @param faces + */ + protected void saveChildState(FacesContext faces) { + + Iterator itr = dataChildren(); + while (itr.hasNext()) { + Map childState = this.getChildState(faces); + this.saveChildState(faces, (UIComponent) itr.next(), childState); + } + } + + /** + * Recursive method for Iterate on children for save + * {@link EditableValueHolder} fields states. + * + * @param faces + * @param c + * @param childState + */ + private void saveChildState(FacesContext faces, UIComponent c, + Map childState) { + + if (c instanceof EditableValueHolder && !c.isTransient()) { + String clientId = c.getClientId(faces); + SavedState ss = (SavedState) childState.get(clientId); + if (ss == null) { + ss = new SavedState(); + childState.put(clientId, ss); + } + ss.populate((EditableValueHolder) c); + } + + // continue hack + Iterator itr = c.getChildren().iterator(); + while (itr.hasNext()) { + saveChildState(faces, (UIComponent) itr.next(), childState); + } + itr = c.getFacets().values().iterator(); + while (itr.hasNext()) { + saveChildState(faces, (UIComponent) itr.next(), childState); + } + } + + /** + * Restore values of {@link EditableValueHolder} fields after change + * current row. + * + * @param faces + */ + protected void restoreChildState(FacesContext faces) { + + Iterator itr = dataChildren(); + while (itr.hasNext()) { + Map childState = this.getChildState(faces); + this.restoreChildState(faces, (UIComponent) itr.next(), childState); + } + } + + /** + * Recursive part of + * {@link #restoreChildState(FacesContext, UIComponent, Map)} + * + * @param faces + * @param c + * @param childState + * + */ + private void restoreChildState(FacesContext faces, UIComponent c, + Map childState) { + // reset id + String id = c.getId(); + c.setId(id); + + // hack + if (c instanceof EditableValueHolder) { + EditableValueHolder evh = (EditableValueHolder) c; + String clientId = c.getClientId(faces); + SavedState ss = (SavedState) childState.get(clientId); + if (ss != null) { + ss.apply(evh); + } else { + NullState.apply(evh); + } + } + + // continue hack + Iterator itr = c.getChildren().iterator(); + while (itr.hasNext()) { + restoreChildState(faces, (UIComponent) itr.next(), childState); + } + itr = c.getFacets().values().iterator(); + while (itr.hasNext()) { + restoreChildState(faces, (UIComponent) itr.next(), childState); + } + } + + /** + * Check for validation errors on children components. If true, saved + * values must be keep on render phase + * + * @param context + * @return + */ + private boolean keepSaved(FacesContext context) { + + Iterator clientIds = this.getChildState(context).keySet().iterator(); + while (clientIds.hasNext()) { + String clientId = (String) clientIds.next(); + Iterator messages = context.getMessages(clientId); + while (messages.hasNext()) { + FacesMessage message = (FacesMessage) messages.next(); + if (message.getSeverity() + .compareTo(FacesMessage.SEVERITY_ERROR) >= 0) { + return (true); + } + } + } + return false; + } + + /** + * Perform iteration on all children components and all data rows with + * given visitor. + * + * @param faces + * @param visitor + */ + protected void iterate(FacesContext faces, ComponentVisitor visitor, + Object argument) { + + // stop if not rendered + if (!this.isRendered()) { + return; + } + // reset rowIndex + this.captureOrigValue(faces); + this.setRowKey(faces, null); + try { + Iterator fixedChildren = fixedChildren(); + while (fixedChildren.hasNext()) { + UIComponent component = (UIComponent) fixedChildren.next(); + visitor.processComponent(faces, component, argument); + } + + walk(faces, visitor, argument); + } catch (Exception e) { + throw new FacesException(e); + } finally { + this.setRowKey(faces, null); + this.restoreOrigValue(faces); + } + } + + /** + * Walk ( visit ) this component on all data-avare children for each + * row. + * + * @param faces + * @param visitor + * @throws IOException + */ + public void walk(FacesContext faces, DataVisitor visitor, Object argument) + throws IOException { + getExtendedDataModel().walk(faces, visitor, + getComponentState().getRange(), argument); + } + + protected void processDecodes(FacesContext faces, Object argument) { + if (!this.isRendered()) + return; + this.resetComponent(faces); + this.iterate(faces, decodeVisitor, argument); + this.decode(faces); + } + + /* + * (non-Javadoc) + * + * @see javax.faces.component.UIData#processDecodes(javax.faces.context.FacesContext) + */ + public void processDecodes(FacesContext faces) { + processDecodes(faces, null); + } + + /** + * Reset per-request fields in component. + * + * @param faces + * + */ + protected void resetComponent(FacesContext faces) { + // resetDataModel(); + if (null != this.childState) { + childState.remove(getBaseClientId(faces)); + } + this._encoded = null; + } + + protected void processUpdates(FacesContext faces, Object argument) { + if (!this.isRendered()) + return; + this.iterate(faces, updateVisitor, argument); + ExtendedDataModel dataModel = getExtendedDataModel(); + // If no validation errors, update values for serializable model, + // restored from view. + if (dataModel instanceof SerializableDataModel && (!keepSaved(faces))) { + SerializableDataModel serializableModel = (SerializableDataModel) dataModel; + serializableModel.update(); + } + } + + public void processUpdates(FacesContext faces) { + processUpdates(faces, null); + } + + protected void processValidators(FacesContext faces, Object argument) { + if (!this.isRendered()) + return; + this.iterate(faces, validateVisitor, argument); + } + + public void processValidators(FacesContext faces) { + processValidators(faces, null); + } + + public void encodeBegin(FacesContext context) throws IOException { + resetDataModel(); + // if(!keepSaved(context)){ + // childState.remove(getBaseClientId(context)); + // } + // Mark component as used, if parent UIData change own range states not + // accessed at + // encode phase must be unsaved. + getEncodedIds().add(getBaseClientId(context)); + // getComponentState().setUsed(true); + super.encodeBegin(context); + } + + /** + * This method must create iterator for all non-data avare children of + * this component ( header/footer facets for components and columns in + * dataTable, facets for tree etc. + * + * @return iterator for all components not sensitive for row data. + */ + protected abstract Iterator fixedChildren(); + + /** + * This method must create iterator for all children components, + * processed "per row" It can be children of UIColumn in dataTable, + * nodes in tree + * + * @return iterator for all components processed per row. + */ + protected abstract Iterator dataChildren(); + + private final static SavedState NullState = new SavedState(); + + // from RI + /** + * This class keep values of {@link EditableValueHolder} row-sensitive + * fields. + * + * @author shura + * + */ + private final static class SavedState implements Serializable { + + private Object submittedValue; + + private static final long serialVersionUID = 2920252657338389849L; + + Object getSubmittedValue() { + return (this.submittedValue); + } + + void setSubmittedValue(Object submittedValue) { + this.submittedValue = submittedValue; + } + + private boolean valid = true; + + boolean isValid() { + return (this.valid); + } + + void setValid(boolean valid) { + this.valid = valid; + } + + private Object value; + + Object getValue() { + return (this.value); + } + + public void setValue(Object value) { + this.value = value; + } + + private boolean localValueSet; + + boolean isLocalValueSet() { + return (this.localValueSet); + } + + public void setLocalValueSet(boolean localValueSet) { + this.localValueSet = localValueSet; + } + + public String toString() { + return ("submittedValue: " + submittedValue + " value: " + value + + " localValueSet: " + localValueSet); + } + + public void populate(EditableValueHolder evh) { + this.value = evh.getLocalValue(); + this.valid = evh.isValid(); + this.submittedValue = evh.getSubmittedValue(); + this.localValueSet = evh.isLocalValueSet(); + } + + public void apply(EditableValueHolder evh) { + evh.setValue(this.value); + evh.setValid(this.valid); + evh.setSubmittedValue(this.submittedValue); + evh.setLocalValueSet(this.localValueSet); + } + + } + + /* + * (non-Javadoc) + * + * @see javax.faces.component.UIData#queueEvent(javax.faces.event.FacesEvent) + */ + public void queueEvent(FacesEvent event) { + if (event.getComponent() != this) { + event = new IndexedEvent(this, event, getRowKey()); + } + // Send event directly to parent, to avoid wrapping in superclass. + UIComponent parent = getParent(); + if (parent == null) { + throw new IllegalStateException( + "No parent component for queue event"); + } else { + parent.queueEvent(event); + } + } + + public void broadcast(FacesEvent event) throws AbortProcessingException { + + if (!(event instanceof IndexedEvent)) { + if (!broadcastLocal(event)) { + super.broadcast(event); + } + return; + } + + // Set up the correct context and fire our wrapped event + IndexedEvent revent = (IndexedEvent) event; + Object oldRowKey = getRowKey(); + FacesContext faces = FacesContext.getCurrentInstance(); + captureOrigValue(faces); + Object eventRowKey = revent.getKey(); + setRowKey(faces, eventRowKey); + FacesEvent rowEvent = revent.getTarget(); + rowEvent.getComponent().broadcast(rowEvent); + // For Ajax events, keep row value. + if (!(rowEvent.getPhaseId() == PhaseId.RENDER_RESPONSE)) { + this._ajaxRowKey = eventRowKey; + this._ajaxRowKeysMap.put(getBaseClientId(faces), eventRowKey); + } + setRowKey(faces, oldRowKey); + restoreOrigValue(faces); + // } + return; + } + + /** + * Process events targetted for concrete implementation. Hook method + * called from {@link #broadcast(FacesEvent)} + * + * @param event - + * processed event. + * @return true if event processed, false if component must continue + * processing. + */ + protected boolean broadcastLocal(FacesEvent event) { + return false; + } + + /** + * Wrapper for event from child component, with value of current row + * key. + * + * @author shura + * + */ + protected static final class IndexedEvent extends FacesEvent { + + private static final long serialVersionUID = -8318895390232552385L; + + private final FacesEvent target; + + private final Object key; + + public IndexedEvent(UIDataAdaptor owner, FacesEvent target, Object key) { + super(owner); + this.target = target; + this.key = key; + } + + public PhaseId getPhaseId() { + return (this.target.getPhaseId()); + } + + public void setPhaseId(PhaseId phaseId) { + this.target.setPhaseId(phaseId); + } + + public boolean isAppropriateListener(FacesListener listener) { + return this.target.isAppropriateListener(listener); + } + + public void processListener(FacesListener listener) { + UIDataAdaptor owner = (UIDataAdaptor) this.getComponent(); + Object prevIndex = owner._rowKey; + try { + owner.setRowKey(this.key); + this.target.processListener(listener); + } finally { + owner.setRowKey(prevIndex); + } + } + + public Object getKey() { + return key; + } + + public FacesEvent getTarget() { + return target; + } + + } + + /** + * "memento" pattern class for state of component. + * + * @author shura + * + */ + private static class DataState implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 17070532L; + + private Object superState; + + private Map componentStates = new HashMap(); + + private Set ajaxKeys; + + public String rowKeyVar; + + public String stateVar; + + } + + /** + * Serialisable model and component state per iteration of parent + * UIData. + * + * @author shura + * + */ + private static class PerIdState implements Serializable { + /** + * + */ + private static final long serialVersionUID = 9037454770537726418L; + + /** + * Flag setted to true if componentState implements StateHolder + */ + private boolean stateInHolder = false; + + /** + * Serializable componentState or + */ + private Object componentState; + + private SerializableDataModel model; + } + + public void restoreState(FacesContext faces, Object object) { + DataState state = (DataState) object; + super.restoreState(faces, state.superState); + this._ajaxKeys = state.ajaxKeys; + this._statesMap = new HashMap(); + this._rowKeyVar = state.rowKeyVar; + this._stateVar = state.stateVar; + // Restore serializable models and component states for all rows of + // parent UIData ( single if this + // component not child of iterable ) + for (Iterator iter = state.componentStates.entrySet().iterator(); iter + .hasNext();) { + Map.Entry stateEntry = (Map.Entry) iter.next(); + PerIdState idState = (PerIdState) stateEntry.getValue(); + DataComponentState compState; + if (idState.stateInHolder) { + // TODO - change RichFaces Tree component, for remove reference + // to component from state. + compState = createComponentState(); + ((StateHolder) compState).restoreState(faces, + idState.componentState); + } else { + compState = (DataComponentState) idState.componentState; + } + Object key = stateEntry.getKey(); + this._statesMap.put(key, compState); + this._modelsMap.put(key, idState.model); + } + } + + public Object saveState(FacesContext faces) { + DataState state = new DataState(); + state.superState = super.saveState(faces); + state.ajaxKeys = this._ajaxKeys; + state.rowKeyVar = this._rowKeyVar; + state.stateVar = this._stateVar; + Set encodedIds = getEncodedIds(); + // Save all states of component and data model for all valies of + // clientId, encoded in this request. + for (Iterator iter = this._statesMap.entrySet().iterator(); iter + .hasNext();) { + Map.Entry stateEntry = (Map.Entry) iter.next(); + DataComponentState dataComponentState = ((DataComponentState) stateEntry + .getValue()); + Object stateKey = stateEntry.getKey(); + if (encodedIds.isEmpty() || encodedIds.contains(stateKey)) { + PerIdState idState = new PerIdState(); + idState.model = getExtendedDataModel().getSerializableModel( + dataComponentState.getRange()); + // Save component state , depended if implemented interfaces. + if (null == dataComponentState) { + idState.componentState = null; + } else if (dataComponentState instanceof Serializable) { + idState.componentState = dataComponentState; + } else if (dataComponentState instanceof StateHolder) { + // TODO - change RichFaces Tree component, for remove + // reference to component from state. + // Change this code to reference for saveAttachedState. + idState.componentState = ((StateHolder) dataComponentState) + .saveState(faces); + idState.stateInHolder = true; + } + if (null != idState.model || null != idState.componentState) { + state.componentStates.put(stateKey, idState); + } + } + } + return state; + } + + public void setParent(UIComponent parent) { + super.setParent(parent); + this._clientId = null; + this._baseClientId = null; + } + + +} Copied: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxActionsRule.java (from rev 1749, trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxActionsRule.java) =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxActionsRule.java (rev 0) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxActionsRule.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -0,0 +1,99 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.webapp.taglib; + +import javax.faces.component.ActionSource; +import javax.faces.event.ActionEvent; + +import com.sun.facelets.FaceletContext; +import com.sun.facelets.el.LegacyMethodBinding; +import com.sun.facelets.tag.MetaRule; +import com.sun.facelets.tag.Metadata; +import com.sun.facelets.tag.MetadataTarget; +import com.sun.facelets.tag.TagAttribute; + +/** + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:21 $ + * + */ +public class AjaxActionsRule extends MetaRule { + + public final static Class[] ACTION_SIG = new Class[0]; + + public final static Class[] ACTION_LISTENER_SIG = new Class[] { ActionEvent.class }; + + public final static class ActionMapper extends Metadata { + + private final TagAttribute attr; + + public ActionMapper(TagAttribute attr) { + this.attr = attr; + } + + public void applyMetadata(FaceletContext ctx, Object instance) { + ((ActionSource) instance).setAction(new LegacyMethodBinding( + this.attr.getMethodExpression(ctx, String.class, + AjaxActionsRule.ACTION_SIG))); + } + } + + public final static class ActionListenerMapper extends Metadata { + + private final TagAttribute attr; + + public ActionListenerMapper(TagAttribute attr) { + this.attr = attr; + } + + public void applyMetadata(FaceletContext ctx, Object instance) { + ((ActionSource) instance) + .setActionListener(new LegacyMethodBinding(this.attr + .getMethodExpression(ctx, null, + AjaxActionsRule.ACTION_LISTENER_SIG))); + } + + } + + public final static AjaxActionsRule instance = new AjaxActionsRule(); + + public AjaxActionsRule() { + super(); + } + + public Metadata applyRule(String name, TagAttribute attribute, + MetadataTarget meta) { + if (meta.isTargetInstanceOf(ActionSource.class)) { + + + if ("action".equals(name)) { + return new ActionMapper(attribute); + } + + if ("actionListener".equals(name)) { + return new ActionListenerMapper(attribute); + } + } + return null; + } + +} Copied: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxComponentHandler.java (from rev 1749, trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxComponentHandler.java) =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxComponentHandler.java (rev 0) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxComponentHandler.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -0,0 +1,58 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.webapp.taglib; + +import javax.faces.component.ActionSource; + +import com.sun.facelets.tag.MetaRuleset; +import com.sun.facelets.tag.jsf.ComponentConfig; +import com.sun.facelets.tag.jsf.ComponentHandler; + +/** + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:23 $ + * + */ +public class AjaxComponentHandler extends ComponentHandler { + + /** + * @param config + */ + public AjaxComponentHandler(ComponentConfig config) { + super(config); + // TODO Auto-generated constructor stub + } + + /* (non-Javadoc) + * @see com.sun.facelets.tag.jsf.ComponentHandler#createMetaRuleset(java.lang.Class) + */ + protected MetaRuleset createMetaRuleset(Class type) { + // TODO Auto-generated method stub + MetaRuleset metaRules = super.createMetaRuleset(type); + if (ActionSource.class.isAssignableFrom(type)) { + metaRules.addRule(AjaxActionsRule.instance); + } + metaRules.addRule(AjaxReRendrRule.instance); + return metaRules; + } + +} Copied: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxReRendrRule.java (from rev 1749, trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxReRendrRule.java) =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxReRendrRule.java (rev 0) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxReRendrRule.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -0,0 +1,88 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.webapp.taglib; + +import java.util.Set; + +import org.ajax4jsf.component.AjaxComponent; +import org.ajax4jsf.renderkit.AjaxRendererUtils; + +import com.sun.facelets.FaceletContext; +import com.sun.facelets.tag.MetaRule; +import com.sun.facelets.tag.Metadata; +import com.sun.facelets.tag.MetadataTarget; +import com.sun.facelets.tag.TagAttribute; + +/** + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:22 $ + * + */ +public class AjaxReRendrRule extends MetaRule { + + public static final AjaxReRendrRule instance = new AjaxReRendrRule(); + /** + * + */ + public AjaxReRendrRule() { + super(); + // TODO Auto-generated constructor stub + } + + /* (non-Javadoc) + * @see com.sun.facelets.tag.MetaRule#applyRule(java.lang.String, com.sun.facelets.tag.TagAttribute, com.sun.facelets.tag.MetadataTarget) + */ + public Metadata applyRule(String name, TagAttribute attribute, + MetadataTarget meta) { + if (meta.isTargetInstanceOf(AjaxComponent.class)) { + if ("reRender".equals(name)) { + if (attribute.isLiteral()) { + return new ReRendersSetMataData(attribute.getValue()); + } else { + // Process as usual expression + return null; + } + } + } + return null; + } + + static class ReRendersSetMataData extends Metadata{ + + private Set _reRender; + /** + * @param value + */ + public ReRendersSetMataData(String value) { + _reRender = AjaxRendererUtils.asSet(value); + } + + /* (non-Javadoc) + * @see com.sun.facelets.tag.Metadata#applyMetadata(com.sun.facelets.FaceletContext, java.lang.Object) + */ + public void applyMetadata(FaceletContext ctx, Object instance) { + ((AjaxComponent) instance).setReRender(_reRender); + + } + + } +} Modified: trunk/ui/core/src/main/config/component/commandButton.xml =================================================================== --- trunk/ui/core/src/main/config/component/commandButton.xml 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/core/src/main/config/component/commandButton.xml 2007-07-20 19:03:05 UTC (rev 1758) @@ -64,7 +64,7 @@ <icon>icon</icon> </tag> <taghandler> - <classname>org.ajax4jsf.taglib.html.facelets.AjaxComponentHandler</classname> + <classname>org.ajax4jsf.webapp.taglib.AjaxComponentHandler</classname> </taghandler> &ui_command_attributes; &html_universal_attributes; Modified: trunk/ui/core/src/main/config/component/commandLink.xml =================================================================== --- trunk/ui/core/src/main/config/component/commandLink.xml 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/core/src/main/config/component/commandLink.xml 2007-07-20 19:03:05 UTC (rev 1758) @@ -63,7 +63,7 @@ <icon>icon</icon> </tag> <taghandler> - <classname>org.ajax4jsf.taglib.html.facelets.AjaxComponentHandler</classname> + <classname>org.ajax4jsf.webapp.taglib.AjaxComponentHandler</classname> </taghandler> &ui_command_attributes; &html_events; Modified: trunk/ui/core/src/main/config/component/form.xml =================================================================== --- trunk/ui/core/src/main/config/component/form.xml 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/core/src/main/config/component/form.xml 2007-07-20 19:03:05 UTC (rev 1758) @@ -33,7 +33,7 @@ <icon>icon</icon> </tag> <taghandler> - <classname>org.ajax4jsf.taglib.html.facelets.AjaxComponentHandler</classname> + <classname>org.ajax4jsf.webapp.taglib.AjaxComponentHandler</classname> </taghandler> &ui_component_attributes; &html_form_attributes; Modified: trunk/ui/core/src/main/config/component/poll.xml =================================================================== --- trunk/ui/core/src/main/config/component/poll.xml 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/core/src/main/config/component/poll.xml 2007-07-20 19:03:05 UTC (rev 1758) @@ -43,7 +43,7 @@ <icon>icon</icon> </tag> <taghandler> - <classname>org.ajax4jsf.taglib.html.facelets.AjaxComponentHandler</classname> + <classname>org.ajax4jsf.webapp.taglib.AjaxComponentHandler</classname> </taghandler> &ui_component_attributes; &ui_command_attributes; Modified: trunk/ui/core/src/main/config/component/push.xml =================================================================== --- trunk/ui/core/src/main/config/component/push.xml 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/core/src/main/config/component/push.xml 2007-07-20 19:03:05 UTC (rev 1758) @@ -44,7 +44,7 @@ </tag> <taghandler generate="true"> <classname>org.ajax4jsf.taglib.html.facelets.AjaxPushHandler</classname> - <superclass>org.ajax4jsf.taglib.html.facelets.AjaxComponentHandler</superclass> + <superclass>org.ajax4jsf.webapp.taglib.AjaxComponentHandler</superclass> </taghandler> &ui_component_attributes; &ui_command_attributes; Deleted: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/core/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -1,1332 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.component; - -import java.io.IOException; -import java.io.Serializable; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - -import javax.faces.FacesException; -import javax.faces.application.FacesMessage; -import javax.faces.component.EditableValueHolder; -import javax.faces.component.NamingContainer; -import javax.faces.component.StateHolder; -import javax.faces.component.UIComponent; -import javax.faces.component.UIData; -import javax.faces.context.FacesContext; -import javax.faces.el.ValueBinding; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.FacesEvent; -import javax.faces.event.FacesListener; -import javax.faces.event.PhaseId; -import javax.faces.model.DataModel; -import javax.faces.model.ListDataModel; -import javax.faces.render.Renderer; - -import org.ajax4jsf.model.DataComponentState; -import org.ajax4jsf.model.DataVisitor; -import org.ajax4jsf.model.ExtendedDataModel; -import org.ajax4jsf.model.SerializableDataModel; -import org.ajax4jsf.renderkit.AjaxChildrenRenderer; - -/** - * Base class for iterable components, like dataTable, Tomahawk dataList, - * Facelets repeat, tree etc., with support for partial rendering on AJAX - * responces for one or more selected iterations. - * - * @author shura - * - */ -public abstract class UIDataAdaptor extends UIData implements AjaxDataEncoder { - - /** - * - */ - public static final String COMPONENT_STATE_ATTRIBUTE = "componentState"; - - public final static DataModel EMPTY_MODEL = new ListDataModel( - Collections.EMPTY_LIST); - - /** - * Base class for visit data model at phases decode, validation and - * update model - * - * @author shura - * - */ - protected abstract class ComponentVisitor implements DataVisitor { - - public void process(FacesContext context, Object rowKey, Object argument) - throws IOException { - setRowKey(context, rowKey); - if (isRowAvailable()) { - Iterator childIterator = dataChildren(); - while (childIterator.hasNext()) { - UIComponent component = (UIComponent) childIterator.next(); - processComponent(context, component, argument); - } - - } - } - - public abstract void processComponent(FacesContext context, - UIComponent c, Object argument) throws IOException; - - } - - /** - * Visitor for process decode on children components. - */ - protected ComponentVisitor decodeVisitor = new ComponentVisitor() { - - public void processComponent(FacesContext context, UIComponent c, - Object argument) { - c.processDecodes(context); - } - - }; - - /** - * Visitor for process validation phase - */ - protected ComponentVisitor validateVisitor = new ComponentVisitor() { - - public void processComponent(FacesContext context, UIComponent c, - Object argument) { - c.processValidators(context); - } - - }; - - /** - * Visitor for process update model phase. - */ - protected ComponentVisitor updateVisitor = new ComponentVisitor() { - - public void processComponent(FacesContext context, UIComponent c, - Object argument) { - c.processUpdates(context); - } - - }; - - /** - * Base client id's of this component, for wich invoked encode... - * methods. Component will save state and serialisable models for this - * keys only. - */ - private Set _encoded; - - /** - * Storage for data model instances with different client id's of this - * component. In case of child for UIData component, this map will keep - * data models for different iterations between phases. - */ - private Map _modelsMap = new HashMap(); - - /** - * Reference for curent data model - */ - private ExtendedDataModel _currentModel = null; - - /** - * States of this component for diferent iterations, same as for models. - */ - private Map _statesMap = new HashMap(); - - /** - * Reference for current component state. - */ - private DataComponentState _currentState = null; - - /** - * Name of EL variable for current component state. - */ - private String _stateVar; - - private String _rowKeyVar; - - /** - * Key for current value in model. - */ - private Object _rowKey = null; - - /** - * Values of row keys, encoded on ajax response rendering. - */ - private Set _ajaxKeys = null; - - private Object _ajaxRowKey = null; - - private Map _ajaxRowKeysMap = new HashMap(); - - /** - * Get name of EL variable for component state. - * - * @return the varState - */ - public String getStateVar() { - return _stateVar; - } - - /** - * @param varStatus - * the varStatus to set - */ - public void setStateVar(String varStatus) { - this._stateVar = varStatus; - } - - /** - * @return the rowKeyVar - */ - public String getRowKeyVar() { - return this._rowKeyVar; - } - - /** - * @param rowKeyVar - * the rowKeyVar to set - */ - public void setRowKeyVar(String rowKeyVar) { - this._rowKeyVar = rowKeyVar; - } - - /* - * (non-Javadoc) - * - * @see javax.faces.component.UIData#getRowCount() - */ - public int getRowCount() { - return getExtendedDataModel().getRowCount(); - } - - /* - * (non-Javadoc) - * - * @see javax.faces.component.UIData#getRowData() - */ - public Object getRowData() { - return getExtendedDataModel().getRowData(); - } - - /* - * (non-Javadoc) - * - * @see javax.faces.component.UIData#isRowAvailable() - */ - public boolean isRowAvailable() { - return this.getExtendedDataModel().isRowAvailable(); - } - - /* - * (non-Javadoc) - * - * @see javax.faces.component.UIData#setRowIndex(int) - */ - public void setRowIndex(int index) { - FacesContext faces = FacesContext.getCurrentInstance(); - ExtendedDataModel localModel = getExtendedDataModel(); - // if(key == localModel.getRowIndex()){ - // return; - // } - // save child state - this.saveChildState(faces); - // Set current model row by int, but immediately get value from model. - // for compability, complex models must provide values map between - // integer and key value. - localModel.setRowIndex(index); - this._rowKey = localModel.getRowKey(); - this._clientId = null; - boolean rowSelected = this._rowKey != null; - - setupVariable(faces, localModel, rowSelected); - // restore child state - this.restoreChildState(faces); - } - - /* - * (non-Javadoc) - * - * @see javax.faces.component.UIData#getRowIndex() - */ - public int getRowIndex() { - return getExtendedDataModel().getRowIndex(); - } - - /** - * Same as for int index, but for complex model key. - * - * @return - */ - public Object getRowKey() { - return this._rowKey; - } - - public void setRowKey(Object key) { - setRowKey(FacesContext.getCurrentInstance(), key); - } - - /** - * Setup current roy by key. Perform same functionality as - * {@link UIData#setRowIndex(int)}, but for key object - it may be not - * only row number in sequence data, but, for example - path to current - * node in tree. - * - * @param faces - - * current FacesContext - * @param key - * new key value. - */ - public void setRowKey(FacesContext faces, Object key) { - ExtendedDataModel localModel = getExtendedDataModel(); - // save child state - this.saveChildState(faces); - this._rowKey = key; - this._clientId = null; - localModel.setRowKey(key); - - boolean rowSelected = key != null; - - setupVariable(faces, localModel, rowSelected); - // restore child state - this.restoreChildState(faces); - - } - - /* - * (non-Javadoc) - * - * @see org.ajax4jsf.ajax.repeat.AjaxDataEncoder#getAjaxKeys() - */ - public Set getAjaxKeys() { - Set keys = null; - if (this._ajaxKeys != null) { - keys = (this._ajaxKeys); - } else { - ValueBinding vb = getValueBinding("ajaxKeys"); - if (vb != null) { - keys = (Set) (vb.getValue(getFacesContext())); - } else if(null != _ajaxRowKey){ - // If none of above exist , use row with submitted AjaxComponent - keys = new HashSet(1); - keys.add(_ajaxRowKey); - } - } - return keys; - } - - /* - * (non-Javadoc) - * - * @see org.ajax4jsf.ajax.repeat.AjaxDataEncoder#setAjaxKeys(java.util.Set) - */ - public void setAjaxKeys(Set ajaxKeys) { - this._ajaxKeys = ajaxKeys; - } - - /* - * (non-Javadoc) - * - * @see org.ajax4jsf.framework.ajax.AjaxChildrenEncoder#encodeAjaxChild(javax.faces.context.FacesContext, - * java.lang.String, java.util.Set, java.util.Set) - */ - public void encodeAjaxChild(FacesContext context, String path, - final Set ids, final Set renderedAreas) throws IOException { - resetDataModel(); - - Renderer renderer = getRenderer(context); - if (null != renderer && renderer instanceof AjaxChildrenRenderer) { - // If renderer support partial encoding - call them. - AjaxChildrenRenderer childrenRenderer = (AjaxChildrenRenderer) renderer; - childrenRenderer.encodeAjaxChildren(context, this, path, ids, - renderedAreas); - } else { - // Use simple ajax children encoding for iterate other keys. - final AjaxChildrenRenderer childrenRenderer = getChildrenRenderer(); - final String childrenPath = path + getId() + NamingContainer.SEPARATOR_CHAR; - ComponentVisitor ajaxVisitor = new ComponentVisitor() { - - public void processComponent(FacesContext context, - UIComponent c, Object argument) throws IOException { - childrenRenderer.encodeAjaxComponent(context, c, childrenPath, - ids, renderedAreas); - } - - }; - Set ajaxKeys = getAjaxKeys(); - if (null != ajaxKeys) { - captureOrigValue(); - Object savedKey = getRowKey(); - setRowKey(context, null); - Iterator fixedChildren = fixedChildren(); - while (fixedChildren.hasNext()) { - UIComponent component = (UIComponent) fixedChildren.next(); - ajaxVisitor.processComponent(context, component, null); - } - for (Iterator iter = ajaxKeys.iterator(); iter.hasNext();) { - Object key = (Object) iter.next(); - ajaxVisitor.process(context, key, null); - } - setRowKey(savedKey); - restoreOrigValue(); - } else { - iterate(context, ajaxVisitor, null); - } - } - } - - /** - * Instance of default renderer in ajax responses. - */ - private AjaxChildrenRenderer _childrenRenderer = null; - - /** - * getter for simple {@link AjaxChildrenRenderer} instance in case of - * ajax responses. If default renderer not support search of children - * for encode in ajax response, component will use this instance by - * default. - * - * @return - */ - protected AjaxChildrenRenderer getChildrenRenderer() { - if (_childrenRenderer == null) { - _childrenRenderer = new AjaxChildrenRenderer() { - - protected Class getComponentClass() { - return UIDataAdaptor.class; - } - - }; - - } - - return _childrenRenderer; - } - - /** - * @return Set of values for clientId's of this component, for wich was - * invoked "encode" methods. - */ - protected Set getEncodedIds() { - if (_encoded == null) { - _encoded = new HashSet(); - } - - return _encoded; - } - - /** - * Setup EL variable for different iteration. Value of row data and - * component state will be put into request scope attributes with names - * given by "var" and "varState" bean properties. - * - * @param faces - * current faces context - * @param localModel - * @param rowSelected - */ - protected void setupVariable(FacesContext faces, DataModel localModel, - boolean rowSelected) { - Map attrs = faces.getExternalContext().getRequestMap(); - if (rowSelected && isRowAvailable()) { - // Current row data. - setupVariable(getVar(), attrs, localModel.getRowData()); - // Component state variable. - setupVariable(getStateVar(), attrs, getComponentState()); - // Row key Data variable. - setupVariable(getRowKeyVar(), attrs, getRowKey()); - - } else { - removeVariable(getVar(), attrs); - removeVariable(getStateVar(), attrs); - removeVariable(getRowKeyVar(), attrs); - } - } - - /** - * @param var - * @param attrs - * @param rowData - */ - private void setupVariable(String var, Map attrs, Object rowData) { - if (var != null) { - attrs.put(var, rowData); - } - } - - /** - * @param var - * @param attrs - * @param rowData - */ - private void removeVariable(String var, Map attrs) { - if (var != null) { - attrs.remove(var); - } - } - - /** - * Reset data model. this method must be called twice per request - - * before decode phase and before component encoding. - */ - protected void resetDataModel() { - this.setExtendedDataModel(null); - } - - /** - * Set data model. Model value will be stored in Map with key as current - * clientId for this component, to keep models between phases for same - * iteration in case if this component child for other UIData - * - * @param model - */ - protected void setExtendedDataModel(ExtendedDataModel model) { - this._currentModel = model; - this._modelsMap.put(getBaseClientId(getFacesContext()), model); - } - - /** - * Get current data model, or create it by {@link #createDataModel()} - * method. For different iterations in ancestor UIData ( if present ) - * will be returned different models. - * - * @return current data model. - */ - protected ExtendedDataModel getExtendedDataModel() { - if (this._currentModel == null) { - String baseClientId = getBaseClientId(getFacesContext()); - ExtendedDataModel model = (ExtendedDataModel) this._modelsMap - .get(baseClientId); - if (null == model) { - model = createDataModel(); - this._modelsMap.put(baseClientId, model); - } - this._currentModel = model; - } - return this._currentModel; - } - - /** - * Hook mathod for create data model in concrete implementations. - * - * @return - */ - protected abstract ExtendedDataModel createDataModel(); - - /** - * Set current state ( at most cases, visual representation ) of this - * component. Same as for DataModel, component will keep states for - * different iterations. - * - * @param state - */ - public void setComponentState(DataComponentState state) { - this._currentState = state; - this._statesMap.put(getBaseClientId(getFacesContext()), - this._currentState); - } - - /** - * @return current state of this component. - */ - public DataComponentState getComponentState() { - DataComponentState state = null; - if (this._currentState == null) { - // Check for binding state to user bean. - ValueBinding valueBinding = getValueBinding(UIDataAdaptor.COMPONENT_STATE_ATTRIBUTE); - FacesContext facesContext = getFacesContext(); - if (null != valueBinding) { - state = (DataComponentState) valueBinding - .getValue(facesContext); - if (null == state) { - // Create default state - state = createComponentState(); - if (!valueBinding.isReadOnly(facesContext)) { - // Store created state in user bean. - valueBinding.setValue(facesContext, state); - } - } - } else { - // Check for stored state in map for parent iterations - String baseClientId = getBaseClientId(facesContext); - state = (DataComponentState) this._statesMap.get(baseClientId); - if (null == state) { - // Create default component state - state = createComponentState(); - this._statesMap.put(baseClientId, state); - } - this._currentState = state; - } - } else { - state = this._currentState; - } - return state; - } - - /** - * Hook method for create default state in concrete implementations. - * - * @return - */ - protected abstract DataComponentState createComponentState(); - - private String _clientId = null; - - public String getClientId(FacesContext faces) { - if (null == _clientId) { - StringBuffer id = new StringBuffer(getBaseClientId(faces)); - Object rowKey = getRowKey(); - if (rowKey != null) { - id.append(NamingContainer.SEPARATOR_CHAR).append( - rowKey.toString()); - } - Renderer renderer; - if (null != (renderer = getRenderer(faces))) { - _clientId = renderer.convertClientId(faces, id.toString()); - } else { - _clientId = id.toString(); - } - - } - return _clientId; - } - - private String _baseClientId = null; - - /** - * Get base clietntId of this component ( withowt iteration part ) - * - * @param faces - * @return - */ - public String getBaseClientId(FacesContext faces) { - // Return any previously cached client identifier - if (_baseClientId == null) { - - // Search for an ancestor that is a naming container - UIComponent ancestorContainer = this; - StringBuffer parentIds = new StringBuffer(); - while (null != (ancestorContainer = ancestorContainer.getParent())) { - if (ancestorContainer instanceof NamingContainer) { - parentIds.append(ancestorContainer.getClientId(faces)) - .append(NamingContainer.SEPARATOR_CHAR); - break; - } - } - String id = getId(); - if (null != id) { - _baseClientId = parentIds.append(id).toString(); - } else { - _baseClientId = parentIds.append( - faces.getViewRoot().createUniqueId()).toString(); - } - } - return (_baseClientId); - - } - - /* - * (non-Javadoc) - * - * @see javax.faces.component.UIComponentBase#setId(java.lang.String) - */ - public void setId(String id) { - // If component created by restoring tree or JSP, initial Id is null. - boolean haveId = null != super.getId(); - super.setId(id); - _baseClientId = null; - _clientId = null; - if (haveId) { - // parent UIData ( if present ) will be set same Id at iteration - // - - // we use it for - // switch to different model and state. - String baseClientId = getBaseClientId(getFacesContext()); - this._currentState = (DataComponentState) this._statesMap - .get(baseClientId); - this._currentModel = (ExtendedDataModel) this._modelsMap - .get(baseClientId); - if (null != this._currentModel) { - this._rowKey = this._currentModel.getRowKey(); - // restoreChildState(); - } - // Restore value for row with submitted AjaxComponent. - this._ajaxRowKey = _ajaxRowKeysMap.get(baseClientId); - } - } - - private Object origValue; - - /** - * Save current state of data variable. - */ - public void captureOrigValue() { - captureOrigValue(FacesContext.getCurrentInstance()); - } - - /** - * Save current state of data variable. - * - * @param faces - * current faces context - */ - public void captureOrigValue(FacesContext faces) { - String var = getVar(); - if (var != null) { - Map attrs = faces.getExternalContext().getRequestMap(); - this.origValue = attrs.get(var); - } - } - - /** - * Restore value of data variable after processing phase. - */ - public void restoreOrigValue() { - restoreOrigValue(FacesContext.getCurrentInstance()); - } - - /** - * Restore value of data variable after processing phase. - * - * @param faces - * current faces context - */ - public void restoreOrigValue(FacesContext faces) { - String var = getVar(); - if (var != null) { - Map attrs = faces.getExternalContext().getRequestMap(); - if (this.origValue != null) { - attrs.put(var, this.origValue); - } else { - attrs.remove(var); - } - } - } - - /** - * Saved values of {@link EditableValueHolder} fields per iterations. - */ - private Map childState; - - /** - * @param faces - * @return Saved values of {@link EditableValueHolder} fields per - * iterations. - */ - protected Map getChildState(FacesContext faces) { - if (this.childState == null) { - this.childState = new HashMap(); - } - String baseClientId = getBaseClientId(faces); - Map currentChildState = (Map) childState.get(baseClientId); - if (null == currentChildState) { - currentChildState = new HashMap(); - childState.put(baseClientId, currentChildState); - } - return currentChildState; - } - - /** - * Save values of {@link EditableValueHolder} fields before change - * current row. - * - * @param faces - */ - protected void saveChildState(FacesContext faces) { - - Iterator itr = dataChildren(); - while (itr.hasNext()) { - Map childState = this.getChildState(faces); - this.saveChildState(faces, (UIComponent) itr.next(), childState); - } - } - - /** - * Recursive method for Iterate on children for save - * {@link EditableValueHolder} fields states. - * - * @param faces - * @param c - * @param childState - */ - private void saveChildState(FacesContext faces, UIComponent c, - Map childState) { - - if (c instanceof EditableValueHolder && !c.isTransient()) { - String clientId = c.getClientId(faces); - SavedState ss = (SavedState) childState.get(clientId); - if (ss == null) { - ss = new SavedState(); - childState.put(clientId, ss); - } - ss.populate((EditableValueHolder) c); - } - - // continue hack - Iterator itr = c.getChildren().iterator(); - while (itr.hasNext()) { - saveChildState(faces, (UIComponent) itr.next(), childState); - } - itr = c.getFacets().values().iterator(); - while (itr.hasNext()) { - saveChildState(faces, (UIComponent) itr.next(), childState); - } - } - - /** - * Restore values of {@link EditableValueHolder} fields after change - * current row. - * - * @param faces - */ - protected void restoreChildState(FacesContext faces) { - - Iterator itr = dataChildren(); - while (itr.hasNext()) { - Map childState = this.getChildState(faces); - this.restoreChildState(faces, (UIComponent) itr.next(), childState); - } - } - - /** - * Recursive part of - * {@link #restoreChildState(FacesContext, UIComponent, Map)} - * - * @param faces - * @param c - * @param childState - * - */ - private void restoreChildState(FacesContext faces, UIComponent c, - Map childState) { - // reset id - String id = c.getId(); - c.setId(id); - - // hack - if (c instanceof EditableValueHolder) { - EditableValueHolder evh = (EditableValueHolder) c; - String clientId = c.getClientId(faces); - SavedState ss = (SavedState) childState.get(clientId); - if (ss != null) { - ss.apply(evh); - } else { - NullState.apply(evh); - } - } - - // continue hack - Iterator itr = c.getChildren().iterator(); - while (itr.hasNext()) { - restoreChildState(faces, (UIComponent) itr.next(), childState); - } - itr = c.getFacets().values().iterator(); - while (itr.hasNext()) { - restoreChildState(faces, (UIComponent) itr.next(), childState); - } - } - - /** - * Check for validation errors on children components. If true, saved - * values must be keep on render phase - * - * @param context - * @return - */ - private boolean keepSaved(FacesContext context) { - - Iterator clientIds = this.getChildState(context).keySet().iterator(); - while (clientIds.hasNext()) { - String clientId = (String) clientIds.next(); - Iterator messages = context.getMessages(clientId); - while (messages.hasNext()) { - FacesMessage message = (FacesMessage) messages.next(); - if (message.getSeverity() - .compareTo(FacesMessage.SEVERITY_ERROR) >= 0) { - return (true); - } - } - } - return false; - } - - /** - * Perform iteration on all children components and all data rows with - * given visitor. - * - * @param faces - * @param visitor - */ - protected void iterate(FacesContext faces, ComponentVisitor visitor, - Object argument) { - - // stop if not rendered - if (!this.isRendered()) { - return; - } - // reset rowIndex - this.captureOrigValue(faces); - this.setRowKey(faces, null); - try { - Iterator fixedChildren = fixedChildren(); - while (fixedChildren.hasNext()) { - UIComponent component = (UIComponent) fixedChildren.next(); - visitor.processComponent(faces, component, argument); - } - - walk(faces, visitor, argument); - } catch (Exception e) { - throw new FacesException(e); - } finally { - this.setRowKey(faces, null); - this.restoreOrigValue(faces); - } - } - - /** - * Walk ( visit ) this component on all data-avare children for each - * row. - * - * @param faces - * @param visitor - * @throws IOException - */ - public void walk(FacesContext faces, DataVisitor visitor, Object argument) - throws IOException { - getExtendedDataModel().walk(faces, visitor, - getComponentState().getRange(), argument); - } - - protected void processDecodes(FacesContext faces, Object argument) { - if (!this.isRendered()) - return; - this.resetComponent(faces); - this.iterate(faces, decodeVisitor, argument); - this.decode(faces); - } - - /* - * (non-Javadoc) - * - * @see javax.faces.component.UIData#processDecodes(javax.faces.context.FacesContext) - */ - public void processDecodes(FacesContext faces) { - processDecodes(faces, null); - } - - /** - * Reset per-request fields in component. - * - * @param faces - * - */ - protected void resetComponent(FacesContext faces) { - // resetDataModel(); - if (null != this.childState) { - childState.remove(getBaseClientId(faces)); - } - this._encoded = null; - } - - protected void processUpdates(FacesContext faces, Object argument) { - if (!this.isRendered()) - return; - this.iterate(faces, updateVisitor, argument); - ExtendedDataModel dataModel = getExtendedDataModel(); - // If no validation errors, update values for serializable model, - // restored from view. - if (dataModel instanceof SerializableDataModel && (!keepSaved(faces))) { - SerializableDataModel serializableModel = (SerializableDataModel) dataModel; - serializableModel.update(); - } - } - - public void processUpdates(FacesContext faces) { - processUpdates(faces, null); - } - - protected void processValidators(FacesContext faces, Object argument) { - if (!this.isRendered()) - return; - this.iterate(faces, validateVisitor, argument); - } - - public void processValidators(FacesContext faces) { - processValidators(faces, null); - } - - public void encodeBegin(FacesContext context) throws IOException { - resetDataModel(); - // if(!keepSaved(context)){ - // childState.remove(getBaseClientId(context)); - // } - // Mark component as used, if parent UIData change own range states not - // accessed at - // encode phase must be unsaved. - getEncodedIds().add(getBaseClientId(context)); - // getComponentState().setUsed(true); - super.encodeBegin(context); - } - - /** - * This method must create iterator for all non-data avare children of - * this component ( header/footer facets for components and columns in - * dataTable, facets for tree etc. - * - * @return iterator for all components not sensitive for row data. - */ - protected abstract Iterator fixedChildren(); - - /** - * This method must create iterator for all children components, - * processed "per row" It can be children of UIColumn in dataTable, - * nodes in tree - * - * @return iterator for all components processed per row. - */ - protected abstract Iterator dataChildren(); - - private final static SavedState NullState = new SavedState(); - - // from RI - /** - * This class keep values of {@link EditableValueHolder} row-sensitive - * fields. - * - * @author shura - * - */ - private final static class SavedState implements Serializable { - - private Object submittedValue; - - private static final long serialVersionUID = 2920252657338389849L; - - Object getSubmittedValue() { - return (this.submittedValue); - } - - void setSubmittedValue(Object submittedValue) { - this.submittedValue = submittedValue; - } - - private boolean valid = true; - - boolean isValid() { - return (this.valid); - } - - void setValid(boolean valid) { - this.valid = valid; - } - - private Object value; - - Object getValue() { - return (this.value); - } - - public void setValue(Object value) { - this.value = value; - } - - private boolean localValueSet; - - boolean isLocalValueSet() { - return (this.localValueSet); - } - - public void setLocalValueSet(boolean localValueSet) { - this.localValueSet = localValueSet; - } - - public String toString() { - return ("submittedValue: " + submittedValue + " value: " + value - + " localValueSet: " + localValueSet); - } - - public void populate(EditableValueHolder evh) { - this.value = evh.getLocalValue(); - this.valid = evh.isValid(); - this.submittedValue = evh.getSubmittedValue(); - this.localValueSet = evh.isLocalValueSet(); - } - - public void apply(EditableValueHolder evh) { - evh.setValue(this.value); - evh.setValid(this.valid); - evh.setSubmittedValue(this.submittedValue); - evh.setLocalValueSet(this.localValueSet); - } - - } - - /* - * (non-Javadoc) - * - * @see javax.faces.component.UIData#queueEvent(javax.faces.event.FacesEvent) - */ - public void queueEvent(FacesEvent event) { - if (event.getComponent() != this) { - event = new IndexedEvent(this, event, getRowKey()); - } - // Send event directly to parent, to avoid wrapping in superclass. - UIComponent parent = getParent(); - if (parent == null) { - throw new IllegalStateException( - "No parent component for queue event"); - } else { - parent.queueEvent(event); - } - } - - public void broadcast(FacesEvent event) throws AbortProcessingException { - - if (!(event instanceof IndexedEvent)) { - if (!broadcastLocal(event)) { - super.broadcast(event); - } - return; - } - - // Set up the correct context and fire our wrapped event - IndexedEvent revent = (IndexedEvent) event; - Object oldRowKey = getRowKey(); - FacesContext faces = FacesContext.getCurrentInstance(); - captureOrigValue(faces); - Object eventRowKey = revent.getKey(); - setRowKey(faces, eventRowKey); - FacesEvent rowEvent = revent.getTarget(); - rowEvent.getComponent().broadcast(rowEvent); - // For Ajax events, keep row value. - if (!(rowEvent.getPhaseId() == PhaseId.RENDER_RESPONSE)) { - this._ajaxRowKey = eventRowKey; - this._ajaxRowKeysMap.put(getBaseClientId(faces), eventRowKey); - } - setRowKey(faces, oldRowKey); - restoreOrigValue(faces); - // } - return; - } - - /** - * Process events targetted for concrete implementation. Hook method - * called from {@link #broadcast(FacesEvent)} - * - * @param event - - * processed event. - * @return true if event processed, false if component must continue - * processing. - */ - protected boolean broadcastLocal(FacesEvent event) { - return false; - } - - /** - * Wrapper for event from child component, with value of current row - * key. - * - * @author shura - * - */ - protected static final class IndexedEvent extends FacesEvent { - - private static final long serialVersionUID = -8318895390232552385L; - - private final FacesEvent target; - - private final Object key; - - public IndexedEvent(UIDataAdaptor owner, FacesEvent target, Object key) { - super(owner); - this.target = target; - this.key = key; - } - - public PhaseId getPhaseId() { - return (this.target.getPhaseId()); - } - - public void setPhaseId(PhaseId phaseId) { - this.target.setPhaseId(phaseId); - } - - public boolean isAppropriateListener(FacesListener listener) { - return this.target.isAppropriateListener(listener); - } - - public void processListener(FacesListener listener) { - UIDataAdaptor owner = (UIDataAdaptor) this.getComponent(); - Object prevIndex = owner._rowKey; - try { - owner.setRowKey(this.key); - this.target.processListener(listener); - } finally { - owner.setRowKey(prevIndex); - } - } - - public Object getKey() { - return key; - } - - public FacesEvent getTarget() { - return target; - } - - } - - /** - * "memento" pattern class for state of component. - * - * @author shura - * - */ - private static class DataState implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 17070532L; - - private Object superState; - - private Map componentStates = new HashMap(); - - private Set ajaxKeys; - - public String rowKeyVar; - - public String stateVar; - - } - - /** - * Serialisable model and component state per iteration of parent - * UIData. - * - * @author shura - * - */ - private static class PerIdState implements Serializable { - /** - * - */ - private static final long serialVersionUID = 9037454770537726418L; - - /** - * Flag setted to true if componentState implements StateHolder - */ - private boolean stateInHolder = false; - - /** - * Serializable componentState or - */ - private Object componentState; - - private SerializableDataModel model; - } - - public void restoreState(FacesContext faces, Object object) { - DataState state = (DataState) object; - super.restoreState(faces, state.superState); - this._ajaxKeys = state.ajaxKeys; - this._statesMap = new HashMap(); - this._rowKeyVar = state.rowKeyVar; - this._stateVar = state.stateVar; - // Restore serializable models and component states for all rows of - // parent UIData ( single if this - // component not child of iterable ) - for (Iterator iter = state.componentStates.entrySet().iterator(); iter - .hasNext();) { - Map.Entry stateEntry = (Map.Entry) iter.next(); - PerIdState idState = (PerIdState) stateEntry.getValue(); - DataComponentState compState; - if (idState.stateInHolder) { - // TODO - change RichFaces Tree component, for remove reference - // to component from state. - compState = createComponentState(); - ((StateHolder) compState).restoreState(faces, - idState.componentState); - } else { - compState = (DataComponentState) idState.componentState; - } - Object key = stateEntry.getKey(); - this._statesMap.put(key, compState); - this._modelsMap.put(key, idState.model); - } - } - - public Object saveState(FacesContext faces) { - DataState state = new DataState(); - state.superState = super.saveState(faces); - state.ajaxKeys = this._ajaxKeys; - state.rowKeyVar = this._rowKeyVar; - state.stateVar = this._stateVar; - Set encodedIds = getEncodedIds(); - // Save all states of component and data model for all valies of - // clientId, encoded in this request. - for (Iterator iter = this._statesMap.entrySet().iterator(); iter - .hasNext();) { - Map.Entry stateEntry = (Map.Entry) iter.next(); - DataComponentState dataComponentState = ((DataComponentState) stateEntry - .getValue()); - Object stateKey = stateEntry.getKey(); - if (encodedIds.isEmpty() || encodedIds.contains(stateKey)) { - PerIdState idState = new PerIdState(); - idState.model = getExtendedDataModel().getSerializableModel( - dataComponentState.getRange()); - // Save component state , depended if implemented interfaces. - if (null == dataComponentState) { - idState.componentState = null; - } else if (dataComponentState instanceof Serializable) { - idState.componentState = dataComponentState; - } else if (dataComponentState instanceof StateHolder) { - // TODO - change RichFaces Tree component, for remove - // reference to component from state. - // Change this code to reference for saveAttachedState. - idState.componentState = ((StateHolder) dataComponentState) - .saveState(faces); - idState.stateInHolder = true; - } - if (null != idState.model || null != idState.componentState) { - state.componentStates.put(stateKey, idState); - } - } - } - return state; - } - - public void setParent(UIComponent parent) { - super.setParent(parent); - this._clientId = null; - this._baseClientId = null; - } - - -} Modified: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIRepeat.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/component/UIRepeat.java 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/core/src/main/java/org/ajax4jsf/component/UIRepeat.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -21,109 +21,16 @@ package org.ajax4jsf.component; -import java.sql.ResultSet; -import java.util.Collections; import java.util.Iterator; -import java.util.List; -import javax.faces.context.FacesContext; -import javax.faces.model.ArrayDataModel; -import javax.faces.model.DataModel; -import javax.faces.model.ListDataModel; -import javax.faces.model.ResultDataModel; -import javax.faces.model.ResultSetDataModel; -import javax.faces.model.ScalarDataModel; -import javax.servlet.jsp.jstl.sql.Result; -import org.ajax4jsf.model.DataComponentState; -import org.ajax4jsf.model.ExtendedDataModel; -import org.ajax4jsf.model.Range; -import org.ajax4jsf.model.SequenceDataModel; -import org.ajax4jsf.model.SequenceRange; /** * @author shura * */ -public class UIRepeat extends UIDataAdaptor { +public class UIRepeat extends SequenceDataAdaptor { /* (non-Javadoc) - * @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#createComponentState() - */ - protected DataComponentState createComponentState() { - // Create component state based on this instance. - return new DataComponentState(){ - - public Range getRange() { - return new SequenceRange(getFirst(),getRows()); - } - - public boolean isTransient() { - // TODO Auto-generated method stub - return false; - } - - public void restoreState(FacesContext arg0, Object arg1) { - // TODO Auto-generated method stub - - } - - public Object saveState(FacesContext arg0) { - // TODO Auto-generated method stub - return null; - } - - public void setTransient(boolean arg0) { - // TODO Auto-generated method stub - - } - }; - - } - - /* (non-Javadoc) - * @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#createDataModel() - */ - protected ExtendedDataModel createDataModel() { - return (ExtendedDataModel) getDataModel(); - } - - protected DataModel getDataModel(){ - // Synthesize a DataModel around our current value if possible - // TODO - for jsf 1.2 use method from superclass ? - Object current = getValue(); - DataModel model; - if (current == null) { - model = new SequenceDataModel(new ListDataModel(Collections.EMPTY_LIST)); - } else if (current instanceof ExtendedDataModel) { - model = (DataModel) current; - } else if (current instanceof DataModel) { - model = new SequenceDataModel((DataModel) current); - } else if (current instanceof List) { - model = new SequenceDataModel(new ListDataModel((List) current)); - } else if (Object[].class.isAssignableFrom(current.getClass())) { - model = new SequenceDataModel(new ArrayDataModel((Object[]) current)); - } else if (current instanceof ResultSet) { - model = new SequenceDataModel(new ResultSetDataModel((ResultSet) current)); - } else if (current instanceof Result) { - model = new SequenceDataModel(new ResultDataModel((Result) current)); - } else { - model = new SequenceDataModel(new ScalarDataModel(current)); - } - return (model); - } - - protected void setDataModel(DataModel model) { - ExtendedDataModel iterableModel; - if( null == model){ - iterableModel = null; - } else if (model instanceof ExtendedDataModel) { - iterableModel = (ExtendedDataModel) model; - } else { - iterableModel = new SequenceDataModel(model); - } - setExtendedDataModel(iterableModel); - } - /* (non-Javadoc) * @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#dataChildren() */ protected Iterator dataChildren() { Deleted: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxActionsRule.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxActionsRule.java 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxActionsRule.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -1,99 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.taglib.html.facelets; - -import javax.faces.component.ActionSource; -import javax.faces.event.ActionEvent; - -import com.sun.facelets.FaceletContext; -import com.sun.facelets.el.LegacyMethodBinding; -import com.sun.facelets.tag.MetaRule; -import com.sun.facelets.tag.Metadata; -import com.sun.facelets.tag.MetadataTarget; -import com.sun.facelets.tag.TagAttribute; - -/** - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:21 $ - * - */ -public class AjaxActionsRule extends MetaRule { - - public final static Class[] ACTION_SIG = new Class[0]; - - public final static Class[] ACTION_LISTENER_SIG = new Class[] { ActionEvent.class }; - - public final static class ActionMapper extends Metadata { - - private final TagAttribute attr; - - public ActionMapper(TagAttribute attr) { - this.attr = attr; - } - - public void applyMetadata(FaceletContext ctx, Object instance) { - ((ActionSource) instance).setAction(new LegacyMethodBinding( - this.attr.getMethodExpression(ctx, String.class, - AjaxActionsRule.ACTION_SIG))); - } - } - - public final static class ActionListenerMapper extends Metadata { - - private final TagAttribute attr; - - public ActionListenerMapper(TagAttribute attr) { - this.attr = attr; - } - - public void applyMetadata(FaceletContext ctx, Object instance) { - ((ActionSource) instance) - .setActionListener(new LegacyMethodBinding(this.attr - .getMethodExpression(ctx, null, - AjaxActionsRule.ACTION_LISTENER_SIG))); - } - - } - - public final static AjaxActionsRule instance = new AjaxActionsRule(); - - public AjaxActionsRule() { - super(); - } - - public Metadata applyRule(String name, TagAttribute attribute, - MetadataTarget meta) { - if (meta.isTargetInstanceOf(ActionSource.class)) { - - - if ("action".equals(name)) { - return new ActionMapper(attribute); - } - - if ("actionListener".equals(name)) { - return new ActionListenerMapper(attribute); - } - } - return null; - } - -} Deleted: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxComponentHandler.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxComponentHandler.java 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxComponentHandler.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -1,58 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.taglib.html.facelets; - -import javax.faces.component.ActionSource; - -import com.sun.facelets.tag.MetaRuleset; -import com.sun.facelets.tag.jsf.ComponentConfig; -import com.sun.facelets.tag.jsf.ComponentHandler; - -/** - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:23 $ - * - */ -public class AjaxComponentHandler extends ComponentHandler { - - /** - * @param config - */ - public AjaxComponentHandler(ComponentConfig config) { - super(config); - // TODO Auto-generated constructor stub - } - - /* (non-Javadoc) - * @see com.sun.facelets.tag.jsf.ComponentHandler#createMetaRuleset(java.lang.Class) - */ - protected MetaRuleset createMetaRuleset(Class type) { - // TODO Auto-generated method stub - MetaRuleset metaRules = super.createMetaRuleset(type); - if (ActionSource.class.isAssignableFrom(type)) { - metaRules.addRule(AjaxActionsRule.instance); - } - metaRules.addRule(AjaxReRendrRule.instance); - return metaRules; - } - -} Deleted: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxReRendrRule.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxReRendrRule.java 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxReRendrRule.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -1,88 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.taglib.html.facelets; - -import java.util.Set; - -import org.ajax4jsf.component.AjaxComponent; -import org.ajax4jsf.renderkit.AjaxRendererUtils; - -import com.sun.facelets.FaceletContext; -import com.sun.facelets.tag.MetaRule; -import com.sun.facelets.tag.Metadata; -import com.sun.facelets.tag.MetadataTarget; -import com.sun.facelets.tag.TagAttribute; - -/** - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:22 $ - * - */ -public class AjaxReRendrRule extends MetaRule { - - public static final AjaxReRendrRule instance = new AjaxReRendrRule(); - /** - * - */ - public AjaxReRendrRule() { - super(); - // TODO Auto-generated constructor stub - } - - /* (non-Javadoc) - * @see com.sun.facelets.tag.MetaRule#applyRule(java.lang.String, com.sun.facelets.tag.TagAttribute, com.sun.facelets.tag.MetadataTarget) - */ - public Metadata applyRule(String name, TagAttribute attribute, - MetadataTarget meta) { - if (meta.isTargetInstanceOf(AjaxComponent.class)) { - if ("reRender".equals(name)) { - if (attribute.isLiteral()) { - return new ReRendersSetMataData(attribute.getValue()); - } else { - // Process as usual expression - return null; - } - } - } - return null; - } - - static class ReRendersSetMataData extends Metadata{ - - private Set _reRender; - /** - * @param value - */ - public ReRendersSetMataData(String value) { - _reRender = AjaxRendererUtils.asSet(value); - } - - /* (non-Javadoc) - * @see com.sun.facelets.tag.Metadata#applyMetadata(com.sun.facelets.FaceletContext, java.lang.Object) - */ - public void applyMetadata(FaceletContext ctx, Object instance) { - ((AjaxComponent) instance).setReRender(_reRender); - - } - - } -} Modified: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxSupportHandler.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxSupportHandler.java 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/AjaxSupportHandler.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -29,6 +29,7 @@ import javax.faces.component.UIComponentBase; import org.ajax4jsf.taglib.html.jsp.AjaxSupportTag; +import org.ajax4jsf.webapp.taglib.AjaxComponentHandler; import com.sun.facelets.FaceletContext; import com.sun.facelets.FaceletException; Modified: trunk/ui/dataTable/pom.xml =================================================================== --- trunk/ui/dataTable/pom.xml 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/dataTable/pom.xml 2007-07-20 19:03:05 UTC (rev 1758) @@ -1,50 +1,54 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>dataTable</artifactId> - <name>Extended data table and lists</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>dataTable</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-core</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>dataTable</artifactId> + <name>Extended data table and lists</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>dataTable</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> +  + </dependencies> </project> \ No newline at end of file Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataGrid.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataGrid.java 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataGrid.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -21,13 +21,15 @@ package org.richfaces.component; -import org.ajax4jsf.component.UIRepeat; +import java.util.Iterator; +import org.ajax4jsf.component.SequenceDataAdaptor; + /** * JSF component class * */ -public abstract class UIDataGrid extends UIRepeat { +public abstract class UIDataGrid extends SequenceDataAdaptor { private static final String COMPONENT_TYPE = "org.richfaces.DataGrig"; @@ -52,5 +54,20 @@ public int getElements() { return getRows(); } + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#dataChildren() + */ + protected Iterator dataChildren() { + // TODO Auto-generated method stub + return getChildren().iterator(); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#fixedChildren() + */ + protected Iterator fixedChildren() { + // TODO Auto-generated method stub + return getFacets().values().iterator(); + } } Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataList.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataList.java 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataList.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -21,16 +21,33 @@ package org.richfaces.component; -import org.ajax4jsf.component.UIRepeat; +import java.util.Iterator; +import org.ajax4jsf.component.SequenceDataAdaptor; + /** * JSF component class * */ -public abstract class UIDataList extends UIRepeat { +public abstract class UIDataList extends SequenceDataAdaptor { private static final String COMPONENT_TYPE = "org.richfaces.DataList"; private static final String COMPONENT_FAMILY = "org.richfaces.DataList"; + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#dataChildren() + */ + protected Iterator dataChildren() { + // TODO Auto-generated method stub + return getChildren().iterator(); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#fixedChildren() + */ + protected Iterator fixedChildren() { + // TODO Auto-generated method stub + return getFacets().values().iterator(); + } } Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -27,7 +27,7 @@ import javax.faces.component.UIComponent; import org.ajax4jsf.component.AjaxSupport; -import org.ajax4jsf.component.UIRepeat; +import org.ajax4jsf.component.SequenceDataAdaptor; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.iterators.FilterIterator; import org.apache.commons.collections.iterators.IteratorChain; @@ -36,7 +36,7 @@ * JSF component class * */ -public abstract class UIDataTable extends UIRepeat { +public abstract class UIDataTable extends SequenceDataAdaptor { /** * @author shura Modified: trunk/ui/drag-drop/pom.xml =================================================================== --- trunk/ui/drag-drop/pom.xml 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/drag-drop/pom.xml 2007-07-20 19:03:05 UTC (rev 1758) @@ -1,50 +1,54 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>drag-drop</artifactId> - <name>Drag and Drop</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>dnd</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-core</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>drag-drop</artifactId> + <name>Drag and Drop</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>dnd</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> +  + </dependencies> </project> \ No newline at end of file Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -21,7 +21,7 @@ package org.richfaces.taglib; -import org.ajax4jsf.taglib.html.facelets.AjaxComponentHandler; +import org.ajax4jsf.webapp.taglib.AjaxComponentHandler; import org.richfaces.component.UIDragSupport; import com.sun.facelets.FaceletContext; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java 2007-07-20 19:02:45 UTC (rev 1757) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java 2007-07-20 19:03:05 UTC (rev 1758) @@ -21,7 +21,7 @@ package org.richfaces.taglib; -import org.ajax4jsf.taglib.html.facelets.AjaxComponentHandler; +import org.ajax4jsf.webapp.taglib.AjaxComponentHandler; import org.richfaces.component.UIDropSupport; import com.sun.facelets.FaceletContext;

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r1757 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: actionparam and 5 other directories.

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

Author: SergeySmirnov Date: 2007-07-20 15:02:45 -0400 (Fri, 20 Jul 2007) New Revision: 1757 Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/source/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/source/usage.html trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/source/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/source/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/source/usage.html trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/source/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/source/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/source/usage.html trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/source/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/usage.xhtml Log: Added a4j components Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/source/usage.html =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/source/usage.html (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/source/usage.html 2007-07-20 19:02:45 UTC (rev 1757) @@ -0,0 +1 @@ +TODO: source should be added \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/source/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/source/usage.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/source/usage.xhtml 2007-07-20 19:02:45 UTC (rev 1757) @@ -0,0 +1 @@ +x \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/usage.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/usage.xhtml 2007-07-20 19:02:45 UTC (rev 1757) @@ -0,0 +1,96 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/ajax" + xmlns:rich="http://richfaces.ajax4jsf.org/rich"> + <ui:composition template="/templates/component-sample.xhtml"> + <ui:define name="sample"> + + <style> + input[type="button"] { + background-color:#{a4jSkin.trimColor}; + } + </style> + + <p>a4j:actionparam is a component that combains together the functionality of f:param and ActionListener. + Additional to the f:param, this component allows to assign the value to the property of the manager bean + directly using assignTo attribute. + </p> + <div class="sample-container"> + <h:form> + <rich:panel> + <a4j:commandButton value="Set Name to Alex" reRender="rep" > + <a4j:actionparam name="username" value="Alex" assignTo="#{userBean.name}"/> + </a4j:commandButton> + <rich:spacer width="20" /> + <a4j:commandButton value="Set Name to John" reRender="rep" > + <a4j:actionparam name="username" value="John" assignTo="#{userBean.name}"/> + </a4j:commandButton> + </rich:panel> + <rich:panel> + <h:outputText id="rep" value="Selected Name:#{userBean.name}"/> + </rich:panel> + </h:form> + </div> + <p> + You can use a4j:param not only with ajax components, but with non-ajax command component also. + In the following example, the used skin of the demo is changed when the full page is refreshed + with regular non-ajax h:commandLink. Using this feature, you can update model values without + invoking even single line of java code on the server side. + </p> + <div class="sample-container"> + <h:form> + <rich:panel> + <f:facet name="header"> + <h:outputText value="Change Demo Appplication Skin To: "/> + </f:facet> + <h:commandLink value="DeepMarine"> + <a4j:actionparam name="skin" value="deepMarine" assignTo="#{skinBean.skin}"/> + </h:commandLink> + <rich:spacer width="20" /> + <h:commandLink value="BlueSky" > + <a4j:actionparam name="skin" value="blueSky" assignTo="#{skinBean.skin}"/> + </h:commandLink> + </rich:panel> + </h:form> + </div> + <p>Attributes 'name' and 'value' are mandatory. You can specify the converter with 'converter' + attribute if you need to convert the value before the model is updates. Note that + the property is assigned with parameter's value on the UPDATE_MODEL phase. So, if + the validation of the form is failed, this phase will be skipped and the property + is not updated. + </p> + <p>It is possible to use javascript variable of custom function for 'value' attribute. In this + case the 'noEscape' attribute should be set to true. When noEscape="true", the 'value' can contain + any javascript expression or javascript function invocation and the result of them will be send + to the server as a value of a4j:actionparam. For following example demonstrate how to assign + the backing bean with browser screen size values. + </p> + <div class="sample-container"> + <h:form> + <a4j:commandButton value="Show Screen Size" reRender="infoPanel"> + <a4j:actionparam name="w" value="screen.width" + assignTo="#{userBean.screenWidth}" noEscape="true" /> + <a4j:actionparam name="h" value="screen.height" + assignTo="#{userBean.screenHeight}" noEscape="true" /> + </a4j:commandButton> + + <rich:panel id="infoPanel"> + <h:panelGrid columns="2"> + <h:outputText value="Width:" /> + <h:outputText value="#{userBean.screenWidth}"/> + <h:outputText value="Height:" /> + <h:outputText value="#{userBean.screenHeight}"/> + </h:panelGrid> + </rich:panel> + </h:form> + </div> + </ui:define> + <ui:define name="sources"> + Here is a fragment of page sources for the given example: + <iframe src="${facesContext.externalContext.requestContextPath}/richfaces/actionparam/source/usage.html" class="source_frame"/> + </ui:define> + </ui:composition> +</html> Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/source/usage.html =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/source/usage.html (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/source/usage.html 2007-07-20 19:02:45 UTC (rev 1757) @@ -0,0 +1 @@ +TODO: source should be added \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/source/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/source/usage.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/source/usage.xhtml 2007-07-20 19:02:45 UTC (rev 1757) @@ -0,0 +1 @@ +x \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml 2007-07-20 19:02:45 UTC (rev 1757) @@ -0,0 +1,112 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/ajax" + xmlns:rich="http://richfaces.ajax4jsf.org/rich"> + <ui:composition template="/templates/component-sample.xhtml"> + <ui:define name="sample"> + + <style> + input[type="button"] { + background-color:#{a4jSkin.trimColor}; + } + </style> + + <p>a4j:form functionality is similar to standard h:form component except two additional features: + <ul> + <li>Along with a4j:htmlCommandLink, it fixes the problem of h:commandLink component that cannot be re-rendered without + re-rendering the whole form it belongs to.</li> + <li>It might convert all non-ajax action + components (including the third party components) to the ajaxian ones if ajaxSubmit + attribute is set to true</li> + </ul> + </p> + <p> + h:commandLink renderer generates the javascript code that is used to submit the form when the link + is clicked. However, if the h:commandLink is rendered outside of the form, for example, when + you point to it with reRender, the wrong code is generated that causes the broken functionality + when user clicks this link later. The example of problematic code is below. To fix the code, + you need to replace h:form with a4j:form and h:commandLink with a4j:htmlCommandLink. + <pre> + .... + <-- This code does not work correctly --> + <h:form> + .... + <a4j:commandButton value="Update Non-Ajax Link" reRender="panel" /> + .... + <h:panelGrid id="panel"> + .... + <h:commandLink value="Non-Ajax Submit" action="foo" /> + .... + </h:panelGrid> + .... + </h:form> + </pre> + </p> + <p> + When ajaxSubmit"true", all included in the form non-ajax control becomes ajaxable. This + approach is similar to the one AjaxAnywhere framework uses. If form works in ajax mode, + the standard ajax attribute such as reRender, eventQueue, requestDelay can be used. The + following example demonstate the difference between partial and full-page refreshing. + In both cases, the regular h:commandButton is used for the form submision. + </p> + + <div class="sample-container" > + <h:panelGrid columns="2"> + + <rich:panel> + <f:facet name="header"> + <h:outputText value="Form with ajaxSubmit equals true"/> + </f:facet> + + <a4j:form ajaxSubmit="true" reRender="name"> + <h:panelGrid> + <h:commandButton value="Set Local Name to John (Ajax)" action="#{userBean.nameItJohn}" /> + <h:outputText id="name" value="Name:#{userBean.name}" /> + </h:panelGrid> + </a4j:form> + </rich:panel> + + <rich:panel> + <f:facet name="header"> + <h:outputText value="Form with ajaxSubmit equals false"/> + </f:facet> + + <a4j:form> + <h:panelGrid> + <h:commandButton value="Set Both Name to Mark (non-Ajax)" action="#{userBean.nameItMark}" /> + <h:outputText id="name" value="Name:#{userBean.name}" /> + </h:panelGrid> + </a4j:form> + </rich:panel> + + </h:panelGrid> + </div> + + <p> + Note:You should not use a4j:form ajaxSubmit"true" if it contains other ajax command components. + Also, due to the security reason, uploadFile form element cannot be convertable to + the be ajaxable. + </p> + + + + + + <f:verbatim> + + <code> + This is a pure text <span>#</span>{mybean.hello} + </code> + </f:verbatim> + <div class="sample-container"> + </div> + </ui:define> + <ui:define name="sources"> + Here is a fragment of page sources for the given example: + <iframe src="${facesContext.externalContext.requestContextPath}/richfaces/form/source/usage.html" class="source_frame"/> + </ui:define> + </ui:composition> +</html> Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/source/usage.html =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/source/usage.html (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/source/usage.html 2007-07-20 19:02:45 UTC (rev 1757) @@ -0,0 +1 @@ +TODO: source should be added \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/source/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/source/usage.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/source/usage.xhtml 2007-07-20 19:02:45 UTC (rev 1757) @@ -0,0 +1 @@ +x \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/usage.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/region/usage.xhtml 2007-07-20 19:02:45 UTC (rev 1757) @@ -0,0 +1,165 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/ajax" + xmlns:rich="http://richfaces.ajax4jsf.org/rich"> + <ui:composition template="/templates/component-sample.xhtml"> + <ui:define name="sample"> + + <style> + input[type="button"] { + background-color:#{a4jSkin.trimColor}; + } + </style> + + <p> + Ajax region is a key ajax component. It limits the part of the component tree to be processed on the server side when + ajax request comes. Processing means invocation during Decode, Validation and Model Update phase. + Most common reasons to use a region are: + <ul> + <li>avoiding the aborting the JSF lifecycle processing during the validation of other + form input unnecessary for given ajax request;</li> + <li>defining the different strategies when events will be deliveries + (immediate="true/false")</li> + <li>showing an individual indicator of ajax status</li> + <li>increasing the performance of the rendering processing (selfRendered="true/false", renderRegionOnly="true/false")</li> + </ul> + </p> + <p> + The following two examples show the situaltion when the validation error does not + allow to process the ajax input. Type the name. The outputText component should + repear after you. However, in the first case, this activity will be aboted because + of the other field with required="true". You will see only the error message + while the "Job" field is empty. + </p> + <div class="sample-container" > + <rich:separator height="1" /> + <a4j:outputPanel ajaxRendered="true"> + <h:messages style="color:red" /> + </a4j:outputPanel> + <h:panelGrid columns="2" width="100%"> + + <h:form id="form1"> + <h:panelGrid columns="2"> + <h:outputText value="Name" /> + <h:inputText value="#{userBean.name}"> + <a4j:support event="onkeyup" reRender="outname" /> + </h:inputText> + <h:outputText value="Job:" /> + <h:inputText required="true" id="job2" value="#{userBean.job}" /> + </h:panelGrid> + </h:form> + + <h:form id="form2"> + <h:panelGrid columns="2"> + <h:outputText value="Name" /> + <a4j:region> + <h:inputText value="#{userBean.name}"> + <a4j:support event="onkeyup" reRender="outname" /> + </h:inputText> + </a4j:region> + <h:outputText value="Job" /> + <h:inputText required="true" id="job1" value="#{userBean.job}" /> + </h:panelGrid> + </h:form> + + </h:panelGrid> + <h:outputText id="outname" style="font-weight:bold" value="Typed Name: #{userBean.name}" /> + <rich:separator style="padding-top:10px" height="1" /> + + </div> + <p> + If no one region is defined explicitly on the page, the whole view plays the role of region. + Regions might be nested. When the ajax request is invoked by the ajax component, the + closest to this component region becomes an actual. + </p> + <p> + Ajax region <b>does not</b> define <b>what</b> the area(s) on the page should be + refreshed when the ajax response is complete. You need to use reRender attribute of + the ajax components or use a4j:outputPanel ajaxRendered="true" for this purpose. + </p> + <p> + Ajax region might limit the set of areas to be re-rendered if regionRenderOnly="true". If + this attribute is set, only the marked area(s) inside the given region will be + included in the list for re-render. The marked area(s) outside of the + region will be ommited. + </p> + <p> + The area(s) marked for update might be re-rendered directly from the component tree + rather than involving jsp (xhtml) page processing if selfRendered attribute is set + to true. This might bust the performance to decrease time spending on Render Respose + phase. However, you need to be aware that the artifact that are not included in the + component tree will disappear from your page after page is updated.<br/> + Most known component that is not stored in the component tree is f:verbatim. It often + used to wrap non-jsf content such as pure html tags in JSF 1.1. However, even f:verbatim + is not required, the pure html tags are not stored in the component tree and will be + revoked from the update area(s) if selfRendered="true". + </p> + <p> + The following example showing the typical situation when the content unexpectedly + disappear during the partial page update when selfRendered="true". The right part of the + example works fine, because the text is produced buy the standard h:outputText component + that is stored in the component tree. Both forms are wrapped with a4j:region selfRendered="true" + </p> + + <div class="sample-container" > + <rich:separator height="1" /> + + <h:panelGrid columns="2" width="100%"> + + <a4j:region selfRendered="true"> + <h:panelGroup> + <h:form> + <h:panelGrid columns="2"> + <h:outputText value="Name" /> + <h:inputText value="#{userBean.name}"> + <a4j:support event="onkeyup" reRender="out3,outname2" /> + </h:inputText> + </h:panelGrid> + </h:form> + <h:panelGroup id="out3"> + This text will disappear during the partual update of this panel. + The text appears back only after the whole page refresh or a partial + update from the region with selfRendered="false" (default value). + </h:panelGroup> + </h:panelGroup> + </a4j:region> + + <a4j:region selfRendered="true"> + <h:panelGroup> + <h:form> + <h:panelGrid columns="2"> + <h:outputText value="Name" /> + <h:inputText value="#{userBean.name}"> + <a4j:support event="onkeyup" reRender="out4,outname2" /> + </h:inputText> + </h:panelGrid> + </h:form> + <h:panelGroup id="out4"> + <h:outputText value="The text of the similar panel will + not disappear because it is printed with h:outputText" /> + </h:panelGroup> + </h:panelGroup> + </a4j:region> + + </h:panelGrid> + <h:outputText id="outname2" style="font-weight:bold" + value="Typed Name: #{userBean.name}" /> + + <rich:separator style="padding-top:10px" height="1" /> + + </div> + + <rich:spacer height="30" /> + </ui:define> + + + + <ui:define name="sources"> + Here is a fragment of page sources for the given example: + <iframe src="${facesContext.externalContext.requestContextPath}/richfaces/region/source/usage.html" class="source_frame"/> + </ui:define> + </ui:composition> +</html>

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r1756 - in trunk/sandbox/samples/scrollable-grid-demo: src/main/java/org/richfaces/demo/datagrid/model and 1 other directories.

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

Author: maksimkaszynski Date: 2007-07-20 13:49:43 -0400 (Fri, 20 Jul 2007) New Revision: 1756 Modified: trunk/sandbox/samples/scrollable-grid-demo/pom.xml trunk/sandbox/samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Key.java trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/grid1.xhtml trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/grid2.xhtml trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/grid3.xhtml trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml Log: updated POM Modified: trunk/sandbox/samples/scrollable-grid-demo/pom.xml =================================================================== --- trunk/sandbox/samples/scrollable-grid-demo/pom.xml 2007-07-20 17:46:02 UTC (rev 1755) +++ trunk/sandbox/samples/scrollable-grid-demo/pom.xml 2007-07-20 17:49:43 UTC (rev 1756) @@ -1,101 +1,29 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>sandbox-samples</artifactId> - <groupId>org.richfaces</groupId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>scrollable-grid-demo</artifactId> - <packaging>war</packaging> - <name>scrollable-grid-demo Maven Webapp</name> - - <dependencies> - - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>scrollable-grid</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-ui</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>0.9.5</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_04</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_04</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.11</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>el-impl</groupId> - <artifactId>el-impl</artifactId> - <version>1.0</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>0.9.5</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.6.2</version> - <scope>runtime</scope> - </dependency> - </dependencies> - - <build> - <finalName>scrollable-grid-demo</finalName> - <plugins> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces.sandbox</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>scrollable-grid-demo</artifactId> + <packaging>war</packaging> + <name>scrollable-grid-demo Maven Webapp</name> + <dependencies> + <dependency> + <groupId>org.richfaces.sandbox.ui</groupId> + <artifactId>scrollable-grid</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + + <build> + <finalName>scrollable-grid-demo</finalName> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@ -105,6 +33,6 @@ </configuration> </plugin> </plugins> - - </build> + + </build> </project> \ No newline at end of file Modified: trunk/sandbox/samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Key.java =================================================================== --- trunk/sandbox/samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Key.java 2007-07-20 17:46:02 UTC (rev 1755) +++ trunk/sandbox/samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/datagrid/model/Key.java 2007-07-20 17:49:43 UTC (rev 1756) @@ -12,8 +12,6 @@ import java.io.Serializable; -import org.ajax4jsf.framework.ajax.AjaxContext; - /** * @author Maksim Kaszynski * Modified: trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml =================================================================== --- trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml 2007-07-20 17:46:02 UTC (rev 1755) +++ trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml 2007-07-20 17:49:43 UTC (rev 1756) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:sg="http://richfaces.ajax4jsf.org/scrollable-grid"> + xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid"> <ui:composition> <sg:column width="200px"> Modified: trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/grid1.xhtml =================================================================== --- trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/grid1.xhtml 2007-07-20 17:46:02 UTC (rev 1755) +++ trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/grid1.xhtml 2007-07-20 17:49:43 UTC (rev 1756) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:sg="http://richfaces.ajax4jsf.org/scrollable-grid"> + xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid"> <ui:composition> <sg:scrollable-grid value="#{modelBuilder.model1}" var="issues" Modified: trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/grid2.xhtml =================================================================== --- trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/grid2.xhtml 2007-07-20 17:46:02 UTC (rev 1755) +++ trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/grid2.xhtml 2007-07-20 17:49:43 UTC (rev 1756) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:sg="http://richfaces.ajax4jsf.org/scrollable-grid"> + xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid"> <ui:composition> <sg:scrollable-grid value="#{modelBuilder.model2}" var="issues" Modified: trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/grid3.xhtml =================================================================== --- trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/grid3.xhtml 2007-07-20 17:46:02 UTC (rev 1755) +++ trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/grid3.xhtml 2007-07-20 17:49:43 UTC (rev 1756) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:sg="http://richfaces.ajax4jsf.org/scrollable-grid"> + xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid"> <ui:composition> <sg:scrollable-grid value="#{modelBuilder.model3}" var="issues" Modified: trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml =================================================================== --- trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml 2007-07-20 17:46:02 UTC (rev 1755) +++ trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml 2007-07-20 17:49:43 UTC (rev 1756) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:sg="http://richfaces.ajax4jsf.org/scrollable-grid" + xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid" xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" > Modified: trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml =================================================================== --- trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml 2007-07-20 17:46:02 UTC (rev 1755) +++ trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml 2007-07-20 17:49:43 UTC (rev 1756) @@ -3,7 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:sg="http://richfaces.ajax4jsf.org/scrollable-grid" + xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid" xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"> <body> <f:view>

17 years, 5 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 July 2007