Modifications to respect PMD rules.

[tools/siman.git] / Workspace / Siman / src / org / splat / simer / admin / ImportUserAction.java

diff --git a/Workspace/Siman/src/org/splat/simer/admin/ImportUserAction.java b/Workspace/Siman/src/org/splat/simer/admin/ImportUserAction.java
index 91586d7ae56736f91c7e2e845250a764778747c6..955ce2ee6e17ab6cc5d83b21794f3f6adbeb5dff 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/admin/ImportUserAction.java
+++ b/Workspace/Siman/src/org/splat/simer/admin/ImportUserAction.java
@@ -5,13 +5,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.hibernate.Session;
-import org.hibernate.Transaction;
 import org.splat.dal.bo.kernel.User;
 import org.splat.service.UserService;
 import org.splat.service.technical.RepositoryService;
 import org.splat.simer.UploadBaseNextAction;
-import org.splat.dal.dao.som.Database;
 
 
 public class ImportUserAction extends UploadBaseNextAction {
@@ -21,8 +18,8 @@ public class ImportUserAction extends UploadBaseNextAction {
         */
     private static final long serialVersionUID = 1516715800624817965L;
 
-    private List<User> users;
-    private Set<User>  newsers;
+    private transient List<User> _users;
+    private transient Set<User>  _newsers;
        /**
         * Injected repository service.
         */
@@ -56,16 +53,19 @@ public class ImportUserAction extends UploadBaseNextAction {
 //  ==============================================================================================================================
 
     public String doImport () {
+      String res = SUCCESS;
       try {
         User       user    = getConnectedUser();     // The database administrator
        File       updir   = getRepositoryService().getDownloadDirectory(user);
        File       upfile  = new File(updir.getPath() + "/" + filename);
 
-        newsers = getUserService().importUsers(upfile);
-        users   = getUserService().selectAllUsers();
-        for (Iterator<User> i=users.iterator(); i.hasNext(); ) {
+        _newsers = getUserService().importUsers(upfile);
+        _users   = getUserService().selectAllUsers();
+        for (Iterator<User> i=_users.iterator(); i.hasNext(); ) {
           User next = i.next();
-          if (!next.equals(user)) continue;
+          if (!next.equals(user)) {
+                       continue;
+               }
           i.remove();                                // Just for not showing the corresponding reserved username
           break;
         }
@@ -74,12 +74,11 @@ public class ImportUserAction extends UploadBaseNextAction {
         setToolProperty("none");
         setLeftMenuProperty("open");
         initializationFullScreenContext(_menuProperty, _toolProperty, _leftMenuProperty);
-        
-        return SUCCESS;
       }
       catch (Exception error) {
-        return ERROR;          
+        res = ERROR;           
       }
+      return res;
     }
     
 //  ==============================================================================================================================
@@ -88,12 +87,12 @@ public class ImportUserAction extends UploadBaseNextAction {
 
     public List<User> getUsers () {
 //  -----------------------------
-      return  users;
+      return  _users;
     }
 
-    public boolean isNew (User user) {
+    public boolean isNew (final User user) {
 //  --------------------------------
-      return newsers.contains(user);
+      return _newsers.contains(user);
     }
 
        /**
@@ -108,7 +107,7 @@ public class ImportUserAction extends UploadBaseNextAction {
         * Set the repositoryService.
         * @param repositoryService the repositoryService to set
         */
-       public void setRepositoryService(RepositoryService repositoryService) {
+       public void setRepositoryService(final RepositoryService repositoryService) {
                _repositoryService = repositoryService;
        }
 
@@ -124,7 +123,7 @@ public class ImportUserAction extends UploadBaseNextAction {
         * Set the userService.
         * @param userService the userService to set
         */
-       public void setUserService(UserService userService) {
+       public void setUserService(final UserService userService) {
                _userService = userService;
        }
        
@@ -140,7 +139,7 @@ public class ImportUserAction extends UploadBaseNextAction {
         * Set the menuProperty.
         * @param menuProperty the menuProperty to set
         */
-       public void setMenuProperty(String menuProperty) {
+       public void setMenuProperty(final String menuProperty) {
                this._menuProperty = menuProperty;
        }