Changeset 3958

Timestamp:

Nov 5, 2010, 12:09:35 PM (13 years ago)

Author:

olle

Message:

Refs #704. Refs #585. Class/file plugins/ProjectToTrash.java in plugin/
updated:

1. Public method

void run(Request request, Response response, ProgressReporter progress)
updated:

1. The Project item was re-created with the new DbControl from

the id value of the former, as this eliminates the need to call
reattachItem(...).

2. The lists of directories and files in the project is now obtained

by calling new private methods
List<Directory> directoryTree(DbControl dc, List<Directory> dirList, Directory startDir)
and List<File> filesInDirectories(DbControl dc, List<Directory> dirList),
respectively.

2. New private method

List<Directory> directoryTree(DbControl dc, List<Directory> dirList, Directory startDir)
added. It obtains a list of all directories that have the start directory
as ancestor.

3. New private method

List<File> filesInDirectories(DbControl dc, List<Directory> dirList)
added. It obtains a list of all files in a list of directories.

File:

• trunk/plugin/src/org/proteios/plugins/ProjectToTrash.java (modified) (11 diffs)

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

@@ -53 +53 @@
 import org.proteios.core.query.Restrictions;
 
+import java.util.ArrayList;
 import java.util.List;
 
@@ -63 +64 @@
     extends AbstractPlugin
 {
+  /**
+   * Logger used. Used to log specific events.
+   */
+  protected static final org.apache.log4j.Logger log = org.apache.log4j.LogManager
+    .getLogger("org.proteios.io");
+  
   public MainType getMainType()
   {
@@ -94 +101 @@
       int jobCount = 0, hitCount = 0, featureCount = 0, ssCount = 0, fileCount = 0, dirCount = 0;
       Project project = (Project) job.getValue("project");
-      // Only needed if the project wasn't active when the job was
-      // created:
+      // Only needed if the project wasn't active when the job was created:
       sc.setActiveProject(project);
       DbControl dc = sc.newDbControl();
-      dc.reattachItem(project);
+      //dc.reattachItem(project);
+      project = Project.getById(dc, project.getId());
       int project_id = sc.getActiveProjectId();
       /* Check that the feature file hasn't been imported already */
@@ -110 +117 @@
       for (Hit hit : hitList)
       {
-        dc.reattachItem(hit);
         dc.deleteItem(hit);
         hitCount++;
@@ -120 +126 @@
       for (Feature feat : featureList)
       {
-        dc.reattachItem(feat);
         dc.deleteItem(feat);
         featureCount++;
@@ -130 +135 @@
       for (Job job : jobList)
       {
-        dc.reattachItem(job);
         job.setRemoved(true);
         jobCount++;
@@ -140 +144 @@
       for (SpectrumSearch ss : spectrumSearchList)
       {
-        dc.reattachItem(ss);
         ss.setRemoved(true);
         ssCount++;
@@ -147 +150 @@
       fileQuery.exclude(Include.MINE, Include.OTHERS);
       fileQuery.include(Include.IN_PROJECT);
-      List<File> fileList = fileQuery.list(dc);
+      List<File> fileItemResultList = fileQuery.list(dc);
+      log.debug("ProjectToTrash: fileItemResultList.size() = " + fileItemResultList.size() + " fileList = " + fileItemResultList);
+      //
+      Directory projDir = project.getProjectDirectory();
+      List<Directory> dirList = new ArrayList<Directory>();
+      dirList = directoryTree(dc, dirList, projDir);
+      log.debug("ProjectToTrash: dirList.size() = " + dirList.size() + " dirList = " + dirList);
+      //
+      List<File> fileList = new ArrayList<File>();
+      fileList = filesInDirectories(dc, dirList);
+      log.debug("ProjectToTrash: fileList.size() = " + fileList.size() + " fileList = " + fileList);
       for (File f : fileList)
       {
-        dc.reattachItem(f);
+        //dc.reattachItem(f);
         f.setRemoved(true);
         fileCount++;
@@ -157 +170 @@
       dirQuery.exclude(Include.MINE, Include.OTHERS);
       dirQuery.include(Include.IN_PROJECT);
-      List<Directory> dirList = dirQuery.list(dc);
-      Directory projDir = project.getProjectDirectory();
+      List<Directory> dirItemResultList = dirQuery.list(dc);
+      log.debug("ProjectToTrash: dirItemResultList.size() = " + dirItemResultList.size());
+      // Set no active project
+      log.debug("ProjectToTrash: active project set to null");
+      sc.setActiveProject(null);
       if (!dirList.contains(projDir))
       {
-        // Doesn't work to reattach for some reason
+        log.debug("ProjectToTrash: projDir.getName() = \"" + projDir.getName() + "\" set to removed");
         projDir.setRemoved(true);
         dirCount++;
@@ -167 +183 @@
       for (Directory d : dirList)
       {
-        dc.reattachItem(d);
+        log.debug("ProjectToTrash: d.getName() = \"" + d.getName() + "\" set to removed");
         d.setRemoved(true);
         dirCount++;
       }
-      project.setClosed(true);
-      /**
-       * Don't delete, just close.
-       */
-      // project.setRemoved(true);
+      project.setRemoved(true);
       dc.commit();
       response
@@ -181 +193 @@
     }
   }
+
+
+  /**
+   * Obtains a list of all directories that have the start directory as ancestor.
+   * 
+   * @param dc DbControl The DbControl to use.
+   * @param dirList List<Directory> The directory list that will be appended with found directories.
+   * @param startDir Directory The start directory for the search.
+   * @return List<Directory> The directory list updated with found directories. 
+   */
+  private List<Directory> directoryTree(DbControl dc, List<Directory> dirList, Directory startDir)
+  {
+    if (startDir != null)
+    {
+      // Find sub-directories to start directory
+      ItemQuery<Directory> dirQuery = startDir.getSubDirectories();
+      /*
+      if (sc.getActiveProjectId() > 0)
+      {
+        dirQuery.include(Include.IN_PROJECT);
+      }
+      */
+      List<Directory> tmpList = dirQuery.list(dc);
+      // Add sub-directories to directory list
+      for (Directory dir: tmpList)
+      {
+        // Add directory to dirList, if not already in list
+        if (!dirList.contains(dir))
+        {
+          dirList.add(dir);
+        }
+        // Add directories in sub-directory to directory list
+        dirList = directoryTree(dc, dirList, dir);
+      }
+    }
+    return dirList;
+  }
+
+
+  /**
+   * Obtains a list of all files in a list of directories.
+   * 
+   * @param dc DbControl The DbControl to use.
+   * @param dirList List<Directory> The directory list.
+   * @return List<File> The file list updated with found files. 
+   */
+  private List<File> filesInDirectories(DbControl dc, List<Directory> dirList)
+  {
+    List<File> fileList = new ArrayList<File>();
+    for (Directory dir: dirList)
+    {
+      ItemQuery<File> fileQuery = dir.getFileQuery();
+      List<File> tmpList = fileQuery.list(dc);
+      for (File file: tmpList)
+      {
+        // Add file to fileList, if not already in list
+        if (!fileList.contains(file))
+        {
+          fileList.add(file);
+        }
+      }
+    }
+    return fileList;
+  }
 }