Author: bdaw Date: 2007-07-05 19:41:21 -0400 (Thu, 05 Jul 2007) New Revision: 7677 Modified: trunk/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java Log: JBPORTAL-1456 - It is impossible to delete once entered user profile property Modified: trunk/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-07-05 23:38:54 UTC (rev 7676) +++ trunk/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-07-05 23:41:21 UTC (rev 7677) @@ -769,11 +769,11 @@ String type = userProfileModule.getProfileInfo().getPropertyInfo(User.INFO_USER_REGISTRATION_DATE).getType(); if (type.equals("java.util.Date")) { - putNonEmptyProperty(user, User.INFO_USER_REGISTRATION_DATE, new Date()); + putProperty(user, User.INFO_USER_REGISTRATION_DATE, new Date()); } else if (type.equals("java.lang.String")) { - putNonEmptyProperty(user, User.INFO_USER_REGISTRATION_DATE, new Date().toString()); + putProperty(user, User.INFO_USER_REGISTRATION_DATE, new Date().toString()); } else { @@ -988,25 +988,13 @@ if (nbErrors == 0) { // - if (givenName.trim().length() != 0) - { - setProperty(user, P3PConstants.INFO_USER_NAME_GIVEN, givenName); - } + setProperty(user, P3PConstants.INFO_USER_NAME_GIVEN, givenName); - if (familyName.trim().length() != 0) - { - setProperty(user, P3PConstants.INFO_USER_NAME_FAMILY, familyName); - } + setProperty(user, P3PConstants.INFO_USER_NAME_FAMILY, familyName); - if (realEmail.trim().length() != 0) - { - setProperty(user, P3PConstants.INFO_USER_BUSINESS_INFO_ONLINE_EMAIL, realEmail); - } + setProperty(user, P3PConstants.INFO_USER_BUSINESS_INFO_ONLINE_EMAIL, realEmail); - if (fakeEmail.trim().length() != 0) - { - setProperty(user, User.INFO_USER_EMAIL_FAKE, fakeEmail); - } + setProperty(user, User.INFO_USER_EMAIL_FAKE, fakeEmail); setProperty(user, User.INFO_USER_VIEW_EMAIL_VIEW_REAL, Boolean.valueOf(viewRealEmail)); @@ -1045,24 +1033,24 @@ } else { - putNonEmptyProperty(user, User.INFO_USER_THEME, theme); + putProperty(user, User.INFO_USER_THEME, theme); } // - putNonEmptyProperty(user, User.INFO_USER_HOMEPAGE, homepage); - putNonEmptyProperty(user, User.INFO_USER_SECURITY_QUESTION, question); - putNonEmptyProperty(user, User.INFO_USER_SECURITY_ANSWER, answer); - putNonEmptyProperty(user, User.INFO_USER_IM_ICQ, icq); - putNonEmptyProperty(user, User.INFO_USER_IM_MSNM, msnm); - putNonEmptyProperty(user, User.INFO_USER_IM_YIM, yim); - putNonEmptyProperty(user, User.INFO_USER_IM_AIM, aim); - putNonEmptyProperty(user, User.INFO_USER_IM_SKYPE, skype); - putNonEmptyProperty(user, User.INFO_USER_IM_XMMP, xmmp); - putNonEmptyProperty(user, User.INFO_USER_SIGNATURE, signature); - putNonEmptyProperty(user, User.INFO_USER_LOCATION, location); - putNonEmptyProperty(user, User.INFO_USER_OCCUPATION, occupation); - putNonEmptyProperty(user, User.INFO_USER_INTERESTS, interests); - putNonEmptyProperty(user, User.INFO_USER_EXTRA, extra); + putProperty(user, User.INFO_USER_HOMEPAGE, homepage); + putProperty(user, User.INFO_USER_SECURITY_QUESTION, question); + putProperty(user, User.INFO_USER_SECURITY_ANSWER, answer); + putProperty(user, User.INFO_USER_IM_ICQ, icq); + putProperty(user, User.INFO_USER_IM_MSNM, msnm); + putProperty(user, User.INFO_USER_IM_YIM, yim); + putProperty(user, User.INFO_USER_IM_AIM, aim); + putProperty(user, User.INFO_USER_IM_SKYPE, skype); + putProperty(user, User.INFO_USER_IM_XMMP, xmmp); + putProperty(user, User.INFO_USER_SIGNATURE, signature); + putProperty(user, User.INFO_USER_LOCATION, location); + putProperty(user, User.INFO_USER_OCCUPATION, occupation); + putProperty(user, User.INFO_USER_INTERESTS, interests); + putProperty(user, User.INFO_USER_EXTRA, extra); // Set back to normal window state resp.setWindowState(WindowState.NORMAL); @@ -1393,25 +1381,17 @@ } } - private void putNonEmptyProperty(User user, String key, Object value) + private void putProperty(User user, String key, Object value) { - if (value != null) + try { - if (value instanceof String && !(((String)value).trim().length() != 0) ) - { - return; - } - //user.getProfile().put(key, value); - try - { - userProfileModule.setProperty(user, key, value); - } - catch (IdentityException e) - { - //TODO: change to error - log.info("Cannot set profile property: ", e); - } + userProfileModule.setProperty(user, key, value); } + catch (IdentityException e) + { + //TODO: change to error + log.info("Cannot set profile property: ", e); + } } public void deleteUser(JBossActionRequest request, JBossActionResponse response)