Simplify intro framework: deprecate StandbyPart and IntroLaunchBar

ua/org.eclipse.ui.intro.universal/plugin.xml

@@ -54,12 +54,7 @@
             <implementation
                   kind="swt">
             </implementation>
-            <launchBar
-               	location="fastview"
-            	bg="$launchbarBackground$"
-            	computed="true">
-            </launchBar>
-         </presentation>
+            </presentation>
       </config>
    </extension>
    <extension

ua/org.eclipse.ui.intro/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.ui.intro; singleton:=true
-Bundle-Version: 3.8.100.qualifier
+Bundle-Version: 3.9.0.qualifier
 Bundle-Activator: org.eclipse.ui.internal.intro.impl.IntroPlugin
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin

ua/org.eclipse.ui.intro/pom.xml

@@ -18,6 +18,6 @@
   </parent>
   <groupId>org.eclipse.platform</groupId>
   <artifactId>org.eclipse.ui.intro</artifactId>
-  <version>3.8.100-SNAPSHOT</version>
+  <version>3.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/IntroPlugin.java

@@ -42,6 +42,7 @@ public class IntroPlugin extends AbstractUIPlugin {
 
 	// We must keep track of the launch bar so that we can
 	// close it if intro is opened from the menu.
+	@SuppressWarnings("removal")
 	private IntroLaunchBar launchBar;
 
 	// used for performance logging. Time when the constructor of
@@ -88,6 +89,12 @@ public void resetVolatileImageRegistry() {
 	}
 
 
+	/**
+	 * @deprecated The launch bar is no longer used. This method will be removed
+	 *             in a future release.
+	 */
+	@SuppressWarnings("removal")
+	@Deprecated(forRemoval = true)
 	public void closeLaunchBar() {
 		if (launchBar != null) {
 			launchBar.close();
@@ -96,6 +103,12 @@ public void closeLaunchBar() {
 		IntroLaunchBar.destroyAll(PlatformUI.getWorkbench());
 	}
 
+	/**
+	 * @deprecated The launch bar is no longer used. This method will be removed
+	 *             in a future release.
+	 */
+	@SuppressWarnings("removal")
+	@Deprecated(forRemoval = true)
 	public void setLaunchBar(IntroLaunchBar launchBar) {
 		this.launchBar = launchBar;
 	}

ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java

@@ -28,26 +28,21 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IActionDelegate;
 import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.handlers.IHandlerService;
-import org.eclipse.ui.internal.intro.impl.IIntroConstants;
 import org.eclipse.ui.internal.intro.impl.IntroPlugin;
 import org.eclipse.ui.internal.intro.impl.Messages;
 import org.eclipse.ui.internal.intro.impl.model.AbstractIntroElement;
 import org.eclipse.ui.internal.intro.impl.model.AbstractIntroPage;
-import org.eclipse.ui.internal.intro.impl.model.IntroLaunchBarElement;
 import org.eclipse.ui.internal.intro.impl.model.IntroModelRoot;
 import org.eclipse.ui.internal.intro.impl.model.IntroPartPresentation;
 import org.eclipse.ui.internal.intro.impl.model.IntroURLAction;
 import org.eclipse.ui.internal.intro.impl.model.loader.ExtensionPointManager;
 import org.eclipse.ui.internal.intro.impl.model.loader.ModelLoaderUtil;
 import org.eclipse.ui.internal.intro.impl.model.util.ModelUtil;
-import org.eclipse.ui.internal.intro.impl.parts.StandbyPart;
 import org.eclipse.ui.internal.intro.impl.presentations.BrowserIntroPartImplementation;
-import org.eclipse.ui.internal.intro.impl.presentations.IntroLaunchBar;
 import org.eclipse.ui.internal.intro.impl.util.DialogUtil;
 import org.eclipse.ui.internal.intro.impl.util.Log;
 import org.eclipse.ui.internal.intro.impl.util.StringUtil;
@@ -76,7 +71,15 @@ public class IntroURL implements IIntroURL {
 	/**
 	 * Constants that represent Intro URL actions.
 	 */
+	/**
+	 * @deprecated Standby mode is no longer used.
+	 */
+	@Deprecated(forRemoval = true)
 	public static final String SET_STANDBY_MODE = "setStandbyMode"; //$NON-NLS-1$
+	/**
+	 * @deprecated Standby mode is no longer used.
+	 */
+	@Deprecated(forRemoval = true)
 	public static final String SHOW_STANDBY = "showStandby"; //$NON-NLS-1$
 	public static final String CLOSE = "close"; //$NON-NLS-1$
 	public static final String SHOW_HELP_TOPIC = "showHelpTopic"; //$NON-NLS-1$
@@ -87,6 +90,10 @@ public class IntroURL implements IIntroURL {
 	public static final String SHOW_PAGE = "showPage"; //$NON-NLS-1$
 	public static final String SHOW_MESSAGE = "showMessage"; //$NON-NLS-1$
 	public static final String NAVIGATE = "navigate"; //$NON-NLS-1$
+	/**
+	 * @deprecated The launch bar is no longer used.
+	 */
+	@Deprecated(forRemoval = true)
 	public static final String SWITCH_TO_LAUNCH_BAR = "switchToLaunchBar"; //$NON-NLS-1$
 	public static final String EXECUTE = "execute"; //$NON-NLS-1$
 
@@ -114,7 +121,15 @@ public class IntroURL implements IIntroURL {
 	public static final String VALUE_TRUE = "true"; //$NON-NLS-1$
 	public static final String VALUE_FALSE = "false"; //$NON-NLS-1$
 	public static final String VALUE_CLOSE = "close"; //$NON-NLS-1$
+	/**
+	 * @deprecated Standby mode is no longer used.
+	 */
+	@Deprecated(forRemoval = true)
 	public static final String VALUE_STANDBY = "standby"; //$NON-NLS-1$
+	/**
+	 * @deprecated The launch bar is no longer used.
+	 */
+	@Deprecated(forRemoval = true)
 	public static final String VALUE_LAUNCHBAR = "launchbar"; //$NON-NLS-1$
 
 
@@ -155,12 +170,12 @@ protected boolean doExecute() {
 		case CLOSE:
 			return closeIntro();
 		case SET_STANDBY_MODE:
-			// Sets the state of the intro part. Does not care about passing
-			// input to the part.
+			// Standby mode is deprecated - treat as simple show/close
 			return setStandbyState(getParameter(KEY_STANDBY));
 		case SHOW_STANDBY:
-			return handleStandbyState(getParameter(KEY_PART_ID),
-					getParameter(KEY_INPUT));
+			// Standby mode is deprecated - just show the intro
+			Log.warning("showStandby action is deprecated; showing intro instead"); //$NON-NLS-1$
+			return IntroPlugin.showIntro(false) != null;
 		case SHOW_HELP:
 			// display the full Help System.
 			return showHelp();
@@ -197,7 +212,9 @@ protected boolean doExecute() {
 		case NAVIGATE:
 			return navigate(getParameter(KEY_DIRECTION));
 		case SWITCH_TO_LAUNCH_BAR:
-			return switchToLaunchBar();
+			// Launch bar is deprecated - just close the intro
+			Log.warning("switchToLaunchBar action is deprecated; closing intro instead"); //$NON-NLS-1$
+			return closeIntro();
 		default:
 			return handleCustomAction();
 		}
@@ -209,29 +226,6 @@ private boolean closeIntro() {
 		return IntroPlugin.closeIntro();
 	}
 
-	/**
-	 * Sets the into part to standby, and shows the passed standby part, with
-	 * the given input. Forces the Intro view to open, if not yet created.
-	 */
-	private boolean handleStandbyState(String partId, String input) {
-		// set intro to standby mode. we know we have a customizable part.
-		CustomizableIntroPart introPart = (CustomizableIntroPart) IntroPlugin
-			.getIntro();
-		if (introPart == null) {
-			introPart = (CustomizableIntroPart) IntroPlugin.showIntro(true);
-		}
-		// store the flag to indicate that standbypart is needed.
-		introPart.getControl().setData(IIntroConstants.SHOW_STANDBY_PART,
-			VALUE_TRUE);
-		IntroPlugin.setIntroStandby(true);
-		StandbyPart standbyPart = introPart
-			.getAdapter(StandbyPart.class);
-
-		// We may not have a valid partId or we might fail to instantiate part or
-		// create the part content. An empty part will be shown. Signal failure.
-		return standbyPart != null && standbyPart.showContentPart(partId, input);
-	}
-
 	/**
 	 * Set the Workbench Intro Part state. Forces the Intro view to open, if not yet created.
 	 *
@@ -247,7 +241,9 @@ private boolean setStandbyState(String state) {
 		if (state.equals(VALUE_CLOSE)) {
 			return IntroPlugin.closeIntro();
 		} else if (state.equals(VALUE_LAUNCHBAR)) {
-			return switchToLaunchBar();
+			// Launch bar is deprecated - just close the intro instead
+			Log.warning("launchbar standby state is deprecated; closing intro instead"); //$NON-NLS-1$
+			return IntroPlugin.closeIntro();
 		}
 		boolean standby = state.equals(VALUE_TRUE) || state.equals(VALUE_STANDBY);
 
@@ -635,26 +631,4 @@ private String retrieveInitialQuery() {
 		return query.toString();
 	}
 
-
-	private boolean switchToLaunchBar() {
-		IIntroPart intro = PlatformUI.getWorkbench().getIntroManager().getIntro();
-		if (intro == null) {
-			return false;
-		}
-
-		IntroModelRoot modelRoot = IntroPlugin.getDefault().getIntroModelRoot();
-
-		IntroLaunchBarElement launchBarElement = modelRoot.getPresentation().getLaunchBarElement();
-		if (launchBarElement == null) {
-			return true;
-		}
-		IWorkbenchWindow window = intro.getIntroSite().getWorkbenchWindow();
-		IntroLaunchBar.create(window, modelRoot, launchBarElement);
-
-		PlatformUI.getWorkbench().getIntroManager().setIntroStandby(intro, true);
-
-		closeIntro();
-
-		return true;
-	}
 }

ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/parts/StandbyPart.java

@@ -47,17 +47,13 @@
 /**
  * Standby part is responsible for managing and creating IStandbycontent parts.
  * It knows how to create and cache content parts. It also handles saving and
- * restoring its own state. It does that by caching the id of the last content
- * part viewed and recreating that part on startup. It also manages the life
- * cycle of content parts by creating and initializing them at the right
- * moments. It also passes the momento at appropriate times to these content
- * parts to enable storing and retrieving of state by content parts. Content
- * parts are responsible for recreating there own state, including input, from
- * the passed momemnto. When the Return to Introduction link is clicked, the
- * Intro goes out of standby content mode, and the standby content parts are not
- * shown anymore until the user explicitly asks for a part again. This is
- * accomplished through a data flag on the CustomizableIntroPart control.
+ * restoring its own state.
+ *
+ * @deprecated The standby part is no longer used. The welcome screen is now
+ *             treated as a regular editor without standby mode. This class will
+ *             be removed in a future release.
  */
+@Deprecated(forRemoval = true)
 public class StandbyPart implements IIntroConstants {
 
 	private FormToolkit toolkit;

ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/IntroLaunchBar.java

@@ -73,7 +73,11 @@
  * available from the application IEclipseContext.
  *
  * @since 3.1
+ * @deprecated The intro launch bar is no longer used. The welcome screen is now treated as a
+ *             regular editor. This class will be removed in a future release.
  */
+@Deprecated(forRemoval = true)
+@SuppressWarnings("removal")
 public class IntroLaunchBar {
 
 	private static final String LAUNCHBAR_ID = "org.eclipse.ui.internal.intro.impl.presentations.IntroLaunchBar"; //$NON-NLS-1$