You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2006/10/15 20:21:36 UTC
svn commit: r464243 - in /myfaces/tomahawk/trunk/sandbox15:
core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/jsf/
examples/src/main/java/org/apache/myfaces/examples/dynaForm/
examples/src/main/resources/org/apache/myfaces/examples/...
Author: imario
Date: Sun Oct 15 11:21:35 2006
New Revision: 464243
URL: http://svn.apache.org/viewvc?view=rev&rev=464243
Log:
dynaForm: added internatialization to sample
Added:
myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/MartialStatus.java (with props)
myfaces/tomahawk/trunk/sandbox15/examples/src/main/resources/org/apache/myfaces/examples/resource/simpleBean_messages.properties (with props)
Modified:
myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java
myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBean.java
myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBeanBacking.java
myfaces/tomahawk/trunk/sandbox15/examples/src/main/webapp/dynaForm/simpleBean.jsp
Modified: myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java?view=diff&rev=464243&r1=464242&r2=464243
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java (original)
+++ myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/guiBuilder/impl/jsf/JsfGuiBuilder.java Sun Oct 15 11:21:35 2006
@@ -1004,8 +1004,15 @@
for (Selection selection : selections)
{
UISelectItem si = new UISelectItem();
- si.setItemLabel(selection.getLabel());
- si.setItemValue(selection.getValue());
+ if (getLabelBundle() != null && selection.getLabel() != null)
+ {
+ si.setItemLabel((String) getLabelBundle().get(selection.getLabel()));
+ }
+ else
+ {
+ si.setItemLabel(selection.getLabel());
+ }
+ si.setItemValue(selection.getValue());
cmp.getChildren().add(si);
}
}
Added: myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/MartialStatus.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/MartialStatus.java?view=auto&rev=464243
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/MartialStatus.java (added)
+++ myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/MartialStatus.java Sun Oct 15 11:21:35 2006
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.myfaces.examples.dynaForm;
+
+public enum MartialStatus
+{
+ SINGLE,
+ MARRIED,
+ DIVORCED,
+ COHABIT
+}
Propchange: myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/MartialStatus.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/MartialStatus.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/MartialStatus.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBean.java?view=diff&rev=464243&r1=464242&r2=464243
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBean.java Sun Oct 15 11:21:35 2006
@@ -21,60 +21,71 @@
public class SimpleBean
{
- private String anyString;
- private long anyLong;
- private boolean anyBoolean;
- private Date anyDateTime;
- private Date anyDateOnly;
+ private String user;
+ private long age;
+ private Date creationDate;
+ private Date birthday;
+ private MartialStatus martialStatus;
+ private boolean checkedData;
- public String getAnyString()
+ public String getUser()
{
- return anyString;
+ return user;
}
- public void setAnyString(String anyString)
+ public void setUser(String user)
{
- this.anyString = anyString;
+ this.user = user;
}
- public long getAnyLong()
+ public long getAge()
{
- return anyLong;
+ return age;
}
- public void setAnyLong(long anyLong)
+ public void setAge(long age)
{
- this.anyLong = anyLong;
+ this.age = age;
}
- public boolean isAnyBoolean()
+ public Date getCreationDate()
{
- return anyBoolean;
+ return creationDate;
}
- public void setAnyBoolean(boolean anyBoolean)
+ public void setCreationDate(Date creationDate)
{
- this.anyBoolean = anyBoolean;
+ this.creationDate = creationDate;
}
- public Date getAnyDateTime()
+ @Temporal(value=TemporalType.DATE)
+ public Date getBirthday()
{
- return anyDateTime;
+ return birthday;
}
- public void setAnyDateTime(Date anyDateTime)
+ public void setBirthday(Date birthday)
{
- this.anyDateTime = anyDateTime;
+ this.birthday = birthday;
}
- @Temporal(value=TemporalType.DATE)
- public Date getAnyDateOnly()
+ public MartialStatus getMartialStatus()
+ {
+ return martialStatus;
+ }
+
+ public void setMartialStatus(MartialStatus martialStatus)
+ {
+ this.martialStatus = martialStatus;
+ }
+
+ public boolean isCheckedData()
{
- return anyDateOnly;
+ return checkedData;
}
- public void setAnyDateOnly(Date anyDateOnly)
+ public void setCheckedData(boolean checkedData)
{
- this.anyDateOnly = anyDateOnly;
+ this.checkedData = checkedData;
}
}
Modified: myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBeanBacking.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBeanBacking.java?view=diff&rev=464243&r1=464242&r2=464243
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBeanBacking.java (original)
+++ myfaces/tomahawk/trunk/sandbox15/examples/src/main/java/org/apache/myfaces/examples/dynaForm/SimpleBeanBacking.java Sun Oct 15 11:21:35 2006
@@ -34,15 +34,15 @@
simpleBean = new SimpleBean();
SimpleBean s1 = new SimpleBean();
- s1.setAnyBoolean(true);
- s1.setAnyDateTime(new Date());
- s1.setAnyLong(1L);
- s1.setAnyString("bean 1");
+ s1.setCheckedData(true);
+ s1.setCreationDate(new Date());
+ s1.setAge(1L);
+ s1.setUser("bean 1");
SimpleBean s2 = new SimpleBean();
- s2.setAnyBoolean(true);
- s2.setAnyDateTime(new Date());
- s2.setAnyLong(2L);
- s2.setAnyString("bean 2");
+ s2.setCheckedData(true);
+ s2.setCreationDate(new Date());
+ s2.setAge(2L);
+ s2.setUser("bean 2");
simpleBeans = new ArrayList<SimpleBean>();
simpleBeans.add(s1);
Added: myfaces/tomahawk/trunk/sandbox15/examples/src/main/resources/org/apache/myfaces/examples/resource/simpleBean_messages.properties
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/examples/src/main/resources/org/apache/myfaces/examples/resource/simpleBean_messages.properties?view=auto&rev=464243
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/examples/src/main/resources/org/apache/myfaces/examples/resource/simpleBean_messages.properties (added)
+++ myfaces/tomahawk/trunk/sandbox15/examples/src/main/resources/org/apache/myfaces/examples/resource/simpleBean_messages.properties Sun Oct 15 11:21:35 2006
@@ -0,0 +1,25 @@
+#
+# Copyright 2006 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+user=User
+age=Age
+creationDate=Creation Date
+birthday=Birthday
+martialStatus=Martial status
+checkedData=Data checked
+SINGLE=single
+MARRIED=married
+DIVORCED=divorced
+COHABIT=cohabit
\ No newline at end of file
Propchange: myfaces/tomahawk/trunk/sandbox15/examples/src/main/resources/org/apache/myfaces/examples/resource/simpleBean_messages.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tomahawk/trunk/sandbox15/examples/src/main/resources/org/apache/myfaces/examples/resource/simpleBean_messages.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tomahawk/trunk/sandbox15/examples/src/main/resources/org/apache/myfaces/examples/resource/simpleBean_messages.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: myfaces/tomahawk/trunk/sandbox15/examples/src/main/webapp/dynaForm/simpleBean.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/examples/src/main/webapp/dynaForm/simpleBean.jsp?view=diff&rev=464243&r1=464242&r2=464243
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/examples/src/main/webapp/dynaForm/simpleBean.jsp (original)
+++ myfaces/tomahawk/trunk/sandbox15/examples/src/main/webapp/dynaForm/simpleBean.jsp Sun Oct 15 11:21:35 2006
@@ -30,6 +30,8 @@
<h:form>
<%@include file="/inc/page_header.jsp" %>
+ <f:loadBundle basename="org.apache.myfaces.examples.resource.simpleBean_messages" var="simpleBeanBundle"/>
+
<h:panelGrid>
<t:htmlTag value="h2">
@@ -39,7 +41,8 @@
<sn:dynaForm
var="simpleBean"
uri="org.apache.myfaces.examples.dynaForm.SimpleBean"
- valueBindingPrefix="simpleBeanBacking.simpleBean">
+ valueBindingPrefix="simpleBeanBacking.simpleBean"
+ bundle="simpleBeanBundle">
<h:panelGrid
id="simpleBean-layout"
columns="2" />
@@ -52,7 +55,8 @@
<sn:dynaForm
var="simpleBean2"
- uri="org.apache.myfaces.examples.dynaForm.SimpleBean">
+ uri="org.apache.myfaces.examples.dynaForm.SimpleBean"
+ bundle="simpleBeanBundle">
<h:dataTable
var="entry"
id="simpleBean2-layout"
@@ -68,7 +72,8 @@
<sn:dynaForm
var="simpleBean3"
uri="org.apache.myfaces.examples.dynaForm.SimpleBean"
- displayOnly="true">
+ displayOnly="true"
+ bundle="simpleBeanBundle">
<h:dataTable
var="entry"
id="simpleBean3-layout"