Changeset 3923

Timestamp:

Oct 29, 2010, 11:07:17 AM (13 years ago)

Author:

olle

Message:

Refs #714. Code for moving files updated to transfer list of
id values for selected files as a session attribute, in order to
avoid problems when moving many files:

1. Class/file action/directory/ViewActiveDirectory.java in

client/servlet/ updated:

1. New valid parameter VInteger VMOVEFILEIDLIST added. It will

be used for the session attribute when transferring file id values.

2. Protected method void runMe() updated when moving files to set

session attribute coupled to parameter VInteger VMOVEFILEIDLIST
to list of integer id values for seleced files. Previous code adding
file id values as hidden text fields to the directory table has
been removed.

3. Private method

Table createDirectoryTable(Table templateTable, Directory dir,
Boolean select, Boolean selectMoveDir, Boolean moveFilesMode, Boolean moveFilesStart)
updated by removal of code adding file id values to click action
for directory table.

2. Class/file action/file/MoveFiles.java in client/servlet/ updated:
3. Protected method void runMe() updated to retrieve list of

id values for files to move from session attribute
ViewActiveDirectory.VMOVEFILEIDLIST, and to reset the value to
null afterwards.

Location:

trunk/client/servlet/src/org/proteios/action

Files:

• directory/ViewActiveDirectory.java (modified) (4 diffs)
• file/MoveFiles.java (modified) (2 diffs)

trunk/client/servlet/src/org/proteios/action/directory/ViewActiveDirectory.java

@@ -105 +105 @@
     public static final VBoolean VMOVEFILES = new VBoolean("moveFiles", false);
     public static final VBoolean VTABLEUPDATEBUTTONCLICKED = new VBoolean("tableUpdateButtonClicked", false);
+    public static final VInteger VMOVEFILEIDLIST = new VInteger("active.move.file.id.list", 1, false);
     
     /**
@@ -160 +161 @@
                 setSessionAttribute(VMOVEFILES, true);
                 setSessionAttribute(ForwardField.VPARAM, MoveFiles.class.getName());
+                setSessionAttribute(VMOVEFILEIDLIST, tmpFileIds);
             }
             else
@@ -388 +390 @@
                 dirToolbar.setDefaultAction(al);
                 dirToolbar.add(al);
-                /*
-                    * Moving several files
-                */
-                log.debug("moveFilesMode = " + moveFilesMode); 
-                if (moveFilesMode)
-                {
-                    /*
-                        * This action may be called several times when
-                        * navigating from the source to the target directory.
-                        * First time the id values for selected files are
-                        * stored in the default valid parameter VInteger ItemIdField.VPARAM,
-                        * otherwise they are stored in valid parameter VInteger ViewActiveFile.VFILEID.
-                    */
-                    List<Integer> tmpFileIds = null;
-                    // Check if first time when navigating to target directory
-                    if (moveFilesStart)
-                    {
-                        tmpFileIds = getValidIntegerList(ItemIdField.VPARAM);
-                        log.debug("tmpFileIds from ItemIdField.VPARAM = " + tmpFileIds);
-                    }
-                    else
-                    {
-                        tmpFileIds = getValidIntegerList(ViewActiveFile.VFILEID);
-                        log.debug("tmpFileIds from ViewActiveFile.VFILEID = " + tmpFileIds);
-                    }
-                    log.debug("tmpFileIds = " + tmpFileIds);
-                    // Add id values for selected files as parameters to action link
-                    if (tmpFileIds != null && tmpFileIds.size() > 0)
-                    {
-                        // Set id values for source files
-                        for (Integer fileId : tmpFileIds)
-                        {
-                            getFormFactory().addHiddenField(dirTable, ViewActiveFile.VFILEID, fileId);
-                        }
-                    }
-                }
             }
             title = new Title(formTitle);
@@ -793 +759 @@
             clickAction.addParameter(NextButtonNameField.VPARAM,
             nextButtonName);
-            if (moveFilesMode)
-            {
-                /*
-                    * This action may be called several times when
-                    * navigating from the source to the target directory.
-                    * First time the id values for selected files are
-                    * stored in the default valid parameter VInteger ItemIdField.VPARAM,
-                    * otherwise they are stored in valid parameter VInteger ViewActiveFile.VFILEID.
-                */
-                List<Integer> tmpFileIds = null;
-                // Check if first time when navigating to target directory
-                if (moveFilesStart)
-                {
-                    try
-                    {
-                        tmpFileIds = getValidIntegerList(ItemIdField.VPARAM);
-                    }
-                    catch (Exception e)
-                    {
-                        log.debug("Exception when trying to retrieve file id list from ItemIdField.VPARAM: " + e);
-                    }
-                    log.debug("tmpFileIds from ItemIdField.VPARAM = " + tmpFileIds);
-                }
-                else
-                {
-                    try
-                    {
-                        tmpFileIds = getValidIntegerList(ViewActiveFile.VFILEID);
-                    }
-                    catch (Exception e)
-                    {
-                        log.debug("Exception when trying to retrieve file id list from ViewActiveFile.VFILEID: " + e);
-                    }
-                    log.debug("tmpFileIds from ViewActiveFile.VFILEID = " + tmpFileIds);
-                }
-                log.debug("tmpFileIds = " + tmpFileIds);
-                // Add id values for selected files as parameters to click action
-                if (tmpFileIds != null && tmpFileIds.size() > 0)
-                {
-                    // Set id values for source files
-                    for (Integer fileId : tmpFileIds)
-                    {
-                        clickAction.addParameter(ViewActiveFile.VFILEID, fileId);
-                    }
-                }
-            }
         }
         else

trunk/client/servlet/src/org/proteios/action/file/MoveFiles.java

@@ -59 +59 @@
      * Verify parameters
      */
-    List<Integer> fileIds = getValidIntegerList(ViewActiveFile.VFILEID);
+    //List<Integer> fileIds = getValidIntegerList(ViewActiveFile.VFILEID);
+    List<Integer> fileIds = getSessionAttributeList(ViewActiveDirectory.VMOVEFILEIDLIST);
     log.debug("fileIds = " + fileIds);
     /*
@@ -109 +110 @@
     setSessionAttribute(ViewActiveDirectory.VSELECTMOVEDIR, false);
     setSessionAttribute(ViewActiveDirectory.VMOVEFILES, false);
+    setSessionAttribute(ViewActiveDirectory.VMOVEFILEIDLIST, null);
     String msg = new String(nFilesMoved + " file[s] moved.");
     log.debug("msg = \"" + msg + "\"");