You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/09/15 13:46:57 UTC
svn commit: r289212 - in /myfaces/examples/trunk/sandbox: ./ WEB-INF/
src/java/org/apache/myfaces/examples/autoupdatedatatablebean/
src/java/org/apache/myfaces/examples/autoupdatedatatablebeans/
src/java/org/apache/myfaces/examples/inputSuggestAjax/ sr...
Author: mmarinschek
Date: Thu Sep 15 04:46:41 2005
New Revision: 289212
URL: http://svn.apache.org/viewcvs?rev=289212&view=rev
Log:
renamed beans to be consistent with jsp file names
Added:
myfaces/examples/trunk/sandbox/autoupdatedatatable.jsp
- copied, changed from r289187, myfaces/examples/trunk/sandbox/ajaxDataTableSingle.jsp
myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/autoupdatedatatablebean/
- copied from r289207, myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/autoupdatedatatablebeans/
myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/AppointmentBean.java
- copied, changed from r289187, myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/SimpleAppointmentBackingBean.java
myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/ScheduleBean.java
- copied, changed from r289187, myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/SimpleScheduleBackingBean.java
Removed:
myfaces/examples/trunk/sandbox/ajaxDataTableSingle.jsp
myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/autoupdatedatatablebeans/
myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/SimpleAppointmentBackingBean.java
myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/SimpleScheduleBackingBean.java
Modified:
myfaces/examples/trunk/sandbox/WEB-INF/examples-config.xml
myfaces/examples/trunk/sandbox/home.jsp
myfaces/examples/trunk/sandbox/inputSuggestAjax.jsp
myfaces/examples/trunk/sandbox/schedule.jsp
myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/autoupdatedatatablebean/AutoUpdateDataTableBean.java
myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/inputSuggestAjax/InputSuggestAjaxBean.java
Modified: myfaces/examples/trunk/sandbox/WEB-INF/examples-config.xml
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/sandbox/WEB-INF/examples-config.xml?rev=289212&r1=289211&r2=289212&view=diff
==============================================================================
--- myfaces/examples/trunk/sandbox/WEB-INF/examples-config.xml (original)
+++ myfaces/examples/trunk/sandbox/WEB-INF/examples-config.xml Thu Sep 15 04:46:41 2005
@@ -12,8 +12,8 @@
<!-- managed bean for autoUpdateDataTable-->
<managed-bean>
- <managed-bean-name>randumnumber</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.examples.autoupdatedatatablebeans.AutoUpdateDataTableBean</managed-bean-class>
+ <managed-bean-name>autoUpdateDataTableBean</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.examples.autoupdatedatatable.AutoUpdateDataTableBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
@@ -22,7 +22,7 @@
<managed-bean>
<managed-bean-name>inputSuggestAjax</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.examples.inputSuggestAjax.InputSuggestAjaxBean</managed-bean-class>
+ <managed-bean-class>org.apache.myfaces.examples.inputsuggestajax.InputSuggestAjaxBean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
@@ -260,8 +260,8 @@
<!-- Managed Beans for schedule.jsp -->
<managed-bean>
- <managed-bean-name>simpleSchedule</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.examples.schedule.SimpleScheduleBackingBean</managed-bean-class>
+ <managed-bean-name>scheduleBean</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.examples.schedule.ScheduleBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>mode</property-name>
@@ -282,12 +282,12 @@
</managed-bean>
<managed-bean>
- <managed-bean-name>simpleAppointment</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.examples.schedule.SimpleAppointmentBackingBean</managed-bean-class>
+ <managed-bean-name>appointmentBean</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.examples.schedule.AppointmentBean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
<managed-property>
<property-name>scheduleBean</property-name>
- <value>#{simpleSchedule}</value>
+ <value>#{scheduleBean}</value>
</managed-property>
</managed-bean>
Copied: myfaces/examples/trunk/sandbox/autoupdatedatatable.jsp (from r289187, myfaces/examples/trunk/sandbox/ajaxDataTableSingle.jsp)
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/sandbox/autoupdatedatatable.jsp?p2=myfaces/examples/trunk/sandbox/autoupdatedatatable.jsp&p1=myfaces/examples/trunk/sandbox/ajaxDataTableSingle.jsp&r1=289187&r2=289212&rev=289212&view=diff
==============================================================================
--- myfaces/examples/trunk/sandbox/ajaxDataTableSingle.jsp (original)
+++ myfaces/examples/trunk/sandbox/autoupdatedatatable.jsp Thu Sep 15 04:46:41 2005
@@ -53,7 +53,7 @@
rowClasses="standardTable_Row1,standardTable_Row2"
columnClasses="standardTable_Column,standardTable_ColumnCentered,standardTable_Column"
var="number"
- value="#{randumnumber.testList}"
+ value="#{autoUpdateDataTableBean.testList}"
preserveDataModel="true"
frequency="5"
>
Modified: myfaces/examples/trunk/sandbox/home.jsp
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/sandbox/home.jsp?rev=289212&r1=289211&r2=289212&view=diff
==============================================================================
--- myfaces/examples/trunk/sandbox/home.jsp (original)
+++ myfaces/examples/trunk/sandbox/home.jsp Thu Sep 15 04:46:41 2005
@@ -22,7 +22,7 @@
<f:verbatim><br/></f:verbatim>
- <h:outputLink value="inputSuggestAjax.jsf" ><f:verbatim>InputSuggestAjax</f:verbatim></h:outputLink>
+ <h:outputLink value="inputsuggestajax.jsf" ><f:verbatim>InputSuggestAjax</f:verbatim></h:outputLink>
<f:verbatim><br/></f:verbatim>
<h:outputLink value="inputSuggest.jsf" ><f:verbatim>Input Suggest</f:verbatim></h:outputLink>
<f:verbatim><br/></f:verbatim>
Modified: myfaces/examples/trunk/sandbox/inputSuggestAjax.jsp
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/sandbox/inputSuggestAjax.jsp?rev=289212&r1=289211&r2=289212&view=diff
==============================================================================
--- myfaces/examples/trunk/sandbox/inputSuggestAjax.jsp (original)
+++ myfaces/examples/trunk/sandbox/inputSuggestAjax.jsp Thu Sep 15 04:46:41 2005
@@ -37,10 +37,10 @@
</style>
<h:panelGrid columns="2">
<h:outputText value="default suggest"/>
- <s:inputSuggestAjax suggestedItemsMethod="#{inputSuggestAjax.getItems}" styleLocation="" />
+ <s:inputsuggestajax suggestedItemsMethod="#{inputsuggestajax.getItems}" styleLocation="" />
<h:outputText value="suggest with limited suggested items"/>
- <s:inputSuggestAjax suggestedItemsMethod="#{inputSuggestAjax.getItems}" styleLocation="" maxSuggestedItems="2" />
+ <s:inputsuggestajax suggestedItemsMethod="#{inputsuggestajax.getItems}" styleLocation="" maxSuggestedItems="2" />
</h:panelGrid>
</h:form>
Modified: myfaces/examples/trunk/sandbox/schedule.jsp
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/sandbox/schedule.jsp?rev=289212&r1=289211&r2=289212&view=diff
==============================================================================
--- myfaces/examples/trunk/sandbox/schedule.jsp (original)
+++ myfaces/examples/trunk/sandbox/schedule.jsp Thu Sep 15 04:46:41 2005
@@ -42,23 +42,23 @@
monthYearRowClass="yearMonthHeader"
weekRowClass="weekHeader"
currentDayCellClass="currentDayCell"
- value="#{simpleSchedule.date}"
- valueChangeListener="#{simpleSchedule.calendarValueChanged}"
- binding="#{simpleSchedule.dateInput}"/>
+ value="#{scheduleBean.date}"
+ valueChangeListener="#{scheduleBean.calendarValueChanged}"
+ binding="#{scheduleBean.dateInput}"/>
<h:outputLabel
for="modeInput"
id="modeLabel"
value="mode:"/>
<h:selectOneMenu
id="modeInput"
- binding="#{simpleSchedule.modeInput}"
+ binding="#{scheduleBean.modeInput}"
immediate="true"
- valueChangeListener="#{simpleSchedule.modeValueChanged}"
+ valueChangeListener="#{scheduleBean.modeValueChanged}"
onchange="this.form.submit();"
- value="#{simpleSchedule.mode}">
+ value="#{scheduleBean.mode}">
<f:selectItems
id="modeItems"
- value="#{simpleSchedule.modeItems}"/>
+ value="#{scheduleBean.modeItems}"/>
</h:selectOneMenu>
<h:outputLabel
for="themeInput"
@@ -68,7 +68,7 @@
id="themeInput"
immediate="true"
onchange="this.form.submit();"
- value="#{simpleSchedule.theme}">
+ value="#{scheduleBean.theme}">
<f:selectItem
itemValue="default"
itemLabel="default"/>
@@ -85,8 +85,8 @@
value="read-only:" />
<h:selectBooleanCheckbox
id="readonlyInput"
- value="#{simpleSchedule.readonly}"
- valueChangeListener="#{simpleSchedule.readonlyValueChanged}"
+ value="#{scheduleBean.readonly}"
+ valueChangeListener="#{scheduleBean.readonlyValueChanged}"
immediate="true"
onchange="this.form.submit();"
title="read-only?"/>
@@ -96,7 +96,7 @@
value="show tooltips:" />
<h:selectBooleanCheckbox
id="tooltipInput"
- value="#{simpleSchedule.tooltip}"
+ value="#{scheduleBean.tooltip}"
immediate="true"
onchange="this.form.submit();"
title="show tooltips?"/>
@@ -104,17 +104,17 @@
</td>
<td width="100%">
<s:schedule
- value="#{simpleSchedule.model}"
+ value="#{scheduleBean.model}"
id="schedule1"
rendered="true"
visibleEndHour="18"
visibleStartHour="8"
workingEndHour="17"
workingStartHour="9"
- readonly="#{simpleSchedule.readonly}"
- actionListener="#{simpleSchedule.scheduleActionPerformed}"
- tooltip="#{simpleSchedule.tooltip}"
- theme="#{simpleSchedule.theme}"/>
+ readonly="#{scheduleBean.readonly}"
+ actionListener="#{scheduleBean.scheduleActionPerformed}"
+ tooltip="#{scheduleBean.tooltip}"
+ theme="#{scheduleBean.theme}"/>
</td>
</tr>
<tr>
@@ -128,14 +128,14 @@
value="start:"/>
<x:inputDate
id="appStart"
- value="#{simpleAppointment.appointmentStart}"
+ value="#{appointmentBean.appointmentStart}"
type="both"/>
<h:outputLabel
for="appEnd"
value="end:"/>
<x:inputDate
id="appEnd"
- value="#{simpleAppointment.appointmentEnd}"
+ value="#{appointmentBean.appointmentEnd}"
type="both"/>
<h:outputLabel
for="appTitle"
@@ -143,14 +143,14 @@
<h:inputText
size="60"
id="appTitle"
- value="#{simpleAppointment.appointmentTitle}"/>
+ value="#{appointmentBean.appointmentTitle}"/>
<h:outputLabel
for="appLocation"
value="location:"/>
<h:inputText
size="60"
id="appLocation"
- value="#{simpleAppointment.appointmentLocation}"/>
+ value="#{appointmentBean.appointmentLocation}"/>
<h:outputLabel
for="appComments"
value="comments:"/>
@@ -158,10 +158,10 @@
cols="60"
rows="5"
id="appComments"
- value="#{simpleAppointment.appointmentComments}"/>
+ value="#{appointmentBean.appointmentComments}"/>
<h:commandButton
value="Add appointment"
- actionListener="#{simpleAppointment.addAppointment}"/>
+ actionListener="#{appointmentBean.addAppointment}"/>
</h:panelGrid>
</td>
</tr>
@@ -172,8 +172,8 @@
<td>
<h:commandButton
value="Remove selected appointment"
- actionListener="#{simpleAppointment.removeAppointment}"
- disabled="#{!simpleSchedule.entrySelected}"/>
+ actionListener="#{appointmentBean.removeAppointment}"
+ disabled="#{!scheduleBean.entrySelected}"/>
</td>
</tr>
<tr>
@@ -187,7 +187,7 @@
value="date:"/>
<x:inputDate
id="holidayDate"
- value="#{simpleAppointment.holidayDate}"
+ value="#{appointmentBean.holidayDate}"
type="date"/>
<h:outputLabel
for="holidayName"
@@ -195,10 +195,10 @@
<h:inputText
size="60"
id="holidayName"
- value="#{simpleAppointment.holidayName}"/>
+ value="#{appointmentBean.holidayName}"/>
<h:commandButton
value="Add holiday"
- actionListener="#{simpleAppointment.addHoliday}"/>
+ actionListener="#{appointmentBean.addHoliday}"/>
</h:panelGrid>
</td>
</tr>
Modified: myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/autoupdatedatatablebean/AutoUpdateDataTableBean.java
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/autoupdatedatatablebean/AutoUpdateDataTableBean.java?rev=289212&r1=289207&r2=289212&view=diff
==============================================================================
--- myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/autoupdatedatatablebean/AutoUpdateDataTableBean.java (original)
+++ myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/autoupdatedatatablebean/AutoUpdateDataTableBean.java Thu Sep 15 04:46:41 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.examples.autoupdatedatatablebeans;
+package org.apache.myfaces.examples.autoupdatedatatablebean;
import java.util.ArrayList;
Modified: myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/inputSuggestAjax/InputSuggestAjaxBean.java
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/inputSuggestAjax/InputSuggestAjaxBean.java?rev=289212&r1=289211&r2=289212&view=diff
==============================================================================
--- myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/inputSuggestAjax/InputSuggestAjaxBean.java (original)
+++ myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/inputSuggestAjax/InputSuggestAjaxBean.java Thu Sep 15 04:46:41 2005
@@ -1,4 +1,4 @@
-package org.apache.myfaces.examples.inputSuggestAjax;
+package org.apache.myfaces.examples.inputsuggestajax;
import java.util.List;
import java.util.ArrayList;
Copied: myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/AppointmentBean.java (from r289187, myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/SimpleAppointmentBackingBean.java)
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/AppointmentBean.java?p2=myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/AppointmentBean.java&p1=myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/SimpleAppointmentBackingBean.java&r1=289187&r2=289212&rev=289212&view=diff
==============================================================================
--- myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/SimpleAppointmentBackingBean.java (original)
+++ myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/AppointmentBean.java Thu Sep 15 04:46:41 2005
@@ -30,7 +30,7 @@
* @author Jurgen Lust (latest modification by $Author$)
* @version $Revision$
*/
-public class SimpleAppointmentBackingBean
+public class AppointmentBean
{
private Date appointmentStart;
private Date appointmentEnd;
@@ -39,7 +39,7 @@
private String appointmentTitle;
private String appointmentLocation;
private String appointmentComments;
- private SimpleScheduleBackingBean scheduleBean;
+ private ScheduleBean scheduleBean;
/**
* @return Returns the appointmentComments.
@@ -156,7 +156,7 @@
/**
* @return Returns the scheduleBean.
*/
- public SimpleScheduleBackingBean getScheduleBean()
+ public ScheduleBean getScheduleBean()
{
return scheduleBean;
}
@@ -164,7 +164,7 @@
/**
* @param scheduleBean The scheduleBean to set.
*/
- public void setScheduleBean(SimpleScheduleBackingBean scheduleBean)
+ public void setScheduleBean(ScheduleBean scheduleBean)
{
this.scheduleBean = scheduleBean;
}
Copied: myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/ScheduleBean.java (from r289187, myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/SimpleScheduleBackingBean.java)
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/ScheduleBean.java?p2=myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/ScheduleBean.java&p1=myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/SimpleScheduleBackingBean.java&r1=289187&r2=289212&rev=289212&view=diff
==============================================================================
--- myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/SimpleScheduleBackingBean.java (original)
+++ myfaces/examples/trunk/sandbox/src/java/org/apache/myfaces/examples/schedule/ScheduleBean.java Thu Sep 15 04:46:41 2005
@@ -38,7 +38,7 @@
* @author Jurgen Lust (latest modification by $Author$)
* @version $Revision$
*/
-public class SimpleScheduleBackingBean
+public class ScheduleBean
{
//~ Instance fields --------------------------------------------------------
@@ -57,7 +57,7 @@
/**
* Creates a new SimpleScheduleBackingBean object.
*/
- public SimpleScheduleBackingBean()
+ public ScheduleBean()
{
super();
initModel();