Changeset 3956

Timestamp:

Nov 5, 2010, 11:52:42 AM (13 years ago)

Author:

olle

Message:

Refs #704. Refs #523. Refs #620. Routines for permanently removing
items in the trash updated to repeat attempts to empty the
trash can, as long as some item is removed in each attempt,
and more items to remove remain:

1. Class/file action/write/EmptyTrash.java in client/servlet/ updated:
2. Private method void emptyTrashCan() updated with new argument

int totalItemCount and calling new private method
int emptyTrashCanAttempt() as long as some item is removed in each
attempt, and more items to remove remain.

2. New private method int emptyTrashCanAttempt() added.

It attempts to permanently remove items, using code previously
in private method void emptyTrashCan().

2. Class/file plugins/EmptyTrashPlugin.java in plugin/ updated:
3. Public method void execute(Request request, Response response, ProgressReporter progress)

updated to call new private method
int emptyTrashCanAttempt(Request request, Response response,
ProgressReporter progress, int accDeletedCount, int totalItemCount)
as long as some item is removed in each attempt, and more items to
remove remain.

2. New private method

int emptyTrashCanAttempt(Request request, Response response,
ProgressReporter progress, int accDeletedCount, int totalItemCount)
added. It attempts to permanently remove items, using code previously
in public method
void execute(Request request, Response response, ProgressReporter progress).

Location:

trunk

Files:

• client/servlet/src/org/proteios/action/write/EmptyTrash.java (modified) (3 diffs)
• plugin/src/org/proteios/plugins/EmptyTrashPlugin.java (modified) (2 diffs)

trunk/client/servlet/src/org/proteios/action/write/EmptyTrash.java

@@ -129 +129 @@
     else
     {
-      emptyTrashCan();
+      emptyTrashCan(totalItemCount);
     }
   }
@@ -183 +183 @@
   /**
    * Empty trash can.
-   */
-  private void emptyTrashCan()
+   * 
+   * @param totalItemCount int Total number of items to remove.
+   */
+  private void emptyTrashCan(int totalItemCount)
+  {
+    int totalDeletedCount = 0;
+    // Repeat emptying trash can as long as items are removed and more items remain
+    int deletedCount = emptyTrashCanAttempt();
+    // Update total deleted count
+    totalDeletedCount += deletedCount;
+    log.debug("Number of items deleted in trash can emptying attempt = " + deletedCount + " total number deleted = " + totalDeletedCount + " of " + totalItemCount);
+    while (deletedCount > 0 && ((totalItemCount - totalDeletedCount) > 0))
+    {
+      // Try again to empty trash can
+      deletedCount = emptyTrashCanAttempt();
+      // Update total deleted count
+      totalDeletedCount += deletedCount;
+      log.debug("Number of items deleted in trash can emptying attempt = " + deletedCount + " total number deleted = " + totalDeletedCount + " of " + totalItemCount);
+    }
+    // Set delete message
+    String deleteMessage = null;
+    if (totalDeletedCount == 1)
+    {
+      deleteMessage = totalDeletedCount + " " + getLocale().get("itemDeleted");
+    }
+    else
+    {
+      deleteMessage = totalDeletedCount + " " + getLocale().get("itemsDeleted");
+    }
+    if (getErrorMessage() != null)
+    {
+      deleteMessage = deleteMessage + ". ERROR: " + getErrorMessage();
+    }
+    log.debug("Message = \"" + deleteMessage + "\"");
+    setMessage(deleteMessage);
+  }
+
+
+  /**
+   * Empty trash can attempt.
+   * 
+   * @return int The number of deleted items in this attempt.
+   */
+  private int emptyTrashCanAttempt()
   {
     setErrorMessage(null);
@@ -194 +236 @@
     // Try deleting File items
     deletedCount += deleteItemsOfSpecificClass(File.class);
-    // Try deleting Project items (done before trying to delete project directory)
-    deletedCount += deleteItemsOfSpecificClass(Project.class);
     // Try deleting Directory items
     deletedCount += deleteItemsOfSpecificClass(Directory.class);
-    // Set delete message
-    String deleteMessage = null;
-    if (deletedCount == 1)
-    {
-      deleteMessage = deletedCount + " " + getLocale().get("itemDeleted");
-    }
-    else
-    {
-      deleteMessage = deletedCount + " " + getLocale().get("itemsDeleted");
-    }
-    if (getErrorMessage() != null)
-    {
-      deleteMessage = deleteMessage + ". ERROR: " + getErrorMessage();
-    }
-    log.debug("Message = \"" + deleteMessage + "\"");
-    setMessage(deleteMessage);
+    // Try deleting Project items
+    deletedCount += deleteItemsOfSpecificClass(Project.class);
+    // Return number of items deleted in this attempt
+    return deletedCount;
   }
 

