[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSContentPage.java, 1.2, 1.3

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29649/com/netscape/admin/dirserv

Modified Files:
	DSContentPage.java 
Log Message:
Resolves: #248073
Summary: Directory Browser shows nothing if the suffix is empty
Description: always displays the system entries (cn=config, cn=monitor, and
cn=schema) regardless of the suffix's existence.



Index: DSContentPage.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSContentPage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DSContentPage.java	9 Sep 2005 18:23:11 -0000	1.2
+++ DSContentPage.java	13 Jul 2007 16:34:39 -0000	1.3
@@ -247,21 +247,22 @@
                 return null;
             }
 
-            public void finished() {                                        
+            public void finished() {
                 _framework.setBusyCursor(false);
                 if (_suffixes != null) {
-                    // We populate the browser controller                    
-                    for (int i = 0; i < _suffixes.length; i++) {                        
+                    // We populate the browser controller
+                    for (int i = 0; i < _suffixes.length; i++) {
                         _controller.addSuffix(_suffixes[i], null);
                     }
-                    _controller.addSuffix("cn=schema", null);
-                    _controller.addSuffix("cn=monitor", null);
-                    _controller.addSuffix("cn=config", null);                    
                 }
                 else {
-                    // Probably an error
+                    // Suffix has no entry
                     Debug.println(0, "DSContentPage.initialize: no suffix found");
-                }                                
+                }
+                // Even if suffix has no entry, we should show system entries
+                _controller.addSuffix("cn=schema", null);
+                _controller.addSuffix("cn=monitor", null);
+                _controller.addSuffix("cn=config", null);
                 
                 _childrenController.setSorted(isSorted);
                 _controller.setShowContainerOnly(_layout.equals(ContentMenuController.NODE_LEAF_LAYOUT));