[Thaw-dev] r14544 - trunk/apps/Thaw/src/thaw/plugins/index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-08-08 21:41:27 +0000 (Wed, 08 Aug 2007)
New Revision: 14544

Modified:
   trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java
   trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
Log:
Specify a maximum folder detph when autosorting the indexes

Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java     2007-08-08 
21:39:12 UTC (rev 14543)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java     2007-08-08 
21:41:27 UTC (rev 14544)
@@ -25,6 +25,7 @@


 public class IndexFolder implements IndexTreeNode, MutableTreeNode {
+       public static final int MAX_AUTOSORTING_DEPTH = 6;

        private static final long serialVersionUID = 2L;


Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java   
2007-08-08 21:39:12 UTC (rev 14543)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java   
2007-08-08 21:41:27 UTC (rev 14544)
@@ -658,7 +658,7 @@
         * @param cat Example: "Automatically sorted/freenet/thaw" (only 
folders !)
         * @return the path in the tree
         */
-       public static TreePath makeMyPath(IndexBrowserPanel indexBrowser, 
String cat) {
+       public static TreePath makeMyPath(IndexBrowserPanel indexBrowser, 
String cat, int maxDepth) {
                String[] split = cat.split("/");

                if (split == null) return null;
@@ -667,7 +667,7 @@
                TreePath path = new TreePath(currentFolder);
                path = path.pathByAddingChild(currentFolder);

-               for (int i = 0 ; i < split.length ; i++) {
+               for (int i = 0 ; i < split.length && i < maxDepth; i++) {
                        if (split[i] == null || "".equals(split[i].trim()))
                                continue;
                        String folder = split[i].trim().toLowerCase();
@@ -759,7 +759,8 @@

                cat = 
I18n.getMessage("thaw.plugin.index.automaticallySorted")+"/"+cat;

-               TreePath path = makeMyPath(indexBrowser, cat);
+               TreePath path = makeMyPath(indexBrowser, cat,
+                                          IndexFolder.MAX_AUTOSORTING_DEPTH+1);

                if (path == null) {
                        return false;