Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java =================================================================== diff -u -rfcc5eca8a605afdc9e927366827553a7862000cd -r34afd44fc6deb2b8c3e68c601968a09f76fa4537 --- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java (.../PortraitSaveAction.java) (revision fcc5eca8a605afdc9e927366827553a7862000cd) +++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java (.../PortraitSaveAction.java) (revision 34afd44fc6deb2b8c3e68c601968a09f76fa4537) @@ -46,6 +46,7 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.CentralToolContentHandler; +import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.imgscalr.ResizePictureUtil; @@ -128,23 +129,23 @@ //resize to the large size is = ResizePictureUtil.resize(file.getInputStream(), - IUserManagementService.PORTRAIT_LARGEST_DIMENSION_LARGE); + CommonConstants.PORTRAIT_LARGEST_DIMENSION_LARGE); NodeKey node = getCentralToolContentHandler().updateFile(originalFileNode.getUuid(), is, fileNameWithoutExt + "_large.jpg", "image/jpeg"); is.close(); log.debug("saved file with uuid: " + node.getUuid() + " and version: " + node.getVersion()); //resize to the medium size is = ResizePictureUtil.resize(file.getInputStream(), - IUserManagementService.PORTRAIT_LARGEST_DIMENSION_MEDIUM); + CommonConstants.PORTRAIT_LARGEST_DIMENSION_MEDIUM); node = getCentralToolContentHandler().updateFile(node.getUuid(), is, fileNameWithoutExt + "_medium.jpg", "image/jpeg"); is.close(); log.debug("saved file with uuid: " + node.getUuid() + " and version: " + node.getVersion()); //resize to the small size is = ResizePictureUtil.resize(file.getInputStream(), - IUserManagementService.PORTRAIT_LARGEST_DIMENSION_SMALL); + CommonConstants.PORTRAIT_LARGEST_DIMENSION_SMALL); node = getCentralToolContentHandler().updateFile(node.getUuid(), is, fileNameWithoutExt + "_small.jpg", "image/jpeg"); is.close(); Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== diff -u -rb26f90eccf164c7058201360d2ca771adcfb597a -r34afd44fc6deb2b8c3e68c601968a09f76fa4537 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision b26f90eccf164c7058201360d2ca771adcfb597a) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 34afd44fc6deb2b8c3e68c601968a09f76fa4537) @@ -52,9 +52,6 @@ * @author Fei Yang */ public interface IUserManagementService { - static int PORTRAIT_LARGEST_DIMENSION_LARGE = 200; - static int PORTRAIT_LARGEST_DIMENSION_MEDIUM = 80; - static int PORTRAIT_LARGEST_DIMENSION_SMALL = 35; /** * save(insert or update) Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -r30fee41d6a27c5f2a371e4b4c83b29d7fbc394fe -r34afd44fc6deb2b8c3e68c601968a09f76fa4537 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 30fee41d6a27c5f2a371e4b4c83b29d7fbc394fe) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 34afd44fc6deb2b8c3e68c601968a09f76fa4537) @@ -70,6 +70,7 @@ import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.dto.UserManageBean; +import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HashUtil; @@ -1118,7 +1119,7 @@ //resize to the large size is = new FileInputStream(portraitFile); InputStream modifiedPortraitInputStream = ResizePictureUtil.resize(is, - PORTRAIT_LARGEST_DIMENSION_LARGE); + CommonConstants.PORTRAIT_LARGEST_DIMENSION_LARGE); NodeKey node = centralToolContentHandler.updateFile(originalFileNode.getUuid(), modifiedPortraitInputStream, fileNameWithoutExt + "_large.jpg", "image/jpeg"); modifiedPortraitInputStream.close(); @@ -1130,7 +1131,7 @@ //resize to the medium size is = new FileInputStream(portraitFile); - modifiedPortraitInputStream = ResizePictureUtil.resize(is, PORTRAIT_LARGEST_DIMENSION_MEDIUM); + modifiedPortraitInputStream = ResizePictureUtil.resize(is, CommonConstants.PORTRAIT_LARGEST_DIMENSION_MEDIUM); node = centralToolContentHandler.updateFile(node.getUuid(), modifiedPortraitInputStream, fileNameWithoutExt + "_medium.jpg", "image/jpeg"); modifiedPortraitInputStream.close(); @@ -1142,7 +1143,7 @@ //resize to the small size is = new FileInputStream(portraitFile); - modifiedPortraitInputStream = ResizePictureUtil.resize(is, PORTRAIT_LARGEST_DIMENSION_SMALL); + modifiedPortraitInputStream = ResizePictureUtil.resize(is, CommonConstants.PORTRAIT_LARGEST_DIMENSION_SMALL); node = centralToolContentHandler.updateFile(node.getUuid(), modifiedPortraitInputStream, fileNameWithoutExt + "_small.jpg", "image/jpeg"); modifiedPortraitInputStream.close(); Index: lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java =================================================================== diff -u -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a -r34afd44fc6deb2b8c3e68c601968a09f76fa4537 --- lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java (.../CommonConstants.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) +++ lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java (.../CommonConstants.java) (revision 34afd44fc6deb2b8c3e68c601968a09f76fa4537) @@ -1,20 +1,24 @@ package org.lamsfoundation.lams.util; public class CommonConstants { - - // params passed from the jqGrid - public static final String PARAM_PAGE = "page"; - public static final String PARAM_ROWS = "rows"; - public static final String PARAM_SIDX = "sidx"; - public static final String PARAM_SORD = "sord"; - // XML Elemetns - public static final String ELEMENT_ROWS = "rows"; - public static final String ELEMENT_PAGE = "page"; - public static final String ELEMENT_TOTAL = "total"; - public static final String ELEMENT_RECORDS = "records"; - public static final String ELEMENT_ROW = "row"; - public static final String ELEMENT_ID = "id"; - public static final String ELEMENT_CELL = "cell"; + public static int PORTRAIT_LARGEST_DIMENSION_LARGE = 200; + public static int PORTRAIT_LARGEST_DIMENSION_MEDIUM = 80; + public static int PORTRAIT_LARGEST_DIMENSION_SMALL = 35; + public static final String[] COUNTRY_CODES = { "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AO", "AQ", "AR", "AS", + "AT", "AU", "AI", "AL", "AM", "AO", "AQ", "AR", "AS", "AT", "AU", "AW", "AX", "AZ", "BA", "BB", "BD", "BE", + "BF", "BG", "BH", "BI", "BJ", "BL", "BM", "BN", "BO", "BR", "BS", "BT", "BV", "BW", "BY", "BZ", "CA", "CC", + "CD", "CF", "CG", "CH", "CI", "CK", "CL", "CM", "CN", "CO", "CR", "CU", "CV", "CX", "CW", "CY", "CZ", "DE", + "DJ", "DK", "DM", "DO", "DZ", "EC", "EE", "EG", "EH", "ER", "ES", "ET", "FI", "FJ", "FK", "FM", "FO", "FR", + "GA", "GB", "GD", "GE", "GF", "GG", "GH", "GI", "GL", "GM", "GN", "GP", "GQ", "GR", "GS", "GT", "GU", "GW", + "GY", "HK", "HM", "HN", "HR", "HT", "HU", "ID", "IE", "IL", "IM", "IN", "IO", "IQ", "IR", "IS", "IT", "JE", + "JM", "JO", "JP", "KE", "KG", "KH", "KI", "KM", "KN", "KP", "KR", "KW", "KY", "KZ", "LA", "LB", "LC", "LI", + "LK", "LR", "LS", "LT", "LU", "LV", "LY", "MA", "MC", "MD", "ME", "MF", "MG", "MH", "MK", "ML", "MM", "MN", + "MO", "MP", "MQ", "MR", "MS", "MT", "MU", "MV", "MW", "MX", "MY", "MZ", "NA", "NC", "NE", "NF", "NG", "NI", + "NL", "NO", "NP", "NR", "NU", "NZ", "OM", "PA", "PE", "PF", "PG", "PH", "PK", "PL", "PM", "PN", "PR", "PS", + "PT", "PW", "PY", "QA", "RE", "RO", "RS", "RU", "RW", "SA", "SB", "SC", "SD", "SE", "SG", "SX", "SH", "SI", + "SJ", "SK", "SL", "SM", "SN", "SO", "SR", "SS", "ST", "SV", "SY", "SZ", "TC", "TD", "TF", "TG", "TH", "TJ", + "TK", "TL", "TM", "TN", "TO", "TR", "TT", "TV", "TW", "TZ", "UA", "UG", "UM", "US", "UY", "UZ", "VA", "VC", + "VE", "VG", "VI", "VN", "VU", "WF", "WS", "YE", "YT", "ZA", "ZM", "ZW" }; }