Bug 515706: [Table][RichText] The RichText editor must be in agreement

with the preferences
https://bugs.eclipse.org/bugs/show_bug.cgi?id=515706

- Move the RichText preferences into infra.ui instead of
uml.diagram.common to use it in table.
- Use the preferences into nattable editors.
- Upgrade MANIFEST versions when needed.

Change-Id: Iee4505223a8e2de23c91a4d46f25ed2627fa04b1
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>

3 files changed, 7 insertions, 7 deletions

diff --git a/plugins/views/documentation/org.eclipse.papyrus.views.documentation/META-INF/MANIFEST.MF b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/META-INF/MANIFEST.MF
index 3a0300b4d51..ce97c3f8870 100644
--- a/plugins/views/documentation/org.eclipse.papyrus.views.documentation/META-INF/MANIFEST.MF
+++ b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.papyrus.infra.services.navigation;bundle-version="[3
  org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.uml.documentation.profile;bundle-version="[1.2.0,2.0.0)",

  org.eclipse.papyrus.uml.types.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)"

+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Bundle-ActivationPolicy: lazy

 Bundle-Vendor: %Bundle-Vendor

diff --git a/plugins/views/documentation/org.eclipse.papyrus.views.documentation/src/org/eclipse/papyrus/views/documentation/Activator.java b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/src/org/eclipse/papyrus/views/documentation/Activator.java
index 33ebdfb4b0a..e4ad4d9fe9c 100644
--- a/plugins/views/documentation/org.eclipse.papyrus.views.documentation/src/org/eclipse/papyrus/views/documentation/Activator.java
+++ b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/src/org/eclipse/papyrus/views/documentation/Activator.java
@@ -17,8 +17,8 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.papyrus.infra.ui.preferences.RichtextPreferencePage;
 import org.eclipse.papyrus.infra.ui.util.EditorHelper;
-import org.eclipse.papyrus.uml.diagram.common.preferences.RichtextPreferencePage;
 import org.eclipse.papyrus.views.documentation.preferences.DocumentationViewPreferences;
 import org.eclipse.papyrus.views.documentation.views.DocumentationView;
 import org.eclipse.ui.IViewPart;
@@ -195,7 +195,7 @@ public class Activator extends AbstractUIPlugin {
 	 * Returns the 'UseRichText' preferences from uml.common
 	 */
 	public boolean getUseRichTextSetting() {
-		return org.eclipse.papyrus.uml.diagram.common.Activator.getDefault().getPreferenceStore().getBoolean(RichtextPreferencePage.USE_CK_EDITOR);
+		return org.eclipse.papyrus.infra.ui.Activator.getDefault().getPreferenceStore().getBoolean(RichtextPreferencePage.USE_CK_EDITOR);
 	}
 
 	/**
diff --git a/plugins/views/documentation/org.eclipse.papyrus.views.documentation/src/org/eclipse/papyrus/views/documentation/views/DocumentationView.java b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/src/org/eclipse/papyrus/views/documentation/views/DocumentationView.java
index eac9db3f69b..79a5e859b17 100644
--- a/plugins/views/documentation/org.eclipse.papyrus.views.documentation/src/org/eclipse/papyrus/views/documentation/views/DocumentationView.java
+++ b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/src/org/eclipse/papyrus/views/documentation/views/DocumentationView.java
@@ -43,8 +43,8 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.properties.ui.widgets.TabbedPropertyTitle;
 import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;
+import org.eclipse.papyrus.infra.ui.preferences.RichtextPreferencePage;
 import org.eclipse.papyrus.infra.widgets.util.PapyrusSelectionService;
-import org.eclipse.papyrus.uml.diagram.common.preferences.RichtextPreferencePage;
 import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;
 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;
 import org.eclipse.papyrus.uml.types.core.commands.SetStereotypeValueCommand;
@@ -195,7 +195,7 @@ public class DocumentationView extends ViewPart {
 	 */
 	IPropertyChangeListener richTextPreferenceListener = event -> {
 		if (RichtextPreferencePage.USE_CK_EDITOR == event.getProperty()) {
-			useRichText = org.eclipse.papyrus.uml.diagram.common.Activator.getDefault().getPreferenceStore().getBoolean(RichtextPreferencePage.USE_CK_EDITOR);
+			useRichText = org.eclipse.papyrus.infra.ui.Activator.getDefault().getPreferenceStore().getBoolean(RichtextPreferencePage.USE_CK_EDITOR);
 			if (useRichText) {
 				if (null != richtextEditor && !richtextEditor.isDisposed()) {
 					richtextEditor.setText(text);
@@ -465,7 +465,7 @@ public class DocumentationView extends ViewPart {
 		getViewSite().getPage().addPartListener(new SaveAtPartFocusLostListener());
 
 		// Add listener on richtext preference
-		org.eclipse.papyrus.uml.diagram.common.Activator.getDefault().getPreferenceStore().addPropertyChangeListener(richTextPreferenceListener);
+		org.eclipse.papyrus.infra.ui.Activator.getDefault().getPreferenceStore().addPropertyChangeListener(richTextPreferenceListener);
 	}
 
 	/**
@@ -781,7 +781,7 @@ public class DocumentationView extends ViewPart {
 			PapyrusSelectionService.getInstance().removeSelectionChangedListener(selectionChangeListener);
 		}
 		if (null != richTextPreferenceListener) {
-			org.eclipse.papyrus.uml.diagram.common.Activator.getDefault().getPreferenceStore().removePropertyChangeListener(richTextPreferenceListener);
+			org.eclipse.papyrus.infra.ui.Activator.getDefault().getPreferenceStore().removePropertyChangeListener(richTextPreferenceListener);
 		}
 		super.dispose();
 	}