[Thaw-dev] r11151 - in trunk/apps/Thaw/src/thaw/plugins: . index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-11-30 21:35:09 +0000 (Thu, 30 Nov 2006)
New Revision: 11151

Modified:
   trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
   trunk/apps/Thaw/src/thaw/plugins/index/IndexCategory.java
Log:
By default, index "Thaw" is now added to the tree

Modified: trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java  2006-11-30 21:30:17 UTC 
(rev 11150)
+++ trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java  2006-11-30 21:35:09 UTC 
(rev 11151)
@@ -9,6 +9,8 @@
 import thaw.plugins.index.*;

 public class IndexBrowser extends ToolbarModifier implements Plugin, 
ChangeListener {
+       public static final String DEFAULT_INDEX = "USK at 
BXd4EqMSOR589aHNHOY-e2QjI9NHwPlJurKxcvo1hBg,HkrDarIUF79uc9fjGu0S3mbp7Qf8YeMHynKf2GQO3r0,AQABAAE/Thaw/2/Thaw.xml";
+
        private Core core;
        private Hsqldb hsqldb;

@@ -35,8 +37,16 @@

                hsqldb.registerChild(this);

-               TableCreator.createTables(hsqldb);
+               boolean newDb;

+               newDb = false;
+
+               if (core.getConfig().getValue("indexDatabaseVersion") == null) {
+                       TableCreator.createTables(hsqldb);
+                       newDb = true;
+                       core.getConfig().setValue("indexDatabaseVersion", "1");
+               }
+
                browserPanel = new IndexBrowserPanel(hsqldb, 
core.getQueueManager(), core.getConfig());

                setMainWindow(core.getMainWindow());
@@ -69,6 +79,10 @@
                action.setTarget(browserPanel.getIndexTree().getRoot());
                addButtonToTheToolbar(button);

+               if (newDb) {
+                       IndexManagementHelper.addIndex(hsqldb, 
core.getQueueManager(), browserPanel.getIndexTree(),
+                                                      
browserPanel.getIndexTree().getRoot(), DEFAULT_INDEX);
+               }

                stateChanged(null);


Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexCategory.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexCategory.java   2006-11-30 
21:30:17 UTC (rev 11150)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexCategory.java   2006-11-30 
21:35:09 UTC (rev 11151)
@@ -234,6 +234,16 @@
                return this.id;
        }

+       public int getChildNumber() {
+               if (children == null)
+                       children = loadChildren();
+
+               if (children == null)
+                       return 0;
+
+               return children.size();
+       }
+
        public Vector loadChildren() {
                Vector children = new Vector();