Changeset 7548

Timestamp:

03/24/09 14:53:32 (16 months ago)

Author:

dragisak

Message:

Get methods in entities should not set fields.

Because of lazy loading, all values in the entity might not be initialized when get method is called. So simpleCollection might not have been initialized when getArticleList is called.

Addresses #1201, #1215 and #1228

Location:

head/ambra

Files:

• libs/otm-models/src/main/java/org/topazproject/ambra/models/Issue.java (modified) (2 diffs)
• webapp/src/main/java/org/topazproject/ambra/admin/action/IssueManagementAction.java (modified) (4 diffs)
• webapp/src/main/java/org/topazproject/ambra/article/service/BrowseService.java (modified) (2 diffs)

head/ambra/libs/otm-models/src/main/java/org/topazproject/ambra/models/Issue.java

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2006-2008 by Topaz, Inc.
+ * Copyright (c) 2006-2009 by Topaz, Inc.
  * http://topazproject.org
  *
@@ -126 +126 @@
    */
   public List<URI> getArticleList() {
-    if (articleList.isEmpty() && !super.getSimpleCollection().isEmpty())
-      this.articleList = super.getSimpleCollection();
-
     return this.articleList;
   }

head/ambra/webapp/src/main/java/org/topazproject/ambra/admin/action/IssueManagementAction.java

@@ -33 +33 @@
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -144 +143 @@
            * are ordering.
            */
-          if (validateCSV(issue, issueURIs))
+          if (validateCSV(issueURIs, browseService.getArticleList(issue)))
             issue = adminService.updateIssue(issueURI,imageURI,displayName,issueURIs,respectOrder);
 
@@ -222 +221 @@
   /**
    *
-   * @param issue
-   * @param issueURIs
+   * @param issueURIs List of issue URI's
+   * @param articleList List of article URI's
    * @return
    * @throws URISyntaxException
    */
-  public Boolean validateCSV(Issue issue, List<URI> issueURIs) throws URISyntaxException {
-    List<URI> curList = issue.getArticleList();
-
-    if (issueURIs.size() != curList.size()) {
+  private Boolean validateCSV(List<URI> issueURIs, List<URI> articleList) throws URISyntaxException {
+
+    if (issueURIs.size() != articleList.size()) {
       addActionMessage("Issue not updated due to the following error.");
       addActionMessage("There has been an addition or deletion in the Article URI List.");
@@ -237 +235 @@
     }
 
-    for(URI uri : curList) {
+    for(URI uri : articleList) {
       if (!issueURIs.contains(uri)) {
         addActionMessage("Issue not updated due to the following error.");

head/ambra/webapp/src/main/java/org/topazproject/ambra/article/service/BrowseService.java

@@ -342 +342 @@
                                         nextIssueURI, imageArticle, description,
                                         parentVolume == null ? null : parentVolume.getId());
-    issueInfo.setArticleUriList(issue.getArticleList());
+    issueInfo.setArticleUriList(getArticleList(issue));
     return issueInfo;
   }
@@ -862 +862 @@
     return articleGroups;
   }
+
+  /**
+   * Get ordered list of articles. Either from articleList or from
+   * simpleCollection if articleList is empty.
+   * @param issue
+   * @return List of article URI's
+   */
+  public List<URI> getArticleList(Issue issue) {
+    List<URI> articleList = issue.getArticleList();
+    if (articleList.isEmpty() && !issue.getSimpleCollection().isEmpty())
+      return new ArrayList<URI>(issue.getSimpleCollection());
+
+    return articleList;
+  }
+
 }