Changeset 48

Timestamp:

02/21/10 15:53:06 (7 months ago)

Author:

ke

Message:

Removed setters and getters for nodeCaptions, edgeLabels and status in tree classes. Swapping dimensions in KahinaTreeView? is now handled in a less sacrilegious way.

Files:

• 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/data/tree/KahinaUnlayeredMemTree.java (modified) (3 diffs)
• kahina/trunk/src/org/kahina/gui/breakpoint/BreakpointTestWindow.java (modified) (3 diffs)
• kahina/trunk/src/org/kahina/test/KahinaTreeTest.java (modified) (2 diffs)
• kahina/trunk/src/org/kahina/visual/tree/KahinaTreeView.java (modified) (12 diffs)
• kahina/trunk/src/org/kahina/visual/tree/KahinaTreeViewListener.java (modified) (1 diff)
• kahina/trunk/src/org/kahina/visual/tree/KahinaTreeViewPanel.java (modified) (5 diffs)

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

@@ -2 +2 @@
-
-import java.util.List;
-import java.util.Map;
-
-import org.kahina.io.database.DatabaseHandler;
@@ -56 +55 @@
-        public void addChild(int parent, int child)
-        {
-TODO Auto-generated method stub
-
+add
+
-        }
-
@@ -110 +109 @@
-
-        @Override
-        public Map<Integer, String> getEdgeLabels()
-        {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public List<Integer> getLeaves()
-        {
@@ -125 +117 @@
-        @Override
-        public String getNodeCaption(int nodeID)
-        {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public Map<Integer, String> getNodeCaptions()
-        {
-                // TODO Auto-generated method stub
@@ -166 +151 @@
-
-        @Override
-        public Map<Integer, Integer> getStatus()
-        {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public boolean hasCollapsedAncestor(int nodeID)
-        {
@@ -184 +162 @@
-                // TODO Auto-generated method stub
-                return false;
-        }
-
-        @Override
-        public void setEdgeLabels(Map<Integer, String> edgeLabels)
-        {
-                // TODO Auto-generated method stub
-
-        }
-
-        @Override
-        public void setNodeCaptions(Map<Integer, String> nodeCaptions)
-        {
-                // TODO Auto-generated method stub
-
-        }
-
@@ -215 +179 @@
-
-        @Override
-setStatus(Map<Integer, Integer> status
+toggleCollapse(int nodeID
-        {
-                // TODO Auto-generated method stub
@@ -222 +186 @@
-
-        @Override
-void toggleCollapse(int nodeID
+int getSize(
-        {
-                // TODO Auto-generated method stub
-
+
-        }
-

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

@@ -45 +45 @@
-        public abstract boolean isCollapsed(int nodeID);
-
-        public abstract void setStatus(Map<Integer, Integer> status);
-
-        public abstract Map<Integer, Integer> getStatus();
-
-        public abstract void setEdgeLabels(Map<Integer, String> edgeLabels);
-
-        public abstract Map<Integer, String> getEdgeLabels();
-
-        public abstract void setNodeCaptions(Map<Integer, String> nodeCaptions);
-
-        public abstract Map<Integer, String> getNodeCaptions();
-
-        public abstract List<Integer> getLeaves();
-
@@ -76 +64 @@
-
-        public abstract int getRootID(int layerID);
+        
+        public abstract int getSize();
-    
-    public String exportXML()

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

@@ -106 +106 @@
-        else
-        {
+                System.err.println("Caption: " + caption); // TODO
-            return caption;
-        }
@@ -180 +181 @@
-            }
-        }
-    }
-    
-    @Override
-        public Map<Integer, String> getNodeCaptions()
-    {
-        return nodeCaptions;
-    }
-
-    @Override
-        public void setNodeCaptions(Map<Integer, String> nodeCaptions)
-    {
-        this.nodeCaptions = nodeCaptions;
-    }
-
-    @Override
-        public Map<Integer, String> getEdgeLabels()
-    {
-        return edgeLabels;
-    }
-
-    @Override
-        public void setEdgeLabels(Map<Integer, String> edgeLabels)
-    {
-        this.edgeLabels = edgeLabels;
-    }
-
-    @Override
-        public Map<Integer, Integer> getStatus()
-    {
-        return status;
-    }
-
-    @Override
-        public void setStatus(Map<Integer, Integer> status)
-    {
-        this.status = status;
-    }
-    
@@ -311 +276 @@
-        nextID = 0;
-    }
+
+        @Override
+        public int getSize()
+        {
+                return nodeCaptions.size();
+        }
-    
-    // TODO find a good way to make this implementation-independent

kahina/trunk/src/org/kahina/gui/breakpoint/BreakpointTestWindow.java

@@ -12 +12 @@
-import javax.swing.JScrollPane;
-
-import org.kahina.breakpoint.KahinaBreakpoint;
-import org.kahina.breakpoint.TreeAutomaton;
-import org.kahina.control.KahinaController;
@@ -122 +121 @@
-        else if (s.equals("addRandomNode"))
-        {
-NodeCaptions().s
+S
-            String caption = generateRandomNodeCaption();
-            view.setMarkedNode(addNode(parentNode, caption));
@@ -286 +285 @@
-                    
-                }
-NodeCaptions().s
+S
-                String caption = generateRandomNodeCaption();
-                addNode(parentNode, caption);

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

@@ -45 +45 @@
-            v0.display(m1,0,17);
-            v0.displaySecondaryTree(m2);
-swap
+toggle
-            
-            v0.setStatusColorEncoding(0,new Color(0,255,0));
@@ -60 +60 @@
-            v1.display(m1,1,17);
-            v1.displaySecondaryTree(m2);
-swap
+toggle
-            
-            v1.setStatusColorEncoding(0,new Color(0,255,0));

kahina/trunk/src/org/kahina/visual/tree/KahinaTreeView.java

@@ -92 +92 @@
-    KahinaTree secondaryTreeModel;
-    
+    private boolean dimensionsSwapped = false;
+    
-    //display coordinates for nodes
-    private HashMap<Integer, Integer> nodeX;
@@ -229 +231 @@
-    }
-    
-swap
+toggle
-    {
-        displaySecondDimension = !displaySecondDimension;
@@ -464 +466 @@
-    public Font getNodeFont(int nodeID)
-    {
-treeModel
+getContentfulTreeModel()
-        Font fnt = statusFontEncoding.get(status);
-        if (fnt == null)
@@ -486 +488 @@
-    public Color getNodeColor(int nodeID)
-    {
-treeModel
+getContentfulTreeModel()
-        Color col = statusNodeColorEncoding.get(status);
-        if (col == null)
@@ -588 +590 @@
-        }
-        treeLayer = 0;
-Mem
+
-        nodeBorderColor = new HashMap<Integer, Color>();
-        resetAllStructures();
@@ -648 +650 @@
-                for (int node : nodeLevels.get(i))
-                {
-treeModel
+getContentfulTreeModel()
-                    if (maxNodeWidth < nodeLabelWidth) maxNodeWidth = nodeLabelWidth;
-                    ArrayList<Integer> children = getVisibleVirtualChildren(treeModel, node);           
@@ -801 +803 @@
-        if (nodeDisplayPolicy == KahinaTreeView.NEVER) return false;
-        if (secondaryTreeModel != null && collapsePolicy == COLLAPSE_SECONDARY && secondaryTreeModel.hasCollapsedAncestor(nodeID)) return false;
-treeModel
+getContentfulTreeModel()
-        Boolean decision = statusVisibilityEncoding.get(status);
-        if (decision == null)
@@ -894 +896 @@
-        if (secondaryTreeModel != null)
-        {
+                dimensionsSwapped = !dimensionsSwapped;
-            KahinaTree firstModel = treeModel;
-            treeModel = secondaryTreeModel;
-            treeModel.setNodeCaptions(firstModel.getNodeCaptions());
-            treeModel.setEdgeLabels(firstModel.getEdgeLabels());
-            treeModel.setStatus(firstModel.getStatus());
-            secondaryTreeModel = firstModel;
-            resetAllStructures();
@@ -956 +956 @@
-            middleIndex = (lowerIndex + upperIndex)/2;
-            FontMetrics fm = getFontMetrics(new Font(Font.SANS_SERIF,Font.PLAIN, fontSize), new BasicStroke(1), fontSize);
-treeModel
+getContentfulTreeModel()
-            middleBound = nodeX.get(selectedLevel.get(middleIndex)) + width / 2 + 2;
-            if (nodePositionPolicy == KahinaTreeView.LEFT_ALIGNED_NODES)
@@ -978 +978 @@
-                }
-                middleIndex = (lowerIndex + upperIndex)/2;
-treeModel
+getContentfulTreeModel()
-                middleBound = nodeX.get(selectedLevel.get(middleIndex)) + width / 2 - 2;
-                if (nodePositionPolicy == KahinaTreeView.LEFT_ALIGNED_NODES)
@@ -997 +997 @@
-        //test coordinates against exact boundaries of candidate node
-        FontMetrics fm = getFontMetrics(new Font(Font.SANS_SERIF,Font.PLAIN, fontSize), new BasicStroke(1), fontSize);
-treeModel
+getContentfulTreeModel()
-        int xLeft = getNodeX(candidateNode) - width / 2 - 2;
-        if (nodePositionPolicy == KahinaTreeView.LEFT_ALIGNED_NODES)
@@ -1037 +1037 @@
-        return treeModel;
-    }
+    
+    public KahinaTree getContentfulTreeModel()
+    {
+        if (dimensionsSwapped)
+        {
+                return secondaryTreeModel;
+        } else
+        {
+                return treeModel;
+        }
+    }
-}

kahina/trunk/src/org/kahina/visual/tree/KahinaTreeViewListener.java

@@ -252 +252 @@
-        else if (command.equals("Display second dimension"))
-        {
-swap
+toggle
-        }
-        else if (command.equals("Swap dimensions"))

kahina/trunk/src/org/kahina/visual/tree/KahinaTreeViewPanel.java

@@ -1 +1 @@
-package org.kahina.visual.tree;
-
-
+
+
+
+
+
+
+
+
-import java.awt.image.BufferedImage;
-import java.util.List;
-
-import javax.swing.*;
-
-import org.kahina.visual.KahinaViewPanel;
@@ -137 +142 @@
-        canvas.setFont(v.getNodeFont(nodeID));
-        FontMetrics fm = canvas.getFontMetrics();
-treeModel
+getContentfulTreeModel()
-        int x = v.getNodeX(nodeID) - width / 2;
-        int y = v.getNodeY(nodeID) - v.getNodeHeight(nodeID) + 2;
@@ -174 +179 @@
-        canvas.setFont(v.getNodeFont(nodeID));
-        FontMetrics fm = canvas.getFontMetrics();
-treeModel
+getContentfulTreeModel()
-        int x = v.getNodeX(nodeID) - width / 2;
-        int y = v.getNodeY(nodeID) - v.getNodeHeight(nodeID) + 2;
@@ -206 +211 @@
-        canvas.setFont(v.getNodeFont(nodeID));
-        FontMetrics fm = canvas.getFontMetrics();
-treeModel
+getContentfulTreeModel()
-        int width = fm.stringWidth(tag);
-        canvas.setColor(Color.BLACK);
@@ -318 +323 @@
-                                else if (v.getNodePositionPolicy() == KahinaTreeView.CENTERED_NODES)
-                                {
-treeModel
-treeModel
+getContentfulTreeModel()
+getContentfulTreeModel()
-                                    x1 -= parentWidth / 2;
-                                    x2 -= nodeWidth / 2;