Update of 
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services
In directory james.mmbase.org:/tmp/cvs-serv11744

Modified Files:
        ServiceUtil.java 
Log Message:
CMSC-1243 List Summary for "All content" should contain the proper content types


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services
See also: http://www.mmbase.org/jira/browse/CMSC-1243


Index: ServiceUtil.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/ServiceUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ServiceUtil.java    20 Jan 2009 05:51:25 -0000      1.2
+++ ServiceUtil.java    21 Jan 2009 02:31:29 -0000      1.3
@@ -12,20 +12,25 @@
 import org.mmbase.bridge.NodeManagerList;
 import org.mmbase.bridge.NotFoundException;
 
+import com.finalist.cmsc.mmbase.PropertiesUtil;
+
 /**
  * @author Marco
  * 
  */
 public class ServiceUtil {
    
+   private static final String PROPERTY_HIDDEN_TYPES = 
"system.contenttypes.hide";
 
    public static List<LabelValueBean> getDirectChildTypes(Cloud cloud,String 
parent) {
       List<NodeManager> resultManager = new ArrayList<NodeManager>();
       NodeManagerList nml = cloud.getNodeManagers();
       Iterator<NodeManager> v = nml.iterator();
+      List<String> hiddenTypes = getHiddenTypes();
       while (v.hasNext()) {
          NodeManager child = v.next();
-         if (isDirectChildType(cloud,child.getName(), parent)) {
+         String name = child.getName();
+         if (!hiddenTypes.contains(name) && isDirectChildType(cloud,name, 
parent)) {
             resultManager.add(child);
          }
       }
@@ -93,4 +98,18 @@
       }
       return false;
    }
+   private static List<String> getHiddenTypes() {
+      String property = PropertiesUtil.getProperty(PROPERTY_HIDDEN_TYPES);
+      if (property == null) {
+         return new ArrayList<String>();
+      }
+
+      ArrayList<String> list = new ArrayList<String>();
+      String[] values = property.split(",");
+      for (String value : values) {
+         list.add(value);
+      }
+      return list;
+   }
+
 }
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to