diff options
author | Moshe WAJNBERG | 2013-05-01 14:06:30 -0400 |
---|---|---|
committer | Markus Keller | 2013-05-01 14:55:47 -0400 |
commit | 7ea3eb6199fb573e91f0ec3833069a6f191ab9a4 (patch) | |
tree | 267dc459a7df2203116106ff23063d26f276b924 | |
parent | d74093a2c7054040119bc2912779c8a5211734e4 (diff) | |
download | eclipse.jdt.ui-7ea3eb6199fb573e91f0ec3833069a6f191ab9a4.zip eclipse.jdt.ui-7ea3eb6199fb573e91f0ec3833069a6f191ab9a4.tar.gz eclipse.jdt.ui-7ea3eb6199fb573e91f0ec3833069a6f191ab9a4.tar.xz |
Bug 273728: [BiDi][type wizards] Incorrect representation of complex expressions (like filepath) containing Bidi characters in "Create New ..." wizards.
14 files changed, 64 insertions, 2 deletions
diff --git a/org.eclipse.jdt.ui/META-INF/MANIFEST.MF b/org.eclipse.jdt.ui/META-INF/MANIFEST.MF index d3ea3a9..7cf7ea2 100644 --- a/org.eclipse.jdt.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.ui/META-INF/MANIFEST.MF @@ -139,5 +139,6 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.3.200,4.0.0)", org.eclipse.ui.navigator.resources;bundle-version="[3.4.0,4.0.0)", org.eclipse.jdt.core.manipulation;bundle-version="[1.4.0,2.0.0)", - com.ibm.icu;bundle-version="4.4.2" + com.ibm.icu;bundle-version="4.4.2", + org.eclipse.equinox.bidi;bundle-version="[0.10.0,2.0.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeAssistFavoritesConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeAssistFavoritesConfigurationBlock.java index af40f9b..cdf61d9 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeAssistFavoritesConfigurationBlock.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeAssistFavoritesConfigurationBlock.java @@ -13,6 +13,8 @@ package org.eclipse.jdt.internal.ui.preferences; import java.util.Arrays; import java.util.List; +import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory; + import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; @@ -30,6 +32,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.StatusDialog; import org.eclipse.jface.layout.PixelConverter; import org.eclipse.jface.operation.IRunnableContext; +import org.eclipse.jface.util.BidiUtils; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.ViewerComparator; import org.eclipse.jface.window.Window; @@ -164,6 +167,7 @@ class CodeAssistFavoritesConfigurationBlock extends OptionsConfigurationBlock { LayoutUtil.setWidthHint(text, fieldWidthHint); LayoutUtil.setHorizontalGrabbing(text); LayoutUtil.setHorizontalSpan(text, fIsEditingMember ? 2 : 1); + BidiUtils.applyBidiProcessing(text, StructuredTextTypeHandlerFactory.JAVA); TextFieldNavigationHandler.install(text); DialogField.createEmptySpace(composite, 1); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeInputDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeInputDialog.java index 044109d..9b1dbc5 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeInputDialog.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeInputDialog.java @@ -12,6 +12,8 @@ package org.eclipse.jdt.internal.ui.preferences; import java.util.List; +import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory; + import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -24,6 +26,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.StatusDialog; import org.eclipse.jface.operation.IRunnableContext; +import org.eclipse.jface.util.BidiUtils; import org.eclipse.jface.window.Window; import org.eclipse.ui.PlatformUI; @@ -151,6 +154,7 @@ public class ImportOrganizeInputDialog extends StatusDialog { Text text= fNameDialogField.getTextControl(null); LayoutUtil.setWidthHint(text, fieldWidthHint); LayoutUtil.setHorizontalGrabbing(text); + BidiUtils.applyBidiProcessing(text, StructuredTextTypeHandlerFactory.JAVA); TextFieldNavigationHandler.install(text); DialogField.createEmptySpace(composite, 1); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationBlock.java index ad8d2ec..5b55c86 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationBlock.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationBlock.java @@ -23,6 +23,8 @@ import java.util.ArrayList; import java.util.List; import java.util.zip.ZipFile; +import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory; + import org.eclipse.swt.SWT; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.graphics.Image; @@ -46,6 +48,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.layout.PixelConverter; +import org.eclipse.jface.util.BidiUtils; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.LabelProvider; @@ -195,6 +198,7 @@ public class JavadocConfigurationBlock { fURLField.doFillIntoGrid(topComp, 2); LayoutUtil.setWidthHint(fURLField.getTextControl(null), converter.convertWidthInCharsToPixels(43)); LayoutUtil.setHorizontalGrabbing(fURLField.getTextControl(null)); + BidiUtils.applyBidiProcessing(fURLField.getTextControl(null), StructuredTextTypeHandlerFactory.URL); fBrowseFolder.doFillIntoGrid(topComp, 1); @@ -224,6 +228,7 @@ public class JavadocConfigurationBlock { fArchiveField.doFillIntoGrid(topComp, 2); LayoutUtil.setWidthHint(fArchiveField.getTextControl(null), converter.convertWidthInCharsToPixels(43)); LayoutUtil.setHorizontalGrabbing(fArchiveField.getTextControl(null)); + BidiUtils.applyBidiProcessing(fArchiveField.getTextControl(null), StructuredTextTypeHandlerFactory.FILE); fBrowseArchive.doFillIntoGrid(topComp, 1); @@ -231,6 +236,7 @@ public class JavadocConfigurationBlock { fArchivePathField.doFillIntoGrid(topComp, 2); LayoutUtil.setWidthHint(fArchivePathField.getTextControl(null), converter.convertWidthInCharsToPixels(43)); LayoutUtil.setHorizontalGrabbing(fArchivePathField.getTextControl(null)); + BidiUtils.applyBidiProcessing(fArchivePathField.getTextControl(null), StructuredTextTypeHandlerFactory.FILE); fBrowseArchivePath.doFillIntoGrid(topComp, 1); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TypeFilterInputDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TypeFilterInputDialog.java index a48e2aa..99b9c11 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TypeFilterInputDialog.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TypeFilterInputDialog.java @@ -12,6 +12,8 @@ package org.eclipse.jdt.internal.ui.preferences; import java.util.List; +import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory; + import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -23,6 +25,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.StatusDialog; +import org.eclipse.jface.util.BidiUtils; import org.eclipse.ui.PlatformUI; @@ -105,6 +108,7 @@ public class TypeFilterInputDialog extends StatusDialog { Text text= fNameDialogField.getTextControl(null); LayoutUtil.setWidthHint(text, fieldWidthHint); LayoutUtil.setHorizontalGrabbing(text); + BidiUtils.applyBidiProcessing(text, StructuredTextTypeHandlerFactory.JAVA); TextFieldNavigationHandler.install(text); fNameDialogField.postSetFocusOnDialogField(parent.getDisplay()); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/UserLibraryPreferencePage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/UserLibraryPreferencePage.java index 312ff8b..d01fbbd 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/UserLibraryPreferencePage.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/UserLibraryPreferencePage.java @@ -45,6 +45,8 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory; + import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.graphics.Point; @@ -77,6 +79,7 @@ import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.resource.StringConverter; +import org.eclipse.jface.util.BidiUtils; import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; @@ -350,6 +353,7 @@ public class UserLibraryPreferencePage extends PreferencePage implements IWorkbe fExportImportList.getListControl(null).setLayoutData(new GridData(GridData.FILL_BOTH)); fLocationField.postSetFocusOnDialogField(parent.getDisplay()); + BidiUtils.applyBidiProcessing(fLocationField.getTextControl(parent), StructuredTextTypeHandlerFactory.FILE); Dialog.applyDialogFont(composite); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderWizardPage.java index 6caa932..c4e402f 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderWizardPage.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderWizardPage.java @@ -16,6 +16,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory; + import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -38,6 +40,7 @@ import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.util.BidiUtils; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeContentProvider; @@ -199,6 +202,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { LayoutUtil.setWidthHint(fProjectField.getTextControl(null), maxFieldWidth); LayoutUtil.setHorizontalGrabbing(fProjectField.getTextControl(null)); LayoutUtil.setWidthHint(fRootDialogField.getTextControl(null), maxFieldWidth); + BidiUtils.applyBidiProcessing(fRootDialogField.getTextControl(null), StructuredTextTypeHandlerFactory.FILE); setControl(composite); Dialog.applyDialogFont(composite); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/AddSourceFolderWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/AddSourceFolderWizardPage.java index c9d3f23..a85eebf 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/AddSourceFolderWizardPage.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/AddSourceFolderWizardPage.java @@ -19,6 +19,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory; + import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -44,6 +46,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.util.BidiUtils; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.ViewerFilter; @@ -100,7 +103,7 @@ public class AddSourceFolderWizardPage extends NewElementWizardPage { fLinkLocation.setLabelText(NewWizardMessages.LinkFolderDialog_dependenciesGroup_locationLabel_desc); fLinkLocation.setButtonLabel(NewWizardMessages.LinkFolderDialog_dependenciesGroup_browseButton_desc); - fLinkLocation.setDialogFieldListener(this); + fLinkLocation.setDialogFieldListener(this); fVariables= new SelectionButtonDialogField(SWT.PUSH); fVariables.setLabelText(NewWizardMessages.LinkFolderDialog_dependenciesGroup_variables_desc); @@ -120,6 +123,7 @@ public class AddSourceFolderWizardPage extends NewElementWizardPage { LayoutUtil.setHorizontalSpan(fLinkLocation.getLabelControl(null), numColumns); LayoutUtil.setHorizontalGrabbing(fLinkLocation.getTextControl(null)); + BidiUtils.applyBidiProcessing(fLinkLocation.getTextControl(null), StructuredTextTypeHandlerFactory.FILE); fVariables.doFillIntoGrid(parent, 1); } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java index a7f7954..69cdbe7 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java @@ -14,6 +14,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory; + import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.widgets.Composite; @@ -31,6 +33,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.jface.action.IAction; import org.eclipse.jface.layout.PixelConverter; +import org.eclipse.jface.util.BidiUtils; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.StructuredSelection; @@ -233,6 +236,7 @@ public class SourceContainerWorkbookPage extends BuildPathBasePage { Composite composite= new Composite(parent, SWT.NONE); LayoutUtil.doDefaultLayout(composite, new DialogField[] { fFoldersList, fUseFolderOutputs , fOutputLocationField}, true, SWT.DEFAULT, SWT.DEFAULT); + BidiUtils.applyBidiProcessing(fOutputLocationField.getTextControl(null), StructuredTextTypeHandlerFactory.FILE); LayoutUtil.setHorizontalGrabbing(fFoldersList.getTreeControl(null)); int buttonBarWidth= converter.convertWidthInCharsToPixels(24); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariableCreationDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariableCreationDialog.java index 18518ed..35aa548 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariableCreationDialog.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariableCreationDialog.java @@ -13,6 +13,8 @@ package org.eclipse.jdt.internal.ui.wizards.buildpaths; import java.io.File; import java.util.List; +import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory; + import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -26,6 +28,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.StatusDialog; +import org.eclipse.jface.util.BidiUtils; import org.eclipse.ui.PlatformUI; @@ -139,6 +142,7 @@ public class VariableCreationDialog extends StatusDialog { fPathField.doFillIntoGrid(inner, 3); LayoutUtil.setWidthHint(fPathField.getTextControl(null), fieldWidthHint); + BidiUtils.applyBidiProcessing(fPathField.getTextControl(null), StructuredTextTypeHandlerFactory.FILE); fDirButton.doFillIntoGrid(inner, 1); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewContainerWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewContainerWizardPage.java index cd2e12e..b81149b 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewContainerWizardPage.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewContainerWizardPage.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.jdt.ui.wizards; +import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory; + import org.eclipse.swt.widgets.Composite; import org.eclipse.core.runtime.CoreException; @@ -23,6 +25,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.jface.util.BidiUtils; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionProvider; @@ -271,6 +274,7 @@ public abstract class NewContainerWizardPage extends NewElementWizardPage { protected void createContainerControls(Composite parent, int nColumns) { fContainerDialogField.doFillIntoGrid(parent, nColumns); LayoutUtil.setWidthHint(fContainerDialogField.getTextControl(null), getMaxFieldWidth()); + BidiUtils.applyBidiProcessing(fContainerDialogField.getTextControl(null), StructuredTextTypeHandlerFactory.FILE); } /** diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java index 7f1c222..a118bd8 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java @@ -97,6 +97,8 @@ import org.eclipse.jdt.internal.ui.wizards.dialogfields.SelectionButtonDialogFie import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField; import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringDialogField; import org.eclipse.jdt.internal.ui.workingsets.IWorkingSetIDs; +import org.eclipse.jface.util.BidiUtils; +import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory; /** * The first page of the New Java Project wizard. This page is typically used in combination with @@ -200,6 +202,7 @@ public class NewJavaProjectWizardPageOne extends WizardPage { fUseDefaults.doFillIntoGrid(locationComposite, numColumns); fLocation.doFillIntoGrid(locationComposite, numColumns); LayoutUtil.setHorizontalGrabbing(fLocation.getTextControl(null)); + BidiUtils.applyBidiProcessing(fLocation.getTextControl(null), StructuredTextTypeHandlerFactory.FILE); return locationComposite; } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewPackageWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewPackageWizardPage.java index 1cf7a06..8dc30c2 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewPackageWizardPage.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewPackageWizardPage.java @@ -19,6 +19,8 @@ import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; import java.net.URI; +import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory; + import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -46,6 +48,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.util.BidiUtils; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.PlatformUI; @@ -257,6 +260,7 @@ public class NewPackageWizardPage extends NewContainerWizardPage { TextFieldNavigationHandler.install(text); fCreatePackageInfoJavaDialogField.doFillIntoGrid(composite, nColumns); + BidiUtils.applyBidiProcessing(fPackageDialogField.getTextControl(null), StructuredTextTypeHandlerFactory.JAVA); } // -------- PackageFieldAdapter -------- diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java index 0c437d5..9adfc1a 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java @@ -19,6 +19,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory; + import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; @@ -55,6 +57,7 @@ import org.eclipse.jface.contentassist.SubjectControlContentAssistant; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.PreferenceDialog; +import org.eclipse.jface.util.BidiUtils; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ICellModifier; import org.eclipse.jface.viewers.ISelection; @@ -778,6 +781,7 @@ public abstract class NewTypeWizardPage extends NewContainerWizardPage { protected void createPackageControls(Composite composite, int nColumns) { fPackageDialogField.doFillIntoGrid(composite, nColumns); Text text= fPackageDialogField.getTextControl(null); + BidiUtils.applyBidiProcessing(text, StructuredTextTypeHandlerFactory.JAVA); LayoutUtil.setWidthHint(text, getMaxFieldWidth()); LayoutUtil.setHorizontalGrabbing(text); ControlContentAssistHelper.createTextContentAssistant(text, fCurrPackageCompletionProcessor); @@ -891,6 +895,7 @@ public abstract class NewTypeWizardPage extends NewContainerWizardPage { fSuperClassDialogField.doFillIntoGrid(composite, nColumns); Text text= fSuperClassDialogField.getTextControl(null); LayoutUtil.setWidthHint(text, getMaxFieldWidth()); + BidiUtils.applyBidiProcessing(text, StructuredTextTypeHandlerFactory.JAVA); JavaTypeCompletionProcessor superClassCompletionProcessor= new JavaTypeCompletionProcessor(false, false, true); superClassCompletionProcessor.setCompletionContextRequestor(new CompletionContextRequestor() { @@ -918,6 +923,13 @@ public abstract class NewTypeWizardPage extends NewContainerWizardPage { tableViewer.setColumnProperties(new String[] {INTERFACE}); TableTextCellEditor cellEditor= new TableTextCellEditor(tableViewer, 0) { + @Override + protected Control createControl(Composite parent) { + Control control= super.createControl(parent); + BidiUtils.applyBidiProcessing(text, StructuredTextTypeHandlerFactory.JAVA); + return control; + } + @Override protected void doSetFocus() { if (text != null) { |