Scroll to first checked element when a dimension is clicked.gradle_1.3.0-beta3

Change-Id: Icf6c6815c3a59a585069127a5e893d6b9e8c275e

1 files changed, 47 insertions, 9 deletions

diff --git a/src/com/google/gct/testing/TwoPanelTree.java b/src/com/google/gct/testing/TwoPanelTree.java
index 9b62e58..ff0c9d6 100644
--- a/src/com/google/gct/testing/TwoPanelTree.java
+++ b/src/com/google/gct/testing/TwoPanelTree.java
@@ -64,7 +64,7 @@ public class TwoPanelTree extends MouseAdapter implements ListSelectionListener,
   // Contains a list of the roots
   private final JPanel leftPanel;
   // Contains the tree view
-  private final JPanel rightPanel;
+  private final JScrollPane rightScrollPane;
   // Contains the left and right panels
   private final Splitter mySplitter;
   // Panel to contain the splitter to display the border.
@@ -97,7 +97,8 @@ public class TwoPanelTree extends MouseAdapter implements ListSelectionListener,
     mySplitter.getDivider().setBorder(BorderFactory.createLineBorder(UIUtil.getBorderColor()));
     mySplitter.setProportion(0.3f);
     leftPanel = new JPanel(new BorderLayout());
-    rightPanel = new JPanel(new BorderLayout());
+    rightScrollPane = new JScrollPane();
+    rightScrollPane.setBorder(BorderFactory.createEmptyBorder());
 
     FlowLayout flowLayout = new FlowLayout(FlowLayout.RIGHT);
     flowLayout.setHgap(15);
@@ -119,9 +120,7 @@ public class TwoPanelTree extends MouseAdapter implements ListSelectionListener,
     }
 
     mySplitter.setFirstComponent(leftPanel);
-    JScrollPane scrollPane = new JScrollPane(rightPanel);
-    scrollPane.setBorder(null);
-    mySplitter.setSecondComponent(scrollPane);
+    mySplitter.setSecondComponent(rightScrollPane);
     mySplitterPanel.add(mySplitter, BorderLayout.CENTER);
     myPanel.add(mySplitterPanel, BorderLayout.CENTER);
 
@@ -321,16 +320,55 @@ public class TwoPanelTree extends MouseAdapter implements ListSelectionListener,
 
   @Override
   public void valueChanged(ListSelectionEvent e) {
-    // Switch to the tree corresponding to the selected dimension
-    rightPanel.removeAll();
+    // Switch to the tree corresponding to the selected dimension.
     CheckboxTree currentTree = treeMap.get(getSelectedDimension());
-    rightPanel.add(currentTree, BorderLayout.CENTER);
-    rightPanel.updateUI();
+    rightScrollPane.setViewportView(currentTree);
+    rightScrollPane.updateUI();
+    prepareForViewing(currentTree);
     for (TwoPanelTreeSelectionListener listener : listeners) {
       listener.dimensionSelectionChanged(new TwoPanelTreeDimensionSelectionEvent(getSelectedDimension()));
     }
   }
 
+  private void prepareForViewing(CheckboxTree tree) {
+    TreeNode root = (TreeNode)tree.getModel().getRoot();
+    if (!isAnyLeafChecked(tree)) {
+      for (int i = 0; i < root.getChildCount(); i++) {
+        CheckedTreeNode firstLevelChild = (CheckedTreeNode)root.getChildAt(i);
+        if (firstLevelChild.getChildCount() > 0) {
+          // Expand the first group when there are no selected leafs.
+          tree.expandPath(new TreePath(firstLevelChild.getPath()));
+          return;
+        }
+      }
+    } else {
+      boolean hasEncounteredCheckedLeaf = false;
+      for (int i = 0; i < root.getChildCount(); i++) {
+        CheckedTreeNode firstLevelChild = (CheckedTreeNode)root.getChildAt(i);
+        if (firstLevelChild.isLeaf()) {
+          if (firstLevelChild.isChecked() && !hasEncounteredCheckedLeaf) {
+            hasEncounteredCheckedLeaf = true;
+            // Scroll to the first checked leaf.
+            tree.scrollPathToVisible(new TreePath(firstLevelChild.getPath()));
+          }
+        } else {
+          for (int j = 0; j < firstLevelChild.getChildCount(); j++) {
+            CheckedTreeNode secondLevelChild = (CheckedTreeNode)firstLevelChild.getChildAt(j);
+            if (secondLevelChild.isChecked()) {
+              tree.expandPath(new TreePath(firstLevelChild.getPath()));
+              if (!hasEncounteredCheckedLeaf) {
+                hasEncounteredCheckedLeaf = true;
+                // Scroll to the first checked leaf.
+                tree.scrollPathToVisible(new TreePath(secondLevelChild.getPath()));
+              }
+              break;
+            }
+          }
+        }
+      }
+    }
+  }
+
   private CloudConfigurationDimension getSelectedDimension() {
     return (CloudConfigurationDimension) list.getModel().getElementAt(list.getSelectedIndex());
   }