expand child nodes after refreshing the node

Author: t-rufang

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/components/ServerExplorerToolWindowFactory.java

@@ -143,6 +143,10 @@ else if (e.getKeyCode() == KeyEvent.VK_CONTEXT_MENU) {
         // add the tree to the window
         toolWindow.getComponent().add(new JBScrollPane(tree));
 
+        // set tree and tree path to expand the node later
+        azureModule.setTree(tree);
+        azureModule.setTreePath(tree.getPathForRow(0));
+
         // setup toolbar icons
         addToolbarItems(toolWindow, azureModule);
 
@@ -170,6 +174,10 @@ private void treeMousePressed(MouseEvent e, JTree tree) {
         SortableTreeNode treeNode = (SortableTreeNode) treePath.getLastPathComponent();
         Node node = (Node) treeNode.getUserObject();
 
+        // set tree and tree path to expand the node later
+        node.setTree(tree);
+        node.setTreePath(treePath);
+
         // delegate click to the node's click action if this is a left button click
         if (SwingUtilities.isLeftMouseButton(e)) {
             // if the node in question is in a "loading" state then we

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/Node.java

@@ -30,6 +30,8 @@
 import com.microsoft.tooling.msservices.helpers.Name;
 import com.microsoft.tooling.msservices.helpers.collections.ObservableList;
 
+import javax.swing.*;
+import javax.swing.tree.TreePath;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.lang.reflect.Constructor;
@@ -51,7 +53,9 @@ public class Node implements MvpView {
     protected Object viewData;
     protected NodeAction clickAction = new NodeAction(this, CLICK_ACTION);
     protected List<NodeAction> nodeActions = new ArrayList<NodeAction>();
-    
+    protected JTree tree;
+    protected TreePath treePath;
+
     // marks this node as being in a "loading" state; when this field is true
     // the following consequences apply:
     //  [1] all actions associated with this node get disabled
@@ -83,6 +87,22 @@ public String getId() {
         return id;
     }
 
+    public JTree getTree() {
+        return tree;
+    }
+
+    public void setTree(JTree tree) {
+        this.tree = tree;
+    }
+
+    public TreePath getTreePath() {
+        return treePath;
+    }
+
+    public void setTreePath(TreePath treePath) {
+        this.treePath = treePath;
+    }
+
     public String getName() {
         return name;
     }

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/RefreshableNode.java

@@ -29,6 +29,8 @@
 import com.microsoft.azuretools.azurecommons.helpers.AzureCmdException;
 import com.microsoft.azuretools.core.mvp.ui.base.NodeContent;
 
+import javax.swing.*;
+import javax.swing.tree.TreePath;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -70,6 +72,8 @@ public List<NodeAction> getNodeActions() {
     protected void onNodeClick(NodeActionEvent e) {
         if (!initialized) {
             this.load(false);
+        } else {
+            expandNodeAfterLoading();
         }
     }
 
@@ -106,6 +110,12 @@ protected void refreshFromAzure() throws Exception {
     protected void updateNodeNameAfterLoading() {
     }
 
+    protected void expandNodeAfterLoading() {
+        if (tree != null && treePath != null) {
+            tree.expandPath(treePath);
+        }
+    }
+
     public ListenableFuture<List<Node>> load(boolean forceRefresh) {
         initialized = true;
         final RefreshableNode node = this;
@@ -125,12 +135,14 @@ public void run() {
                                 public void onSuccess(List<Node> nodes) {
                                     updateName(nodeName, null);
                                     updateNodeNameAfterLoading();
+                                    expandNodeAfterLoading();
                                 }
 
                                 @Override
                                 public void onFailure(Throwable throwable) {
                                     updateName(nodeName, throwable);
                                     updateNodeNameAfterLoading();
+                                    expandNodeAfterLoading();
                                 }
                             });
                             node.refreshItems(future, forceRefresh);

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/AzureModule.java

@@ -165,6 +165,7 @@ protected void refreshItems() throws AzureCmdException {
 
     @Override
     protected void onNodeClick(NodeActionEvent e) {
+        super.onNodeClick(e);
     }
 
     @Override