diff options
| author | Mickael Istria | 2016-02-22 11:59:41 +0000 |
|---|---|---|
| committer | Mickael Istria | 2016-02-22 14:56:46 +0000 |
| commit | 5ce0697e4cd487ce778eee0d13662df7429ca1c9 (patch) | |
| tree | 4eb5afac2d6813f38306ebd39c462127693a4e9a | |
| parent | b098bb8fbdc222aaba31192b3ed7fee093b24e6e (diff) | |
| download | eclipse.platform.ui-5ce0697e4cd487ce778eee0d13662df7429ca1c9.tar.gz eclipse.platform.ui-5ce0697e4cd487ce778eee0d13662df7429ca1c9.tar.xz eclipse.platform.ui-5ce0697e4cd487ce778eee0d13662df7429ca1c9.zip | |
Bug 488090 - Replace "unknown extensions" with "unassociated"
Change-Id: If5c170eccf3deb5fab17a906b7ba016921017916
Signed-off-by: Mickael Istria <mistria@redhat.com>
13 files changed, 45 insertions, 44 deletions
diff --git a/bundles/org.eclipse.ui.ide/plugin.properties b/bundles/org.eclipse.ui.ide/plugin.properties index b41cf328b27..9ea41c48da3 100644 --- a/bundles/org.eclipse.ui.ide/plugin.properties +++ b/bundles/org.eclipse.ui.ide/plugin.properties @@ -10,7 +10,7 @@ # Remy Chi Jian Suen <remy.suen@gmail.com> - [KeyBindings] 'emacs' keyword should link to keys preference page # Robert Roth <robert.roth.off@gmail.com> - Bug 310491 # Patrik Suzzi <psuzzi@gmail.com> - Bug 480102 -# Mickael Istria (Red Hat Inc.) - Unknown editor strategy +# Mickael Istria (Red Hat Inc.) - unassociated editor strategy ############################################################################### Plugin.name = Eclipse IDE UI Plugin.providerName = Eclipse.org @@ -23,7 +23,7 @@ ExtPoint.resourceFilters = Resource Filters ExtPoint.markerSupport = Marker Support ExtPoint.fileSystemSupport = File System Support ExtPoint.editorAssociationOverride = Editor Association Override -ExtPoint.unknownEditorStrategy = Strategies to handle unassociated files +ExtPoint.unassociatedEditorStrategy = Strategies to handle unassociated files KeysPreference.Name = Keys Preferences KeysPreference.Description = Preferences related to keys, accelerator key bindings, key configurations and commands. diff --git a/bundles/org.eclipse.ui.ide/plugin.xml b/bundles/org.eclipse.ui.ide/plugin.xml index d33288abef0..90a33631ddf 100644 --- a/bundles/org.eclipse.ui.ide/plugin.xml +++ b/bundles/org.eclipse.ui.ide/plugin.xml @@ -12,7 +12,7 @@ <extension-point id="markerSupport" name="%ExtPoint.markerSupport" schema="schema/markerSupport.exsd"/> <extension-point id="filesystemSupport" name="%ExtPoint.fileSystemSupport" schema="schema/filesystemSupport.exsd"/> <extension-point id="editorAssociationOverride" name="%ExtPoint.editorAssociationOverride" schema="schema/editorAssociationOverride.exsd"/> - <extension-point id="unknownEditorStrategy" name="%ExtPoint.unknownEditorStrategy" schema="schema/unknownEditorStrategy.exsd"/> + <extension-point id="unassociatedEditorStrategy" name="%ExtPoint.unassociatedEditorStrategy" schema="schema/unassociatedEditorStrategy.exsd"/> <extension point="org.eclipse.ui.importWizards"> @@ -2404,7 +2404,7 @@ </perspectiveExtension> </extension> <extension - point="org.eclipse.ui.ide.unknownEditorStrategy"> + point="org.eclipse.ui.ide.unassociatedEditorStrategy"> <strategy class="org.eclipse.ui.internal.ide.SystemEditorOrTextEditorStrategy" id="org.eclipse.ui.ide.systemEditorThenTextEditor" @@ -2416,8 +2416,8 @@ label="%textEditor"> </strategy> <strategy - class="org.eclipse.ui.internal.ide.AskUserViaPopupUnknownEditorStrategy" - id="org.eclipse.ui.ide.askUserForUnknownEditor" + class="org.eclipse.ui.internal.ide.AskUserViaPopupUnassociatedEditorStrategy" + id="org.eclipse.ui.ide.askUserForUnassociatedEditor" label="%askUserViaPopup"> </strategy> </extension> diff --git a/bundles/org.eclipse.ui.ide/schema/unknownEditorStrategy.exsd b/bundles/org.eclipse.ui.ide/schema/unassociatedEditorStrategy.exsd index 9cb1340a4f1..3e7795dc863 100644 --- a/bundles/org.eclipse.ui.ide/schema/unknownEditorStrategy.exsd +++ b/bundles/org.eclipse.ui.ide/schema/unassociatedEditorStrategy.exsd @@ -3,11 +3,11 @@ <schema targetNamespace="org.eclipse.ui.ide" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> - <meta.schema plugin="org.eclipse.ui.ide" id="unknownEditorStrategy" name="Strategies to handle unassociated files"/> + <meta.schema plugin="org.eclipse.ui.ide" id="unassociatedEditorStrategy" name="Strategies to handle unassociated files"/> </appInfo> <documentation> <p>This extension point allows to plug different strategies for supporting unassociated files inside the IDE. Strategies can be such as forcing a specific editor, asking user to choose an editor, polling a remote registry to find an editor...</p> -<p>Users and extenders are able to choose which strategy to use by setting the related org.eclipse.ui.ide.unknownEditorStrategy preference to the id of their favourite strategy.<br/> +<p>Users and extenders are able to choose which strategy to use by setting the related org.eclipse.ui.ide.unassociatedEditorStrategy preference to the id of their favourite strategy.<br/> The default strategy is to check for system editor and to open the Eclipse text editor if no relevant editor is found. </p> </documentation> @@ -65,7 +65,7 @@ The default strategy is to check for system editor and to open the Eclipse text </documentation> <appInfo> - <meta.attribute kind="java" basedOn=":org.eclipse.ui.ide.IUnknownEditorStrategy"/> + <meta.attribute kind="java" basedOn=":org.eclipse.ui.ide.IUnassociatedEditorStrategy"/> </appInfo> </annotation> </attribute> @@ -105,7 +105,7 @@ The default strategy is to check for system editor and to open the Eclipse text <meta.section type="apiinfo"/> </appInfo> <documentation> - This adds a new interface IUnknownEditorStrategy to the API of org.eclipse.ui.ide. + This adds a new interface IUnassociatedEditorStrategy to the API of org.eclipse.ui.ide. </documentation> </annotation> diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/IDE.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/IDE.java index cfbc6058b5b..62c6f6e25c2 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/IDE.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/IDE.java @@ -74,7 +74,7 @@ import org.eclipse.ui.internal.ide.EditorAssociationOverrideDescriptor; import org.eclipse.ui.internal.ide.IDEWorkbenchMessages; import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin; import org.eclipse.ui.internal.ide.SystemEditorOrTextEditorStrategy; -import org.eclipse.ui.internal.ide.UnknownEditorStrategyRegistry; +import org.eclipse.ui.internal.ide.UnassociatedEditorStrategyRegistry; import org.eclipse.ui.internal.ide.model.StandardPropertiesAdapterFactory; import org.eclipse.ui.internal.ide.model.WorkbenchAdapterFactory; import org.eclipse.ui.internal.ide.registry.MarkerHelpRegistry; @@ -139,12 +139,12 @@ public final class IDE { public static final String RESOURCE_PERSPECTIVE_ID = "org.eclipse.ui.resourcePerspective"; //$NON-NLS-1$ /** - * A preference key to decide which {@link IUnknownEditorStrategy} to use + * A preference key to decide which {@link IUnassociatedEditorStrategy} to use * when trying to open files without associated editors. * * @since 3.12 */ - public static final String UNKNOWN_EDITOR_STRATEGY_PREFERENCE_KEY = "unknownEditorStrategy";//$NON-NLS-1$ + public static final String UNASSOCIATED_EDITOR_STRATEGY_PREFERENCE_KEY = "unassociatedEditorStrategy";//$NON-NLS-1$ /** * Marker help registry mapping markers to help context ids and resolutions; @@ -1031,7 +1031,7 @@ public final class IDE { return defaultDescriptor; } - IUnknownEditorStrategy strategy = getUnknowEditorStrategy(); + IUnassociatedEditorStrategy strategy = getUnknowEditorStrategy(); IEditorDescriptor editorDesc; try { editorDesc = strategy.getEditorDescriptor(name, editorReg); @@ -1049,14 +1049,14 @@ public final class IDE { } /** - * @return The strategy to use in order to open unknown file. Either as set - * by preference, or a {@link SystemEditorOrTextEditorStrategy} if none is - * explicitly configured. + * @return The strategy to use in order to open unassociated file. Either as + * set by preference, or a {@link SystemEditorOrTextEditorStrategy} + * if none is explicitly configured. */ - private static IUnknownEditorStrategy getUnknowEditorStrategy() { + private static IUnassociatedEditorStrategy getUnknowEditorStrategy() { String preferedStrategy = IDEWorkbenchPlugin.getDefault().getPreferenceStore() - .getString(UNKNOWN_EDITOR_STRATEGY_PREFERENCE_KEY); - IUnknownEditorStrategy res = UnknownEditorStrategyRegistry.getStrategy(preferedStrategy); + .getString(UNASSOCIATED_EDITOR_STRATEGY_PREFERENCE_KEY); + IUnassociatedEditorStrategy res = UnassociatedEditorStrategyRegistry.getStrategy(preferedStrategy); if (res == null) { res = new SystemEditorOrTextEditorStrategy(); } diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/IUnknownEditorStrategy.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/IUnassociatedEditorStrategy.java index bd1ee270ece..db3a5e7a7e7 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/IUnknownEditorStrategy.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/IUnassociatedEditorStrategy.java @@ -18,12 +18,12 @@ import org.eclipse.ui.IEditorRegistry; /** * This interface represents a strategy for choosing an IEditorDescriptor for a - * given file name. It's used by the org.eclipse.ui.ide.unknownEditorStrategy - * extension point. + * given file name. It's used by the + * org.eclipse.ui.ide.unassociatedEditorStrategy extension point. * * @since 3.12 */ -public interface IUnknownEditorStrategy { +public interface IUnassociatedEditorStrategy { /** * @param fileName diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/AskUserViaPopupUnknownEditorStrategy.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/AskUserViaPopupUnassociatedEditorStrategy.java index cb20d675227..30920de0bdd 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/AskUserViaPopupUnknownEditorStrategy.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/AskUserViaPopupUnassociatedEditorStrategy.java @@ -17,13 +17,13 @@ import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IEditorRegistry; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.EditorSelectionDialog; -import org.eclipse.ui.ide.IUnknownEditorStrategy; +import org.eclipse.ui.ide.IUnassociatedEditorStrategy; /** * @since 3.12 * */ -public class AskUserViaPopupUnknownEditorStrategy implements IUnknownEditorStrategy { +public class AskUserViaPopupUnassociatedEditorStrategy implements IUnassociatedEditorStrategy { @Override public IEditorDescriptor getEditorDescriptor(String fileName, IEditorRegistry editorRegistry) { diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ExtendedFileEditorsPreferencePage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ExtendedFileEditorsPreferencePage.java index 4a5968b64f2..48e229fd780 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ExtendedFileEditorsPreferencePage.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ExtendedFileEditorsPreferencePage.java @@ -54,13 +54,13 @@ public class ExtendedFileEditorsPreferencePage extends FileEditorsPreferencePage Label unknownTypeStrategyLabel = new Label(defaultStrategyComposite, SWT.NONE); unknownTypeStrategyLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); unknownTypeStrategyLabel - .setText(IDEWorkbenchMessages.ExtendedFileEditorsPreferencePage_strategyForUnknownFiles); + .setText(IDEWorkbenchMessages.ExtendedFileEditorsPreferencePage_strategyForUnassociatedFiles); ComboViewer viewer = new ComboViewer(defaultStrategyComposite); viewer.setLabelProvider(new LabelProvider() { @Override public String getText(Object o) { String id = (String) o; - String label = UnknownEditorStrategyRegistry.getLabel(id); + String label = UnassociatedEditorStrategyRegistry.getLabel(id); if (label != null) { return label; } @@ -69,14 +69,14 @@ public class ExtendedFileEditorsPreferencePage extends FileEditorsPreferencePage } }); viewer.setContentProvider(new ArrayContentProvider()); - viewer.setInput(UnknownEditorStrategyRegistry.retrieveAllStrategies()); + viewer.setInput(UnassociatedEditorStrategyRegistry.retrieveAllStrategies()); this.idePreferenceStore = IDEWorkbenchPlugin.getDefault().getPreferenceStore(); viewer.setSelection( - new StructuredSelection(this.idePreferenceStore.getString(IDE.UNKNOWN_EDITOR_STRATEGY_PREFERENCE_KEY))); + new StructuredSelection(this.idePreferenceStore.getString(IDE.UNASSOCIATED_EDITOR_STRATEGY_PREFERENCE_KEY))); viewer.addSelectionChangedListener(new ISelectionChangedListener() { @Override public void selectionChanged(SelectionChangedEvent event) { - idePreferenceStore.setValue(IDE.UNKNOWN_EDITOR_STRATEGY_PREFERENCE_KEY, + idePreferenceStore.setValue(IDE.UNASSOCIATED_EDITOR_STRATEGY_PREFERENCE_KEY, (String) ((IStructuredSelection) event.getSelection()).getFirstElement()); } }); @@ -103,7 +103,7 @@ public class ExtendedFileEditorsPreferencePage extends FileEditorsPreferencePage @Override public void performDefaults() { super.performDefaults(); - idePreferenceStore.setToDefault(IDE.UNKNOWN_EDITOR_STRATEGY_PREFERENCE_KEY); + idePreferenceStore.setToDefault(IDE.UNASSOCIATED_EDITOR_STRATEGY_PREFERENCE_KEY); } } diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEPreferenceInitializer.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEPreferenceInitializer.java index 54c58b6eca2..8671fe13380 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEPreferenceInitializer.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEPreferenceInitializer.java @@ -88,7 +88,7 @@ public class IDEPreferenceInitializer extends AbstractPreferenceInitializer { node.put(IDEInternalPreferences.WORKBENCH_SYSTEM_EXPLORER, getShowInSystemExplorerCommand()); - node.put(IDE.UNKNOWN_EDITOR_STRATEGY_PREFERENCE_KEY, SystemEditorOrTextEditorStrategy.EXTENSION_ID); + node.put(IDE.UNASSOCIATED_EDITOR_STRATEGY_PREFERENCE_KEY, SystemEditorOrTextEditorStrategy.EXTENSION_ID); } /** diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java index 71cbf5805d2..38037db322e 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java @@ -1023,7 +1023,7 @@ public class IDEWorkbenchMessages extends NLS { public static String editorAssociationOverride_error_invalidElementName_message; public static String editorAssociationOverride_error_invalidExtension_message; - public static String ExtendedFileEditorsPreferencePage_strategyForUnknownFiles; + public static String ExtendedFileEditorsPreferencePage_strategyForUnassociatedFiles; public static String ExtendedFileEditorsPreferencePage_labelNotResolved; static { diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/SystemEditorOrTextEditorStrategy.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/SystemEditorOrTextEditorStrategy.java index 9e393bbaf82..9db73a4060e 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/SystemEditorOrTextEditorStrategy.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/SystemEditorOrTextEditorStrategy.java @@ -12,13 +12,13 @@ package org.eclipse.ui.internal.ide; import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IEditorRegistry; -import org.eclipse.ui.ide.IUnknownEditorStrategy; +import org.eclipse.ui.ide.IUnassociatedEditorStrategy; /** * @since 3.12 * */ -public final class SystemEditorOrTextEditorStrategy implements IUnknownEditorStrategy { +public final class SystemEditorOrTextEditorStrategy implements IUnassociatedEditorStrategy { static final String EXTENSION_ID = "org.eclipse.ui.ide.systemEditorThenTextEditor"; //$NON-NLS-1$ @Override diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/TextEditorStrategy.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/TextEditorStrategy.java index 4760c772ef5..1500b4a88a1 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/TextEditorStrategy.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/TextEditorStrategy.java @@ -12,13 +12,13 @@ package org.eclipse.ui.internal.ide; import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IEditorRegistry; -import org.eclipse.ui.ide.IUnknownEditorStrategy; +import org.eclipse.ui.ide.IUnassociatedEditorStrategy; /** * @since 3.12 * */ -public final class TextEditorStrategy implements IUnknownEditorStrategy { +public final class TextEditorStrategy implements IUnassociatedEditorStrategy { @Override public IEditorDescriptor getEditorDescriptor(String name, IEditorRegistry editorReg) { diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/UnknownEditorStrategyRegistry.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/UnassociatedEditorStrategyRegistry.java index 5e3879a490e..d957e5003a2 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/UnknownEditorStrategyRegistry.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/UnassociatedEditorStrategyRegistry.java @@ -19,15 +19,15 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; -import org.eclipse.ui.ide.IUnknownEditorStrategy; +import org.eclipse.ui.ide.IUnassociatedEditorStrategy; /** * @since 3.12 * */ -public class UnknownEditorStrategyRegistry { +public class UnassociatedEditorStrategyRegistry { - private static final String EXTENSION_POINT_ID = IDEWorkbenchPlugin.IDE_WORKBENCH + ".unknownEditorStrategy"; //$NON-NLS-1$ + private static final String EXTENSION_POINT_ID = IDEWorkbenchPlugin.IDE_WORKBENCH + ".unassociatedEditorStrategy"; //$NON-NLS-1$ private static Map<String, String> idsToLabel; @@ -37,7 +37,7 @@ public class UnknownEditorStrategyRegistry { * @return an instance of the strategy, or {@code null} if no strategy is * found for this id */ - public static IUnknownEditorStrategy getStrategy(String strategyId) { + public static IUnassociatedEditorStrategy getStrategy(String strategyId) { if (strategyId == null) { return null; } @@ -47,7 +47,7 @@ public class UnknownEditorStrategyRegistry { for (IConfigurationElement extension : extensions) { if (strategyId.equals(readAttribute(extension, "id"))) { //$NON-NLS-1$ try { - return (IUnknownEditorStrategy) extension.createExecutableExtension("class"); //$NON-NLS-1$ + return (IUnassociatedEditorStrategy) extension.createExecutableExtension("class"); //$NON-NLS-1$ } catch (CoreException ex) { IDEWorkbenchPlugin.log(ex.getMessage(), ex); return null; @@ -81,7 +81,8 @@ public class UnknownEditorStrategyRegistry { /** * @param id * the id of the strategy to use - * @return the label for the supplied strategy id, or {@code null} for unknown id. + * @return the label for the supplied strategy id, or {@code null} for + * unknown id. */ public static String getLabel(String id) { if (idsToLabel == null || !idsToLabel.containsKey(id)) { diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties index dffb91c1f1a..0a9608e53b7 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties @@ -1012,7 +1012,7 @@ IDEEditorsPreferencePage_WorkbenchPreference_viewsRelatedLink = See <a>''{0}''</ IDEEditorsPreferencePage_WorkbenchPreference_contentTypesRelatedLink = See <a>''{0}''</a> for content-type based file associations. WorkbenchEncoding_invalidCharset = {0} is not a valid charset. IDE_areYouSure={0} Are you sure you want to continue? -ExtendedFileEditorsPreferencePage_strategyForUnknownFiles=&Open unassociated files with: +ExtendedFileEditorsPreferencePage_strategyForUnassociatedFiles=&Open unassociated files with: ExtendedFileEditorsPreferencePage_labelNotResolved={0} (label not resolved) SystemSettingsChange_title = High Contrast Mode Change |