trunk/plugin/src/org/proteios/plugins/EmptyTrashPlugin.java

@@ -136 +136 @@
       ProgressReporter progress)
   {
-    //
     Integer totalItemCountInput = (Integer) job.getValue("totalItemCountInput");
     log.debug("totalItemCountInput = " + totalItemCountInput);
@@ -146 +145 @@
     }
     //
+    int totalDeletedCount = 0;
+    // Repeat emptying trash can as long as items are removed and more items remain
+    int deletedCount = emptyTrashCanAttempt(request, response, progress, totalDeletedCount, totalItemCount);
+    // Update total deleted count
+    totalDeletedCount += deletedCount;
+    log.debug("Number of items deleted in trash can emptying attempt = " + deletedCount + " total number deleted = " + totalDeletedCount + " of " + totalItemCountInput);
+    while (deletedCount > 0 && ((totalItemCountInput - totalDeletedCount) > 0))
+    {
+      // Try again to empty trash can
+      deletedCount = emptyTrashCanAttempt(request, response, progress, totalDeletedCount, totalItemCount);
+      // Update total deleted count
+      totalDeletedCount += deletedCount;
+      log.debug("Number of items deleted in trash can emptying attempt = " + deletedCount + " total number deleted = " + totalDeletedCount + " of " + totalItemCountInput);
+    }
+    // Set delete message
+    String deleteMessage = null;
+    if (totalDeletedCount == 1)
+    {
+      deleteMessage = totalDeletedCount + " item deleted";
+    }
+    else
+    {
+      deleteMessage = totalDeletedCount + " items deleted";
+    }
+    if (getErrorMessage() != null)
+    {
+      deleteMessage = deleteMessage + ". ERROR: " + getErrorMessage();
+    }
+    log.debug("Message = \"" + deleteMessage + "\"");
+    // Set job response message
+    if (getErrorMessage() == null)
+    {
+      response.setDone(deleteMessage);
+    }
+    else
+    {
+      response.setError(deleteMessage, null);
+    }
+  }
+
+
+  private int emptyTrashCanAttempt(Request request, Response response,
+      ProgressReporter progress, int accDeletedCount, int totalItemCount)
+  {
     setErrorMessage(null);
     int deletedCount = 0;
     // Try deleting Job items
-    deletedCount += deleteItemsOfSpecificClass(Job.class, progress, deletedCount, totalItemCount);
+    deletedCount += deleteItemsOfSpecificClass(Job.class, progress, accDeletedCount, totalItemCount);
     // Try deleting SpectrumSearch items
-    deletedCount += deleteItemsOfSpecificClass(SpectrumSearch.class, progress, deletedCount, totalItemCount);
+    deletedCount += deleteItemsOfSpecificClass(SpectrumSearch.class, progress, accDeletedCount, totalItemCount);
     // Try deleting File items
-    deletedCount += deleteItemsOfSpecificClass(File.class, progress, deletedCount, totalItemCount);
-    // Try deleting Project items (done before trying to delete project directory)
-    deletedCount += deleteItemsOfSpecificClass(Project.class, progress, deletedCount, totalItemCount);
+    deletedCount += deleteItemsOfSpecificClass(File.class, progress, accDeletedCount, totalItemCount);
     // Try deleting Directory items
-    deletedCount += deleteItemsOfSpecificClass(Directory.class, progress, deletedCount, totalItemCount);
-    // Set delete message
-    String deleteMessage = null;
-    if (deletedCount == 1)
-    {
-      deleteMessage = deletedCount + " item deleted";
-    }
-    else
-    {
-      deleteMessage = deletedCount + " items deleted";
-    }
-    if (getErrorMessage() != null)
-    {
-      deleteMessage = deleteMessage + ". ERROR: " + getErrorMessage();
-    }
-    log.debug("Message = \"" + deleteMessage + "\"");
-    // Set job response message
-    if (getErrorMessage() == null)
-    {
-      response.setDone(deleteMessage);
-    }
-    else
-    {
-      response.setError(deleteMessage, null);
-    }
+    deletedCount += deleteItemsOfSpecificClass(Directory.class, progress, accDeletedCount, totalItemCount);
+    // Try deleting Project items
+    deletedCount += deleteItemsOfSpecificClass(Project.class, progress, accDeletedCount, totalItemCount);
+    // Return number of items deleted in this attempt
+    return deletedCount;
   }