Changeset 4464

Timestamp:

2003-06-03T16:22:45+12:00 (21 years ago)

Author:

jmt12

Message:

2030093: Added a method getCount() which returns the count of both documents and folders.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/Collection.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/Collection.java

@@ -166 +166 @@
     return get(BUILT);
     }
+
+    /** Determine the number of documents and folders in this collection. */
+    public int getCount() {
+    return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), true, true);
+    }
+
     /** Calculates the number of documents in this collection. */
     public int getDocumentCount() {
-    return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), false);
+    return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), false, true);
     }
     /** Retrieve the description of this collection.
@@ -242 +248 @@
     /** Counts the number of folders used in the current record set. */
     public int getFolderCount() {
-    return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), true);
+    return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), true, false);
     }
     /** Determine if this collection has had an import action run upon it since the last major change.
@@ -382 +388 @@
 
     /** Count either documents or folders, depending on the state of the given boolean. */
-    private int getCount(TreeNode node, boolean folders) {
+    private int getCount(TreeNode node, boolean count_folders, boolean count_files) {
     int count = 0;
     File file = ((FileNode)node).getFile();
-    if(file.isFile() && !folders) {
+    if(file.isFile() && count_files) {
         count++;
     }
-    else if(file.isDirectory() && folders) {
+    else if(file.isDirectory() && count_folders) {
         count++;
     }
     for(int i = 0; i < node.getChildCount(); i++) {
-        count = count + getCount(node.getChildAt(i), folders);
+        count = count + getCount(node.getChildAt(i), count_folders, count_files);
     }
     return count;