399853: [Widgets] Papyrus shall enable to edit the comment body with a

rich-text editor
https://bugs.eclipse.org/bugs/show_bug.cgi?id=399853
make epf for extraplugins

Change-Id: I59e406b2b388cc8231f8575cb7842310a7765de4

6 files changed, 21 insertions, 21 deletions

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/META-INF/MANIFEST.MF b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/META-INF/MANIFEST.MF
index f814a022632..8bfb7ed0b6f 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/META-INF/MANIFEST.MF
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/META-INF/MANIFEST.MF
@@ -2,9 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets.epf.richtext.extension;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-ClassPath: lib/jsoup-1.7.3.jar
-Bundle-Activator: org.eclipse.papyrus.infra.widgets.epf.richtext.extension.RichPlugin
+Bundle-Version: 1.0.1.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.epf.common,
@@ -12,13 +10,16 @@ Require-Bundle: org.eclipse.epf.common,
  org.eclipse.ui,
  org.eclipse.ui.forms,
  org.eclipse.ui.workbench.texteditor,
- org.eclipse.epf.common.html;bundle-version="1.5.0",
- org.eclipse.epf.common.ui;bundle-version="1.5.0",
+ org.eclipse.ui.editors;bundle-version="3.8.0",
  org.eclipse.epf.richtext;bundle-version="1.6.0",
- org.eclipse.ui.editors;bundle-version="3.8.0"
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.papyrus.infra.widgets.epf.richtext.extension,
+ org.eclipse.epf.common.html;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.core.log,
+ org.eclipse.pde.runtime
+Export-Package: org.eclipse.papyrus.infra.widgets.epf.richtext,
+ org.eclipse.papyrus.infra.widgets.epf.richtext.extension,
  org.eclipse.papyrus.infra.widgets.epf.richtext.extension.actions,
  org.eclipse.papyrus.infra.widgets.epf.richtext.extension.dialogs,
  org.eclipse.papyrus.infra.widgets.epf.richtext.extension.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.papyrus.infra.widgets.epf.richtext.extension.RichPlugin
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/RichTextObservableValue.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/RichTextObservableValue.java
index 8b64fe4d866..8a35a1a6728 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/RichTextObservableValue.java
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/RichTextObservableValue.java
@@ -10,13 +10,12 @@
  *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

  * 

  *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.databinding;

+package org.eclipse.papyrus.infra.widgets.epf.richtext.extension;

 

 import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

 import org.eclipse.core.databinding.observable.value.IObservableValue;

 import org.eclipse.core.databinding.observable.value.ValueDiff;

 import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;

-import org.eclipse.papyrus.infra.widgets.epf.richtext.extension.RichTextEditor;

 import org.eclipse.papyrus.infra.widgets.providers.UnchangedObject;

 import org.eclipse.swt.widgets.Event;

 import org.eclipse.swt.widgets.Listener;

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/RichTextValueEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/RichTextValueEditor.java
index b99153a667d..95b555f484b 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/RichTextValueEditor.java
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/RichTextValueEditor.java
@@ -10,12 +10,11 @@
  *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

  * 

  *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

+package org.eclipse.papyrus.infra.widgets.epf.richtext.extension;

 

 import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.papyrus.infra.widgets.databinding.RichTextObservableValue;

-import org.eclipse.papyrus.infra.widgets.epf.richtext.extension.RichText;

-import org.eclipse.papyrus.infra.widgets.epf.richtext.extension.RichTextEditor;

+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

+import org.eclipse.papyrus.infra.widgets.editors.AbstractValueEditor;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Composite;

 

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/properties/RichTextEditorWithReferences.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/properties/RichTextEditorWithReferences.java
index 2c4de15577f..91560869061 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/properties/RichTextEditorWithReferences.java
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/properties/RichTextEditorWithReferences.java
@@ -10,15 +10,15 @@
  *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

  * 

  *****************************************************************************/

-package org.eclipse.papyrus.views.properties.widgets;

+package org.eclipse.papyrus.infra.widgets.epf.richtext.extension.properties;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.LabelProvider;

 import org.eclipse.jface.window.Window;

 import org.eclipse.papyrus.infra.emf.utils.TextReferencesHelper;

-import org.eclipse.papyrus.infra.widgets.editors.RichTextValueEditor;

 import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog;

+import org.eclipse.papyrus.infra.widgets.epf.richtext.extension.RichTextValueEditor;

 import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;

 import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/properties/RichTextWithReferences.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/properties/RichTextWithReferences.java
index 32df44a8f00..ccdcba47594 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/properties/RichTextWithReferences.java
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/properties/RichTextWithReferences.java
@@ -10,13 +10,14 @@
  *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

  * 

  *****************************************************************************/

-package org.eclipse.papyrus.views.properties.widgets;

+package org.eclipse.papyrus.infra.widgets.epf.richtext.extension.properties;

 

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.papyrus.infra.emf.utils.TextReferencesHelper;

 import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

-import org.eclipse.papyrus.infra.widgets.editors.RichTextValueEditor;

+import org.eclipse.papyrus.infra.widgets.epf.richtext.extension.RichTextValueEditor;

 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

+import org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor;

 import org.eclipse.swt.widgets.Composite;

 

 /**

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/properties/uml/CommentBodyRichTextEditor.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/properties/uml/CommentBodyRichTextEditor.java
index 2e39686f9b1..277e07af0bd 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/properties/uml/CommentBodyRichTextEditor.java
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/src/org/eclipse/papyrus/infra/widgets/epf/richtext/extension/properties/uml/CommentBodyRichTextEditor.java
@@ -10,7 +10,7 @@
  *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

  * 

  *****************************************************************************/

-package org.eclipse.papyrus.uml.properties.widgets;

+package org.eclipse.papyrus.infra.widgets.epf.richtext.extension.properties.uml;

 

 import java.util.Collections;

 

@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.resource.ResourceSet;

 import org.eclipse.papyrus.infra.emf.providers.EMFGraphicalContentProvider;

+import org.eclipse.papyrus.infra.widgets.epf.richtext.extension.properties.RichTextWithReferences;

 import org.eclipse.papyrus.uml.tools.namereferences.NameReferencesHelper;

 import org.eclipse.papyrus.uml.tools.providers.SemanticUMLContentProvider;

 import org.eclipse.papyrus.uml.tools.util.UMLProviderHelper;

@@ -25,7 +26,6 @@ import org.eclipse.papyrus.views.properties.creation.CreationContext;
 import org.eclipse.papyrus.views.properties.creation.EcorePropertyEditorFactory;

 import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;

 import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.views.properties.widgets.RichTextWithReferences;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.uml2.uml.UMLPackage;

 

@@ -49,7 +49,7 @@ public class CommentBodyRichTextEditor extends RichTextWithReferences {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.views.properties.widgets.RichTextWithReferences#doBinding()

+	 * @see org.eclipse.papyrus.infra.widgets.epf.richtext.extension.properties.RichTextWithReferences#doBinding()

 	 *

 	 */

 	@Override