From 219d0738ef43fbcbc10cf3943e48f0fa201d0778 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Thu, 4 Oct 2007 16:13:50 +0000
Subject: [PATCH] Fix for another regression in the Advanced Search UI after
 recent dialog changes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/web/bean/AdvancedSearchDialog.java  | 5 -----
 source/java/org/alfresco/web/bean/SearchProperties.java   | 8 ++------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/source/java/org/alfresco/web/bean/AdvancedSearchDialog.java b/source/java/org/alfresco/web/bean/AdvancedSearchDialog.java
index 9c09a20f73..04dd71304e 100644
--- a/source/java/org/alfresco/web/bean/AdvancedSearchDialog.java
+++ b/source/java/org/alfresco/web/bean/AdvancedSearchDialog.java
@@ -140,11 +140,6 @@ public class AdvancedSearchDialog extends BaseDialogBean
     */
    public DataModel getCategoriesDataModel()
    {
-      if (properties.getCategoriesDataModel() == null)
-      {
-         properties.setCategoriesDataModel(new ListDataModel());
-      }
-      
       properties.getCategoriesDataModel().setWrappedData(properties.getCategories());
       
       return properties.getCategoriesDataModel();
diff --git a/source/java/org/alfresco/web/bean/SearchProperties.java b/source/java/org/alfresco/web/bean/SearchProperties.java
index f9ed880626..bc5baeb4fe 100644
--- a/source/java/org/alfresco/web/bean/SearchProperties.java
+++ b/source/java/org/alfresco/web/bean/SearchProperties.java
@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.Map;
 
 import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
 import javax.faces.model.SelectItem;
 
 import org.alfresco.repo.cache.ExpiringValueCache;
@@ -101,7 +102,7 @@ public class SearchProperties
     private List<Node> categories = new ArrayList<Node>(2);
 
     /** datamodel for table of categories to search */
-    private DataModel categoriesDataModel = null;
+    private DataModel categoriesDataModel = new ListDataModel();
 
     /** title attribute to search */
     private String title = null;
@@ -336,11 +337,6 @@ public class SearchProperties
         return categoriesDataModel;
     }
 
-    public void setCategoriesDataModel(DataModel categoriesDataModel)
-    {
-        this.categoriesDataModel = categoriesDataModel;
-    }
-
     public String getTitle()
     {
         return title;