Bug 464974: GVT45:(Bidi) Wrong display of file path including bidi data on External Annotation Attachment Configuration panelI20150421-0800

3 files changed, 34 insertions, 11 deletions

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExternalAnnotationsAttachmentBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExternalAnnotationsAttachmentBlock.java
index 795042e47d..0da5b5c6f2 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExternalAnnotationsAttachmentBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExternalAnnotationsAttachmentBlock.java
@@ -15,6 +15,8 @@ import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
+import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -24,6 +26,7 @@ import org.eclipse.swt.widgets.DirectoryDialog;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -40,6 +43,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.layout.PixelConverter;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.util.BidiUtils;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.ViewerFilter;
@@ -198,16 +202,21 @@ public class ExternalAnnotationsAttachmentBlock {
 
 		fWorkspaceFileNameField.doFillIntoGrid(composite, 3);
 		LayoutUtil.setHorizontalIndent(fWorkspaceFileNameField.getLabelControl(null));
-		LayoutUtil.setWidthHint(fWorkspaceFileNameField.getTextControl(null), widthHint);
-		LayoutUtil.setHorizontalGrabbing(fWorkspaceFileNameField.getTextControl(null));
+		Text workspaceFileNameField= fWorkspaceFileNameField.getTextControl(null);
+		LayoutUtil.setWidthHint(workspaceFileNameField, widthHint);
+		LayoutUtil.setHorizontalGrabbing(workspaceFileNameField);
+		BidiUtils.applyBidiProcessing(workspaceFileNameField, StructuredTextTypeHandlerFactory.FILE);
 
 		DialogField.createEmptySpace(composite, 3);
 
 		fExternalRadio.doFillIntoGrid(composite, 3);
 		fExternalFileNameField.doFillIntoGrid(composite, 3);
 		LayoutUtil.setHorizontalIndent(fExternalFileNameField.getLabelControl(null));
-		LayoutUtil.setWidthHint(fExternalFileNameField.getTextControl(null), widthHint);
-		LayoutUtil.setHorizontalGrabbing(fExternalFileNameField.getTextControl(null));
+		Text externalFileNameField= fExternalFileNameField.getTextControl(null);
+		LayoutUtil.setWidthHint(externalFileNameField, widthHint);
+		LayoutUtil.setHorizontalGrabbing(externalFileNameField);
+		BidiUtils.applyBidiProcessing(externalFileNameField, StructuredTextTypeHandlerFactory.FILE);
+
 
 		DialogField.createEmptySpace(composite, 2);
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/OutputLocationDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/OutputLocationDialog.java
index 4b64103513..9b223d8558 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/OutputLocationDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/OutputLocationDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 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
@@ -13,6 +13,8 @@ package org.eclipse.jdt.internal.ui.wizards.buildpaths;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -33,6 +35,7 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
 
 import org.eclipse.jface.dialogs.StatusDialog;
+import org.eclipse.jface.util.BidiUtils;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.ViewerFilter;
@@ -137,6 +140,7 @@ public class OutputLocationDialog extends StatusDialog {
 		textData.grabExcessHorizontalSpace= true;
 		textData.horizontalIndent= indent;
 		textControl.setLayoutData(textData);
+		BidiUtils.applyBidiProcessing(textControl, StructuredTextTypeHandlerFactory.FILE);
 
 		Button buttonControl= fContainerDialogField.getChangeControl(inner);
 		GridData buttonData= new GridData();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentBlock.java
index 6367140865..52e21d88ec 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentBlock.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 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
@@ -14,6 +14,8 @@ import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
+import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -23,6 +25,7 @@ import org.eclipse.swt.widgets.DirectoryDialog;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
@@ -39,6 +42,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.layout.PixelConverter;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.util.BidiUtils;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.ViewerFilter;
@@ -300,7 +304,9 @@ public class SourceAttachmentBlock {
 			desc.setText(NewWizardMessages.SourceAttachmentBlock_filename_description);
 
 			fVariableFileNameField.doFillIntoGrid(composite, 4);
-			LayoutUtil.setWidthHint(fVariableFileNameField.getTextControl(null), widthHint);
+			Text variableFileNameField= fVariableFileNameField.getTextControl(null);
+			LayoutUtil.setWidthHint(variableFileNameField, widthHint);
+			BidiUtils.applyBidiProcessing(variableFileNameField, StructuredTextTypeHandlerFactory.FILE);
 
 			// label that shows the resolved path for variable jars
 			//DialogField.createEmptySpace(composite, 1);
@@ -326,15 +332,19 @@ public class SourceAttachmentBlock {
 			fWorkspaceRadio.doFillIntoGrid(composite, 4);
 
 			fWorkspaceFileNameField.doFillIntoGrid(composite, 4);
-			LayoutUtil.setWidthHint(fWorkspaceFileNameField.getTextControl(null), widthHint);
-			LayoutUtil.setHorizontalGrabbing(fWorkspaceFileNameField.getTextControl(null));
+			Text workspaceFileNameField= fWorkspaceFileNameField.getTextControl(null);
+			LayoutUtil.setWidthHint(workspaceFileNameField, widthHint);
+			LayoutUtil.setHorizontalGrabbing(workspaceFileNameField);
+			BidiUtils.applyBidiProcessing(workspaceFileNameField, StructuredTextTypeHandlerFactory.FILE);
 
 			DialogField.createEmptySpace(composite, 4);
 
 			fExternalRadio.doFillIntoGrid(composite, 4);
 			fExternalFileNameField.doFillIntoGrid(composite, 4);
-			LayoutUtil.setWidthHint(fExternalFileNameField.getTextControl(null), widthHint);
-			LayoutUtil.setHorizontalGrabbing(fExternalFileNameField.getTextControl(null));
+			Text externalFileNameField= fExternalFileNameField.getTextControl(null);
+			LayoutUtil.setWidthHint(externalFileNameField, widthHint);
+			LayoutUtil.setHorizontalGrabbing(externalFileNameField);
+			BidiUtils.applyBidiProcessing(externalFileNameField, StructuredTextTypeHandlerFactory.FILE);
 
 			fEncodingCombo.doFillIntoGrid(composite, 2);
 			DialogField.createEmptySpace(composite, 1);