From ded554211d25122be8fce30266c7a15b9d82efce Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sun, 22 Sep 2013 12:04:56 +0000
Subject: [PATCH] git-svn-id: https://svn.libreccm.org/ccm/trunk@2323
 8810af33-2d31-482b-a856-94f89814c4df

---
 .../ui/object/CustomizableObjectList.java     | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java b/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java
index a9b88f80d..f4d858dec 100644
--- a/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java
@@ -91,7 +91,7 @@ public class CustomizableObjectList extends ComplexObjectList {
     private final Map<String, Filter> filters =
                                       new LinkedHashMap<String, Filter>();
     
-    private CategoryFilter categoryFilter;
+    //private CategoryFilter categoryFilter;
     /**
      * The available sort fields. We use an {@link LinkedHashMap} here to
      * preserve the insertation order.
@@ -177,12 +177,12 @@ public class CustomizableObjectList extends ComplexObjectList {
         filters.put(label, filter);
     }
     
-    public CategoryFilter addCategoryFilter(final String label,
-                                            final String rootCategory) {
-        categoryFilter = CategoryFilter.createCategoryFilter(label, rootCategory);
-        
-        return categoryFilter;
-    }
+//    public CategoryFilter addCategoryFilter(final String label,
+//                                            final String rootCategory) {
+//        categoryFilter = CategoryFilter.createCategoryFilter(label, rootCategory);
+//        
+//        return categoryFilter;
+//    }
 
     /**
      * Add a sort field option.
@@ -247,9 +247,9 @@ public class CustomizableObjectList extends ComplexObjectList {
 
         final DataCollection objects = super.getObjects(request, response);
         
-        if ((objects != null) && (categoryFilter != null)) {
-            categoryFilter.applyFilter(objects);
-        }
+//        if ((objects != null) && (categoryFilter != null)) {
+//            categoryFilter.applyFilter(objects);
+//        }
 
         return objects;
     }
@@ -326,13 +326,13 @@ public class CustomizableObjectList extends ComplexObjectList {
                 filterEntry.getValue().setValue(value);
             }
         }
-        if (categoryFilter != null) {
-            final String value = Globalization.decodeParameter(request, "categoryFilter");
-            
-            if ((value != null) && !value.isEmpty()) {
-                categoryFilter.setValue(value);
-            }
-        }
+//        if (categoryFilter != null) {
+//            final String value = Globalization.decodeParameter(request, "categoryFilter");
+//            
+//            if ((value != null) && !value.isEmpty()) {
+//                categoryFilter.setValue(value);
+//            }
+//        }
 
         final Element controls = content.newChildElement("filterControls");
         controls.addAttribute("customName", m_customName);
@@ -341,9 +341,9 @@ public class CustomizableObjectList extends ComplexObjectList {
         for (Map.Entry<String, Filter> filterEntry : filters.entrySet()) {
             filterElems.addContent(filterEntry.getValue().getXml());
         }
-        if (categoryFilter != null) {
-            filterElems.addContent(categoryFilter.getXml());
-        }
+//        if (categoryFilter != null) {
+//            filterElems.addContent(categoryFilter.getXml());
+//        }
 
         if (!sortFields.isEmpty()) {
             //Look for a sort parameter. If one is found, use one to sort the data