Merge branch 'master' into databinding-api-deletion

bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.ui.workbench.swt;singleton:=true
-Bundle-Version: 0.16.600.qualifier
+Bundle-Version: 0.16.700.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java

@@ -263,7 +263,7 @@ private void subscribeTrimHandler(@EventTopic(UIEvents.TrimmedWindow.TOPIC_TRIMB
 				}
 			}
 		} else if (UIEvents.isREMOVE(event)) {
-			for (Object o : UIEvents.asIterable(event, UIEvents.EventTags.NEW_VALUE)) {
+			for (Object o : UIEvents.asIterable(event, UIEvents.EventTags.OLD_VALUE)) {
 				MUIElement removed = (MUIElement) o;
 				if (removed.getRenderer() != null) {
 					removeGui(removed);

bundles/org.eclipse.ui.browser/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.ui.browser; singleton:=true
-Bundle-Version: 3.7.200.qualifier
+Bundle-Version: 3.7.300.qualifier
 Bundle-Activator: org.eclipse.ui.internal.browser.WebBrowserUIPlugin
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin

bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java

@@ -29,6 +29,7 @@
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ColumnWeightData;
@@ -541,8 +542,7 @@ protected static void search(File directory, List<String> existingPaths,
 	 */
 	@Override
 	protected void performDefaults() {
-		internal.setSelection(false);
-		external.setSelection(true);
+		setDefaultChoiceSelection();
 
 		BrowserManager.getInstance().currentBrowser = null;
 		BrowserManager.getInstance().setupDefaultBrowsers();
@@ -561,8 +561,7 @@ protected void performDefaults() {
 	 * appeared after the Eclipse Platform update.
 	 */
 	protected void addDefaults() {
-		internal.setSelection(false);
-		external.setSelection(true);
+		setDefaultChoiceSelection();
 
 		BrowserManager.getInstance().currentBrowser = null;
 		BrowserManager.getInstance().addDefaultBrowsers();
@@ -600,4 +599,17 @@ public boolean performCancel() {
 		BrowserManager.getInstance().loadBrowsers();
 		return super.performCancel();
 	}
+
+	private void setDefaultChoiceSelection() {
+		int browserChoice = getBrowserChoiceDefaultPreference();
+		internal.setSelection(browserChoice == WebBrowserPreference.INTERNAL);
+		external.setSelection(browserChoice == WebBrowserPreference.EXTERNAL);
+	}
+
+	private static int getBrowserChoiceDefaultPreference() {
+		IPreferenceStore preferenceStore = WebBrowserUIPlugin.getInstance().getPreferenceStore();
+		int browserChoice = preferenceStore.getDefaultInt(WebBrowserPreference.PREF_BROWSER_CHOICE);
+		return browserChoice;
+
+	}
 }

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/FiltersConfigurationDialog.java

@@ -30,7 +30,9 @@
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.dialogs.TrayDialog;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ISelection;
@@ -60,7 +62,6 @@
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.internal.ide.IDEInternalPreferences;
 import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
-import org.eclipse.ui.preferences.ViewSettingsDialog;
 import org.eclipse.ui.views.markers.FilterConfigurationArea;
 import org.eclipse.ui.views.markers.internal.MarkerMessages;
 import org.osgi.framework.FrameworkUtil;
@@ -72,10 +73,11 @@
  * @since 3.3
  *
  */
-public class FiltersConfigurationDialog extends ViewSettingsDialog {
+public class FiltersConfigurationDialog extends TrayDialog {
 
 	private static final String SELECTED_FILTER_GROUP = "SELECTED_FILTER_GROUP"; //$NON-NLS-1$
 	private static final String PREV_SELECTED_ELEMENTS = "PREV_SELECTED_ELEMENTS"; //$NON-NLS-1$
+	private static int DEFAULTS_BUTTON_ID = 25;
 
 	private Collection<MarkerFieldFilterGroup> filterGroups;
 
@@ -116,6 +118,7 @@ public FiltersConfigurationDialog(Shell parentShell, MarkerContentGenerator gene
 		filterGroups = makeWorkingCopy(generator.getAllFilters());
 		this.generator = generator;
 		andFilters = false;
+		setHelpAvailable(false);
 	}
 
 	/**
@@ -165,7 +168,7 @@ protected Control createDialogArea(Composite parent) {
 
 		createConfigDesc(configComposite);
 
-		createMarkerLimits(composite);
+		createAllConfigArea(composite);
 
 		Label separator = new Label(parent, SWT.HORIZONTAL | SWT.SEPARATOR);
 		separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -243,9 +246,11 @@ private boolean isShowAll() {
 	}
 
 	/**
+	 * Create the area of the dialog that apply's to all configurations.
+	 *
 	 * @param parent
 	 */
-	private void createMarkerLimits(Composite parent) {
+	private void createAllConfigArea(Composite parent) {
 		compositeLimits = new Composite(parent, SWT.NONE);
 		GridLayout glCompositeLimits = new GridLayout(3, false);
 		compositeLimits.setLayout(glCompositeLimits);
@@ -265,7 +270,7 @@ public void widgetSelected(SelectionEvent e) {
 		limitButton.setLayoutData(limitData);
 
 		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
+		GridLayout layout = new GridLayout(3, false);
 		layout.marginWidth = 0;
 		layout.marginHeight = 0;
 		composite.setLayout(layout);
@@ -302,6 +307,14 @@ public void widgetSelected(SelectionEvent e) {
 				limitText.setText(Integer.toString(generator.getMarkerLimits()));
 			}
 		});
+
+		Composite defaultButtonComposite = new Composite(composite, SWT.NONE);
+		GridLayout defaultButtonLayout = new GridLayout(1, false);
+		defaultButtonComposite.setLayout(defaultButtonLayout);
+		GridData defaultButtonCompositeData = new GridData(SWT.END, SWT.END, true, false);
+		defaultButtonComposite.setLayoutData(defaultButtonCompositeData);
+
+		createButton(defaultButtonComposite, DEFAULTS_BUTTON_ID, JFaceResources.getString("defaults"), false); //$NON-NLS-1$
 	}
 
 	/**
@@ -678,6 +691,13 @@ protected void okPressed() {
 	}
 
 	@Override
+	protected void buttonPressed(int buttonId) {
+		if (buttonId == DEFAULTS_BUTTON_ID) {
+			performDefaults();
+		}
+		super.buttonPressed(buttonId);
+	}
+
 	protected void performDefaults() {
 		andFilters = false;
 

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/application/WorkbenchAdvisor.java

@@ -686,10 +686,6 @@ public String getMainPreferencePageId() {
 	 *
 	 * @param configurer the window configurer
 	 * @param shell      the window's shell
-	 * @see IWorkbenchWindowConfigurer#createMenuBar
-	 * @see IWorkbenchWindowConfigurer#createCoolBarControl
-	 * @see IWorkbenchWindowConfigurer#createStatusLineControl
-	 * @see IWorkbenchWindowConfigurer#createPageComposite
 	 *
 	 * @deprecated since 3.1, override
 	 *             {@link WorkbenchWindowAdvisor#createWindowContents(Shell)}

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/application/WorkbenchWindowAdvisor.java

@@ -269,10 +269,6 @@ public void postWindowClose() {
 	 * </p>
 	 *
 	 * @param shell the window's shell
-	 * @see IWorkbenchWindowConfigurer#createMenuBar
-	 * @see IWorkbenchWindowConfigurer#createCoolBarControl
-	 * @see IWorkbenchWindowConfigurer#createStatusLineControl
-	 * @see IWorkbenchWindowConfigurer#createPageComposite
 	 * @deprecated This method is no longer used. Applications now define workbench
 	 *             window contents in their application model.
 	 */

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowViewMenu.java

@@ -31,13 +31,19 @@
 import org.eclipse.core.commands.Parameterization;
 import org.eclipse.core.commands.ParameterizedCommand;
 import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
+import org.eclipse.e4.ui.workbench.IResourceUtilities;
+import org.eclipse.e4.ui.workbench.swt.util.ISWTResourceUtilities;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ContributionItem;
 import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
@@ -221,6 +227,13 @@ public PluginCCIP(IViewDescriptor v, IServiceLocator serviceLocator, String id,
 			pluginId = ((ViewDescriptor) v).getPluginId();
 		}
 
+		public PluginCCIP(MPartDescriptor partDesc, IServiceLocator serviceLocator, String id, String commandId,
+				int style) {
+			super(serviceLocator, id, commandId, style);
+			localId = partDesc.getElementId();
+			pluginId = null;
+		}
+
 		@Override
 		public String getLocalId() {
 			return localId;
@@ -235,26 +248,49 @@ public String getPluginId() {
 
 	@SuppressWarnings("unchecked")
 	private CommandContributionItemParameter getItem(String viewId) {
+		MApplication application = window.getService(MApplication.class);
+		List<MPartDescriptor> descriptors = application.getDescriptors();
 		IViewRegistry reg = WorkbenchPlugin.getDefault().getViewRegistry();
-		IViewDescriptor desc = reg.find(viewId);
-		if (desc == null) {
+
+		MPartDescriptor partDesc = descriptors.stream().filter(descriptor -> descriptor.getElementId().equals(viewId))
+				.findFirst().orElse(null);
+
+		if (partDesc == null) {
 			return null;
 		}
-		String label = desc.getLabel();
+		String label = partDesc.getLabel();
+
+		CommandContributionItemParameter parms;
+
+		IViewDescriptor desc = reg.find(viewId);
+		if (desc != null) {
+			parms = new PluginCCIP(desc, window, viewId,
+					IWorkbenchCommandConstants.VIEWS_SHOW_VIEW, CommandContributionItem.STYLE_PUSH);
+		} else {
+			parms = new PluginCCIP(partDesc, window, viewId,
+					IWorkbenchCommandConstants.VIEWS_SHOW_VIEW, CommandContributionItem.STYLE_PUSH);
+		}
 
-		CommandContributionItemParameter parms = new PluginCCIP(desc, window, viewId,
-				IWorkbenchCommandConstants.VIEWS_SHOW_VIEW, CommandContributionItem.STYLE_PUSH);
 		parms.label = label;
-		parms.icon = desc.getImageDescriptor();
+		parms.icon = getImage(partDesc);
 		parms.parameters = new HashMap<String, String>();
 
-		parms.parameters.put(VIEW_ID_PARM, viewId);
+		parms.parameters.put(IWorkbenchCommandConstants.VIEWS_SHOW_VIEW_PARM_ID, viewId);
 		if (makeFast) {
 			parms.parameters.put(IWorkbenchCommandConstants.VIEWS_SHOW_VIEW_PARM_FASTVIEW, "true"); //$NON-NLS-1$
 		}
 		return parms;
 	}
 
+	private ImageDescriptor getImage(MPartDescriptor element) {
+		String iconURI = element.getIconURI();
+		if (iconURI != null && !iconURI.isBlank()) {
+			ISWTResourceUtilities resUtils = (ISWTResourceUtilities) window.getService(IResourceUtilities.class);
+			return resUtils.imageDescriptorFromURI(URI.createURI(iconURI));
+		}
+		return null;
+	}
+
 	private List<String> addOpenedViews(IWorkbenchPage page, List<String> actions) {
 		ArrayList<String> views = getParts(page);
 		ArrayList<String> result = new ArrayList<>(views.size() + actions.size());

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbookEditorsHandler.java

@@ -126,6 +126,7 @@ protected void setMatcherString(String pattern) {
 	protected void setLabelProvider(final TableViewerColumn tableViewerColumn) {
 
 		tableViewerColumn.setLabelProvider(new StyledCellLabelProvider() {
+			private BoldStylerProvider boldStylerProvider;
 
 			/* called once for each element in the table */
 			@Override
@@ -143,9 +144,7 @@ public void update(ViewerCell cell) {
 					} else {
 						String pattern = matcher.getPattern();
 						StyledStringHighlighter ssh = new StyledStringHighlighter();
-						StyledString ss = ssh.highlight(text, pattern,
-								new BoldStylerProvider(WorkbookEditorsHandler.this.getFont(false, true))
-										.getBoldStyler());
+						StyledString ss = ssh.highlight(text, pattern, getBoldStylerProvider().getBoldStyler());
 						cell.setStyleRanges(ss.getStyleRanges());
 					}
 
@@ -162,6 +161,22 @@ public String getToolTipText(Object element) {
 				return super.getToolTipText(element);
 			}
 
+			private BoldStylerProvider getBoldStylerProvider() {
+				if (boldStylerProvider == null) {
+					boldStylerProvider = new BoldStylerProvider(WorkbookEditorsHandler.this.getFont(false, true));
+				}
+				return boldStylerProvider;
+			}
+
+			@Override
+			public void dispose() {
+				super.dispose();
+
+				if (boldStylerProvider != null) {
+					boldStylerProvider.dispose();
+					boldStylerProvider = null;
+				}
+			}
 		});
 
 		ColumnViewerToolTipSupport.enableFor(tableViewerColumn.getViewer());