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

Change-Id: I9454286e81907d0bd7fbe0c234b6bf41303d03ab

6 files changed, 55 insertions, 26 deletions

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml
index 89aeaf55300..b53eb510b63 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml
@@ -1,20 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.widget.feature" label="Papyrus widgets" provider-name="Eclipse Modeling Project" version="1.0.1.qualifier">

+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.infra.widget.feature"

+      label="Papyrus widgets"

+      version="1.0.1.qualifier"

+      provider-name="Eclipse Modeling Project">

 

-<copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2012 CEA LIST

-All rights reserved.   This program and the accompanying materials

-are made available under the terms of the Eclipse Public License

-v1.0

-which accompanies this distribution, and is available at

+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

+      Copyright (c) 2012 CEA LIST
+All rights reserved.   This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0
+which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html

    </copyright>

 

    <license url="%licenseURL">

-		%license

-	</license>

+      %license

+   </license>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.widgets" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.widgets"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.widgets.toolbox" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.widgets.toolbox"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-</feature>
\ No newline at end of file
+   <plugin

+         id="org.eclipse.papyrus.infra.widgets.epf.richtext.extension"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/.classpath b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/.classpath
index 644d3b7f678..8a8f1668cdc 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/.classpath
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="src" path="src"/>

-	<classpathentry exported="true" kind="lib" path="lib/jsoup-1.7.3.jar"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

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/build.properties b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/build.properties
index 6830e88b9ca..872a9d2877b 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/build.properties
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext.extension/build.properties
@@ -2,6 +2,11 @@ bin.includes = icons/,\
                META-INF/,\
                rte/,\
                plugin.properties,\
-               about.html
+               about.html,\
+               files/,\
+               .
 src.includes = about.html
+source.. = src/
+output.. = bin/
+jars.compile.order = .
 
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
index 425ecf3b4a0..9ce92c00ae8 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
@@ -11,7 +11,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",

  com.ibm.icu;bundle-version="4.4.2",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.1"

+ org.eclipse.papyrus.infra.core;bundle-version="1.0.1",

+ org.eclipse.epf.richtext;bundle-version="1.6.0",

+ org.eclipse.papyrus.infra.widgets.epf.richtext.extension;bundle-version="1.0.1",

+ org.eclipse.epf.common.html;bundle-version="1.5.0"

 Export-Package: org.eclipse.papyrus.infra.widgets,

  org.eclipse.papyrus.infra.widgets.creation,

  org.eclipse.papyrus.infra.widgets.databinding,

@@ -21,9 +24,7 @@ Export-Package: org.eclipse.papyrus.infra.widgets,
  org.eclipse.papyrus.infra.widgets.selectors,

  org.eclipse.papyrus.infra.widgets.strategy,

  org.eclipse.papyrus.infra.widgets.util,

- org.eclipse.papyrus.infra.widgets.validator,

- org.eclipse.papyrus.infra.widgets.epf.richtext.extension,

- org.eclipse.epf.richtext

+ org.eclipse.papyrus.infra.widgets.validator

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.1.qualifier

diff --git a/releng/top-pom-main.xml b/releng/top-pom-main.xml
index 9467e5488ab..047a5b3834e 100755
--- a/releng/top-pom-main.xml
+++ b/releng/top-pom-main.xml
@@ -177,6 +177,7 @@
 		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy</module>

 		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences</module>

 		<module>../plugins/infra/widget/org.eclipse.papyrus.infra.widgets</module>

+		<module>../plugins/infra/widget/org.eclipse.papyrus.infra.widgets.epf.richtext</module>

 		<module>../plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox</module>

 		<module>../plugins/doc/org.eclipse.papyrus.moka.doc</module>

 		<module>../plugins/sysml/org.eclipse.papyrus.sysml</module>