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

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-08-28 19:20:03 +0000 (Tue, 28 Aug 2007)
New Revision: 14906

Modified:
   trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
   trunk/apps/Thaw/src/thaw/plugins/index/IndexParser.java
   trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java
Log:
Fix index content import : Must refresh the link and file list + Must not purge 
the index before importing

Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java   
2007-08-28 18:15:43 UTC (rev 14905)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java   
2007-08-28 19:20:03 UTC (rev 14906)
@@ -985,8 +985,8 @@


        public static class IndexImporter extends BasicIndexAction {
-               public IndexImporter(final AbstractButton actionSource) {
-                       super(null, null, actionSource);
+               public IndexImporter(final IndexBrowserPanel indexBrowser, 
final AbstractButton actionSource) {
+                       super(null, indexBrowser, actionSource);
                }

                public void setTarget(final IndexTreeNode node) {
@@ -1008,7 +1008,10 @@
                        if (newFile == null)
                                return;

-                       new 
IndexParser(((Index)getTarget())).loadXML(newFile.getPath());
+                       new 
IndexParser(((Index)getTarget())).loadXML(newFile.getPath(), false);
+
+                       
getIndexBrowserPanel().getTables().getFileTable().refresh();
+                       
getIndexBrowserPanel().getTables().getLinkTable().refresh();
                }
        }


Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexParser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexParser.java     2007-08-28 
18:15:43 UTC (rev 14905)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexParser.java     2007-08-28 
19:20:03 UTC (rev 14906)
@@ -294,8 +294,14 @@
        public class IndexHandler extends DefaultHandler {
                private Locator locator = null;

+               private boolean clean = true;
+
                public IndexHandler() {
+                       this(true);
+               }

+               public IndexHandler(boolean clean) {
+                       this.clean = clean;
                }

                /**
@@ -310,7 +316,8 @@
                 * @see org.xml.sax.ContentHandler#startDocument()
                 */
                public void startDocument() throws SAXException {
-                       index.purgeIndex();
+                       if (clean)
+                               index.purgeIndex();
                }

                /**
@@ -571,12 +578,16 @@
         * see import functionnality
         */
        public IndexHandler getIndexHandler() {
-               return new IndexHandler();
+               return getIndexHandler(true);
        }

+       public IndexHandler getIndexHandler(boolean clean) {
+               return new IndexHandler(clean);
+       }

+
        public synchronized void loadXML(final java.io.InputStream input, 
boolean clean) {
-               IndexHandler handler = new IndexHandler();
+               IndexHandler handler = new IndexHandler(clean);

                try {
                        // Use the default (non-validating) parser
@@ -584,9 +595,11 @@

                        // Parse the input
                        SAXParser saxParser = factory.newSAXParser();
+
                        Logger.info(this, "Parsing index ...");
                        saxParser.parse(input, handler );
                        Logger.info(this, "Parsing done");
+
                } catch(javax.xml.parsers.ParserConfigurationException e) {
                        Logger.error(this, "Error (1) while parsing index: 
"+e.toString());
                } catch(org.xml.sax.SAXException e) {

Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java       2007-08-28 
18:15:43 UTC (rev 14905)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java       2007-08-28 
19:20:03 UTC (rev 14906)
@@ -251,7 +251,7 @@
                item = new 
JMenuItem(I18n.getMessage("thaw.plugin.index.importIndex"),
                                     IconBox.minImportAction);
                indexMenu.add(item);
-               indexAndFileActions.add(new 
IndexManagementHelper.IndexImporter(item));
+               indexAndFileActions.add(new 
IndexManagementHelper.IndexImporter(indexBrowser, item));

                item = new 
JMenuItem(I18n.getMessage("thaw.plugin.index.delete"),
                                     IconBox.minDelete);