svnno****@sourc*****
svnno****@sourc*****
2008年 11月 24日 (月) 14:14:05 JST
Revision: 1415 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1415 Author: shinsuke Date: 2008-11-24 14:14:05 +0900 (Mon, 24 Nov 2008) Log Message: ----------- added language. Modified Paths: -------------- board/trunk/src/main/config/erd/board.erd board/trunk/src/main/config/sql/board.ddl board/trunk/src/main/java/jp/sf/pal/board/db/bsbhv/BsUserInfoBhv.java board/trunk/src/main/java/jp/sf/pal/board/db/bsentity/BsUserInfo.java board/trunk/src/main/java/jp/sf/pal/board/db/bsentity/dbmeta/UserInfoDbm.java board/trunk/src/main/java/jp/sf/pal/board/db/cbean/bs/BsUserInfoCB.java board/trunk/src/main/java/jp/sf/pal/board/db/cbean/cq/bs/AbstractBsUserInfoCQ.java board/trunk/src/main/java/jp/sf/pal/board/db/cbean/cq/bs/BsUserInfoCQ.java board/trunk/src/main/java/jp/sf/pal/board/db/cbean/cq/ciq/UserInfoCIQ.java board/trunk/src/main/webapp/WEB-INF/db/board.data.db -------------- next part -------------- Modified: board/trunk/src/main/config/erd/board.erd =================================================================== --- board/trunk/src/main/config/erd/board.erd 2008-11-24 04:16:20 UTC (rev 1414) +++ board/trunk/src/main/config/erd/board.erd 2008-11-24 05:14:05 UTC (rev 1415) @@ -152,7 +152,7 @@ <indices/> <constraint> <x>452</x> - <y>871</y> + <y>890</y> <width>-1</width> <height>-1</height> </constraint> @@ -1312,6 +1312,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"/> @@ -1363,7 +1379,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> @@ -1385,7 +1401,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> @@ -1444,7 +1460,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="../../.."/> @@ -1514,7 +1530,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> @@ -1536,7 +1552,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> @@ -1558,7 +1574,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> @@ -1580,7 +1596,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> @@ -1592,7 +1608,7 @@ <indices/> <constraint> <x>1094</x> - <y>871</y> + <y>890</y> <width>-1</width> <height>-1</height> </constraint> @@ -1746,7 +1762,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="../../.."/> @@ -1816,7 +1832,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> @@ -1838,7 +1854,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> @@ -1860,7 +1876,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> @@ -1882,7 +1898,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> @@ -1894,7 +1910,7 @@ <indices/> <constraint> <x>1418</x> - <y>871</y> + <y>890</y> <width>-1</width> <height>-1</height> </constraint> Modified: board/trunk/src/main/config/sql/board.ddl =================================================================== --- board/trunk/src/main/config/sql/board.ddl 2008-11-24 04:16:20 UTC (rev 1414) +++ board/trunk/src/main/config/sql/board.ddl 2008-11-24 05:14:05 UTC (rev 1415) @@ -176,6 +176,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: board/trunk/src/main/java/jp/sf/pal/board/db/bsbhv/BsUserInfoBhv.java =================================================================== --- board/trunk/src/main/java/jp/sf/pal/board/db/bsbhv/BsUserInfoBhv.java 2008-11-24 04:16:20 UTC (rev 1414) +++ board/trunk/src/main/java/jp/sf/pal/board/db/bsbhv/BsUserInfoBhv.java 2008-11-24 05:14:05 UTC (rev 1415) @@ -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: board/trunk/src/main/java/jp/sf/pal/board/db/bsentity/BsUserInfo.java =================================================================== --- board/trunk/src/main/java/jp/sf/pal/board/db/bsentity/BsUserInfo.java 2008-11-24 04:16:20 UTC (rev 1414) +++ board/trunk/src/main/java/jp/sf/pal/board/db/bsentity/BsUserInfo.java 2008-11-24 05:14:05 UTC (rev 1415) @@ -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: board/trunk/src/main/java/jp/sf/pal/board/db/bsentity/dbmeta/UserInfoDbm.java =================================================================== --- board/trunk/src/main/java/jp/sf/pal/board/db/bsentity/dbmeta/UserInfoDbm.java 2008-11-24 04:16:20 UTC (rev 1414) +++ board/trunk/src/main/java/jp/sf/pal/board/db/bsentity/dbmeta/UserInfoDbm.java 2008-11-24 05:14:05 UTC (rev 1415) @@ -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: board/trunk/src/main/java/jp/sf/pal/board/db/cbean/bs/BsUserInfoCB.java =================================================================== --- board/trunk/src/main/java/jp/sf/pal/board/db/cbean/bs/BsUserInfoCB.java 2008-11-24 04:16:20 UTC (rev 1414) +++ board/trunk/src/main/java/jp/sf/pal/board/db/cbean/bs/BsUserInfoCB.java 2008-11-24 05:14:05 UTC (rev 1415) @@ -294,6 +294,10 @@ doColumn("TELEPHONE"); } + public void columnLocale() { + doColumn("LOCALE"); + } + public void columnRoleId() { doColumn("ROLE_ID"); } Modified: board/trunk/src/main/java/jp/sf/pal/board/db/cbean/cq/bs/AbstractBsUserInfoCQ.java =================================================================== --- board/trunk/src/main/java/jp/sf/pal/board/db/cbean/cq/bs/AbstractBsUserInfoCQ.java 2008-11-24 04:16:20 UTC (rev 1414) +++ board/trunk/src/main/java/jp/sf/pal/board/db/cbean/cq/bs/AbstractBsUserInfoCQ.java 2008-11-24 05:14:05 UTC (rev 1415) @@ -1909,6 +1909,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.board.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.board.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: board/trunk/src/main/java/jp/sf/pal/board/db/cbean/cq/bs/BsUserInfoCQ.java =================================================================== --- board/trunk/src/main/java/jp/sf/pal/board/db/cbean/cq/bs/BsUserInfoCQ.java 2008-11-24 04:16:20 UTC (rev 1414) +++ board/trunk/src/main/java/jp/sf/pal/board/db/cbean/cq/bs/BsUserInfoCQ.java 2008-11-24 05:14:05 UTC (rev 1415) @@ -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: board/trunk/src/main/java/jp/sf/pal/board/db/cbean/cq/ciq/UserInfoCIQ.java =================================================================== --- board/trunk/src/main/java/jp/sf/pal/board/db/cbean/cq/ciq/UserInfoCIQ.java 2008-11-24 04:16:20 UTC (rev 1414) +++ board/trunk/src/main/java/jp/sf/pal/board/db/cbean/cq/ciq/UserInfoCIQ.java 2008-11-24 05:14:05 UTC (rev 1415) @@ -198,6 +198,10 @@ return _myCQ.getTelephone(); } + protected ConditionValue getCValueLocale() { + return _myCQ.getLocale(); + } + protected ConditionValue getCValueRoleId() { return _myCQ.getRoleId(); } Modified: board/trunk/src/main/webapp/WEB-INF/db/board.data.db =================================================================== (Binary files differ)