Changeset 53

Timestamp:

02/22/10 17:49:02 (7 months ago)

Author:

ke

Message:

DB tree: XML import and various bugfixes. Not functional yet.

Files:

• kahina/trunk/src/org/kahina/core/data (deleted)
• kahina/trunk/src/org/kahina/data/tree/KahinaDbTree.java (modified) (8 diffs)
• kahina/trunk/src/org/kahina/data/tree/KahinaTree.java (modified) (2 diffs)
• kahina/trunk/src/org/kahina/test/KahinaTreeTest.java (modified) (3 diffs)

kahina/trunk/src/org/kahina/data/tree/KahinaDbTree.java

@@ -8 +8 @@
-import org.kahina.core.KahinaException;
-import org.kahina.io.database.DatabaseHandler;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
-
-public class KahinaDbTree extends KahinaTree
@@ -78 +82 @@
-                {
-                        db.execute("CREATE TABLE " + NODE_TABLE_NAME + " (id INT, "
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                }
-        }
@@ -106 +114 @@
-                                                + NODE_TABLE_NAME + " WHERE id = ? AND tree = "
-                                                + treeID);
+                getLayerStatement = db.prepareStatement("SELECT layer FROM "
+                                + NODE_TABLE_NAME + " WHERE id = ? AND tree = " + treeID);
-                clearStatement = db.prepareStatement("DELETE FROM " + NODE_TABLE_NAME
-                                + " WHERE tree = " + treeID);
@@ -126 +136 @@
-                                .prepareStatement("SELECT nodeCaption FROM " + NODE_TABLE_NAME
-                                                + " WHERE id = ? AND tree = " + treeID);
+                getNodeStatusStatement = db.prepareStatement("SELECT status FROM "
+                                + NODE_TABLE_NAME + " WHERE id = ? AND tree = " + treeID);
-                getRootStatement = db.prepareStatement("SELECT id FROM "
-                                + NODE_TABLE_NAME + " WHERE realParent IS NULL AND tree = "
@@ -135 +147 @@
-        }
-
-
-
-
-
+
+
-                try
-                {
@@ -149 +159 @@
-                        throw new KahinaException("SQL error.", e);
-                }
+                nextID = Math.max(id, nextID) + 1;
+        }
+
+        @Override
+        public int addNode(String caption, String label, int nodeStatus)
+        {
+                int id = nextID++;
+                addNode(id, caption, label, nodeStatus);
-                return id;
-        }
@@ -166 +184 @@
-                computeAndStoreLayerInformation(child);
-        }
-
+
-        private void computeAndStoreLayerInformation(int child)
-        {
@@ -454 +472 @@
-        }
-
+        public static KahinaTree importXML(Document dom, LayerDecider decider,
+                        DatabaseHandler db)
+        {
+                KahinaDbTree m = new KahinaDbTree(decider, db);
+                Element treeElement = dom.getDocumentElement();
+                NodeList childNodes = treeElement.getChildNodes();
+                for (int i = 0; i < childNodes.getLength(); i++)
+                {
+                        Node n = childNodes.item(i);
+                        if (n.getNodeName().equals("node"))
+                        {
+                                importXMLNode(m, (Element) n, -1);
+                                // TODO: a little risky, root node could be assigned another ID
+                                m.setRootID(0);
+                                break;
+                        }
+                }
+                return m;
+        }
+
+        private static void importXMLNode(KahinaDbTree m, Element node, int parentID)
+        {
+                String caption = node.getAttribute("caption");
+                String label = node.getAttribute("label");
+                int status = 0;
+                if (node.getAttribute("status").length() > 0)
+                {
+                        status = Integer.parseInt(node.getAttribute("status"));
+                }
+                int id;
+                if (node.getAttribute("id").length() > 0)
+                {
+                        id = Integer.parseInt(node.getAttribute("id"));
+                        m.addNode(id, caption, label, status);
+                } else
+                {
+                        id = m.addNode(caption, label, status);
+                }
+                if (parentID != -1)
+                {
+                        m.addChild(parentID, id);
+                }
+                // go through children recursively
+                NodeList childNodes = node.getChildNodes();
+                for (int i = 0; i < childNodes.getLength(); i++)
+                {
+                        Node n = childNodes.item(i);
+                        if (n.getNodeName().equals("node"))
+                        {
+                                importXMLNode(m, (Element) n, id);
+                        }
+                }
+        }
+
+        @Override
+        public void finalize() throws Throwable
+        {
+                clear();
+                super.finalize();
+        }
+
-}

kahina/trunk/src/org/kahina/data/tree/KahinaTree.java

@@ -22 +22 @@
-                super(nextID++);
-                this.decider = decider;
-c
+doC
-        }
-
@@ -31 +31 @@
-         */
-        public void clear()
+        {
+                doClear();
+        }
+        
+        private void doClear()
-        {
-                primaryModel = this;

kahina/trunk/src/org/kahina/test/KahinaTreeTest.java

@@ -13 +13 @@
-
-import org.kahina.data.KahinaTypeException;
+import org.kahina.data.tree.KahinaDbTree;
+import org.kahina.data.tree.KahinaTree;
+import org.kahina.data.tree.LayerDecider;
+import org.kahina.io.database.DatabaseHandler;
-import org.kahina.visual.tree.KahinaTreeView;
-import org.kahina.visual.tree.KahinaTreeViewMarker;
@@ -25 +29 @@
-        try
-        {
+                LayerDecider decider = new TestLayerDecider();
+                DatabaseHandler data = new DatabaseHandler();
+                
-            File file = new File("src/org/kahina/test/trale-tree.xml");
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document dom = db.parse(file);
-
+
+
-            
-            file = new File("src/org/kahina/test/trale-tree2.xml");
@@ -35 +43 @@
-            db = dbf.newDocumentBuilder();
-            dom = db.parse(file);
-
+
+
-            
-            KahinaTreeView v0 = new KahinaTreeView();