Issue #109: Expand the connection in the view on project create

Author: eharris369

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/views/ViewHelper.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 IBM Corporation and others.
+ * Copyright (c) 2018, 2019 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -16,6 +16,7 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IViewReference;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
@@ -56,7 +57,9 @@ public static void expandConnection(MicroclimateConnection connection) {
 			IViewPart view = getViewPart(MicroclimateExplorerView.VIEW_ID);
 			if (view instanceof CommonNavigator) {
 				CommonViewer viewer = ((CommonNavigator)view).getCommonViewer();
-				viewer.expandToLevel(2);
+				if (!viewer.getExpandedState(connection)) {
+					viewer.expandToLevel(2);
+				}
  			}
 		}
 	}
@@ -89,14 +92,15 @@ public static void refreshNavigatorView(String viewId, Object element) {
     }
 
 	public static IViewPart getViewPart(String viewId) {
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-        if (window != null) {
-            IWorkbenchPage page = window.getActivePage();
-            if (page != null) {
-                return page.findView(viewId);
-            }
-        }
-        return null;
+    	for (IWorkbenchWindow window : PlatformUI.getWorkbench().getWorkbenchWindows()) {
+    		for (IWorkbenchPage page : window.getPages()) {
+    			for (IViewReference reference : page.getViewReferences()) {
+    				if (viewId.equals(reference.getId())) {
+    					return reference.getView(false);
+    				}
+    			}
+    		}
+    	}
+    	return null;
 	}
-	
 }

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/wizards/NewMicroclimateProjectWizard.java

@@ -15,6 +15,7 @@
 
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Display;
 
 import com.ibm.microclimate.core.internal.MCLogger;
 import com.ibm.microclimate.core.internal.MCUtil;
@@ -24,6 +25,7 @@
 import com.ibm.microclimate.core.internal.console.ProjectTemplateInfo;
 import com.ibm.microclimate.ui.internal.actions.ImportProjectAction;
 import com.ibm.microclimate.ui.internal.messages.Messages;
+import com.ibm.microclimate.ui.internal.views.ViewHelper;
 
 public class NewMicroclimateProjectWizard extends Wizard {
 
@@ -57,21 +59,28 @@ public boolean performFinish() {
 		}
 
 		try {
-			if (newProjectPage.importProject()) {
-				connection.getMCSocket().registerProjectCreateHandler(name, new IOperationHandler() {
-					@Override
-					public void operationComplete(boolean passed, String msg) {
-						connection.getMCSocket().deregisterProjectCreateHandler(name);
-						if (passed) {
-							MicroclimateApplication app = connection.getAppByName(name);
-							if (app != null) {
+			final boolean importProject = newProjectPage.importProject();
+			connection.getMCSocket().registerProjectCreateHandler(name, new IOperationHandler() {
+				@Override
+				public void operationComplete(boolean passed, String msg) {
+					connection.getMCSocket().deregisterProjectCreateHandler(name);
+					if (passed) {
+						MicroclimateApplication app = connection.getAppByName(name);
+						if (app != null) {
+							Display.getDefault().asyncExec(new Runnable() {
+								@Override
+								public void run() {
+									ViewHelper.expandConnection(connection);
+								}
+							});
+							if (importProject) {
 								ImportProjectAction.importProject(app);
-								return;
 							}
+							return;
 						}
 					}
-				});
-			}
+				}
+			});
 			connection.requestProjectCreate(info, name);
 			return true;
 		} catch (Exception e) {