Bug 488285 - *EditorStrategy* in o.e.ui.internal.registryI20170322-2000

UnassociatedEditorStrategyRegistry (and strategies) should be in
org.eclipse.ui.internal.registry

Change-Id: I85047deaab759b69a813bd056cba0e356d474247
Signed-off-by: Mickael Istria <mistria@redhat.com>

9 files changed, 22 insertions, 10 deletions

diff --git a/bundles/org.eclipse.ui.ide/plugin.xml b/bundles/org.eclipse.ui.ide/plugin.xml
index fd669146535..586d6915dd7 100644
--- a/bundles/org.eclipse.ui.ide/plugin.xml
+++ b/bundles/org.eclipse.ui.ide/plugin.xml
@@ -2526,19 +2526,19 @@
    <extension
          point="org.eclipse.ui.ide.unassociatedEditorStrategy">
       <strategy
-            class="org.eclipse.ui.internal.ide.SystemEditorOrTextEditorStrategy"
+            class="org.eclipse.ui.internal.ide.registry.SystemEditorOrTextEditorStrategy"
             id="org.eclipse.ui.ide.systemEditorThenTextEditor"
             interactive="false"
             label="%systemEditorThenTextEditor">
       </strategy>
       <strategy
-            class="org.eclipse.ui.internal.ide.TextEditorStrategy"
+            class="org.eclipse.ui.internal.ide.registry.TextEditorStrategy"
             id="org.eclipse.ui.ide.textEditor"
             interactive="false"
             label="%textEditor">
       </strategy>
       <strategy
-            class="org.eclipse.ui.internal.ide.AskUserViaPopupUnassociatedEditorStrategy"
+            class="org.eclipse.ui.internal.ide.registry.AskUserViaPopupUnassociatedEditorStrategy"
             id="org.eclipse.ui.ide.askUserForUnassociatedEditor"
             interactive="true"
             label="%askUserViaPopup">
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 41e7a887648..fdcd2549ce6 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,12 +74,12 @@ import org.eclipse.ui.PlatformUI;
 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.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;
 import org.eclipse.ui.internal.ide.registry.MarkerHelpRegistryReader;
+import org.eclipse.ui.internal.ide.registry.SystemEditorOrTextEditorStrategy;
+import org.eclipse.ui.internal.ide.registry.UnassociatedEditorStrategyRegistry;
 import org.eclipse.ui.internal.misc.UIStats;
 import org.eclipse.ui.part.FileEditorInput;
 
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 af549c2eec9..54ec1e9c3ce 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
@@ -38,6 +38,7 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.internal.dialogs.FileEditorsPreferencePage;
+import org.eclipse.ui.internal.ide.registry.UnassociatedEditorStrategyRegistry;
 
 /**
  * @since 3.12
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 1bba9154f8e..4f2febe688f 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
@@ -20,6 +20,7 @@ import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.IWorkbenchPreferenceConstants;
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.internal.ide.handlers.ShowInSystemExplorerHandler;
+import org.eclipse.ui.internal.ide.registry.SystemEditorOrTextEditorStrategy;
 import org.eclipse.ui.internal.views.markers.MarkerSupportInternalUtilities;
 
 /**
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchPlugin.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchPlugin.java
index a1b976366dc..2ab029cf641 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchPlugin.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchPlugin.java
@@ -38,6 +38,7 @@ import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.ide.registry.MarkerImageProviderRegistry;
 import org.eclipse.ui.internal.ide.registry.ProjectImageRegistry;
+import org.eclipse.ui.internal.ide.registry.UnassociatedEditorStrategyRegistry;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/AskUserViaPopupUnassociatedEditorStrategy.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/AskUserViaPopupUnassociatedEditorStrategy.java
index 30920de0bdd..58b5e05c13b 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/AskUserViaPopupUnassociatedEditorStrategy.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/AskUserViaPopupUnassociatedEditorStrategy.java
@@ -9,7 +9,7 @@
  *     Mickael Istria (Red Hat Inc.) - initial API and implementation
  *     Patrik Suzzi <psuzzi@gmail.com> - Bug 485201
  *******************************************************************************/
-package org.eclipse.ui.internal.ide;
+package org.eclipse.ui.internal.ide.registry;
 
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -18,6 +18,7 @@ import org.eclipse.ui.IEditorRegistry;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.EditorSelectionDialog;
 import org.eclipse.ui.ide.IUnassociatedEditorStrategy;
+import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
 
 /**
  * @since 3.12
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/registry/SystemEditorOrTextEditorStrategy.java
index 33c2952b50e..cb88526fcea 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/registry/SystemEditorOrTextEditorStrategy.java
@@ -8,11 +8,13 @@
  * Contributors:
  *     Mickael Istria (Red Hat Inc.) - extracted from IDE.getEditorDescription
  *******************************************************************************/
-package org.eclipse.ui.internal.ide;
+package org.eclipse.ui.internal.ide.registry;
 
 import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IEditorRegistry;
+import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.ide.IUnassociatedEditorStrategy;
+import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
 
 /**
  * Strategy for unassociated file types:
@@ -30,7 +32,11 @@ import org.eclipse.ui.ide.IUnassociatedEditorStrategy;
  * @since 3.12
  */
 public final class SystemEditorOrTextEditorStrategy implements IUnassociatedEditorStrategy {
-	static final String EXTENSION_ID = "org.eclipse.ui.ide.systemEditorThenTextEditor"; //$NON-NLS-1$
+	/**
+	 * Id of the extension. Defined in plugin.xml and may be used as value for
+	 * preference {@link IDE#UNASSOCIATED_EDITOR_STRATEGY_PREFERENCE_KEY}
+	 */
+	public static final String EXTENSION_ID = "org.eclipse.ui.ide.systemEditorThenTextEditor"; //$NON-NLS-1$
 
 	@Override
 	public IEditorDescriptor getEditorDescriptor(String name, IEditorRegistry editorReg) {
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/registry/TextEditorStrategy.java
index 1500b4a88a1..72877d23bfe 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/registry/TextEditorStrategy.java
@@ -8,11 +8,12 @@
  * Contributors:
  *     Mickael Istria (Red Hat Inc.) - extracted from IDE.getEditorDescription
  *******************************************************************************/
-package org.eclipse.ui.internal.ide;
+package org.eclipse.ui.internal.ide.registry;
 
 import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IEditorRegistry;
 import org.eclipse.ui.ide.IUnassociatedEditorStrategy;
+import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
 
 /**
  * @since 3.12
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/UnassociatedEditorStrategyRegistry.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/UnassociatedEditorStrategyRegistry.java
index e0341e1f046..9bfab657238 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/UnassociatedEditorStrategyRegistry.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/UnassociatedEditorStrategyRegistry.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Mickael Istria (Red Hat Inc.) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.ui.internal.ide;
+package org.eclipse.ui.internal.ide.registry;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.ui.ide.IUnassociatedEditorStrategy;
+import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
 
 /**
  * @since 3.12