Merge pull request #704 from eharris369/CW2675-fixGetStartedAction-0.…

…11.0 CW Issue #2675: Open editor first so view does not take up entire window - 0.11.0
eclipse-archived · Apr 16, 2020 · 9121eb7 · 9121eb7
2 parents cd61ece + 52f2cce
commit 9121eb7
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/...rg.eclipse.codewind.ui/src/org/eclipse/codewind/ui/internal/actions/GetStartedAction.java b/...rg.eclipse.codewind.ui/src/org/eclipse/codewind/ui/internal/actions/GetStartedAction.java
@@ -11,9 +11,14 @@
 
 package org.eclipse.codewind.ui.internal.actions;
 
+import org.eclipse.codewind.core.internal.Logger;
 import org.eclipse.codewind.ui.internal.messages.Messages;
 import org.eclipse.codewind.ui.internal.views.ViewHelper;
 import org.eclipse.jface.action.Action;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.intro.IIntroManager;
 import org.eclipse.ui.intro.IIntroPart;
@@ -33,12 +38,30 @@ public void run() {
 			manager.closeIntro(introPart);
 		}
 
+		// Open the J2EE perspective
+		try {
+			IWorkbench workbench = PlatformUI.getWorkbench();
+			workbench.showPerspective("org.eclipse.jst.j2ee.J2EEPerspective", workbench.getActiveWorkbenchWindow());
+		} catch (Exception e) {
+			Logger.logError("An error occurred trying to open the J2EE perspective", e);
+		}
+
+		// Open the Codewind welcome page
+		IEditorPart part = OpenWelcomePageAction.openWelcomePage();
+
 		// Open the Codewind Explorer view
 		ViewHelper.openCodewindExplorerViewNoExec();
-
-		// Open the Codewind welcome page
-		// Make sure this done last so that it has focus
-		OpenWelcomePageAction.openWelcomePage();
+
+		// Make the welcome page the focus
+		if (part != null) {
+			IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+			if (window != null) {
+				IWorkbenchPage page = window.getActivePage();
+				if (page != null) {
+					page.activate(part);
+				}
+			}
+		}
 	}
 
 }
diff --git a/...lipse.codewind.ui/src/org/eclipse/codewind/ui/internal/actions/OpenWelcomePageAction.java b/...lipse.codewind.ui/src/org/eclipse/codewind/ui/internal/actions/OpenWelcomePageAction.java
@@ -52,19 +52,23 @@ public void run() {
 		openWelcomePage();
 	}
 
-	public static void openWelcomePage() {
+	public static IEditorPart openWelcomePage() {
 		IWorkbenchWindow workbenchWindow = CodewindUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
 		IWorkbenchPage page = workbenchWindow.getActivePage();
+		IEditorPart editorPart = null;
 
 		try {
 			WelcomePageEditorInput input = new WelcomePageEditorInput();
-			IEditorPart editorPart = page.openEditor(input, WelcomePageEditorInput.EDITOR_ID);
+			editorPart = page.openEditor(input, WelcomePageEditorInput.EDITOR_ID);
 			if (!(editorPart instanceof WelcomePageEditorPart)) {
 				// This should not happen
 				Logger.logError("Welcome page editor part is the wrong type: " + editorPart.getClass()); //$NON-NLS-1$
+				editorPart = null;
 			}
 		} catch (Exception e) {
 			Logger.logError("An error occurred opening the welcome page editor", e); //$NON-NLS-1$
 		}
+
+		return editorPart;
 	}
 }