Attachment 31672 Details for Bug 69732 – rollback patch for this one and 120285

[patch] rollback patch for this one and 120285

rollback_69732_120285.txt (text/plain), 69.00 KB, created by Curtis d'Entremont

on 2005-12-13 14:40:31 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis d'Entremont

Created: 2005-12-13 14:40:31 EST

Size: 69.00 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.platform
>Index: cheatsheets/CVS_1.xml
>===================================================================
>RCS file: /home/eclipse/org.eclipse.platform/cheatsheets/CVS_1.xml,v
>retrieving revision 1.5
>diff -u -r1.5 CVS_1.xml
>--- cheatsheets/CVS_1.xml	9 Dec 2005 21:16:46 -0000	1.5
>+++ cheatsheets/CVS_1.xml	13 Dec 2005 19:36:05 -0000
>@@ -18,8 +18,7 @@
> 
> 	<item
> 		href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
>-		title="Load the Destination into your Workspace"
>-		dialog="true">
>+		title="Load the Destination into your Workspace">
> 		<description>
> Select the project and choose Replace With &gt; Another Branch or Version from the context menu. Then select the branch to replace with. In this step you must ensure that the destination is loaded into your workspace. This is a manual task, you will need to perform the work and click the "Click to complete" button to move to the next step.
> 		</description>
>@@ -27,8 +26,7 @@
> 
> 	<item
> 		href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm" 
>-		title="Merge Details"
>-		dialog="true">
>+		title="Merge Details">
> 		<description>
> Select the project, choose Team &gt; Merge and complete the wizard as required. This step specifies the details of the merge.  This is a manual task, you will need to perform the work and click the "Click to complete" button to move to the next step.
> 		</description>
>#P org.eclipse.jdt
>Index: cheatsheets/HelloWorldSWT.xml
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt/cheatsheets/HelloWorldSWT.xml,v
>retrieving revision 1.9
>diff -u -r1.9 HelloWorldSWT.xml
>--- cheatsheets/HelloWorldSWT.xml	9 Dec 2005 21:16:46 -0000	1.9
>+++ cheatsheets/HelloWorldSWT.xml	13 Dec 2005 19:36:06 -0000
>@@ -33,7 +33,6 @@
> 	<item
> 		href="/org.eclipse.platform.doc.isv/samples/org.eclipse.swt.examples/doc-html/swt_manual_setup.html"
> 		title="Add SWT projects to your workspace"
>-		dialog="true"
> 		skip="true">
> 		<description>
> 		Since you are creating a standalone SWT application, you need to download 
>@@ -59,7 +58,6 @@
> 	<item
> 		href="/org.eclipse.jdt.doc.user/tasks/tasks-12.htm"
> 		title="Create a Java project"
>-		dialog="true"
> 		skip="true">
> 		<action
> 			pluginId="org.eclipse.jdt.ui"
>@@ -78,7 +76,6 @@
> 	<item
> 		href="/org.eclipse.jdt.doc.user/tasks/tasks-110.htm"
> 		title="Configure the Java project"
>-		dialog="true"
> 		skip="true">
> 		<description>
> 			1. Select your Java project and from the context menu select Properties. 
>@@ -95,7 +92,6 @@
> 	<item
> 		href="/org.eclipse.jdt.doc.user/gettingStarted/qs-9.htm" 
> 		title="Create the HelloWorld class"
>-		dialog="true"
> 		skip="true">
> 		<action
> 			pluginId="org.eclipse.jdt.ui"
>Index: cheatsheets/HelloWorld.xml
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt/cheatsheets/HelloWorld.xml,v
>retrieving revision 1.7
>diff -u -r1.7 HelloWorld.xml
>--- cheatsheets/HelloWorld.xml	9 Dec 2005 21:16:46 -0000	1.7
>+++ cheatsheets/HelloWorld.xml	13 Dec 2005 19:36:06 -0000
>@@ -31,7 +31,6 @@
> 	<item
> 		href="/org.eclipse.jdt.doc.user/tasks/tasks-12.htm"
> 		title="Create a Java project"
>-		dialog="true"
> 		skip="true">
> 		<action
> 			pluginId="org.eclipse.jdt.ui"
>@@ -50,7 +49,6 @@
> 	<item
> 		href="/org.eclipse.jdt.doc.user/gettingStarted/qs-9.htm" 
> 		title="Create your HelloWorld class"
>-		dialog="true"
> 		skip="true">
> 		<action
> 			pluginId="org.eclipse.jdt.ui"
>#P org.eclipse.help.ui
>Index: src/org/eclipse/help/ui/internal/ContextHelpDialog.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/ContextHelpDialog.java,v
>retrieving revision 1.39
>diff -u -r1.39 ContextHelpDialog.java
>--- src/org/eclipse/help/ui/internal/ContextHelpDialog.java	12 Dec 2005 16:08:14 -0000	1.39
>+++ src/org/eclipse/help/ui/internal/ContextHelpDialog.java	13 Dec 2005 19:36:06 -0000
>@@ -13,7 +13,6 @@
> 
> import org.eclipse.help.*;
> import org.eclipse.help.internal.base.BaseHelpSystem;
>-import org.eclipse.jface.dialogs.TrayDialog;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.accessibility.*;
> import org.eclipse.swt.custom.BusyIndicator;
>@@ -22,7 +21,6 @@
> import org.eclipse.swt.graphics.*;
> import org.eclipse.swt.layout.*;
> import org.eclipse.swt.widgets.*;
>-import org.eclipse.ui.IWorkbenchWindow;
> import org.eclipse.ui.PlatformUI;
> 
> /**
>@@ -305,23 +303,16 @@
> 		for (int i = 0; i < relatedTopics.length; i++) {
> 			createLink(composite, relatedTopics[i]);
> 		}
>-
>-		// create dynamic help link if current context allows dynamic help
>-		Object shellData = parentShell.getData();
>-		IWorkbenchWindow wbWindow = HelpUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
>-		if (DefaultHelpUI.isActiveShell(parentShell, wbWindow) || shellData instanceof TrayDialog) {
>-			// Create separator.
>-			label = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
>-			label.setBackground(backgroundColour);
>-			label.setForeground(foregroundColour);
>-			data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING
>-					| GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
>-			data.horizontalSpan = 2;
>-			label.setLayoutData(data);
>-
>-			// create link to the dynamic help
>-			createDynamicHelpLink(composite);
>-		}
>+		// Create separator.
>+		label = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
>+		label.setBackground(backgroundColour);
>+		label.setForeground(foregroundColour);
>+		data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING
>+				| GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
>+		data.horizontalSpan = 2;
>+		label.setLayoutData(data);
>+		// create link to the dynamic help
>+		createDynamicHelpLink(composite);
> 		
> 		return composite;
> 	}
>Index: src/org/eclipse/help/ui/internal/Messages.properties
>===================================================================
>RCS file: /home/eclipse/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties,v
>retrieving revision 1.14
>diff -u -r1.14 Messages.properties
>--- src/org/eclipse/help/ui/internal/Messages.properties	12 Dec 2005 16:08:14 -0000	1.14
>+++ src/org/eclipse/help/ui/internal/Messages.properties	13 Dec 2005 19:36:06 -0000
>@@ -71,7 +71,6 @@
> ReusableHelpPart_internalWebBrowserError=Error while opening internal web browser
> ReusableHelpPart_openInHelpContentsAction_label=Open in Help &Contents
> ReusableHelpPart_copyAction_label=&Copy
>-ReusableHelpPart_closeAction_tooltip=Close
> ReusableHelpPart_bookmarkAction_label=&Add Bookmark
> ReusableHelpPart_internalBrowserTitle=Help
> ReusableHelpPart_status = {0} - {1}
>@@ -175,7 +174,7 @@
> BrowsersPreferencePage_wgroup=Open window context help
> BrowsersPreferencePage_view=in a dynamic help &view
> BrowsersPreferencePage_dgroup=Open dialog context help
>-BrowsersPreferencePage_tray=in dialog &tray
>+BrowsersPreferencePage_window=in a dynamic help &window
> InfoCenterPage_url = &URL:
> InfoCenterPage_invalidURL=Invalid URL
> InfoCenterPage_tocError=Error while loading table of contents
>Index: src/org/eclipse/help/ui/internal/DefaultHelpUI.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/DefaultHelpUI.java,v
>retrieving revision 1.35
>diff -u -r1.35 DefaultHelpUI.java
>--- src/org/eclipse/help/ui/internal/DefaultHelpUI.java	12 Dec 2005 16:08:14 -0000	1.35
>+++ src/org/eclipse/help/ui/internal/DefaultHelpUI.java	13 Dec 2005 19:36:06 -0000
>@@ -11,6 +11,7 @@
> 
> import java.net.URL;
> 
>+import org.eclipse.core.runtime.Platform;
> import org.eclipse.core.runtime.Preferences;
> import org.eclipse.help.IContext;
> import org.eclipse.help.browser.IBrowser;
>@@ -19,13 +20,14 @@
> import org.eclipse.help.internal.base.IHelpBaseConstants;
> import org.eclipse.help.ui.internal.util.ErrorUtil;
> import org.eclipse.help.ui.internal.views.ContextHelpPart;
>-import org.eclipse.help.ui.internal.views.HelpTray;
>+import org.eclipse.help.ui.internal.views.ContextHelpWindow;
> import org.eclipse.help.ui.internal.views.HelpView;
>-import org.eclipse.help.ui.internal.views.ReusableHelpPart;
>-import org.eclipse.jface.dialogs.DialogTray;
> import org.eclipse.jface.dialogs.MessageDialog;
>-import org.eclipse.jface.dialogs.TrayDialog;
>+import org.eclipse.jface.window.Window;
> import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.DisposeEvent;
>+import org.eclipse.swt.events.DisposeListener;
>+import org.eclipse.swt.graphics.Rectangle;
> import org.eclipse.swt.widgets.Control;
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Shell;
>@@ -53,6 +55,7 @@
> public class DefaultHelpUI extends AbstractHelpUI {
> 
> 	private ContextHelpDialog f1Dialog = null;
>+	private ContextHelpWindow f1Window = null;
> 	private static DefaultHelpUI instance;
> 
> 	private static final String HELP_VIEW_ID = "org.eclipse.help.ui.HelpView"; //$NON-NLS-1$
>@@ -157,9 +160,9 @@
> 				// check the dialog
> 				if (activeShell != null) {
> 					Object data = activeShell.getData();
>-					if (data instanceof TrayDialog) {
>+					if (data instanceof Window) {
> 						IContext context = ContextHelpPart.findHelpContext(c);
>-						displayContextAsHelpTray(activeShell, context);
>+						displayContextAsHelpPane(activeShell, context);
> 						return;
> 					}
> 				}
>@@ -195,13 +198,8 @@
> 				// check the dialog
> 				if (activeShell != null) {
> 					Object data = activeShell.getData();
>-					if (data instanceof TrayDialog) {
>-						displayContextAsHelpTray(activeShell, null);
>-						return;
>-					}
>-					else {
>-						// tried to summon help from a non-tray dialog
>-						// not supported
>+					if (data instanceof Window) {
>+						displayContextAsHelpPane(activeShell, null);
> 						return;
> 					}
> 				}
>@@ -278,8 +276,8 @@
> 		// check the dialog
> 		if (activeShell != null) {
> 			Object data = activeShell.getData();
>-			if (data instanceof TrayDialog && (!dinfopop || noInfopop)) {
>-				displayContextAsHelpTray(activeShell, context);
>+			if (data instanceof Window && (!dinfopop || noInfopop)) {
>+				displayContextAsHelpPane(activeShell, context);
> 				return;
> 			}
> 		}
>@@ -310,7 +308,7 @@
> 		return display.getActiveShell();
> 	}
> 
>-	static boolean isActiveShell(Shell activeShell, IWorkbenchWindow window) {
>+	private static boolean isActiveShell(Shell activeShell, IWorkbenchWindow window) {
> 		// Test if the active shell belongs to this window
> 		return activeShell != null && activeShell.equals(window.getShell());
> 	}
>@@ -324,28 +322,36 @@
> 		f1Dialog.open();
> 	}
> 
>-	private void displayContextAsHelpTray(Shell activeShell, IContext context) {
>-		Control controlInFocus = activeShell.getDisplay().getFocusControl();
>-		TrayDialog dialog = (TrayDialog)activeShell.getData();
>-		
>-		DialogTray tray = dialog.getTray();
>-		if (tray == null) {
>-			tray = new HelpTray();
>-			dialog.openTray(tray);
>-		}
>-		if (tray instanceof HelpTray) {
>-			ReusableHelpPart helpPart = ((HelpTray)tray).getHelpPart();
>-			if (context != null) {
>-				helpPart.showPage(IHelpUIConstants.HV_CONTEXT_HELP_PAGE);
>-				helpPart.update(context, null, controlInFocus);
>-			}
>-			else {
>-				helpPart.showPage(IHelpUIConstants.HV_FSEARCH_PAGE, true);
>+	private void displayContextAsHelpPane(Shell activeShell, IContext context) {
>+		Control c = activeShell.getDisplay().getFocusControl();
>+		if (f1Window != null) {
>+			Shell parentShell = activeShell;
>+			if (activeShell.getData() instanceof ContextHelpWindow)
>+				parentShell = (Shell) activeShell.getParent();
>+			if (f1Window.getShell().getParent().equals(parentShell)) {
>+				f1Window.update(context, c);
>+				return;
> 			}
> 		}
>-		else {
>-			// someone else was occupying the tray; not supported
>-		}
>+		Rectangle pbounds = activeShell.getBounds();
>+		f1Window = new ContextHelpWindow(activeShell);
>+		f1Window.create();
>+		Shell helpShell = f1Window.getShell();
>+		helpShell.setText(Messages.DefaultHelpUI_wtitle);
>+		helpShell.setSize(300, pbounds.height);
>+		if (context != null)
>+			f1Window.update(context, c);
>+		else
>+			f1Window.showSearch();
>+		if (!Platform.getWS().equals(Platform.WS_GTK))
>+			f1Window.dock(true);
>+		helpShell.addDisposeListener(new DisposeListener() {
>+
>+			public void widgetDisposed(DisposeEvent e) {
>+				f1Window = null;
>+			}
>+		});
>+		helpShell.open();
> 	}
> 
> 	/**
>Index: src/org/eclipse/help/ui/internal/Messages.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.java,v
>retrieving revision 1.9
>diff -u -r1.9 Messages.java
>--- src/org/eclipse/help/ui/internal/Messages.java	12 Dec 2005 16:08:14 -0000	1.9
>+++ src/org/eclipse/help/ui/internal/Messages.java	13 Dec 2005 19:36:06 -0000
>@@ -55,7 +55,6 @@
> 	public static String ReusableHelpPart_openInfoCenterAction_label;
> 	public static String ReusableHelpPart_openAction_label;
> 	public static String ReusableHelpPart_openInHelpContentsAction_label;
>-	public static String ReusableHelpPart_closeAction_tooltip;
> 	public static String ReusableHelpPart_copyAction_label;
> 	public static String ReusableHelpPart_bookmarkAction_label;
> 	public static String ReusableHelpPart_status;
>@@ -141,7 +140,7 @@
> 	public static String BrowsersPreferencePage_wgroup;
> 	public static String BrowsersPreferencePage_view;
> 	public static String BrowsersPreferencePage_dgroup;
>-	public static String BrowsersPreferencePage_tray;
>+	public static String BrowsersPreferencePage_window;
> 	public static String InfoCenterPage_url;
> 	public static String InfoCenterPage_invalidURL;
> 	public static String InfoCenterPage_tocError;
>Index: src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java,v
>retrieving revision 1.72
>diff -u -r1.72 ReusableHelpPart.java
>--- src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java	9 Dec 2005 21:15:13 -0000	1.72
>+++ src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java	13 Dec 2005 19:36:06 -0000
>@@ -269,7 +269,7 @@
> 		}
> 	}
> 
>-	private class HelpPartPage implements IHelpPartPage {
>+	private class HelpPartPage {
> 		private String id;
> 
> 		private String iconId;
>@@ -643,40 +643,7 @@
> 			indexerJob.schedule();
> 		}
> 	}
>-	
>-	/**
>-	 * Adds the given page to this part.
>-	 * 
>-	 * @param page the page to add
>-	 */
>-	public void addPage(IHelpPartPage page) {
>-		pages.add(page);		
>-	}
>-	
>-	/**
>-	 * Adds the given part to this one. The part can then be used inside
>-	 * any page and referred to by id.
>-	 * 
>-	 * @param id the part's unique id
>-	 * @param part the part to add
>-	 */
>-	public void addPart(String id, IHelpPart part) {
>-		part.init(this, id, memento);
>-		mform.addPart(part);
>-	}
>-	
>-	/**
>-	 * Creates a new page for this part.
>-	 * 
>-	 * @param id the page's unique id
>-	 * @param text the page's heading, or null for none
>-	 * @param iconId the page's icon
>-	 * @return the newly created page
>-	 */
>-	public IHelpPartPage createPage(String id, String text, String iconId) {
>-		return new HelpPartPage(id, text, iconId);
>-	}
>-	
>+
> 	private void definePages() {
> 		pages = new ArrayList();
> 		// federated search page
>Index: src/org/eclipse/help/ui/internal/views/IHelpPartPage.java
>===================================================================
>RCS file: src/org/eclipse/help/ui/internal/views/IHelpPartPage.java
>diff -N src/org/eclipse/help/ui/internal/views/IHelpPartPage.java
>--- src/org/eclipse/help/ui/internal/views/IHelpPartPage.java	9 Dec 2005 21:15:13 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,37 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2005 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- * 
>- * Contributors:
>- *     IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.help.ui.internal.views;
>-
>-import org.eclipse.jface.action.IToolBarManager;
>-import org.eclipse.ui.IMemento;
>-
>-public interface IHelpPartPage {
>-	void addPart(String id, boolean flexible);
>-	void addPart(String id, boolean flexible, boolean grabVertical);
>-	boolean canOpen();
>-	void dispose();
>-	IHelpPart findPart(String id);
>-	int getHorizontalMargin();
>-	String getIconId();
>-	String getId();
>-	int getNumberOfFlexibleParts();
>-	String getText();
>-	IToolBarManager getToolBarManager();
>-	int getVerticalSpacing();
>-	void refilter();
>-	void saveState(IMemento memento);
>-	void setFocus();
>-	void setHorizontalMargin(int value);
>-	void setVerticalSpacing(int value);
>-	void setVisible(boolean visible);
>-	void stop();
>-	void toggleRoleFilter();
>-}
>Index: src/org/eclipse/help/ui/internal/views/HelpTray.java
>===================================================================
>RCS file: src/org/eclipse/help/ui/internal/views/HelpTray.java
>diff -N src/org/eclipse/help/ui/internal/views/HelpTray.java
>--- src/org/eclipse/help/ui/internal/views/HelpTray.java	12 Dec 2005 16:08:14 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,250 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2005 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- * 
>- * Contributors:
>- *     IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.help.ui.internal.views;
>-
>-import org.eclipse.help.ui.internal.Messages;
>-import org.eclipse.jface.action.ContributionItem;
>-import org.eclipse.jface.action.IContributionItem;
>-import org.eclipse.jface.action.ToolBarManager;
>-import org.eclipse.jface.dialogs.DialogTray;
>-import org.eclipse.jface.dialogs.IDialogPage;
>-import org.eclipse.jface.dialogs.IPageChangeProvider;
>-import org.eclipse.jface.dialogs.IPageChangedListener;
>-import org.eclipse.jface.dialogs.PageChangedEvent;
>-import org.eclipse.jface.dialogs.TrayDialog;
>-import org.eclipse.swt.SWT;
>-import org.eclipse.swt.graphics.Color;
>-import org.eclipse.swt.graphics.GC;
>-import org.eclipse.swt.graphics.Image;
>-import org.eclipse.swt.graphics.ImageData;
>-import org.eclipse.swt.graphics.PaletteData;
>-import org.eclipse.swt.graphics.RGB;
>-import org.eclipse.swt.layout.GridData;
>-import org.eclipse.swt.layout.GridLayout;
>-import org.eclipse.swt.widgets.Composite;
>-import org.eclipse.swt.widgets.Control;
>-import org.eclipse.swt.widgets.Display;
>-import org.eclipse.swt.widgets.Event;
>-import org.eclipse.swt.widgets.Label;
>-import org.eclipse.swt.widgets.Listener;
>-import org.eclipse.swt.widgets.Shell;
>-import org.eclipse.swt.widgets.TabFolder;
>-import org.eclipse.swt.widgets.TabItem;
>-import org.eclipse.swt.widgets.ToolBar;
>-import org.eclipse.swt.widgets.ToolItem;
>-import org.eclipse.ui.PlatformUI;
>-import org.eclipse.ui.forms.HyperlinkGroup;
>-import org.eclipse.ui.forms.widgets.FormToolkit;
>-
>-/**
>- * The tray that appears on the side of dialogs when the user summons context
>- * help or a cheat sheet follows the user into a dialog.
>- */
>-public class HelpTray extends DialogTray implements IPageChangedListener {
>-	
>-	private static final int DEFAULT_WIDTH = 210;
>-	private FormToolkit toolkit;
>-	private ReusableHelpPart helpPart;
>-	private Shell shell;
>-	private IContributionItem closeAction;
>-	private Image normal;
>-	private Image hover;
>-	
>-	/**
>-	 * Creates any actions needed by the tray.
>-	 */
>-	private void createActions() {
>-		createImages();
>-		closeAction = new ContributionItem() {
>-			public void fill(ToolBar parent, int index) {
>-				final ToolItem item = new ToolItem(parent, SWT.PUSH);
>-				item.setImage(normal);
>-				item.setHotImage(hover);
>-				item.setToolTipText(Messages.ReusableHelpPart_closeAction_tooltip);
>-				item.addListener(SWT.Selection, new Listener() {
>-					public void handleEvent(Event event) {
>-						// close the tray
>-						TrayDialog dialog = (TrayDialog)shell.getData();
>-						dialog.closeTray();
>-						
>-						// set focus back to shell
>-						shell.setFocus();
>-					}
>-				});
>-			}
>-		};
>-	}
>-	
>-	/**
>-	 * Creates the contents of the tray.
>-	 * 
>-	 * @param parent the parent composite that will contain the tray
>-	 */
>-	protected Control createContents(Composite parent) {
>-		toolkit = new FormToolkit(parent.getDisplay());
>-		toolkit.getHyperlinkGroup().setHyperlinkUnderlineMode(HyperlinkGroup.UNDERLINE_HOVER);
>-		toolkit.getColors().initializeSectionToolBarColors();
>-		Composite container = new Composite(parent, SWT.NONE);
>-		GridLayout layout = new GridLayout();
>-		layout.marginWidth = layout.marginHeight = 0;
>-		layout.verticalSpacing = 0;
>-		container.setLayout(layout);
>-		container.addListener(SWT.Dispose, new Listener() {
>-			public void handleEvent(Event event) {
>-				dispose();
>-			}
>-		});
>-		
>-		ToolBarManager tbm = new ToolBarManager(SWT.FLAT);
>-		tbm.createControl(container);
>-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
>-		gd.grabExcessHorizontalSpace = true;
>-		tbm.getControl().setLayoutData(gd);
>-		Label separator = new Label(container, SWT.SEPARATOR | SWT.HORIZONTAL);
>-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
>-		gd.heightHint = 1;
>-		separator.setLayoutData(gd);
>-		helpPart = new ReusableHelpPart(PlatformUI.getWorkbench().getProgressService());
>-		helpPart.init(null, tbm, null, null);
>-		helpPart.setDefaultContextHelpText(Messages.HelpView_defaultText);
>-		helpPart.createControl(container, toolkit);
>-		gd = new GridData(GridData.FILL_BOTH);
>-		gd.widthHint = DEFAULT_WIDTH;
>-		helpPart.getControl().setLayoutData(gd);
>-		
>-		createActions();
>-		tbm.add(closeAction);
>-		
>-		shell = parent.getShell();
>-		hookPageChangeListener(shell);
>-		helpPart.getControl().addListener(SWT.Dispose, new Listener() {
>-			public void handleEvent(Event event) {
>-				unhookPageChangeListener(shell);
>-			}
>-		});
>-		
>-		return container;
>-	}
>-
>-	/**
>-	 * Creates any custom needed by the tray, such as the close button.
>-	 */
>-	private void createImages() {
>-		Display display = Display.getCurrent();
>-		int[] shape = new int[] { 
>-				3,  3, 5,  3, 7,  5, 8,  5, 10, 3, 12, 3, 
>-				12, 5, 10, 7, 10, 8, 12,10, 12,12,
>-				10,12, 8, 10, 7, 10, 5, 12, 3, 12,
>-				3, 10, 5,  8, 5,  7, 3,  5
>-		};
>-		
>-		/*
>-		 * Use magenta as transparency color since it is used infrequently.
>-		 */
>-		Color border = display.getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW);
>-		Color background = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
>-		Color backgroundHot = new Color(display, new RGB(252, 160, 160));
>-		Color transparent = display.getSystemColor(SWT.COLOR_MAGENTA);
>-
>-		PaletteData palette = new PaletteData(new RGB[] { transparent.getRGB(), border.getRGB(), background.getRGB(), backgroundHot.getRGB() });
>-		ImageData data = new ImageData(16, 16, 8, palette);
>-		data.transparentPixel = 0;
>-
>-		normal = new Image(display, data);
>-		normal.setBackground(transparent);
>-		GC gc = new GC(normal);
>-		gc.setBackground(background);
>-		gc.fillPolygon(shape);
>-		gc.setForeground(border);
>-		gc.drawPolygon(shape);
>-		gc.dispose();
>-
>-		hover = new Image(display, data);
>-		hover.setBackground(transparent);
>-		gc = new GC(hover);
>-		gc.setBackground(backgroundHot);
>-		gc.fillPolygon(shape);
>-		gc.setForeground(border);
>-		gc.drawPolygon(shape);
>-		gc.dispose();
>-		
>-		backgroundHot.dispose();
>-	}
>-
>-	/**
>-	 * Disposes any resources used by the tray.
>-	 */
>-	private void dispose() {
>-		normal.dispose();
>-		hover.dispose();
>-		toolkit.dispose();
>-		helpPart.dispose();
>-	}
>-
>-	/**
>-	 * Returns the ReusableHelpPart contained in the tray.
>-	 * 
>-	 * @return the tray's ReusableHelpPart
>-	 */
>-	public ReusableHelpPart getHelpPart() {
>-		return helpPart;
>-	}
>-	
>-	/**
>-	 * Add the listener that gets notified of page changes (to automatically
>-	 * update context help).
>-	 * 
>-	 * @param parent the Composite to hook the listener to
>-	 */
>-	private void hookPageChangeListener(Composite parent) {
>-		Object data = parent.getData();
>-		if (data instanceof IPageChangeProvider) {
>-			((IPageChangeProvider)data).addPageChangedListener(this);
>-		}
>-	}
>-
>-	/**
>-	 * Called whenever the dialog we're inside has changed pages. This updates
>-	 * the context help page if it is visible.
>-	 * 
>-	 * @param event the page change event
>-	 */
>-	public void pageChanged(PageChangedEvent event) {
>-		Object page = event.getSelectedPage();
>-		Control c = null;
>-		if (page instanceof IDialogPage) {
>-			c = ((IDialogPage) page).getControl();
>-		} else {
>-			c = shell.getDisplay().getFocusControl();
>-			if (c instanceof TabFolder) {
>-				TabFolder folder = (TabFolder) c;
>-				TabItem[] selection = folder.getSelection();
>-				if (selection.length == 1) {
>-					c = selection[0].getControl();
>-				}
>-			}
>-		}
>-		helpPart.update(null, null, c);
>-	}
>-	
>-	/**
>-	 * Remove the listener that gets notified of page changes (to automatically
>-	 * update context help).
>-	 * 
>-	 * @param parent the Composite that had the listener
>-	 */
>-	private void unhookPageChangeListener(Composite parent) {
>-		Object data = parent.getData();
>-		if (data instanceof IPageChangeProvider) {
>-			((IPageChangeProvider)data).removePageChangedListener(this);
>-		}
>-	}
>-}
>Index: src/org/eclipse/help/ui/internal/browser/BrowsersPreferencePage.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/BrowsersPreferencePage.java,v
>retrieving revision 1.44
>diff -u -r1.44 BrowsersPreferencePage.java
>--- src/org/eclipse/help/ui/internal/browser/BrowsersPreferencePage.java	12 Dec 2005 16:08:14 -0000	1.44
>+++ src/org/eclipse/help/ui/internal/browser/BrowsersPreferencePage.java	13 Dec 2005 19:36:06 -0000
>@@ -53,7 +53,7 @@
> 
> 	private Button whelpAsInfopopButton;
> 
>-	private Button dhelpAsTrayButton;
>+	private Button dhelpAsWindowButton;
> 
> 	private Button dhelpAsInfopopButton;
> 
>@@ -181,13 +181,13 @@
> 		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
> 		group.setLayout(layout);
> 		group.setText(Messages.BrowsersPreferencePage_dgroup);
>-		dhelpAsTrayButton = new Button(group, SWT.RADIO);
>-		dhelpAsTrayButton.setText(Messages.BrowsersPreferencePage_tray);
>+		dhelpAsWindowButton = new Button(group, SWT.RADIO);
>+		dhelpAsWindowButton.setText(Messages.BrowsersPreferencePage_window);
> 		dhelpAsInfopopButton = new Button(group, SWT.RADIO);
> 		dhelpAsInfopopButton.setText(Messages.BrowsersPreferencePage_dinfopop);
> 		boolean dinfopop = HelpBasePlugin.getDefault().getPluginPreferences()
> 				.getBoolean(IHelpBaseConstants.P_KEY_DIALOG_INFOPOP);
>-		dhelpAsTrayButton.setSelection(!dinfopop);
>+		dhelpAsWindowButton.setSelection(!dinfopop);
> 		dhelpAsInfopopButton.setSelection(dinfopop);
> 
> 		if (PlatformUI.getWorkbench().getBrowserSupport()
>@@ -304,7 +304,7 @@
> 
> 		boolean dinfopop = HelpBasePlugin.getDefault().getPluginPreferences()
> 				.getDefaultBoolean(IHelpBaseConstants.P_KEY_DIALOG_INFOPOP);
>-		dhelpAsTrayButton.setSelection(!dinfopop);
>+		dhelpAsWindowButton.setSelection(!dinfopop);
> 		dhelpAsInfopopButton.setSelection(dinfopop);
> 		
> 		if (openInPlaceButton!=null) {
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /home/eclipse/org.eclipse.help.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.8
>diff -u -r1.8 MANIFEST.MF
>--- META-INF/MANIFEST.MF	9 Dec 2005 21:15:13 -0000	1.8
>+++ META-INF/MANIFEST.MF	13 Dec 2005 19:36:06 -0000
>@@ -13,7 +13,7 @@
>  org.eclipse.help.ui.internal.browser.embedded;x-internal:=true,
>  org.eclipse.help.ui.internal.search;x-internal:=true,
>  org.eclipse.help.ui.internal.util;x-internal:=true,
>- org.eclipse.help.ui.internal.views;x-friends:="org.eclipse.ui.cheatsheets"
>+ org.eclipse.help.ui.internal.views;x-internal:=true
> Require-Bundle: org.eclipse.help.base;bundle-version="[3.1.0,4.0.0)",
>  org.eclipse.help.appserver;bundle-version="[3.1.0,4.0.0)",
>  org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
>Index: src/org/eclipse/help/ui/internal/views/ContextHelpWindow.java
>===================================================================
>RCS file: src/org/eclipse/help/ui/internal/views/ContextHelpWindow.java
>diff -N src/org/eclipse/help/ui/internal/views/ContextHelpWindow.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/help/ui/internal/views/ContextHelpWindow.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,396 @@
>+/*******************************************************************************
>+ * Copyright (c) 2000, 2005 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *     Sebastian Davids <sdavids@gmx.de> - bug 93374
>+ *******************************************************************************/
>+package org.eclipse.help.ui.internal.views;
>+
>+import org.eclipse.core.runtime.Platform;
>+import org.eclipse.help.IContext;
>+import org.eclipse.help.ui.internal.IHelpUIConstants;
>+import org.eclipse.help.ui.internal.Messages;
>+import org.eclipse.jface.action.ToolBarManager;
>+import org.eclipse.jface.dialogs.IDialogPage;
>+import org.eclipse.jface.dialogs.IPageChangeProvider;
>+import org.eclipse.jface.dialogs.IPageChangedListener;
>+import org.eclipse.jface.dialogs.PageChangedEvent;
>+import org.eclipse.jface.window.Window;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.ControlEvent;
>+import org.eclipse.swt.events.ControlListener;
>+import org.eclipse.swt.graphics.Rectangle;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.layout.GridLayout;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Display;
>+import org.eclipse.swt.widgets.Event;
>+import org.eclipse.swt.widgets.Label;
>+import org.eclipse.swt.widgets.Listener;
>+import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.swt.widgets.TabFolder;
>+import org.eclipse.swt.widgets.TabItem;
>+import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.forms.HyperlinkGroup;
>+import org.eclipse.ui.forms.widgets.FormToolkit;
>+
>+public class ContextHelpWindow extends Window implements IPageChangedListener {
>+	private ReusableHelpPart helpPart;
>+
>+	private static final int DOCK_MARGIN = 10;
>+
>+	private static final int CLIP_ALLOWANCE = 5;
>+
>+	private FormToolkit toolkit;
>+
>+	private Listener listener;
>+
>+	private ControlListener parentListener;
>+
>+	private Rectangle savedPbounds;
>+
>+	private Rectangle savedBounds;
>+
>+	private boolean parentResizeBlocked = false;
>+
>+	public ContextHelpWindow(Shell parent) {
>+		super(parent);
>+		setShellStyle(SWT.CLOSE | SWT.RESIZE);
>+		if (!Platform.getWS().equals(Platform.WS_GTK)) {
>+			parentListener = new ControlListener() {
>+				public void controlMoved(ControlEvent e) {
>+					maintainRelativePosition();
>+				}
>+
>+				public void controlResized(ControlEvent e) {
>+					onParentWindowResize();
>+				}
>+			};
>+			listener = new Listener() {
>+				public void handleEvent(Event e) {
>+					switch (e.type) {
>+					case SWT.FocusIn:
>+					case SWT.Selection:
>+						update((Control) e.widget);
>+						break;
>+					case SWT.Move:
>+						if (onWindowMove())
>+							e.doit = false;
>+						break;
>+					case SWT.Resize:
>+						onWindowResize();
>+						break;
>+					}
>+				}
>+			};
>+		}
>+	}
>+	
>+	public void showSearch() {
>+		helpPart.showPage(IHelpUIConstants.HV_FSEARCH_PAGE, true);
>+	}
>+
>+	private void maintainRelativePosition() {
>+		if (savedPbounds == null || isDocked())
>+			dock(true);
>+		else {
>+			Rectangle pbounds = getShell().getParent().getBounds();
>+			Rectangle bounds = getShell().getBounds();
>+			int deltaX = pbounds.x - savedPbounds.x;
>+			int deltaY = pbounds.y - savedPbounds.y;
>+			int newX = bounds.x + deltaX;
>+			int newY = bounds.y + deltaY;
>+			boolean doDock = false;
>+			Rectangle dbounds = getShell().getDisplay().getBounds();
>+			if (newX > dbounds.width - bounds.width) {
>+				newX = dbounds.width - bounds.width;
>+				if (pbounds.x + pbounds.width > newX)
>+					doDock = true;
>+			} else if (newX < 0)
>+				doDock = true;
>+			if (newY > dbounds.height - bounds.height) {
>+				newY = dbounds.height - bounds.height;
>+			} else if (newY < 0)
>+				newY = 0;
>+			if (doDock) {
>+				dock(true);
>+				return;
>+			}
>+			getShell().setLocation(newX, newY);
>+			savedPbounds = pbounds;
>+			savedBounds = getShell().getBounds();
>+		}
>+	}
>+
>+	protected Control createContents(Composite parent) {
>+		toolkit = new FormToolkit(parent.getDisplay());
>+		toolkit.getHyperlinkGroup().setHyperlinkUnderlineMode(
>+				HyperlinkGroup.UNDERLINE_HOVER);
>+		toolkit.getColors().initializeSectionToolBarColors();
>+		Composite container = new Composite(parent, SWT.NULL);
>+		GridLayout layout = new GridLayout();
>+		layout.marginWidth = layout.marginHeight = 0;
>+		layout.verticalSpacing = 0;
>+		container.setLayout(layout);
>+
>+		GridData gd;
>+		ToolBarManager tbm = new ToolBarManager(SWT.FLAT);
>+		tbm.createControl(container);
>+		gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
>+		gd.grabExcessHorizontalSpace = true;
>+		tbm.getControl().setLayoutData(gd);
>+		Label separator = new Label(container, SWT.SEPARATOR | SWT.HORIZONTAL);
>+		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
>+		gd.heightHint = 1;
>+		separator.setLayoutData(gd);
>+		helpPart = new ReusableHelpPart(PlatformUI.getWorkbench()
>+				.getProgressService());
>+		helpPart.init(null, tbm, null, null);
>+		helpPart.setDefaultContextHelpText(Messages.HelpView_defaultText); //		
>+		helpPart.createControl(container, toolkit);
>+		helpPart.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
>+		if (!Platform.getWS().equals(Platform.WS_GTK)) 
>+			hookListeners();
>+		helpPart.showPage(IHelpUIConstants.HV_CONTEXT_HELP_PAGE);
>+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
>+		return container;
>+	}
>+
>+	private void hookListeners() {
>+		Shell shell = getShell();
>+		shell.addListener(SWT.Move, listener);
>+		shell.addListener(SWT.Resize, listener);
>+		hookPageChangeListener(shell.getParent(), listener);
>+		shell.getParent().addControlListener(parentListener);
>+	}
>+
>+	private void unhookListeners() {
>+		Shell shell = getShell();
>+		shell.getParent().removeControlListener(parentListener);
>+		unhookPageChangeListener(shell.getParent(), listener);
>+		shell.removeListener(SWT.Move, listener);
>+		shell.removeListener(SWT.Resize, listener);
>+	}
>+
>+	private void hookPageChangeListener(Composite parent, Listener listener) {
>+		Object data = parent.getData();
>+		if (data instanceof IPageChangeProvider) {
>+			((IPageChangeProvider) data).addPageChangedListener(this);
>+		}
>+	}
>+
>+	private void unhookPageChangeListener(Composite parent, Listener listener) {
>+		Object data = parent.getData();
>+		if (data instanceof IPageChangeProvider) {
>+			((IPageChangeProvider) data).removePageChangedListener(this);
>+		}
>+	}
>+
>+	public void dock(boolean changeSides) {
>+		getShell().setBounds(computeDockedBounds(changeSides));
>+	}
>+
>+	public Rectangle computeDockedBounds(boolean changeSides) {
>+		Display d = getShell().getDisplay();
>+		Rectangle dbounds = d.getBounds();
>+		Rectangle pbounds = getShell().getParent().getBounds();
>+
>+		int leftMargin = pbounds.x;
>+		int rightMargin = dbounds.width - pbounds.x - pbounds.width;
>+		int centeredLeftMargin = dbounds.width / 2 - pbounds.width / 2;
>+		boolean rightParent = leftMargin > centeredLeftMargin;
>+		int currentX = getShell().getLocation().x;
>+		int newSize = getShell().getSize().x;
>+		boolean leftOK = newSize <= leftMargin + CLIP_ALLOWANCE;
>+		boolean rightOK = newSize <= rightMargin + CLIP_ALLOWANCE;
>+		int x;
>+		// first try to keep the same side
>+		if (currentX < pbounds.x && leftOK && (!changeSides || !rightParent)) {
>+			x = pbounds.x - newSize;
>+		} else if (currentX > pbounds.x && rightOK
>+				&& (!changeSides || rightParent)) {
>+			x = pbounds.x + pbounds.width;
>+		}
>+		// must switch side
>+		else if (changeSides) {
>+			if (rightOK)
>+				x = pbounds.x + pbounds.width;
>+			else if (leftOK)
>+				x = pbounds.x - newSize;
>+			else {
>+				// pick the margin that has more space, reduce size
>+				if (leftMargin > rightMargin) {
>+					newSize = leftMargin;
>+					x = pbounds.x - newSize;
>+				} else {
>+					newSize = rightMargin;
>+					x = dbounds.width - newSize;
>+				}
>+			}
>+		} else {
>+			if (currentX < pbounds.x) {
>+				newSize = leftMargin;
>+				x = pbounds.x - newSize;
>+			} else {
>+				newSize = rightMargin;
>+				x = dbounds.width - newSize;
>+			}
>+		}
>+		savedPbounds = pbounds;
>+		savedBounds = getShell().getBounds();
>+		return new Rectangle(x, pbounds.y, newSize, pbounds.height);
>+	}
>+
>+	private boolean onWindowMove() {
>+		if (savedBounds == null) {
>+			savedBounds = getShell().getBounds();
>+			savedPbounds = getShell().getParent().getBounds();
>+			return false;
>+		}
>+		Rectangle bounds = getShell().getBounds();
>+		Rectangle pbounds = getShell().getParent().getBounds();
>+		if (bounds.y != savedBounds.y) {
>+			// vertical move
>+			if (bounds.y + bounds.height == savedBounds.y + savedBounds.height) {
>+				// upper edge resize
>+				if (isDocked()) {
>+					savedBounds = bounds;
>+					savedPbounds = pbounds;
>+					return false;
>+				}
>+			}
>+		}
>+		boolean doDock = false;
>+
>+		if (bounds.x < pbounds.x) {
>+			// left
>+			int deltaX = bounds.x - savedBounds.x;
>+			if (deltaX > 0 || bounds.x + bounds.width > pbounds.x) {
>+				// moving closer - check for dock snap
>+				int distance = pbounds.x - bounds.x - bounds.width;
>+				if (Math.abs(distance) <= DOCK_MARGIN)
>+					doDock = true;
>+			}
>+		} else {
>+			// right
>+			int deltaX = bounds.x - savedBounds.x;
>+			if (deltaX < 0 || bounds.x < pbounds.x + pbounds.width) {
>+				// moving closer - check for dock snap
>+				int distance = bounds.x - pbounds.x - pbounds.width;
>+				if (Math.abs(distance) <= DOCK_MARGIN)
>+					doDock = true;
>+			}
>+		}
>+		if (bounds.y + bounds.height < pbounds.y) // above
>+			doDock = false;
>+		if (pbounds.y + pbounds.height < bounds.y) // below
>+			doDock = false;
>+		if (doDock)
>+			dock(false);
>+		savedBounds = getShell().getBounds();
>+		savedPbounds = getShell().getParent().getBounds();
>+		return doDock;
>+	}
>+
>+	private void onWindowResize() {
>+		if (isDocked()) {
>+			Rectangle bounds = getShell().getBounds();
>+			Rectangle pbounds = getShell().getParent().getBounds();
>+			if (bounds.height != savedBounds.height) {
>+				Shell parent = (Shell) getShell().getParent();
>+				if ((parent.getStyle() & SWT.RESIZE) != 0) {
>+					parentResizeBlocked = true;
>+					parent.setBounds(pbounds.x, bounds.y, pbounds.width,
>+							bounds.height);
>+					parentResizeBlocked = false;
>+				}
>+			}
>+		}
>+		savedBounds = getShell().getBounds();
>+	}
>+
>+	private void onParentWindowResize() {
>+		if (!parentResizeBlocked && isDocked()) {
>+			Rectangle bounds = getShell().getBounds();
>+			Rectangle pbounds = getShell().getParent().getBounds();
>+			if (bounds.x == savedPbounds.x + savedPbounds.width) {
>+				// right
>+				if (savedPbounds.x + savedPbounds.width != pbounds.x
>+						+ pbounds.width)
>+					// right edge moved
>+					dock(false);
>+			} else {
>+			}
>+			getShell().setSize(getShell().getSize().x,
>+					getShell().getParent().getSize().y);
>+		}
>+		savedPbounds = getShell().getParent().getBounds();
>+	}
>+
>+	public void update(Control c) {
>+		helpPart.update(null, c);
>+	}
>+
>+	public void update(IContext context, Control c) {
>+		helpPart.showPage(IHelpUIConstants.HV_CONTEXT_HELP_PAGE);
>+		helpPart.update(context, null, c);
>+	}
>+
>+	public boolean close() {
>+		if (!Platform.getWS().equals(Platform.WS_GTK)) 
>+			unhookListeners();
>+		if (super.close()) {
>+			if (toolkit != null) {
>+				toolkit.dispose();
>+				toolkit = null;
>+			}
>+			if (helpPart != null) {
>+				helpPart.dispose();
>+				helpPart = null;
>+			}
>+			return true;
>+		}
>+		return false;
>+	}
>+
>+	private boolean isDocked() {
>+		if (savedPbounds == null)
>+			return false;
>+		return isDocked(savedBounds, savedPbounds);
>+	}
>+
>+	private boolean isDocked(Rectangle bounds, Rectangle pbounds) {
>+		if (pbounds.height != bounds.height)
>+			return false;
>+		if (bounds.y + bounds.height < pbounds.y) // above
>+			return false;
>+		if (pbounds.y + pbounds.height < bounds.y) // below
>+			return false;
>+		return bounds.x == pbounds.x + pbounds.width
>+				|| bounds.x == pbounds.x - bounds.width;
>+	}
>+
>+	public void pageChanged(PageChangedEvent event) {
>+		Object page = event.getSelectedPage();
>+		Control c = null;
>+		if (page instanceof IDialogPage) {
>+			c = ((IDialogPage) page).getControl();
>+		} else {
>+			c = getShell().getDisplay().getFocusControl();
>+			if (c instanceof TabFolder) {
>+				TabFolder folder = (TabFolder) c;
>+				TabItem[] selection = folder.getSelection();
>+				if (selection.length == 1) {
>+					c = selection[0].getControl();
>+				}
>+			}
>+		}
>+		update(null, c);
>+	}
>+}
>#P org.eclipse.pde
>Index: cheatsheets/updates.xml
>===================================================================
>RCS file: /home/eclipse/org.eclipse.pde/cheatsheets/updates.xml,v
>retrieving revision 1.9
>diff -u -r1.9 updates.xml
>--- cheatsheets/updates.xml	9 Dec 2005 21:16:45 -0000	1.9
>+++ cheatsheets/updates.xml	13 Dec 2005 19:36:12 -0000
>@@ -31,7 +31,6 @@
> 	<item
> 		href="/org.eclipse.pde.doc.user/guide/pde_creating.htm"
> 		title="Creating the plug-in project"
>-		dialog="true"
> 		skip="true">
> 		<action
> 			pluginId="org.eclipse.pde.ui"
>@@ -50,7 +49,6 @@
> 	<item
> 		href="/org.eclipse.pde.doc.user/guide/pde_feature_setup.htm"
> 		title="Creating the feature project"
>-		dialog="true"
> 		skip="true">
> 		<action
> 			pluginId="org.eclipse.pde.ui"
>@@ -85,7 +83,6 @@
> 	<item
> 		href="/org.eclipse.pde.doc.user/guide/pde_site_setup.htm"
> 		title="Creating an update site project"
>-		dialog="true"
> 		skip="true">
> 		<action
> 			pluginId="org.eclipse.pde.ui"
>@@ -147,7 +144,6 @@
> 	</item>
> 	<item
> 		href="/org.eclipse.pde.doc.user/guide/pde_site_previewing.htm"
>-		dialog="true"
> 		title="Testing the update site">
> 		<action
> 			pluginId="org.eclipse.ui.ide"
>@@ -172,7 +168,6 @@
> 	</item>
> 	<item
> 		href="/org.eclipse.pde.doc.user/guide/pde_site_previewing.htm"
>-		dialog="true"
> 		title="Installing the feature">
> 		<description>
> 		   	When ready to test the feature itself, install
>@@ -186,7 +181,6 @@
> 	</item>
> 	<item
> 		href="/org.eclipse.pde.doc.user/guide/pde_site_previewing.htm"
>-		dialog="true"
> 		title="Verifying the installation">
> 		<description>
> 			Upon restart, select <b>Help-&gt;Software Updates-&gt;Manage Configuration...</b>.
>Index: cheatsheets/rcpapp.xml
>===================================================================
>RCS file: /home/eclipse/org.eclipse.pde/cheatsheets/rcpapp.xml,v
>retrieving revision 1.5
>diff -u -r1.5 rcpapp.xml
>--- cheatsheets/rcpapp.xml	9 Dec 2005 21:16:45 -0000	1.5
>+++ cheatsheets/rcpapp.xml	13 Dec 2005 19:36:12 -0000
>@@ -15,7 +15,6 @@
> 
> 	<item
> 		href="/org.eclipse.pde.doc.user/guide/rcp_project.htm" 
>-		dialog="true"
> 		title="Creating a New Plug-in Project">
> 		<action
> 			pluginId="org.eclipse.pde.ui"
>@@ -41,7 +40,6 @@
>     
> 	<item
> 		href="/org.eclipse.pde.doc.user/guide/product_configuration.htm"
>-		dialog="true"
> 		title="Defining a product configuration">
> 		<action 
> 			pluginId="org.eclipse.pde.ui"
>@@ -71,7 +69,6 @@
> 
> 	<item
> 		href="/org.eclipse.pde.doc.user/guide/product_export.htm"
>-		dialog="true"
> 		title="Exporting a Rich Client Application">
> 		<description>
> 			The product configuration editor also allows you to export RCP
>Index: cheatsheets/helloworld.xml
>===================================================================
>RCS file: /home/eclipse/org.eclipse.pde/cheatsheets/helloworld.xml,v
>retrieving revision 1.7
>diff -u -r1.7 helloworld.xml
>--- cheatsheets/helloworld.xml	9 Dec 2005 21:16:45 -0000	1.7
>+++ cheatsheets/helloworld.xml	13 Dec 2005 19:36:12 -0000
>@@ -16,7 +16,6 @@
> 
> 	<item
> 		href="/org.eclipse.pde.doc.user/guide/pde_configuring.htm"
>-		dialog="true"
> 		title="Configuring PDE">
> 		<action
> 			pluginId="org.eclipse.pde.ui"
>@@ -53,7 +52,6 @@
> 	<item
> 		href="/org.eclipse.pde.doc.user/guide/pde_creating.htm" 
> 		title="Creating a New Plug-in Project"
>-		dialog="true"
> 		skip="true">
> 		<action
> 			pluginId="org.eclipse.pde.ui"
>@@ -129,7 +127,6 @@
> 		
> 	<item
> 		href="/org.eclipse.pde.doc.user/guide/pde_running.htm"
>-		dialog="true"
> 		title="Running the plug-in">
> 		<action
> 			pluginId="org.eclipse.pde.ui"
>@@ -151,7 +148,6 @@
> 
> 	<item
> 		href="/org.eclipse.pde.doc.user/guide/pde_deploy.htm"
>-		dialog="true"
> 		title="Deploying a plug-in">
> 		<action
> 			pluginId="org.eclipse.pde.ui"
>#P org.eclipse.ui.cheatsheets
>Index: src/org/eclipse/ui/internal/cheatsheets/data/Item.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/Item.java,v
>retrieving revision 1.7
>diff -u -r1.7 Item.java
>--- src/org/eclipse/ui/internal/cheatsheets/data/Item.java	9 Dec 2005 21:19:51 -0000	1.7
>+++ src/org/eclipse/ui/internal/cheatsheets/data/Item.java	13 Dec 2005 19:36:12 -0000
>@@ -15,7 +15,6 @@
> public class Item extends Intro implements IActionItem, IPerformWhenItem, ISubItemItem {
> 	private String title;
> 	private boolean skip;
>-	private boolean dialog;
> 	private ArrayList itemExtensions;
> 	
> 	private Action action;
>@@ -30,11 +29,10 @@
> 		super();
> 	}
> 	
>-	public Item(String title, String description, String href, String contextId, boolean skip, boolean dialog) {
>+	public Item(String title, String description, String href, String contextId, boolean skip) {
> 		super(description, href, contextId);
> 		this.title = title;
> 		this.skip = skip;
>-		this.dialog = dialog;
> 	}
> 	
> 	/**
>@@ -61,14 +59,6 @@
> 	}
> 
> 	/**
>-	 * Returns whether or not this item requires opening a dialog.
>-	 * @return whether the item requires opening a dialog
>-	 */
>-	public boolean isDialog() {
>-		return this.dialog;
>-	}
>-	
>-	/**
> 	 * Returns the skip.
> 	 * @return boolean
> 	 */
>@@ -77,14 +67,6 @@
> 	}
> 
> 	/**
>-	 * Sets whether or not this item requires opening a dialog.
>-	 * @param dialog whether the item requires opening a dialog
>-	 */
>-	public void setDialog(boolean dialog) {
>-		this.dialog = dialog;
>-	}
>-	
>-	/**
> 	 * @param skip The skip to set.
> 	 */
> 	public void setSkip(boolean skip) {
>Index: src/org/eclipse/ui/internal/cheatsheets/data/IParserTags.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/IParserTags.java,v
>retrieving revision 1.10
>diff -u -r1.10 IParserTags.java
>--- src/org/eclipse/ui/internal/cheatsheets/data/IParserTags.java	9 Dec 2005 21:19:51 -0000	1.10
>+++ src/org/eclipse/ui/internal/cheatsheets/data/IParserTags.java	13 Dec 2005 19:36:12 -0000
>@@ -55,14 +55,12 @@
> 	 * <!ELEMENT item (description [action|perform-when] | (subitem|repeated-subitem|conditional-subitem)*)>
> 	 * <!ATTLIST item
> 	 *   title               CDATA #REQUIRED
>-	 *   dialog              ("true" | "false") "false"
> 	 *   skip                ("true" | "false") "false"
> 	 *   contextId           CDATA #IMPLIED
> 	 *   href                CDATA #IMPLIED
> 	 * >
> 	 */
> 	public static final String ITEM = "item"; //$NON-NLS-1$
>-	public static final String DIALOG = "dialog"; //$NON-NLS-1$
> 	public static final String SKIP = "skip"; //$NON-NLS-1$
> 
> 	/*
>Index: src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java,v
>retrieving revision 1.16
>diff -u -r1.16 CheatSheetParser.java
>--- src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java	9 Dec 2005 21:19:51 -0000	1.16
>+++ src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetParser.java	13 Dec 2005 19:36:12 -0000
>@@ -505,8 +505,6 @@
> 					item.setHref(attribute.getNodeValue());
> 				} else if (attributeName.equals(IParserTags.SKIP)) {
> 					item.setSkip(attribute.getNodeValue().equals(TRUE_STRING));
>-				} else if (attributeName.equals(IParserTags.DIALOG)) {
>-					item.setDialog(attribute.getNodeValue().equals(TRUE_STRING));
> 				} else {
> 					AbstractItemExtensionElement[] ie = handleUnknownItemAttribute(attribute, itemNode);
> 					if (ie != null)
>Index: src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetHelpPart.java
>===================================================================
>RCS file: src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetHelpPart.java
>diff -N src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetHelpPart.java
>--- src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetHelpPart.java	9 Dec 2005 21:19:51 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,150 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2005 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- * 
>- * Contributors:
>- *     IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.ui.internal.cheatsheets.views;
>-
>-import org.eclipse.core.runtime.IPath;
>-import org.eclipse.help.ui.internal.views.IHelpPart;
>-import org.eclipse.help.ui.internal.views.ReusableHelpPart;
>-import org.eclipse.jface.action.IAction;
>-import org.eclipse.jface.action.IMenuManager;
>-import org.eclipse.jface.action.IToolBarManager;
>-import org.eclipse.jface.action.Separator;
>-import org.eclipse.jface.resource.ImageDescriptor;
>-import org.eclipse.swt.widgets.Composite;
>-import org.eclipse.swt.widgets.Control;
>-import org.eclipse.ui.IMemento;
>-import org.eclipse.ui.forms.AbstractFormPart;
>-import org.eclipse.ui.forms.widgets.FormToolkit;
>-import org.eclipse.ui.internal.cheatsheets.CheatSheetPlugin;
>-import org.eclipse.ui.internal.cheatsheets.Messages;
>-
>-/**
>- * A help part wrapper that contains a cheat sheet. This is used to display
>- * cheat sheets inside the ReusableHelpPart.
>- */
>-public class CheatSheetHelpPart extends AbstractFormPart implements IHelpPart {
>-	
>-	public static final String ID = "cheatsheet-page";
>-	
>-	private CheatSheetViewer viewer;
>-	private String id;
>-	
>-	/**
>-	 * Constructs a new part.
>-	 * 
>-	 * @param parent the parent Composite that will contain the widgets
>-	 * @param toolkit the form toolkit to use for creating the widgets
>-	 * @param tbm the toolbar we will contribute to
>-	 * @param id the unique id of the cheatsheet to display in the part
>-	 */
>-	public CheatSheetHelpPart(Composite parent, FormToolkit toolkit, IToolBarManager tbm, String id) {
>-		viewer = new CheatSheetViewer(true);
>-		viewer.setInput(id);
>-		viewer.createPartControl(parent);
>-		contributeToToolBar(tbm);
>-	}
>-
>-	/**
>-	 * Contributes any actions we have to the toolbar.
>-	 * 
>-	 * @param tbm the toolbar to contribute to
>-	 */
>-	private void contributeToToolBar(IToolBarManager tbm) {
>-		IPath path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_ELCL).append("collapse_expand_all.gif");//$NON-NLS-1$
>-		ImageDescriptor collapseExpandImage = CheatSheetPlugin.createImageDescriptor(CheatSheetPlugin.getPlugin().getBundle(), path);
>-		CheatSheetExpandRestoreAction expandRestoreAction = new CheatSheetExpandRestoreAction(Messages.COLLAPSE_ALL_BUT_CURRENT_TOOLTIP, false, viewer);
>-		expandRestoreAction.setToolTipText(Messages.COLLAPSE_ALL_BUT_CURRENT_TOOLTIP);
>-		expandRestoreAction.setImageDescriptor(collapseExpandImage);
>-		tbm.insertBefore("back", expandRestoreAction); //$NON-NLS-1$
>-		tbm.insertBefore("back", new Separator()); //$NON-NLS-1$
>-		viewer.setExpandRestoreAction(expandRestoreAction);
>-	}
>-	
>-	/**
>-	 * This part doesn't require a context menu.
>-	 */
>-	public boolean fillContextMenu(IMenuManager manager) {
>-		return false;
>-	}
>-	
>-	/**
>-	 * Returns the part's top Control.
>-	 */
>-	public Control getControl() {
>-		return viewer.getControl();
>-	}
>-	
>-	/**
>-	 * This part doesn't use any global actions.
>-	 */
>-	public IAction getGlobalAction(String id) {
>-		return null;
>-	}
>-	
>-	/**
>-	 * Returns the part's unique identifier.
>-	 * 
>-	 * @param the unique id for the part
>-	 */
>-	public String getId() {
>-		return id;
>-	}
>-	
>-	/**
>-	 * Returns whether or not this part contains the given Control, which
>-	 * is in focus.
>-	 * 
>-	 * @param control the Control in focus
>-	 */
>-	public boolean hasFocusControl(Control control) {
>-		return viewer.hasFocusControl(control);
>-	}
>-	
>-	/**
>-	 * Initializes the part.
>-	 */
>-	public void init(ReusableHelpPart parent, String id, IMemento memento) {
>-		this.id = id;
>-	}
>-
>-	/**
>-	 * No filtering required.
>-	 */
>-	public void refilter() {
>-	}
>-	
>-	/**
>-	 * The cheat sheet automatically saves its state; no action required.
>-	 */
>-	public void saveState(IMemento memento) {
>-	}
>-	
>-	/**
>-	 * Sets the visibility of the part.
>-	 * 
>-	 * @param whether or not the part should be visible
>-	 */
>-	public void setVisible(boolean visible) {
>-		viewer.getControl().setVisible(visible);
>-	}
>-	
>-	/**
>-	 * No action needed for this part here.
>-	 */
>-	public void stop() {
>-	}
>-	
>-	/**
>-	 * No action needed for this part here.
>-	 */
>-	public void toggleRoleFilter() {
>-	}
>-}
>Index: src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetView.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetView.java,v
>retrieving revision 1.29
>diff -u -r1.29 CheatSheetView.java
>--- src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetView.java	9 Dec 2005 21:19:51 -0000	1.29
>+++ src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetView.java	13 Dec 2005 19:36:12 -0000
>@@ -94,7 +94,7 @@
> 	public void createPartControl(Composite parent) {
> 		CheatSheetStopWatch.startStopWatch("CheatSheetView.createPartControl"); //$NON-NLS-1$
> 
>-		viewer = new CheatSheetViewer(false);
>+		viewer = new CheatSheetViewer();
> 		viewer.createPartControl(parent);
> 	
> 		if (!actionBarContributed) {
>Index: src/org/eclipse/ui/internal/cheatsheets/views/ViewItem.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/ViewItem.java,v
>retrieving revision 1.35
>diff -u -r1.35 ViewItem.java
>--- src/org/eclipse/ui/internal/cheatsheets/views/ViewItem.java	9 Dec 2005 21:19:51 -0000	1.35
>+++ src/org/eclipse/ui/internal/cheatsheets/views/ViewItem.java	13 Dec 2005 19:36:12 -0000
>@@ -333,16 +333,6 @@
> 		return mainItemComposite.isExpanded();
> 	}
> 
>-	/**
>-     * Returns whether or not cheat sheet viewer containing this item is in
>-     * a modal dialog.
>-     * 
>-     * @return whether the cheat sheet viewer is in a modal dialog
>-	 */
>-	public boolean isInDialogMode() {
>-		return viewer.isInDialogMode();
>-	}
>-	
> 	/*package*/
> 	boolean isSkipped() {
> 		return isSkipped;
>Index: src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java,v
>retrieving revision 1.34
>diff -u -r1.34 CheatSheetViewer.java
>--- src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java	9 Dec 2005 21:19:51 -0000	1.34
>+++ src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java	13 Dec 2005 19:36:12 -0000
>@@ -24,11 +24,7 @@
> import org.eclipse.core.runtime.Path;
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.core.runtime.Status;
>-import org.eclipse.help.ui.internal.views.HelpTray;
>-import org.eclipse.help.ui.internal.views.IHelpPartPage;
>-import org.eclipse.help.ui.internal.views.ReusableHelpPart;
> import org.eclipse.jface.action.Action;
>-import org.eclipse.jface.dialogs.TrayDialog;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.DisposeEvent;
>@@ -39,11 +35,7 @@
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
> import org.eclipse.swt.widgets.Display;
>-import org.eclipse.swt.widgets.Event;
> import org.eclipse.swt.widgets.Label;
>-import org.eclipse.swt.widgets.Listener;
>-import org.eclipse.swt.widgets.Shell;
>-import org.eclipse.swt.widgets.Widget;
> import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.cheatsheets.ICheatSheetEvent;
> import org.eclipse.ui.cheatsheets.ICheatSheetViewer;
>@@ -90,24 +82,19 @@
> 	private ArrayList viewItemList = new ArrayList();
> 
> 	//Composites
>-	protected Composite control;
>+	private Composite control;
> 
> 	private Cursor busyCursor;
> 	
> 	private ErrorPage errorPage;
> 	private CheatSheetPage cheatSheetPage;
> 	private Label howToBegin;
>-	private boolean inDialog;
>-	private Listener listener;
> 
> 	/**
> 	 * The constructor.
>-	 * 
>-	 * @param inDialog whether or not this viewer will be placed in a modal dialog
> 	 */
>-	public CheatSheetViewer(boolean inDialog) {
>+	public CheatSheetViewer() {
> 		currentItemNum = -1;
>-		this.inDialog = inDialog;
> 		saveHelper = new CheatSheetSaveHelper();
> 	}
> 
>@@ -553,21 +540,6 @@
> 				dispose();
> 			}
> 		});
>-		
>-		/*
>-		 * org.eclipse.help.ui is an optional dependency; only perform this
>-		 * step is this plugin is present.
>-		 */
>-		if (!inDialog && (Platform.getBundle("org.eclipse.help.ui") != null)) {
>-			listener = new Listener() {
>-				public void handleEvent(Event event) {
>-					if (isTrayDialog(event.widget)) {
>-						dialogOpened((TrayDialog)((Shell)event.widget).getData());
>-					}
>-				}
>-			};
>-			Display.getCurrent().addFilter(SWT.Show, listener);
>-		}
> 
> 		howToBegin = new Label(control, SWT.WRAP);
> 		howToBegin.setText(Messages.INITIAL_VIEW_DIRECTIONS);
>@@ -583,53 +555,11 @@
> 	}
> 
> 	/**
>-	 * Called when any TrayDialog is opened. The viewer must react by disabling
>-	 * itself and moving the cheat sheet to the dialog's tray if the current item
>-	 * was flagged as one that opens a modal dialog.
>-	 * 
>-	 * @param dialog the dialog that was opened
>-	 */
>-	private void dialogOpened(TrayDialog dialog) {
>-		if (isInDialogItem()) {
>-			final String id = getCheatSheetID();
>-			HelpTray tray = (HelpTray)dialog.getTray();
>-			if (tray == null) {
>-				tray = new HelpTray();
>-				dialog.openTray(tray);
>-			}
>-			ReusableHelpPart helpPart = tray.getHelpPart();
>-			IHelpPartPage page = helpPart.createPage(CheatSheetHelpPart.ID, null, null);
>-			page.setVerticalSpacing(0);
>-			page.setHorizontalMargin(0);
>-			helpPart.addPart(CheatSheetHelpPart.ID, new CheatSheetHelpPart(helpPart.getForm().getForm().getBody(), helpPart.getForm().getToolkit(), page.getToolBarManager(), id));
>-			page.addPart(CheatSheetHelpPart.ID, true);
>-			helpPart.addPage(page);
>-			helpPart.showPage(CheatSheetHelpPart.ID);
>-			
>-			/*
>-			 * Disable the viewer until the tray is closed, then show it again.
>-			 */
>-			control.setVisible(false);
>-			Display.getCurrent().removeFilter(SWT.Show, listener);
>-
>-			helpPart.getControl().addListener(SWT.Dispose, new Listener() {
>-				public void handleEvent(Event event) {
>-					control.setVisible(true);
>-					Display.getCurrent().addFilter(SWT.Show, listener);
>-					checkSavedState();
>-				}
>-			});
>-		}
>-	}
>-
>-	/**
> 	 * Disposes of this cheat sheet viewer.
> 	 */
> 	private void dispose() {
>-		if (listener != null) {
>-			Display.getCurrent().removeFilter(SWT.Show, listener);
>-		}
> 		internalDispose();
>+
> 		if (busyCursor != null)
> 			busyCursor.dispose();
> 	}
>@@ -701,17 +631,6 @@
> 		return (ViewItem) viewItemList.get(index);
> 	}
> 	
>-	/**
>-	 * Returns whether or not this viewer contains the given Control, which
>-	 * is currently in focus.
>-	 * 
>-	 * @param control the Control currently in focus
>-	 * @return whether this viewer contains the given Control or not
>-	 */
>-	public boolean hasFocusControl(Control control) {
>-		return (control == this.control) || (cheatSheetPage.getForm() == control);
>-	}
>-	
> 	private void initCheatSheetView() {
> 		CheatSheetStopWatch.startStopWatch("CheatSheetViewer.initCheatSheetView()"); //$NON-NLS-1$
> 		//Re-initialize list to store items collapsed by expand/restore action on c.s. toolbar.
>@@ -802,39 +721,8 @@
> 			cheatSheetPage.dispose();
> 		}
> 	}
>-
>-	/**
>-	 * Returns whether or not the currently active item requires opening a
>-	 * modal dialog.
>-	 * 
>-	 * @return whether the current item opens a modal dialog
>-	 */
>-	private boolean isInDialogItem() {
>-		ViewItem item = getViewItemAtIndex(currentItemNum);
>-		return item.getItem().isDialog();
>-	}
> 	
> 	/**
>-	 * Returns whether or not this cheat sheet viewer is inside a modal
>-	 * dialog.
>-	 * 
>-	 * @return whether this viewer is inside a modal dialog
>-	 */
>-	public boolean isInDialogMode() {
>-		return inDialog;
>-	}
>-	
>-	/**
>-	 * Returns whether the given widget is a TrayDialog.
>-	 * 
>-	 * @param widget the widget to check
>-	 * @return whether or not the widget is a TrayDialog
>-	 */
>-	private boolean isTrayDialog(Widget widget) {
>-		return (widget instanceof Shell && ((Shell)widget).getData() instanceof TrayDialog);
>-	}
>-
>-	/**
> 	* Read the contents of the welcome page
> 	*/
> 	private boolean readFile() {
>Index: src/org/eclipse/ui/internal/cheatsheets/views/CoreItem.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CoreItem.java,v
>retrieving revision 1.28
>diff -u -r1.28 CoreItem.java
>--- src/org/eclipse/ui/internal/cheatsheets/views/CoreItem.java	9 Dec 2005 21:19:51 -0000	1.28
>+++ src/org/eclipse/ui/internal/cheatsheets/views/CoreItem.java	13 Dec 2005 19:36:12 -0000
>@@ -63,14 +63,7 @@
> 	}
> 
> 	private void createButtons(Action action) {
>-		/*
>-		 * When the cheat sheet is displayed in a dialog's tray, hide
>-		 * the action that was just invoked to open the dialog.
>-		 */
>-		boolean inDialog = isInDialogMode();
>-		boolean isDialogAction = getItem().isDialog();
>-		boolean hideAction = isDialogAction && inDialog;
>-		if (action != null && !hideAction) {
>+		if (action != null ) {
> 			final ImageHyperlink startButton = createButton(buttonComposite, CheatSheetPlugin.getPlugin().getImage(ICheatSheetResource.CHEATSHEET_ITEM_BUTTON_START), this, itemColor, Messages.PERFORM_TASK_TOOLTIP);
> 			page.getToolkit().adapt(startButton, true, true);
> 			startButton.addHyperlinkListener(new HyperlinkAdapter() {
>Index: src/org/eclipse/ui/cheatsheets/CheatSheetViewerFactory.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/CheatSheetViewerFactory.java,v
>retrieving revision 1.5
>diff -u -r1.5 CheatSheetViewerFactory.java
>--- src/org/eclipse/ui/cheatsheets/CheatSheetViewerFactory.java	9 Dec 2005 21:19:51 -0000	1.5
>+++ src/org/eclipse/ui/cheatsheets/CheatSheetViewerFactory.java	13 Dec 2005 19:36:12 -0000
>@@ -37,6 +37,6 @@
> 	 * @return a new cheat sheet viewer
> 	 */
> 	public static ICheatSheetViewer createCheatSheetView() {
>-		return new CheatSheetViewer(false);
>+		return new CheatSheetViewer();
> 	}
> }
>Index: schema/cheatSheetContentFileSpec.html
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.cheatsheets/schema/cheatSheetContentFileSpec.html,v
>retrieving revision 1.15
>diff -u -r1.15 cheatSheetContentFileSpec.html
>--- schema/cheatSheetContentFileSpec.html	9 Dec 2005 21:19:51 -0000	1.15
>+++ schema/cheatSheetContentFileSpec.html	13 Dec 2005 19:36:12 -0000
>@@ -11,7 +11,7 @@
> <body>
> 
> <h1>Cheat Sheet Content File XML Format</h1>
>-<p>Version 3.2</p>
>+<p>Version 3.0</p>
> <p>This document describes the cheat sheet content file structure as a series of
> DTD fragments (machine readable <a href="contentFile.xsd">XML schema</a>).</p>
> <h2><code>cheatsheet</code></h2>
>@@ -70,7 +70,6 @@
> <pre>&lt;!ELEMENT item (description ([action|perform-when] | (subitem|repeated-subitem|conditional-subitem)*))&gt;&nbsp;
> &lt;!ATTLIST item&nbsp;
> &nbsp; title&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CDATA #REQUIRED
>-&nbsp; dialog  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (&quot;true&quot; | &quot;false&quot;) &quot;false&quot;
> &nbsp; skip   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (&quot;true&quot; | &quot;false&quot;) &quot;false&quot;
> &nbsp; contextId&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CDATA #IMPLIED&nbsp;
> &nbsp; href &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CDATA #IMPLIED
>@@ -80,9 +79,6 @@
> follows:</p>
> <ul type="disc">
>   <li><b>title</b> - The title of the cheat sheet item.
>-  <li><b>dialog</b> - dialog=&quot;true&quot; means this step involves opening
>-    a modal dialog. This is a hint to the system that it should allow the user
>-    to continue using the cheat sheet while in the modal dialog.</li>
>   <li><b>skip</b> - skip=&quot;true&quot; means that the whole step can be
>     skipped; the UI generally shows a button that the user can press to indicate
>     that they are skipping this step</li>
>@@ -326,8 +322,8 @@
>   &lt;intro&gt;
>     &lt;description&gt;Example cheat sheet with two steps.&lt;/description&gt;
>   &lt;/intro&gt;
>-  &lt;item title=&quot;Step 1&quot; dialog=&quot;true&quot;&gt;
>-     &lt;description&gt;This is a step with an action that involves opening a modal dialog.&lt;/description&gt;
>+  &lt;item title=&quot;Step 1&quot;&gt;
>+     &lt;description&gt;This is a step with an action.&lt;/description&gt;
>      &lt;action class=&quot;com.xyz.myaction&quot; pluginId=&quot;com.xyz&quot;/&gt;
>   &lt;/item&gt;
>   &lt;item title=&quot;Step 2&quot;&gt;
>@@ -337,7 +333,7 @@
> 
> <br>
> <p class=note id=copyright>
>-Copyright (c) 2004, 2005 IBM Corporation and others.<br>
>+Copyright (c) 2004 IBM Corporation and others.<br>
> 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 
>Index: schema/contentFile.xsd
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.cheatsheets/schema/contentFile.xsd,v
>retrieving revision 1.6
>diff -u -r1.6 contentFile.xsd
>--- schema/contentFile.xsd	9 Dec 2005 21:19:51 -0000	1.6
>+++ schema/contentFile.xsd	13 Dec 2005 19:36:12 -0000
>@@ -4,7 +4,7 @@
> 	<xsd:annotation>
> 		<xsd:documentation xml:lang="en">
> 		Schema for cheat sheet content file.
>- 		Copyright (c) 2004, 2005 IBM Corporation and others.&lt;br&gt;
>+ 		Copyright (c) 2004 IBM Corporation and others.&lt;br&gt;
> 		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 
>@@ -57,7 +57,6 @@
> 	            </xsd:choice>
>             </xsd:choice>
>             <xsd:attribute name="title" type="xsd:string" use="required"/>
>-            <xsd:attribute name="dialog" type="xsd:boolean" use="optional" default="false"/>
>             <xsd:attribute name="skip" type="xsd:boolean" use="optional" default="false"/>
>             <xsd:attribute name="contextId" type="xsd:string" use="optional"/>
>             <xsd:attribute name="href" type="xsd:string" use="optional"/>
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF,v
>retrieving revision 1.10
>diff -u -r1.10 MANIFEST.MF
>--- META-INF/MANIFEST.MF	9 Dec 2005 21:19:51 -0000	1.10
>+++ META-INF/MANIFEST.MF	13 Dec 2005 19:36:12 -0000
>@@ -17,6 +17,5 @@
>  org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
>  org.eclipse.help;bundle-version="[3.1.0,4.0.0)",
>  org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
>- org.eclipse.help.base;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
>- org.eclipse.help.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional
>+ org.eclipse.help.base;bundle-version="[3.2.0,4.0.0)";resolution:=optional
> Eclipse-LazyStart: true

Actions: View | Diff

Attachments on bug 69732: 30499 | 31492 | 31495 | 31504 | 31505 | 31672