svnno****@sourc*****
svnno****@sourc*****
2008年 11月 24日 (月) 13:03:52 JST
Revision: 1413
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1413
Author: shinsuke
Date: 2008-11-24 13:03:52 +0900 (Mon, 24 Nov 2008)
Log Message:
-----------
added language.
Modified Paths:
--------------
userinfo/trunk/src/main/config/erd/userinfo.erd
userinfo/trunk/src/main/config/sql/userinfo.ddl
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/UserInfoAction.java
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/bsbhv/BsUserInfoBhv.java
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/bsentity/BsUserInfo.java
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/bsentity/dbmeta/UserInfoDbm.java
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/bs/BsUserInfoCB.java
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/cq/bs/AbstractBsUserInfoCQ.java
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/cq/bs/BsUserInfoCQ.java
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/cq/ciq/UserInfoCIQ.java
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/dxo/UserInfoDxo.java
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/form/UserInfoForm.java
userinfo/trunk/src/main/resources/application.properties
userinfo/trunk/src/main/resources/application_ja.properties
userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.1.log.db
userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.data.db
userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/confirm.jsp
userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/edit.jsp
userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/grouplist.jsp
userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/rolelist.jsp
-------------- next part --------------
Modified: userinfo/trunk/src/main/config/erd/userinfo.erd
===================================================================
--- userinfo/trunk/src/main/config/erd/userinfo.erd 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/config/erd/userinfo.erd 2008-11-24 04:03:52 UTC (rev 1413)
@@ -166,6 +166,22 @@
<defaultValue></defaultValue>
</net.java.amateras.db.visual.model.ColumnModel>
<net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>locale</columnName>
+ <logicalName>Locale</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType">
+ <name>VARCHAR</name>
+ <logicalName>String</logicalName>
+ <supportSize>true</supportSize>
+ <type>12</type>
+ </columnType>
+ <size>5</size>
+ <notNull>false</notNull>
+ <primaryKey>false</primaryKey>
+ <description></description>
+ <autoIncrement>false</autoIncrement>
+ <defaultValue></defaultValue>
+ </net.java.amateras.db.visual.model.ColumnModel>
+ <net.java.amateras.db.visual.model.ColumnModel>
<columnName>role_id</columnName>
<logicalName>Default Role ID</logicalName>
<columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel/columnType"/>
@@ -217,7 +233,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>updated_time</columnName>
<logicalName>Updated Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[16]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -239,7 +255,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>deleted_time</columnName>
<logicalName>Deleted Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[16]/columnType"/>
<size>10</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -298,7 +314,7 @@
<autoIncrement>false</autoIncrement>
<defaultValue></defaultValue>
</net.java.amateras.db.visual.model.ColumnModel>
- <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[14]"/>
+ <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]"/>
</entry>
</references>
<source class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
@@ -368,7 +384,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>created_time</columnName>
<logicalName>Created Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[16]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -390,7 +406,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>updated_time</columnName>
<logicalName>Updated Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[16]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -412,7 +428,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>deleted_time</columnName>
<logicalName>Deleted Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[16]/columnType"/>
<size>10</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -434,7 +450,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>versionNo</columnName>
<logicalName>Version No.</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[21]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[22]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -446,7 +462,7 @@
<indices/>
<constraint>
<x>40</x>
- <y>700</y>
+ <y>719</y>
<width>-1</width>
<height>-1</height>
</constraint>
@@ -600,7 +616,7 @@
<autoIncrement>false</autoIncrement>
<defaultValue></defaultValue>
</net.java.amateras.db.visual.model.ColumnModel>
- <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[13]"/>
+ <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[14]"/>
</entry>
</references>
<source class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
@@ -670,7 +686,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>created_time</columnName>
<logicalName>Created Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[16]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -692,7 +708,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>updated_time</columnName>
<logicalName>Updated Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[16]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -714,7 +730,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>deleted_time</columnName>
<logicalName>Deleted Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[16]/columnType"/>
<size>10</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -736,7 +752,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>versionNo</columnName>
<logicalName>Version No.</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[21]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[22]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -748,7 +764,7 @@
<indices/>
<constraint>
<x>364</x>
- <y>700</y>
+ <y>719</y>
<width>-1</width>
<height>-1</height>
</constraint>
Modified: userinfo/trunk/src/main/config/sql/userinfo.ddl
===================================================================
--- userinfo/trunk/src/main/config/sql/userinfo.ddl 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/config/sql/userinfo.ddl 2008-11-24 04:03:52 UTC (rev 1413)
@@ -58,6 +58,7 @@
email VARCHAR(255),
url VARCHAR(255),
telephone VARCHAR(40),
+ locale VARCHAR(5),
role_id VARCHAR(255),
group_id VARCHAR(255),
created_time TIMESTAMP NOT NULL,
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/UserInfoAction.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/UserInfoAction.java 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/UserInfoAction.java 2008-11-24 04:03:52 UTC (rev 1413)
@@ -2,7 +2,10 @@
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -444,6 +447,26 @@
.getSelectedGroupList(userInfoForm.selectedGroups);
}
+ public List<Map<String, String>> getLocaleItems() {
+ List<Map<String, String>> localeList = new ArrayList<Map<String, String>>();
+ Locale[] locales = Locale.getAvailableLocales();
+ Locale cLocale = request.getLocale();
+ Map<String, Locale> checkMap = new HashMap<String, Locale>();
+ for (Locale lc : locales) {
+ String value = lc.toString().length() > 5 ? lc.toString()
+ .substring(0, 5) : lc.toString();
+ if (!checkMap.containsKey(value)) {
+ Map<String, String> map = new HashMap<String, String>(2);
+ map.put("label", lc.getDisplayLanguage(cLocale) + "(" + value
+ + ")");
+ map.put("value", value);
+ localeList.add(map);
+ checkMap.put(value, lc);
+ }
+ }
+ return localeList;
+ }
+
/**
* @return the request
*/
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/bsbhv/BsUserInfoBhv.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/bsbhv/BsUserInfoBhv.java 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/bsbhv/BsUserInfoBhv.java 2008-11-24 04:03:52 UTC (rev 1413)
@@ -37,7 +37,7 @@
* USER_ID
*
* [column]
- * USER_ID, GIVEN_NAME, FAMILY_NAME, MIDDLE_NAME, GIVEN_NAME_DESC, FAMILY_NAME_DESC, NICKNAME, GENDER, BIRTH_DATE, EMAIL, URL, TELEPHONE, ROLE_ID, GROUP_ID, CREATED_TIME, CREATED_BY, UPDATED_TIME, UPDATED_BY, DELETED_TIME, DELETED_BY, VERSIONNO
+ * USER_ID, GIVEN_NAME, FAMILY_NAME, MIDDLE_NAME, GIVEN_NAME_DESC, FAMILY_NAME_DESC, NICKNAME, GENDER, BIRTH_DATE, EMAIL, URL, TELEPHONE, LOCALE, ROLE_ID, GROUP_ID, CREATED_TIME, CREATED_BY, UPDATED_TIME, UPDATED_BY, DELETED_TIME, DELETED_BY, VERSIONNO
*
* [sequence]
*
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/bsentity/BsUserInfo.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/bsentity/BsUserInfo.java 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/bsentity/BsUserInfo.java 2008-11-24 04:03:52 UTC (rev 1413)
@@ -20,7 +20,7 @@
* USER_ID
*
* [column]
- * USER_ID, GIVEN_NAME, FAMILY_NAME, MIDDLE_NAME, GIVEN_NAME_DESC, FAMILY_NAME_DESC, NICKNAME, GENDER, BIRTH_DATE, EMAIL, URL, TELEPHONE, ROLE_ID, GROUP_ID, CREATED_TIME, CREATED_BY, UPDATED_TIME, UPDATED_BY, DELETED_TIME, DELETED_BY, VERSIONNO
+ * USER_ID, GIVEN_NAME, FAMILY_NAME, MIDDLE_NAME, GIVEN_NAME_DESC, FAMILY_NAME_DESC, NICKNAME, GENDER, BIRTH_DATE, EMAIL, URL, TELEPHONE, LOCALE, ROLE_ID, GROUP_ID, CREATED_TIME, CREATED_BY, UPDATED_TIME, UPDATED_BY, DELETED_TIME, DELETED_BY, VERSIONNO
*
* [sequence]
*
@@ -105,6 +105,9 @@
/** TELEPHONE: {VARCHAR(40)} */
protected String _telephone;
+ /** LOCALE: {VARCHAR(5)} */
+ protected String _locale;
+
/** ROLE_ID: {VARCHAR(255) : FK to ROLE_INFO} */
protected String _roleId;
@@ -395,6 +398,7 @@
sb.append(delimiter).append(getEmail());
sb.append(delimiter).append(getUrl());
sb.append(delimiter).append(getTelephone());
+ sb.append(delimiter).append(getLocale());
sb.append(delimiter).append(getRoleId());
sb.append(delimiter).append(getGroupId());
sb.append(delimiter).append(getCreatedTime());
@@ -682,6 +686,28 @@
this._telephone = telephone;
}
+ /** The column annotation for S2Dao. {VARCHAR(5)} */
+ public static final String locale_COLUMN = "LOCALE";
+
+ /**
+ * LOCALE: {VARCHAR(5)} <br />
+ *
+ * @return The value of the column 'LOCALE'. (Nullable)
+ */
+ public String getLocale() {
+ return _locale;
+ }
+
+ /**
+ * LOCALE: {VARCHAR(5)} <br />
+ *
+ * @param locale The value of the column 'LOCALE'. (Nullable)
+ */
+ public void setLocale(String locale) {
+ _modifiedProperties.addPropertyName("locale");
+ this._locale = locale;
+ }
+
/** The column annotation for S2Dao. {VARCHAR(255) : FK to ROLE_INFO} */
public static final String roleId_COLUMN = "ROLE_ID";
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/bsentity/dbmeta/UserInfoDbm.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/bsentity/dbmeta/UserInfoDbm.java 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/bsentity/dbmeta/UserInfoDbm.java 2008-11-24 04:03:52 UTC (rev 1413)
@@ -84,6 +84,9 @@
protected ColumnInfo _columnTelephone = cci("TELEPHONE", "telephone",
String.class, false, 40, 0);
+ protected ColumnInfo _columnLocale = cci("LOCALE", "locale", String.class,
+ false, 5, 0);
+
protected ColumnInfo _columnRoleId = cci("ROLE_ID", "roleId", String.class,
false, 255, 0);
@@ -159,6 +162,10 @@
return _columnTelephone;
}
+ public ColumnInfo columnLocale() {
+ return _columnLocale;
+ }
+
public ColumnInfo columnRoleId() {
return _columnRoleId;
}
@@ -424,6 +431,7 @@
setupEps(_epsMap, new EpsEmail(), columnEmail());
setupEps(_epsMap, new EpsUrl(), columnUrl());
setupEps(_epsMap, new EpsTelephone(), columnTelephone());
+ setupEps(_epsMap, new EpsLocale(), columnLocale());
setupEps(_epsMap, new EpsRoleId(), columnRoleId());
setupEps(_epsMap, new EpsGroupId(), columnGroupId());
setupEps(_epsMap, new EpsCreatedTime(), columnCreatedTime());
@@ -516,6 +524,12 @@
}
}
+ public static class EpsLocale implements Eps<UserInfo> {
+ public void setup(UserInfo e, Object v) {
+ e.setLocale((String) v);
+ }
+ }
+
public static class EpsRoleId implements Eps<UserInfo> {
public void setup(UserInfo e, Object v) {
e.setRoleId((String) v);
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/bs/BsUserInfoCB.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/bs/BsUserInfoCB.java 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/bs/BsUserInfoCB.java 2008-11-24 04:03:52 UTC (rev 1413)
@@ -294,6 +294,10 @@
doColumn("TELEPHONE");
}
+ public void columnLocale() {
+ doColumn("LOCALE");
+ }
+
public void columnRoleId() {
doColumn("ROLE_ID");
}
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/cq/bs/AbstractBsUserInfoCQ.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/cq/bs/AbstractBsUserInfoCQ.java 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/cq/bs/AbstractBsUserInfoCQ.java 2008-11-24 04:03:52 UTC (rev 1413)
@@ -1910,6 +1910,143 @@
abstract protected ConditionValue getCValueTelephone();
/**
+ * Equal(=). And NullOrEmptyIgnored, OnceRegistered. {VARCHAR(5)}
+ *
+ * @param locale The value of locale as equal.
+ */
+ public void setLocale_Equal(String locale) {
+ regLocale(CK_EQ, fRES(locale));
+ }
+
+ /**
+ * NotEqual(!=). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param locale The value of locale as notEqual.
+ */
+ public void setLocale_NotEqual(String locale) {
+ regLocale(CK_NE, fRES(locale));
+ }
+
+ /**
+ * GreaterThan(>). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param locale The value of locale as greaterThan.
+ */
+ public void setLocale_GreaterThan(String locale) {
+ regLocale(CK_GT, fRES(locale));
+ }
+
+ /**
+ * LessThan(<). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param locale The value of locale as lessThan.
+ */
+ public void setLocale_LessThan(String locale) {
+ regLocale(CK_LT, fRES(locale));
+ }
+
+ /**
+ * GreaterEqual(>=). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param locale The value of locale as greaterEqual.
+ */
+ public void setLocale_GreaterEqual(String locale) {
+ regLocale(CK_GE, fRES(locale));
+ }
+
+ /**
+ * LessEqual(<=). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param locale The value of locale as lessEqual.
+ */
+ public void setLocale_LessEqual(String locale) {
+ regLocale(CK_LE, fRES(locale));
+ }
+
+ /**
+ * PrefixSearch(like 'xxx%'). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param locale The value of locale as prefixSearch.
+ */
+ public void setLocale_PrefixSearch(String locale) {
+ regLocale(CK_PS, fRES(locale));
+ }
+
+ /**
+ * LikeSearch(like 'xxx%' escape ...). And NullOrEmptyIgnored,
+ * SeveralRegistered.
+ *
+ * @param locale The value of locale as likeSearch.
+ * @param likeSearchOption The option of like-search. (NotNull)
+ */
+ public void setLocale_LikeSearch(
+ String locale,
+ jp.sf.pal.userinfo.db.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+ registerLikeSearchQuery(CK_LS, fRES(locale), getCValueLocale(),
+ "LOCALE", "Locale", "locale", likeSearchOption);
+ }
+
+ /**
+ * InScope(in ('a', 'b')). And NullOrEmptyIgnored,
+ * NullOrEmptyElementIgnored, SeveralRegistered.
+ *
+ * @param localeList The collection of locale as inScope.
+ */
+ public void setLocale_InScope(Collection<String> localeList) {
+ regLocale(CK_INS, cTL(localeList));
+ }
+
+ /**
+ * InScope(in ('a', 'b')). And NullOrEmptyIgnored,
+ * NullOrEmptyElementIgnored, SeveralRegistered.
+ *
+ * @param locale The collection of locale as inScope.
+ * @param inScopeOption The option of in-scope. (NotNull)
+ */
+ public void setLocale_InScope(
+ String locale,
+ jp.sf.pal.userinfo.db.allcommon.cbean.coption.InScopeOption inScopeOption) {
+ registerInScopeQuery(CK_INS, fRES(locale), getCValueLocale(), "LOCALE",
+ "Locale", "locale", inScopeOption);
+ }
+
+ /**
+ * NotInScope(not in ('a', 'b')). And NullOrEmptyIgnored,
+ * NullOrEmptyElementIgnored, SeveralRegistered.
+ *
+ * @param localeList The collection of locale as notInScope.
+ */
+ public void setLocale_NotInScope(Collection<String> localeList) {
+ regLocale(CK_NINS, cTL(localeList));
+ }
+
+ /**
+ * IsNull(is null). And OnceRegistered.
+ */
+ public void setLocale_IsNull() {
+ regLocale(CK_ISN, DUMMY_OBJECT);
+ }
+
+ /**
+ * IsNotNull(is not null). And OnceRegistered.
+ */
+ public void setLocale_IsNotNull() {
+ regLocale(CK_ISNN, DUMMY_OBJECT);
+ }
+
+ protected void regLocale(ConditionKey key, Object value) {
+ registerQuery(key, value, getCValueLocale(), "LOCALE", "Locale",
+ "locale");
+ }
+
+ protected void registerInlineLocale(ConditionKey key, Object value) {
+ registerInlineQuery(key, value, getCValueLocale(), "LOCALE", "Locale",
+ "locale");
+ }
+
+ abstract protected ConditionValue getCValueLocale();
+
+ /**
* Equal(=). And NullOrEmptyIgnored, OnceRegistered. {VARCHAR(255) : FK to
* ROLE_INFO}
*
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/cq/bs/BsUserInfoCQ.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/cq/bs/BsUserInfoCQ.java 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/cq/bs/BsUserInfoCQ.java 2008-11-24 04:03:52 UTC (rev 1413)
@@ -521,6 +521,29 @@
return this;
}
+ protected ConditionValue _locale;
+
+ public ConditionValue getLocale() {
+ if (_locale == null) {
+ _locale = new ConditionValue();
+ }
+ return _locale;
+ }
+
+ protected ConditionValue getCValueLocale() {
+ return getLocale();
+ }
+
+ public BsUserInfoCQ addOrderBy_Locale_Asc() {
+ regOBA("LOCALE");
+ return this;
+ }
+
+ public BsUserInfoCQ addOrderBy_Locale_Desc() {
+ regOBD("LOCALE");
+ return this;
+ }
+
protected ConditionValue _roleId;
public ConditionValue getRoleId() {
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/cq/ciq/UserInfoCIQ.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/cq/ciq/UserInfoCIQ.java 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/db/cbean/cq/ciq/UserInfoCIQ.java 2008-11-24 04:03:52 UTC (rev 1413)
@@ -198,6 +198,10 @@
return _myCQ.getTelephone();
}
+ protected ConditionValue getCValueLocale() {
+ return _myCQ.getLocale();
+ }
+
protected ConditionValue getCValueRoleId() {
return _myCQ.getRoleId();
}
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/dxo/UserInfoDxo.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/dxo/UserInfoDxo.java 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/dxo/UserInfoDxo.java 2008-11-24 04:03:52 UTC (rev 1413)
@@ -25,6 +25,7 @@
+ ", email : email" //
+ ", url : url" //
+ ", telephone : telephone" //
+ + ", locale : locale" //
+ ", roleId : roleId" //
+ ", groupId : groupId" //
+ ", createdTime : createdTime" //
@@ -53,6 +54,7 @@
+ ", email : email" //
+ ", url : url" //
+ ", telephone : telephone" //
+ + ", locale : locale" //
+ ", roleId : roleId" //
+ ", groupId : groupId" //
// + ", createdTime : createdTime" //
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/form/UserInfoForm.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/form/UserInfoForm.java 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/form/UserInfoForm.java 2008-11-24 04:03:52 UTC (rev 1413)
@@ -53,6 +53,9 @@
@Maxbytelength(maxbytelength = 40)
public String telephone;
+ @Maxbytelength(maxbytelength = 5)
+ public String locale;
+
@Maxbytelength(maxbytelength = 255)
public String roleId;
@@ -105,6 +108,7 @@
email = null;
url = null;
telephone = null;
+ locale = null;
roleId = null;
groupId = null;
createdTime = null;
Modified: userinfo/trunk/src/main/resources/application.properties
===================================================================
--- userinfo/trunk/src/main/resources/application.properties 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/resources/application.properties 2008-11-24 04:03:52 UTC (rev 1413)
@@ -134,3 +134,5 @@
labels.add_groups=Add >>
labels.remove_groups=<< Remove
+labels.locale=Language
+
Modified: userinfo/trunk/src/main/resources/application_ja.properties
===================================================================
--- userinfo/trunk/src/main/resources/application_ja.properties 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/resources/application_ja.properties 2008-11-24 04:03:52 UTC (rev 1413)
@@ -127,3 +127,4 @@
labels.add_groups=\u8ffd\u52a0 >>
labels.remove_groups=<< \u524a\u9664
+labels.locale=\u8a00\u8a9e
Modified: userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.1.log.db
===================================================================
(Binary files differ)
Modified: userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.data.db
===================================================================
(Binary files differ)
Modified: userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/confirm.jsp
===================================================================
--- userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/confirm.jsp 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/confirm.jsp 2008-11-24 04:03:52 UTC (rev 1413)
@@ -85,6 +85,16 @@
<th><bean:message key="labels.telephone_number"/></th>
<td>${f:h(telephone)}<html:hidden property="telephone"/></td>
</tr>
+ <tr>
+ <th><bean:message key="labels.locale"/></th>
+ <td>
+<c:if test="${locale==''}"><bean:message key="labels.none"/></c:if>
+<c:forEach var="l" varStatus="s" items="${localeItems}">
+ <c:if test="${locale==l.value}">${f:h(l.label)}</c:if>
+</c:forEach>
+<html:hidden property="locale"/>
+ </td>
+ </tr>
<c:if test="${roleAvailable}">
<tr>
<th><bean:message key="labels.default_role"/></th>
Modified: userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/edit.jsp
===================================================================
--- userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/edit.jsp 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/edit.jsp 2008-11-24 04:03:52 UTC (rev 1413)
@@ -86,6 +86,17 @@
<th><bean:message key="labels.telephone_number"/></th>
<td><html:text property="telephone" size="20"/></td>
</tr>
+ <tr>
+ <th><bean:message key="labels.locale"/></th>
+ <td>
+ <html:select property="locale">
+<option value=""><bean:message key="labels.none"/></option>
+<c:forEach var="l" varStatus="s" items="${localeItems}">
+ <html:option value="${l.value}">${f:h(l.label)}</html:option>
+</c:forEach>
+ </html:select>
+ </td>
+ </tr>
<c:if test="${roleAvailable}">
<tr>
<th><bean:message key="labels.default_role"/></th>
Modified: userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/grouplist.jsp
===================================================================
--- userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/grouplist.jsp 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/grouplist.jsp 2008-11-24 04:03:52 UTC (rev 1413)
@@ -41,6 +41,7 @@
<html:hidden property="email"/>
<html:hidden property="url"/>
<html:hidden property="telephone"/>
+<html:hidden property="locale"/>
<html:hidden property="roleId"/>
<html:hidden property="groupId"/>
<html:select property="selectedRoles" multiple="true" style="display:none;">
Modified: userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/rolelist.jsp
===================================================================
--- userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/rolelist.jsp 2008-11-23 01:39:24 UTC (rev 1412)
+++ userinfo/trunk/src/main/webapp/WEB-INF/view/userInfo/rolelist.jsp 2008-11-24 04:03:52 UTC (rev 1413)
@@ -41,6 +41,7 @@
<html:hidden property="email"/>
<html:hidden property="url"/>
<html:hidden property="telephone"/>
+<html:hidden property="locale"/>
<html:hidden property="roleId"/>
<html:hidden property="groupId"/>
<html:select property="selectedGroups" multiple="true" style="display:none;">