changeset 165:2d0b17897390

JMC-6171: (Mac OSX) FileDialog.setfilterIndex() doesn't work as expected Summary: Revert workaround for the file dialog bug on Mac OS X, which is now fixed in the Eclipse 4.10 release Reviewed-by: aptmac, jmatsuoka Contributed-by: Jessye Coleman-Shapiro <jescolem@redhat.com>
author jmatsuoka <jmatsuok@redhat.com>
date Wed, 05 Jun 2019 10:18:42 -0400
parents 7c0748da48ec
children c565a2a4bf74
files application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/actions/OpenFileAction.java
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/actions/OpenFileAction.java	Mon Jun 03 16:50:57 2019 -0400
+++ b/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/actions/OpenFileAction.java	Wed Jun 05 10:18:42 2019 -0400
@@ -47,7 +47,6 @@
 import org.openjdk.jmc.rcp.application.ApplicationPlugin;
 import org.openjdk.jmc.ui.MCPathEditorInput;
 import org.openjdk.jmc.ui.WorkbenchToolkit;
-import org.openjdk.jmc.ui.common.util.Environment;
 
 /**
  * Class for opening a file
@@ -141,10 +140,7 @@
 	public static void openFile(IWorkbenchWindow inWindow) {
 		FileDialog dialog = new FileDialog(inWindow.getShell(), SWT.OPEN | SWT.MULTI);
 		dialog.setFilterPath(getDefaultFilterPath());
-		// FIXME: Workaround for Eclipse bug 540164. See JMC-6171.
-		if (Environment.getOSType() != Environment.OSType.MAC) {
-			setFilterNamesAndExtensions(dialog);
-		}
+		setFilterNamesAndExtensions(dialog);
 		dialog.setText(Messages.OpenFileAction_OPEN_FILE_TITLE);
 
 		if (dialog.open() == null) {