Attachment 213548 Details for Bug 370119 – Alternative approach

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Alternative approach

intro.patch (text/plain), 3.49 KB, created by Krzysztof Daniel

on 2012-04-04 04:17:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2012-04-04 04:17:08 EDT

Size: 3.49 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/WorkbenchActionBuilder.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/WorkbenchActionBuilder.java
>index ba7072a..edd965f 100644
>--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/WorkbenchActionBuilder.java
>+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/WorkbenchActionBuilder.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -8,6 +8,7 @@
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *     Andreas Buchen <andreas.buchen@sap.com> - Bug 206584
>+ *      Red Hat, Inc. - Bug 370119
>  *******************************************************************************/
> package org.eclipse.ui.internal.ide;
> 
>@@ -1017,7 +1018,7 @@
> 
> 
> 
>-        makeFeatureDependentActions(window);
>+        makeFeatureDependentActions(window, window.getWorkbench().getIntroManager().hasIntro());
> 
>         // Actions for invisible accelerators
>         showViewMenuAction = ActionFactory.SHOW_VIEW_MENU.create(window);
>@@ -1174,7 +1175,7 @@
>     /**
>      * Creates the feature-dependent actions for the menu bar.
>      */
>-    private void makeFeatureDependentActions(IWorkbenchWindow window) {
>+    private void makeFeatureDependentActions(IWorkbenchWindow window, boolean hasIntroPage) {
>         AboutInfo[] infos = null;
>         
>         IPreferenceStore prefs = IDEWorkbenchPlugin.getDefault().getPreferenceStore();
>@@ -1193,22 +1194,24 @@
>         // Optimization: if welcome pages were found on a previous run, then just add the action.
>         String quickStartKey = IDEActionFactory.QUICK_START.getId();
>         String showQuickStart = prefs.getString(quickStartKey);
>-        if (sameState && "true".equals(showQuickStart)) { //$NON-NLS-1$
>-            quickStartAction = IDEActionFactory.QUICK_START.create(window);
>-			register(quickStartAction);
>-        }
>-        else if (sameState && "false".equals(showQuickStart)) { //$NON-NLS-1$
>-        	// do nothing
>-        }
>-        else {
>-        	// do the work
>-    		infos = IDEWorkbenchPlugin.getDefault().getFeatureInfos();
>-        	boolean found = hasWelcomePage(infos);
>-            prefs.setValue(quickStartKey, String.valueOf(found));
>-            if (found) {
>-                quickStartAction = IDEActionFactory.QUICK_START.create(window);
>-                register(quickStartAction);
>-	        }
>+        // if there is an intro, do not bother displaying legacy welcomes.
>+        if(!hasIntroPage){
>+			if (sameState && "true".equals(showQuickStart)) { //$NON-NLS-1$
>+				quickStartAction = IDEActionFactory.QUICK_START.create(window);
>+				register(quickStartAction);
>+			} else if (sameState && "false".equals(showQuickStart)) { //$NON-NLS-1$
>+				// do nothing
>+			} else {
>+				// do the work
>+				infos = IDEWorkbenchPlugin.getDefault().getFeatureInfos();
>+				boolean found = hasWelcomePage(infos);
>+				prefs.setValue(quickStartKey, String.valueOf(found));
>+				if (found) {
>+					quickStartAction = IDEActionFactory.QUICK_START
>+							.create(window);
>+					register(quickStartAction);
>+				}
>+			}
>         }
>         
>         // See if a tips and tricks page is specified.

Actions: View | Diff

Attachments on bug 370119: 210260 | 213497 | 213548 | 213549 | 213576 | 214214