[jboss-svn-commits] JBL Code SVN: r34294 - labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2010-07-29 08:55:41 -0400 (Thu, 29 Jul 2010)
New Revision: 34294

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/UpdateMasterAccountAction.java
Log:
Added empty methods prepare and validate.
Added necessary condition for editing adress/home address.

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/UpdateMasterAccountAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/UpdateMasterAccountAction.java	2010-07-29 12:36:54 UTC (rev 34293)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/UpdateMasterAccountAction.java	2010-07-29 12:55:41 UTC (rev 34294)
@@ -64,6 +64,16 @@
   }
 
   @Override
+  public void validate() {
+    // nothing to validate
+  }
+
+  @Override
+  public void prepare() {
+    // nothing to prepare
+  }
+
+  @Override
   public String input() {
     if (isGuest()) {
       return UNAUTHENTICATED;
@@ -111,12 +121,14 @@
     // Map<String, String> targetProfile = user.getProperties();
     Map<Long, ProfileFieldValue> targetProfile = profileManager.getProfile(user);
 
-    try {
-      String sbsAddress = getSbsAddressFromNukes(NukesUserMapper.ADDRESS, profile.get(NukesUserMapper.ADDRESS));
-      profile.put(NukesUserMapper.ADDRESS, sbsAddress);
-      updateProfileField(NukesUserMapper.ADDRESS, profile, targetProfile);
-    } catch (UserNotFoundException e) {
-      log.error("Cannot update address", e);
+    if (isFieldChanged(profile.get(NukesUserMapper.ADDRESS))) {
+      try {
+        String sbsAddress = getSbsAddressFromNukes(NukesUserMapper.ADDRESS, profile.get(NukesUserMapper.ADDRESS));
+        profile.put(NukesUserMapper.ADDRESS, sbsAddress);
+        updateProfileField(NukesUserMapper.ADDRESS, profile, targetProfile);
+      } catch (UserNotFoundException e) {
+        log.error("Cannot update address", e);
+      }
     }
 
     updateProfileField(NukesUserMapper.PHONE_NUMBER, profile, targetProfile);
@@ -125,13 +137,15 @@
     updateProfileField(NukesUserMapper.YOUR_AIM_ADDRESS, profile, targetProfile);
     updateProfileField(NukesUserMapper.YOUR_YIM_NUMBER, profile, targetProfile);
 
-    try {
-      String sbsHomeAddress = getSbsAddressFromNukes(NukesUserMapper.HOME_ADDRESS, profile
-          .get(NukesUserMapper.HOME_ADDRESS));
-      profile.put(NukesUserMapper.HOME_ADDRESS, sbsHomeAddress);
-      updateProfileField(NukesUserMapper.HOME_ADDRESS, profile, targetProfile);
-    } catch (UserNotFoundException e) {
-      log.error("Cannot update address", e);
+    if (isFieldChanged(profile.get(NukesUserMapper.HOME_ADDRESS))) {
+      try {
+        String sbsHomeAddress = getSbsAddressFromNukes(NukesUserMapper.HOME_ADDRESS,
+            profile.get(NukesUserMapper.HOME_ADDRESS));
+        profile.put(NukesUserMapper.HOME_ADDRESS, sbsHomeAddress);
+        updateProfileField(NukesUserMapper.HOME_ADDRESS, profile, targetProfile);
+      } catch (UserNotFoundException e) {
+        log.error("Cannot update home address", e);
+      }
     }
     updateProfileField(NukesUserMapper.OCCUPATION, profile, targetProfile);
     updateProfileField(NukesUserMapper.EXPERTISE, profile, targetProfile);