Merge branch 'eclipse-platform:master' into master

Author: fedejeanne

bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToNumberConverter.java

@@ -80,7 +80,7 @@ public final T convert(Object fromObject) {
 	/**
 	 * Invoked when the number should converted.
 	 *
-	 * @return number if conversion was successfule, <code>null</code> if the
+	 * @return number if conversion was successful, <code>null</code> if the
 	 *         number was out of range
 	 */
 	protected abstract T doConvert(Number number);

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java

@@ -908,12 +908,21 @@ public void adjustTopRight(final CTabFolder tabFolder) {
 		// We need to modify the 'exclude' bit based on if the menuTB is
 		// visible or not
 		RowData rd = (RowData) menuTB.getLayoutData();
+		ToolItem item = menuTB.getItem(0);
 		if (needsMenu) {
-			menuTB.getItem(0).setData(THE_PART_KEY, part);
+			item.setData(THE_PART_KEY, part);
 			rd.exclude = false;
+			String tooltip = viewMenu.getTooltip();
+			if (tooltip == null) {
+				tooltip = viewMenu.getLabel();
+			}
+			if (tooltip == null) {
+				tooltip = SWTRenderersMessages.viewMenu;
+			}
+			item.setToolTipText(tooltip);
 			menuTB.setVisible(true);
 		} else {
-			menuTB.getItem(0).setData(THE_PART_KEY, null);
+			item.setData(THE_PART_KEY, null);
 			rd.exclude = true;
 			menuTB.setVisible(false);
 		}

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.java

@@ -534,8 +534,11 @@ public void hookControllerLogic(MUIElement me) {
 				@Override
 				public void controlResized(ControlEvent e) {
 					// Don't store the maximized size in the model
+					// But set the maximized tag so that the user can access the current state
 					if (shell.getMaximized()) {
-						return;
+						me.getTags().add(ShellMaximizedTag);
+					} else {
+						me.getTags().remove(ShellMaximizedTag);
 					}
 
 					try {

bundles/org.eclipse.jface/src/org/eclipse/jface/action/IContributionManagerOverrides.java

@@ -79,7 +79,7 @@ public interface IContributionManagerOverrides {
 	public String getText(IContributionItem item);
 
 	/**
-	 * Visiblity override.
+	 * Visibility override.
 	 *
 	 * @param item the contribution item in question
 	 * @return  <ul>

bundles/org.eclipse.jface/src/org/eclipse/jface/action/StatusLine.java

@@ -73,10 +73,10 @@
 	/** visibility state of the progressbar */
 	protected volatile boolean fProgressIsVisible = false;
 
-	/** visibility state of the cancle button */
+	/** visibility state of the cancel button */
 	protected boolean fCancelButtonIsVisible = false;
 
-	/** enablement state of the cancle button */
+	/** enablement state of the cancel button */
 	protected volatile boolean fCancelEnabled = false;
 
 	/** name of the task */
@@ -85,7 +85,7 @@
 	/** name of the task without sub-tasks */
 	protected volatile String fBaseTaskName;
 
-	/** is the task is cancled */
+	/** is the task is canceled */
 	protected volatile boolean fIsCanceled;
 
 	/** the start time of the task */
@@ -115,7 +115,7 @@
 	/** the toolbar */
 	protected volatile ToolBar fToolBar;
 
-	/** the cancle button */
+	/** the cancel button */
 	protected volatile ToolItem fCancelButton;
 
 	/** stop image descriptor */

bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/deferred/AbstractVirtualTable.java

@@ -28,7 +28,7 @@
  * </p>
  *
  * <p>
- * This is package visiblity by design. It would only need to be made public if there was
+ * This is package visibility by design. It would only need to be made public if there was
  * a demand to use the deferred content provider algorithms like
  * <code>BackgroundContentProvider</code> with non-JFace viewers.
  * </p>

bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java

@@ -46,7 +46,7 @@
 
 /**
  *
- * This Reconciler Strategy is a default stategy which will be present if no other highlightReconcilers are registered for a given content-type. It splits the text into 'words' (which are defined as
+ * This Reconciler Strategy is a default strategy which will be present if no other highlightReconcilers are registered for a given content-type. It splits the text into 'words' (which are defined as
  * anything in-between non-alphanumeric characters) and searches the document highlighting all like words.
  *
  * E.g. if your file contains "t^he dog in the bog" and you leave your caret at ^ you will get both instances of 'the' highlighted.

bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.ui.ide.application;singleton:=true
-Bundle-Version: 1.5.700.qualifier
+Bundle-Version: 1.5.800.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.21.0,4.0.0)",

bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java

@@ -128,7 +128,7 @@ public class IDEWorkbenchAdvisor extends WorkbenchAdvisor {
 	private AboutInfo[] welcomePerspectiveInfos = null;
 
 	/**
-	 * Helper for managing activites in response to workspace changes.
+	 * Helper for managing activities in response to workspace changes.
 	 */
 	private IDEWorkbenchActivityHelper activityHelper = null;
 

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchActivityHelper.java

@@ -39,7 +39,7 @@
 import org.eclipse.ui.progress.WorkbenchJob;
 
 /**
- * Utility class that manages promotion of activites in response to workspace changes.
+ * Utility class that manages promotion of activities in response to workspace changes.
  *
  * @since 3.0
  */