summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Wouters2014-04-07 03:44:08 (EDT)
committerLaurent Wouters2014-04-17 02:04:18 (EDT)
commit83f2664514c1861bdb2f8938d224802e04e95901 (patch)
tree3e80bc749884bc729c9c458a926838300b9f17e4
parent3d53da6cbf692d9ecd419ebddf0f1a64dc89efeb (diff)
downloadorg.eclipse.papyrus-83f2664514c1861bdb2f8938d224802e04e95901.zip
org.eclipse.papyrus-83f2664514c1861bdb2f8938d224802e04e95901.tar.gz
org.eclipse.papyrus-83f2664514c1861bdb2f8938d224802e04e95901.tar.bz2
[releng] Cleanup plugins for main buildrefs/changes/87/25187/1
Signed-off-by: Laurent Wouters <laurent.wouters@cea.fr>
-rw-r--r--plugins/developer/org.eclipse.papyrus.codegen/build.properties1
-rw-r--r--plugins/developer/org.eclipse.papyrus.dev.java.utils/build.properties1
-rw-r--r--plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/build.properties1
-rw-r--r--plugins/developer/org.eclipse.papyrus.developer.profile/build.properties1
-rwxr-xr-xplugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/about.html28
-rw-r--r--plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/build.properties1
-rw-r--r--plugins/developer/org.eclipse.papyrus.doc/build.properties1
-rwxr-xr-xplugins/developer/org.eclipse.papyrus.documentation.plugin.edit/about.html28
-rw-r--r--plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/build.properties1
-rwxr-xr-xplugins/developer/org.eclipse.papyrus.documentation.plugin.editor/about.html28
-rw-r--r--plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/build.properties1
-rw-r--r--plugins/developer/org.eclipse.papyrus.domaincodegen.ui/build.properties1
-rw-r--r--plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/build.properties1
-rw-r--r--plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/build.properties1
-rw-r--r--plugins/developer/org.eclipse.papyrus.domaincontextcodegen/build.properties1
-rw-r--r--plugins/developer/org.eclipse.papyrus.gmf.editPoliciesstates/build.properties1
-rw-r--r--plugins/developer/org.eclipse.papyrus.gmf.editpartview/build.properties1
-rw-r--r--plugins/developer/org.eclipse.papyrus.gmf.figureview/build.properties1
-rw-r--r--plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/build.properties1
-rw-r--r--plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties1
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties1
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/build.properties1
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.doc/build.properties1
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/build.properties1
-rw-r--r--plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/build.properties1
-rwxr-xr-xplugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/about.html28
-rw-r--r--plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/build.properties1
-rw-r--r--plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/build.properties1
-rw-r--r--plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/build.properties1
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/build.properties1
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/build.properties1
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/.classpath13
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/src/org/eclipse/papyrus/infra/emf/editor/part/PapyrusEditor.java303
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/src/org/eclipse/papyrus/infra/emf/editor/providers/CustomizableContentProvider.java44
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/.classpath15
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/src/org/eclipse/papyrus/infra/emf/newchild/action/ExtendedTypeAction.java73
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.classpath13
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/build.properties1
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.classpath13
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/build.properties3
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.classpath13
-rw-r--r--plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath13
-rw-r--r--plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IEMFFacetProjectEditor.java93
-rw-r--r--plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/EMFFacetProjectEditor.java286
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.doc/build.properties1
-rwxr-xr-xplugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/about.html28
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/build.properties1
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.tools/.classpath13
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableList.java174
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/build.properties1
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/build.properties1
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/build.properties2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/build.properties1
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.classpath13
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/build.properties2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/.classpath15
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/CollaborationUseAdapter.java37
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/ConnectionPointReferenceAdapter.java37
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/MessageAdapter.java37
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/ParameterAdapter.java40
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/PropertyAdapter.java68
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/StateAdapter.java37
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/TransitionAdapter.java37
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF1
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF1
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF1
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF1
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.classpath15
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/src/org/eclipse/papyrus/uml/textedit/parameter/xtext/ui/contributions/ParameterPopupEditor.java311
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF1
-rwxr-xr-xplugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF1
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF1
73 files changed, 238 insertions, 1663 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/build.properties b/plugins/developer/org.eclipse.papyrus.codegen/build.properties
index 81b8b4f..288b0ef 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.codegen/build.properties
@@ -6,3 +6,4 @@ bin.includes = META-INF/,\
about.html,\
plugin.properties,\
resource/
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.dev.java.utils/build.properties b/plugins/developer/org.eclipse.papyrus.dev.java.utils/build.properties
index d924ee3..4700a34 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.java.utils/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.dev.java.utils/build.properties
@@ -5,3 +5,4 @@ bin.includes = META-INF/,\
plugin.xml,\
plugin.properties,\
icons/
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/build.properties b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/build.properties
index 9300a85..7b3a7f6 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/build.properties
@@ -9,3 +9,4 @@ bin.includes = META-INF/,\
build.properties,\
plugin.pdoc,\
about.html
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.developer.profile/build.properties b/plugins/developer/org.eclipse.papyrus.developer.profile/build.properties
index d8f3399..75d4441 100644
--- a/plugins/developer/org.eclipse.papyrus.developer.profile/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.developer.profile/build.properties
@@ -4,3 +4,4 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
profile/
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/about.html b/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/about.html
new file mode 100755
index 0000000..77ef695
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>March, 2014</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/build.properties b/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/build.properties
index 986a293..2a539d0 100644
--- a/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer/build.properties
@@ -5,3 +5,4 @@ bin.includes = META-INF/,\
resource/notation.uiCustom,\
resource/Notation.querySet
source.. = src/
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.doc/build.properties b/plugins/developer/org.eclipse.papyrus.doc/build.properties
index 491c2c9..2202c47 100644
--- a/plugins/developer/org.eclipse.papyrus.doc/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.doc/build.properties
@@ -8,3 +8,4 @@ bin.includes = META-INF/,\
plugin.properties,\
about.html
bin.excludes = icons/Papyrus.psd
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/about.html b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/about.html
new file mode 100755
index 0000000..77ef695
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>March, 2014</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/build.properties b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/build.properties
index ec2e13c..775cf23 100644
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/build.properties
@@ -12,3 +12,4 @@ bin.includes = .,\
jars.compile.order = .
source.. = src-gen/
output.. = bin/
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/about.html b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/about.html
new file mode 100755
index 0000000..77ef695
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>March, 2014</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/build.properties b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/build.properties
index b614042..be1f034 100644
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/build.properties
@@ -12,3 +12,4 @@ bin.includes = .,\
jars.compile.order = .
source.. = src-gen/
output.. = bin
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/build.properties b/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/build.properties
index 531639f..30ab365 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/build.properties
@@ -7,3 +7,4 @@ bin.includes = META-INF/,\
plugin.properties,\
about.html
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/build.properties b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/build.properties
index 9bd94ae..9d86d19 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/build.properties
@@ -18,3 +18,4 @@ bin.includes = .,\
jars.compile.order = .
source.. = src/
output.. = bin/
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/build.properties b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/build.properties
index 9bd94ae..9d86d19 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/build.properties
@@ -18,3 +18,4 @@ bin.includes = .,\
jars.compile.order = .
source.. = src/
output.. = bin/
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/build.properties b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/build.properties
index 8f29bcb..d26a823 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/build.properties
@@ -14,3 +14,4 @@ source.. = src/,\
transforsrc/
output.. = bin/
customBuildCallbacks = build.acceleo
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editPoliciesstates/build.properties b/plugins/developer/org.eclipse.papyrus.gmf.editPoliciesstates/build.properties
index 657277d..6be98f9 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editPoliciesstates/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editPoliciesstates/build.properties
@@ -5,3 +5,4 @@ bin.includes = META-INF/,\
plugin.xml,\
plugin.properties,\
about.html
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/build.properties b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/build.properties
index 657277d..6be98f9 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/build.properties
@@ -5,3 +5,4 @@ bin.includes = META-INF/,\
plugin.xml,\
plugin.properties,\
about.html
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/build.properties b/plugins/developer/org.eclipse.papyrus.gmf.figureview/build.properties
index c659c55..5587fef 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.gmf.figureview/build.properties
@@ -5,3 +5,4 @@ bin.includes = META-INF/,\
about.html,\
plugin.properties,\
plugin.xml
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/build.properties b/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/build.properties
index c659c55..5587fef 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview/build.properties
@@ -5,3 +5,4 @@ bin.includes = META-INF/,\
about.html,\
plugin.properties,\
plugin.xml
+src.includes = about.html
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties
index 6308384..eaf743a 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties
@@ -6,3 +6,4 @@ bin.includes = META-INF/,\
resource/,\
about.html,\
plugin.properties
+src.includes = about.html
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties
index 655978a..6f7dcdf 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties
@@ -4,3 +4,4 @@ bin.includes = META-INF/,\
about.html,\
plugin.properties,\
resources/
+src.includes = about.html
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/build.properties
index c94e473..92a2ba5 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/build.properties
@@ -3,3 +3,4 @@ bin.includes = META-INF/,\
resource/,\
about.html,\
OSGI-INF/
+src.includes = about.html
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.doc/build.properties
index ba2a4b0..1fc4f90 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/build.properties
@@ -2,3 +2,4 @@ bin.includes = META-INF/,\
plugin.xml,\
about.html,\
resource/
+src.includes = about.html
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/build.properties
index c17eeaa..51024c6 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/build.properties
@@ -4,3 +4,4 @@ bin.includes = META-INF/,\
plugin.properties,\
about.html,\
resource/
+src.includes = about.html
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/build.properties b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/build.properties
index 7a1c7bd..4232c9d 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/build.properties
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/build.properties
@@ -7,3 +7,4 @@ bin.includes = META-INF/,\
toc-dev.xml,\
OSGI-INF/,\
toc-user.xml
+src.includes = about.html
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/about.html b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/about.html
new file mode 100755
index 0000000..77ef695
--- /dev/null
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>March, 2014</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/build.properties b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/build.properties
index 47663ae..06f2c32 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/build.properties
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc/build.properties
@@ -1,3 +1,4 @@
bin.includes = META-INF/,\
resource/,\
plugin.xml
+src.includes = about.html
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/build.properties b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/build.properties
index 06312a2..423aa02 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/build.properties
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/build.properties
@@ -6,3 +6,4 @@ bin.includes = META-INF/,\
plugin.xml,\
plugin.properties,\
src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/presentation/messages.properties
+src.includes = about.html
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/build.properties b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/build.properties
index 7a7f60f..2f26700 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/build.properties
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/build.properties
@@ -11,3 +11,4 @@ bin.includes = META-INF/,\
toc.html,\
OSGI-INF/,\
javadoc/
+src.includes = about.html
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/build.properties
index 03c24e2..6f8a384 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/build.properties
@@ -6,3 +6,4 @@ bin.includes = META-INF/,\
about.html,\
plugin.xml,\
OSGI-INF/
+src.includes = about.html
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/build.properties
index bb55517..118b518 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/build.properties
@@ -6,3 +6,4 @@ bin.includes = META-INF/,\
plugin.xml,\
schema/,\
OSGI-INF/
+src.includes = about.html
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/.classpath
index e4f6d5b..347916a 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/.classpath
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/.classpath
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry excluding="org/eclipse/papyrus/infra/emf/editor/providers/CustomizableContentProvider.java|org/eclipse/papyrus/infra/emf/editor/part/PapyrusEditor.java" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath> \ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/src/org/eclipse/papyrus/infra/emf/editor/part/PapyrusEditor.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/src/org/eclipse/papyrus/infra/emf/editor/part/PapyrusEditor.java
deleted file mode 100644
index 8e4300a..0000000
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/src/org/eclipse/papyrus/infra/emf/editor/part/PapyrusEditor.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package org.eclipse.papyrus.infra.emf.editor.part;
-
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.ecore.presentation.EcoreEditor;
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
-import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;
-import org.eclipse.emf.transaction.TransactionalCommandStack;
-import org.eclipse.emf.transaction.impl.TransactionalCommandStackImpl;
-import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.emf.editor.Activator;
-import org.eclipse.papyrus.infra.emf.editor.actions.MoDiscoDropAdapter;
-import org.eclipse.papyrus.infra.emf.editor.providers.CustomizableContentProvider;
-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
-import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;
-import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
-import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
-import org.eclipse.papyrus.infra.widgets.editors.StringEditor;
-import org.eclipse.papyrus.infra.widgets.providers.PatternViewerFilter;
-import org.eclipse.papyrus.views.properties.widgets.layout.GridData;
-import org.eclipse.papyrus.views.properties.widgets.layout.PropertiesLayout;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-/**
- * An extended EMF editor
- *
- * This generic editor provides the following features :
- *
- * - EMF Facet browser customization
- * - Papyrus customizable property view
- * - Papyrus customizable new child
- *
- * @author Camille Letavernier
- *
- */
-public class PapyrusEditor extends EcoreEditor implements ITabbedPropertySheetPageContributor, CommandStackListener {
-
- public static final String PROPERTY_VIEW_ID = "CustomizablePropertyView"; //$NON-NLS-1$
-
- /**
- * The Property sheet page for this editor
- */
- protected IPropertySheetPage iPropertySheetPage;
-
- /**
- * The services registry associated to this editor
- */
- protected ServicesRegistry registry;
-
- @Override
- public void createPages() {
- // Creates the model from the editor input
- //
- createModel();
-
- getContainer().setBackground(new Color(getContainer().getDisplay(), 255, 255, 255));
- getContainer().setBackgroundMode(SWT.INHERIT_DEFAULT);
-
- Composite gParent = new Composite(getContainer(), SWT.NONE);
- gParent.setLayout(new FillLayout());
-
- //SashForm parent = new SashForm(gParent, SWT.VERTICAL | SWT.V_SCROLL | SWT.H_SCROLL);
- //parent.setLayout(new FillLayout());
-
- Composite parent = new Composite(gParent, SWT.NONE);
- parent.setLayout(new PropertiesLayout());
-
- // try {
- // registry = new ServicesRegistry();
- // registry.add(LabelProviderService.class, 1, new LabelProviderServiceImpl());
- // registry.add(ServiceUtilsForResourceInitializerService.class, 1, new ServiceUtilsForResourceInitializerService());
- // //registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);
- // registry.startRegistry();
- // } catch (ServiceException ex) {
- // Activator.log.error(ex);
- // }
-
- // Only creates the other pages if there is something that can be edited
- //
- if(!getEditingDomain().getResourceSet().getResources().isEmpty()) {
- // Create a page for the selection tree view.
- //
-
- final PatternViewerFilter filter = new PatternViewerFilter();
- filter.setShowIfHasVisibleParent(true);
-
- final StringEditor filterPattern = new StringEditor(parent, SWT.NONE, "Filter");
- filterPattern.addCommitListener(new ICommitListener() {
-
- public void commit(AbstractEditor editor) {
- filter.setPattern((String)filterPattern.getValue());
- selectionViewer.refresh();
- }
-
- });
-
- Tree tree = new Tree(parent, getTreeStyle() | SWT.MULTI);
- tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- selectionViewer = new TreeViewer(tree);
- selectionViewer.setFilters(new ViewerFilter[]{ filter });
- setCurrentViewer(selectionViewer);
- IStructuredContentProvider contentProvider = createContentProvider();
- getCustomizationManager().installCustomPainter(tree);
-
- ILabelProvider labelProvider = createLabelProvider();
-
- editingDomain.getCommandStack().addCommandStackListener(this);
-
- selectionViewer.setContentProvider(contentProvider);
- selectionViewer.setLabelProvider(labelProvider);
-
- selectionViewer.setInput(editingDomain.getResourceSet());
- selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-
- new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
-
- createContextMenuFor(selectionViewer);
- int pageIndex = addPage(gParent);
- setPageText(pageIndex, "Model"); //$NON-NLS-1$
-
- setActivePage(0);
-
- // Preview preview = new Preview(this);
- // preview.createPartControl(parent);
- // addPreview(preview);
-
- parent.layout();
- }
-
- // Ensures that this editor will only display the page's tab
- // area if there are more than one page
- //
- getContainer().addControlListener(new ControlAdapter() {
-
- boolean guard = false;
-
- @Override
- public void controlResized(ControlEvent event) {
- if(!guard) {
- guard = true;
- hideTabs();
- guard = false;
- }
- }
- });
-
- if(getActionBarContributor() instanceof ActionBarContributor) {
- ((ActionBarContributor)getActionBarContributor()).setEditingDomain(getEditingDomain());
- }
-
- updateProblemIndication();
- }
-
- protected int getTreeStyle() {
- return SWT.BORDER;
- }
-
-
- @Override
- protected void initializeEditingDomain() {
- // Create an adapter factory that yields item providers.
- //
- adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
- adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
-
- // Create the command stack that will notify this editor as commands are executed.
- //
- TransactionalCommandStack commandStack = new TransactionalCommandStackImpl();
-
- // Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
- //
- commandStack.addCommandStackListener(new CommandStackListener() {
-
- public void commandStackChanged(final EventObject event) {
- getContainer().getDisplay().asyncExec(new Runnable() {
-
- public void run() {
- firePropertyChange(IEditorPart.PROP_DIRTY);
-
- // Try to select the affected objects.
- //
- Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
- if(mostRecentCommand != null) {
- setSelectionToViewer(mostRecentCommand.getAffectedObjects());
- }
-
- Iterator<PropertySheetPage> propertySheetPagesIterator = propertySheetPages.iterator();
- while(propertySheetPagesIterator.hasNext()) {
- PropertySheetPage propertySheetPage = propertySheetPagesIterator.next();
- if(propertySheetPage.getControl().isDisposed()) {
- propertySheetPagesIterator.remove();
- } else {
- propertySheetPage.refresh();
- }
- }
- }
- });
- }
- });
-
- // Create the editing domain with a special command stack.
- //
- editingDomain = new TransactionalEditingDomainImpl(adapterFactory, commandStack);
- editingDomain.setResourceToReadOnlyMap(new HashMap<Resource, Boolean>());
- }
-
- @Override
- protected void createContextMenuFor(StructuredViewer viewer) {
- MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
- contextMenu.add(new Separator("additions")); //$NON-NLS-1$
- contextMenu.setRemoveAllWhenShown(true);
- contextMenu.addMenuListener(this);
- Menu menu = contextMenu.createContextMenu(viewer.getControl());
- viewer.getControl().setMenu(menu);
-
- int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
- Transfer[] transfers = new Transfer[]{ LocalTransfer.getInstance() };
- viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
- viewer.addDropSupport(dndOperations, transfers, new MoDiscoDropAdapter(editingDomain, viewer));
- }
-
- @Override
- public IPropertySheetPage getPropertySheetPage() {
- if(iPropertySheetPage == null) {
- iPropertySheetPage = new TabbedPropertySheetPage(this);
- }
- return iPropertySheetPage;
- }
-
- protected CustomizationManager getCustomizationManager() {
- return Activator.getDefault().getCustomizationManager();
- }
-
- protected IStructuredContentProvider createContentProvider() {
- return new CustomizableContentProvider(getCustomizationManager());
- }
-
- protected ILabelProvider createLabelProvider() {
- LabelProviderService service = new LabelProviderServiceImpl();
- try {
- service.startService();
- } catch (ServiceException ex) {
- Activator.log.error(ex);
- return new LabelProvider();
- }
- return service.getLabelProvider();
- // try {
- // return registry.getService(LabelProviderService.class).getLabelProvider();
- // } catch (ServiceException ex) {
- // Activator.log.error(ex);
- // return new LabelProvider();
- // }
- }
-
- public void commandStackChanged(EventObject event) {
- getViewer().refresh();
- }
-
- public String getContributorId() {
- return PROPERTY_VIEW_ID;
- }
-}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/src/org/eclipse/papyrus/infra/emf/editor/providers/CustomizableContentProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/src/org/eclipse/papyrus/infra/emf/editor/providers/CustomizableContentProvider.java
deleted file mode 100644
index b0158b0..0000000
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/src/org/eclipse/papyrus/infra/emf/editor/providers/CustomizableContentProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.emf.editor.providers;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelContentProvider;
-import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;
-
-
-public class CustomizableContentProvider extends CustomizableModelContentProvider {
-
- public CustomizableContentProvider(CustomizationManager customizationManager) {
- super(customizationManager);
- }
-
- @Override
- public Object[] getRootElements(final Object inputElement) {
- if(inputElement instanceof IFile) {
- return super.getRootElements(inputElement);
- }
-
- if(inputElement instanceof ResourceSet) {
- return ((ResourceSet)inputElement).getResources().get(0).getContents().toArray();
- }
-
- return new Object[0];
- }
-
- @Override
- public boolean hasChildren(Object parentElement) {
- return getChildren(parentElement).length > 0;
- }
-
-}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/.classpath
index 2ca72ba..ff7e605 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/.classpath
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/.classpath
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry excluding="org/eclipse/papyrus/infra/emf/newchild/action/ExtendedTypeAction.java" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath> \ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/src/org/eclipse/papyrus/infra/emf/newchild/action/ExtendedTypeAction.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/src/org/eclipse/papyrus/infra/emf/newchild/action/ExtendedTypeAction.java
deleted file mode 100644
index 120edaa..0000000
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/src/org/eclipse/papyrus/infra/emf/newchild/action/ExtendedTypeAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.emf.newchild.action;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedEditHelperAdvice;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedSemanticTypeDescriptor;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-
-
-public class ExtendedTypeAction extends Action {
-
- private IElementType elementType;
-
- private EObject parent;
-
- private EditingDomain domain;
-
- private ExtendedSemanticTypeDescriptor descriptor;
-
- public static ExtendedEditHelperAdvice advice = new ExtendedEditHelperAdvice();
-
- public ExtendedTypeAction(EObject parent, ExtendedElementTypeConfiguration elementTypeConfiguration, EditingDomain domain) {
- this.elementType = ExtendedTypesRegistry.getInstance().getType(elementTypeConfiguration.getId());
- // this.descriptor = new ExtendedSemanticTypeDescriptor(elementTypeConfiguration);
- // this.elementType = ExtendedHintedTypeFactory.getInstance().createSpecializationType(descriptor);
- this.parent = parent;
- this.domain = domain;
-
- configureAction();
- }
-
- protected void configureAction() {
- setText(descriptor.getName());
- setImageDescriptor(ImageDescriptor.createFromURL(descriptor.getIconURL()));
- }
-
- @Override
- public void run() {
- CreateElementRequest request = new CreateElementRequest((TransactionalEditingDomain)domain, parent, elementType);
-
- IElementEditService provider = ElementEditServiceUtils.getCommandProvider(parent);
-
- if(provider != null) {
- ICommand createGMFCommand = provider.getEditCommand(request);
-
- Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);
-
- domain.getCommandStack().execute(emfCommand);
- }
- }
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.classpath b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.classpath
index 37a803e..347916a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.classpath
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.classpath
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry excluding="org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/ModelStyleSheetsModelElement.java" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath> \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/build.properties
index 0ec1139..3371776 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/build.properties
@@ -4,3 +4,4 @@ bin.includes = META-INF/,\
plugin.pdoc,\
OSGI-INF/,\
about.html
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.classpath
index 6c79a3a..db94bd8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.classpath
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.classpath
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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 excluding="org/eclipse/papyrus/infra/emf/nattable/celleditor/editors/EMFSingleEBooleanCheckBoxCellEditorConfig.java|org/eclipse/papyrus/infra/emf/nattable/celleditor/editors/EMFSingleEEnumEditorConfig.java|org/eclipse/papyrus/infra/emf/nattable/celleditor/editors/EMFSingleEIntCellEditorConfig.java|org/eclipse/papyrus/infra/emf/nattable/celleditor/editors/EMFSingleEStringCellEditorConfig.java|org/eclipse/papyrus/infra/emf/nattable/celleditor/registry/EMFFeatureCellEditorFactory.java" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <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="output" path="bin"/>
+</classpath> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/build.properties
index 104bd7a..06a68a7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/build.properties
@@ -3,6 +3,5 @@ bin.includes = META-INF/,\
plugin.xml,\
OSGI-INF/,\
about.html,\
- icons/,\
- resources/
+ icons/,
src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.classpath
index f0c973d..eae3307 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.classpath
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.classpath
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry excluding="org/eclipse/papyrus/infra/nattable/row/reorder/DefaultReorderBindings.java|org/eclipse/papyrus/infra/nattable/row/reorder/DefaultRowReorderLayerConfiguration.java|org/eclipse/papyrus/infra/nattable/row/reorder/MultiRowReorderCommand.java|org/eclipse/papyrus/infra/nattable/row/reorder/MultiRowReorderCommandHandler.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderCommand.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderCommandHandler.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderDragMode.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderEndCommand.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderEndCommandHandler.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderEvent.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderLayer.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderStartCommand.java|org/eclipse/papyrus/infra/nattable/row/reorder/RowReorderStartCommandHandler.java|org/eclipse/papyrus/infra/nattable/celleditor/configs/IAxisEStructuralFeatureCellEditorConfiguration.java" kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath> \ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath
index 7441b7f..347916a 100644
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath
+++ b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry excluding="org/eclipse/papyrus/eclipse/project/editors/interfaces/IEMFFacetProjectEditor.java|org/eclipse/papyrus/eclipse/project/editors/project/EMFFacetProjectEditor.java" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath> \ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IEMFFacetProjectEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IEMFFacetProjectEditor.java
deleted file mode 100644
index 707b084..0000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IEMFFacetProjectEditor.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.eclipse.project.editors.interfaces;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.facet.infra.facet.FacetSet;
-
-/**
- *
- * This interface is used to edit the EMF-Facet project
- *
- */
-public interface IEMFFacetProjectEditor extends IJavaProjectEditor/* , IManifestEditor , IBuildEditor */{
-
- /** the EMF-Facet nature */
- public static final String EMF_FACET_NATURE = "org.eclipse.emf.facet.common.ProjectNature"; //$NON-NLS-1$
-
- /** the name of the extension point for the facet registration */
- public static final String FACET_REGISTRATION = "org.eclipse.emf.facet.infra.facet.registration"; //$NON-NLS-1$
-
- /** the name of the extension point for the query registration */
- public static final String QUERY_REGISTRATION = "org.eclipse.emf.facet.infra.query.registration"; //$NON-NLS-1$
-
- /** the build command for EMF_FACET project */
- public static final String EMF_FACET_BUILD_COMMAND = "org.eclipse.emf.facet.common.core.builder";
-
- public static final String FACET_SET = "facetset"; //$NON-NLS-1$
-
- public static final String FILE = "file"; //$NON-NLS-1$
-
- public static final String QUERY_SET = "modelqueryset"; //$NON-NLS-1$
-
- /**
- *
- * @param facetSets
- * a list of FacetSet to register
- */
- public void registerFacetSets(final List<FacetSet> facetSets);
-
- /**
- *
- * @param querySets
- * a list of QuerySet to register
- */
- public void registerQuerySets(final List<EObject> querySets);
-
- /**
- *
- * @param dependency
- * a dependency to add to the project
- */
- public void addDependency(final String dependency);
-
- /**
- *
- * @param dependency
- * a dependency to add to the project
- * @param version
- * the version of the dependency
- */
- public void addDependency(final String dependency, final String version);
-
- /**
- * Gets the plugin editor.
- *
- * @return the plugin editor
- */
- public IPluginProjectEditor getPluginEditor();
-
-
-
- /**
- * Gets the manifest editor.
- *
- * @return the manifest editor
- */
- public IManifestEditor getManifestEditor() ;
-
-
-}
diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/EMFFacetProjectEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/EMFFacetProjectEditor.java
deleted file mode 100644
index b329e0c..0000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/EMFFacetProjectEditor.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.eclipse.project.editors.project;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.facet.infra.facet.FacetSet;
-import org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IEMFFacetProjectEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-/**
- *
- * Editor for the EMF-Facet project
- *
- */
-public class EMFFacetProjectEditor extends JavaProjectEditor implements IEMFFacetProjectEditor {
-
- /**
- * the plugin editor
- */
- private final IPluginProjectEditor pluginEditor;
-
- /**
- * the manifest editor
- */
- private final IManifestEditor manifestEditor;
-
-
- /**
- * Gets the plugin editor.
- *
- * @return the plugin editor
- */
- public IPluginProjectEditor getPluginEditor() {
- return pluginEditor;
- }
-
-
-
- /**
- * Gets the manifest editor.
- *
- * @return the manifest editor
- */
- public IManifestEditor getManifestEditor() {
- return manifestEditor;
- }
-
-
- /**
- *
- * Constructor.
- *
- * @param project
- * @throws CoreException
- * @throws IOException
- * @throws SAXException
- * @throws ParserConfigurationException
- */
- public EMFFacetProjectEditor(final IProject project) throws IOException, CoreException, ParserConfigurationException, SAXException {
- super(project);
- this.pluginEditor = new PluginProjectEditor(project);
- this.manifestEditor = new ManifestEditor(project);
- }
-
-
- /**
- *
- * @see org.eclipse.papyrus.eclipse.project.editors.project.JavaProjectEditor#getMissingNature()
- *
- * {@inheritDoc}
- */
- @Override
- public Set<String> getMissingNature() {
- Set<String> natures = super.getMissingNature();
- natures.addAll(this.pluginEditor.getMissingNature());
- if(!hasNature(EMF_FACET_NATURE)) {
- natures.add(EMF_FACET_NATURE);
- }
- return natures;
- }
-
- @Override
- public void init() {
- super.init();
- this.manifestEditor.init();
- this.pluginEditor.init();
- }
-
- /**
- *
- * @see org.eclipse.papyrus.eclipse.project.editors.project.JavaProjectEditor#getMissingFiles()
- *
- * {@inheritDoc}
- */
- @Override
- public Set<String> getMissingFiles() {
- Set<String> files = super.getMissingFiles();
- files.addAll(this.pluginEditor.getMissingFiles());
- files.addAll(this.manifestEditor.getMissingFiles());
- return files;
- }
-
- /**
- *
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IEMFFacetProjectEditor#registerFacetSets(java.util.List)
- *
- * {@inheritDoc}
- */
- public void registerFacetSets(final List<FacetSet> facetSets) {
- for(int i = 0; i < facetSets.size(); i++) {
- FacetSet set = facetSets.get(i);
- URI uri = set.eResource().getURI();
- IPath projectLocation = getProject().getLocation();
- String filepath = uri.devicePath();
- String projectPath = projectLocation.toOSString();
- filepath = filepath.substring(projectPath.length());
- if(filepath.charAt(0) == '/') {
- filepath = filepath.substring(1);
- }
- boolean registered = false;
- //we test if the file is already registered
- List<Node> extensions = this.pluginEditor.getExtensions(FACET_REGISTRATION);
- if(extensions != null) {
- Iterator<Node> iter = extensions.iterator();
- while(iter.hasNext()) {
- Node current = iter.next();
- Node child = current.getFirstChild();
- if(child != null) {
- NamedNodeMap attributes = child.getAttributes();
- Node node = attributes.getNamedItem(FILE);
- if(node != null) {
- String path = node.getNodeValue();
- registered = filepath.equals(path);
-
- }
- }
- }
- }
- if(!registered) {
- Element extension = this.pluginEditor.addExtension(FACET_REGISTRATION);
- Element facetSet = this.pluginEditor.addChild(extension, FACET_SET);
- this.pluginEditor.setAttribute(facetSet, FILE, filepath);
- }
- }
- }
-
- /**
- *
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IEMFFacetProjectEditor#registerQuerySets(java.util.List)
- *
- * {@inheritDoc}
- */
- public void registerQuerySets(final List<EObject> querySets) {
-
- for(int i = 0; i < querySets.size(); i++) {
-
- URI uri = querySets.get(i).eResource().getURI();
- IPath projectLocation = getProject().getLocation();
- String filepath = uri.devicePath();
- String projectPath = projectLocation.toOSString();
- filepath = filepath.substring(projectPath.length());
- if(filepath.charAt(0) == '/') {
- filepath = filepath.substring(1);
- }
- boolean registered = false;
- //we test if the file is already registered
- List<Node> extensions = this.pluginEditor.getExtensions(QUERY_REGISTRATION);
- if(extensions != null) {
- Iterator<Node> iter = extensions.iterator();
- while(iter.hasNext() && registered == false) {
- Node current = iter.next();
- Node child = current.getFirstChild();
- if(child != null) {
- NamedNodeMap attributes = child.getAttributes();
- Node node = attributes.getNamedItem(FILE);
- if(node != null) {
- String path = node.getNodeValue();
- registered = filepath.equals(path);
-
- }
- }
- }
- }
- if(!registered) {
- Element extension = this.pluginEditor.addExtension(QUERY_REGISTRATION);
- Element querySet = this.pluginEditor.addChild(extension, QUERY_SET);
- this.pluginEditor.setAttribute(querySet, FILE, filepath);
- }
- }
- }
-
- /**
- *
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IEMFFacetProjectEditor#addDependency(java.lang.String)
- *
- * {@inheritDoc}
- */
- public void addDependency(final String dependency) {
- this.manifestEditor.addDependency(dependency);
-
- }
-
- @Override
- public void save() {
- this.pluginEditor.save();
- this.manifestEditor.save();
- super.save();
- }
-
- /**
- *
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IEMFFacetProjectEditor#addDependency(java.lang.String, java.lang.String)
- *
- * {@inheritDoc}
- */
- public void addDependency(final String dependency, final String version) {
- this.manifestEditor.addDependency(dependency, version);
- }
-
- @Override
- public void create() {
- super.create();
- this.pluginEditor.create();
- this.manifestEditor.create();
- }
-
- /**
- *
- * @see org.eclipse.papyrus.eclipse.project.editors.project.JavaProjectEditor#createFiles(java.util.Set)
- *
- * {@inheritDoc}
- */
- @Override
- public void createFiles(final Set<String> files) {
- this.pluginEditor.createFiles(files);
- this.manifestEditor.createFiles(files);
- super.createFiles(files);
- }
-
- /**
- *
- * @see org.eclipse.papyrus.eclipse.project.editors.project.JavaProjectEditor#getMissingBuildCommand()
- *
- * {@inheritDoc}
- */
- @Override
- public Set<String> getMissingBuildCommand() {
- Set<String> buildCommand = super.getMissingBuildCommand();
- buildCommand.addAll(this.pluginEditor.getMissingBuildCommand());
- if(!hasBuildCommand(IManifestEditor.MANIFEST_BUILD_COMMAND)) {
- buildCommand.add(IManifestEditor.MANIFEST_BUILD_COMMAND);
- }
- if(!hasBuildCommand(EMF_FACET_BUILD_COMMAND)) {
- buildCommand.add(EMF_FACET_BUILD_COMMAND);
- }
- return buildCommand;
- }
-}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/build.properties b/plugins/infra/org.eclipse.papyrus.infra.doc/build.properties
index bf5fe19..bc36f4a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/build.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.doc/build.properties
@@ -6,3 +6,4 @@ bin.includes = META-INF/,\
toc.xml,\
about.html,\
resource/
+src.includes = about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/about.html b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/about.html
new file mode 100755
index 0000000..77ef695
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>March, 2014</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/build.properties b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/build.properties
index 20dcdf9..ed6ddf0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/build.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/build.properties
@@ -18,3 +18,4 @@ jars.compile.order = .
source.. = src-gen/,\
src/
output.. = bin
+src.includes = about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/.classpath b/plugins/infra/org.eclipse.papyrus.infra.tools/.classpath
index 947a9a8..347916a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/.classpath
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/.classpath
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry excluding="org/eclipse/papyrus/infra/tools/databinding/MultipleObservableList.java" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath> \ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableList.java b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableList.java
deleted file mode 100644
index ddf8af2..0000000
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableList.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.tools.databinding;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.ObservableList;
-
-//TODO : Implement the getters
-//The list may be either the union or the intersection of all sublists
-//Union : allows the "remove" and "removeAll" on a group of lists (Even if one of the sublists doesn't contain the given element)
-//Intersection : Closer to the behavior of the CompositeValue (The current value is displayed only if it is shared by all elements)
-//The Union is probably a better solution
-//Simple solution : bind read operations to the first sub-list
-
-/**
- * A Composite ObservableList. Modifications are forwarded to each sublist
- * The read operations are not supported. This list behaves as if it were empty
- *
- * @author Camille Letavernier
- */
-//TODO : Add listeners on sub-observables, and remove them on dispose
-public class MultipleObservableList extends ObservableList implements ICommitListener, AggregatedObservable {
-
- List<IObservableList> observableLists = new LinkedList<IObservableList>();
-
- /**
- *
- * Constructor.
- *
- */
- public MultipleObservableList() {
- super(new LinkedList<Object>(), Object.class);
- throw new UnsupportedOperationException("This class is not supported yet"); //$NON-NLS-1$
- }
-
- @Override
- public void add(int index, Object element) {
- for(IObservableList observableList : observableLists) {
- observableList.add(index, element);
- }
- }
-
- @Override
- public void clear() {
- for(IObservableList observableList : observableLists) {
- observableList.clear();
- }
- }
-
- @Override
- public boolean contains(Object o) {
- boolean contains = false;
-
- for(IObservableList observableList : observableLists) {
- if(observableList.contains(o)) {
- contains = true;
- } else {
- return false;
- }
- }
-
- return contains;
- }
-
- @Override
- public boolean add(Object o) {
- for(IObservableList observableList : observableLists) {
- observableList.add(o);
- }
- return true;
- }
-
- @Override
- public boolean remove(Object o) {
- for(IObservableList observableList : observableLists) {
- observableList.remove(o);
- }
- return true;
- }
-
- @Override
- public boolean containsAll(Collection c) {
- boolean containsAll = false;
- for(IObservableList observableList : observableLists) {
- containsAll = containsAll && observableList.containsAll(c);
- }
- return containsAll;
- }
-
- @Override
- public boolean addAll(Collection c) {
- for(IObservableList observableList : observableLists) {
- observableList.addAll(c);
- }
- return true;
- }
-
- @Override
- public boolean addAll(int index, Collection c) {
- for(IObservableList observableList : observableLists) {
- observableList.addAll(index, c);
- }
- return true;
- }
-
- @Override
- public boolean removeAll(Collection c) {
- for(IObservableList observableList : observableLists) {
- observableList.removeAll(c);
- }
- return true;
- }
-
- @Override
- public boolean retainAll(Collection c) {
- for(IObservableList observableList : observableLists) {
- observableList.retainAll(c);
- }
- return true;
- }
-
- @Override
- public Object set(int index, Object element) {
- for(IObservableList observableList : observableLists) {
- observableList.set(index, element);
- }
- return null;
- }
-
- @Override
- public Object move(int oldIndex, int newIndex) {
- for(IObservableList observableList : observableLists) {
- observableList.move(oldIndex, newIndex);
- }
- return null;
- }
-
- @Override
- public Object remove(int index) {
- for(IObservableList observableList : observableLists) {
- observableList.remove(index);
- }
- return null;
- }
-
- public void commit(AbstractEditor editor) {
- for(IObservableList observableList : observableLists) {
- if(observableList instanceof ICommitListener) {
- ((ICommitListener)observableList).commit(editor);
- }
- }
- }
-
- @Override
- public void dispose() {
- super.dispose();
- for(IObservableList observable : observableLists) {
- observable.dispose();
- }
- }
-}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/build.properties
index ae22b3b..f70828b 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/build.properties
@@ -5,3 +5,4 @@ bin.includes = META-INF/,\
about.html,\
plugin.properties,\
plugin.xml
+src.includes = about.html
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/build.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/build.properties
index 8e222d8..fd27543 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/build.properties
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/build.properties
@@ -9,3 +9,4 @@ bin.includes = .,\
jars.compile.order = .
source.. = src/
output.. = bin
+src.includes = about.html
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
index e0c3058..db432d3 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
@@ -20,7 +20,6 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/build.properties
index 1068d29..0f4ea95 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/build.properties
@@ -1,6 +1,6 @@
#
#Mon Sep 12 09:29:44 CEST 2011
-bin.includes=META-INF/,.,plugin.xml,messages.properties,plugin.properties,schema/,about.html
+bin.includes=META-INF/,.,messages.properties,plugin.properties,schema/,about.html
output..=bin/
src.includes = about.html
source..=src/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/build.properties
index 0953209..b51c584 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/build.properties
@@ -10,3 +10,4 @@ bin.includes = META-INF/,\
plugin.properties,\
messages.properties
+src.includes = about.html
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.classpath b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.classpath
index dd6c4e1..db94bd8 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.classpath
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.classpath
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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 excluding="org/eclipse/papyrus/uml/nattable/celleditor/editor/SingleReferenceComboCellEditor.java" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <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="output" path="bin"/>
+</classpath> \ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/build.properties b/plugins/uml/org.eclipse.papyrus.uml.service.types/build.properties
index 9764b35..9d0aee9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/build.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/build.properties
@@ -1,6 +1,5 @@
bin.includes = META-INF/,\
.,\
- bin/,\
about.html,\
plugin.properties,\
icons/,\
@@ -8,4 +7,3 @@ bin.includes = META-INF/,\
output..=bin/
src.includes = about.html
source..=src/,src-gen/
-bin..=bin/
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.classpath b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.classpath
index e7cc931..310f737 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.classpath
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.classpath
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src-gen"/>
- <classpathentry excluding="org/eclipse/papyrus/uml/properties/xtext/" kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src-gen"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath> \ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/CollaborationUseAdapter.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/CollaborationUseAdapter.java
deleted file mode 100644
index 647ae89..0000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/CollaborationUseAdapter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.properties.xtext;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.widgets.xtext.adapter.IXtextAdapter;
-
-import com.google.inject.Injector;
-
-
-public class CollaborationUseAdapter implements IXtextAdapter {
-
- public EObject reconcile(EObject sourceModelObject, EObject xtextObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getText(EObject modelObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Injector getInjector(EObject sourceModelObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/ConnectionPointReferenceAdapter.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/ConnectionPointReferenceAdapter.java
deleted file mode 100644
index 5c46d5c..0000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/ConnectionPointReferenceAdapter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.properties.xtext;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.widgets.xtext.adapter.IXtextAdapter;
-
-import com.google.inject.Injector;
-
-
-public class ConnectionPointReferenceAdapter implements IXtextAdapter {
-
- public EObject reconcile(EObject sourceModelObject, EObject xtextObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getText(EObject modelObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Injector getInjector(EObject sourceModelObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/MessageAdapter.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/MessageAdapter.java
deleted file mode 100644
index 85b4caa..0000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/MessageAdapter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.properties.xtext;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.widgets.xtext.adapter.IXtextAdapter;
-
-import com.google.inject.Injector;
-
-
-public class MessageAdapter implements IXtextAdapter {
-
- public EObject reconcile(EObject sourceModelObject, EObject xtextObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getText(EObject modelObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Injector getInjector(EObject sourceModelObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/ParameterAdapter.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/ParameterAdapter.java
deleted file mode 100644
index 8af4544..0000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/ParameterAdapter.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.properties.xtext;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.widgets.xtext.adapter.IXtextAdapter;
-
-import com.google.inject.Injector;
-
-
-public class ParameterAdapter implements IXtextAdapter {
-
- public EObject reconcile(EObject sourceModelObject, EObject xtextObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getText(EObject modelObject) {
- //ParameterPopupEditor config = new ParameterPopupEditor();
- //return config.getTextToEdit(modelObject);
- return null;
- }
-
- public Injector getInjector(EObject sourceModelObject) {
- // Injector injector = InjectorFactory.createInjector((Parameter)sourceModelObject);
- // System.out.println(injector.getInstance(Element.class));
- // return injector;
- return null;
- }
-
-}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/PropertyAdapter.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/PropertyAdapter.java
deleted file mode 100644
index 7ecfc6d..0000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/PropertyAdapter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.properties.xtext;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.property.editor.xtext.ui.contributions.PropertyPopupEditorConfigurationContribution;
-import org.eclipse.papyrus.property.editor.xtext.ui.internal.UmlPropertyActivator;
-import org.eclipse.papyrus.property.editor.xtext.umlProperty.PropertyRule;
-import org.eclipse.papyrus.infra.widgets.xtext.adapter.IXtextAdapter;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.VisibilityKind;
-
-import com.google.inject.Injector;
-
-
-public class PropertyAdapter implements IXtextAdapter {
-
- public EObject reconcile(EObject sourceModelObject, EObject xtextObject) {
- Property target;
- if(sourceModelObject != null) {
- target = (Property)sourceModelObject;
- } else {
- target = UMLFactory.eINSTANCE.createProperty();
- }
- PropertyRule source = (PropertyRule)xtextObject;
-
-
- //TODO
-
-
- return target;
- }
-
- private VisibilityKind getVisibility(PropertyRule source) {
- switch(source.getVisibility()) {
- case PACKAGE:
- return VisibilityKind.PACKAGE_LITERAL;
- case PRIVATE:
- return VisibilityKind.PRIVATE_LITERAL;
- case PROTECTED:
- return VisibilityKind.PROTECTED_LITERAL;
- case PUBLIC:
- return VisibilityKind.PUBLIC_LITERAL;
- default:
- return null;
- }
- }
-
- public String getText(EObject modelObject) {
- PropertyPopupEditorConfigurationContribution config = new PropertyPopupEditorConfigurationContribution();
- return config.getTextToEdit(modelObject); //Cannot retrieve the property type's label
- }
-
- public Injector getInjector(EObject sourceModelObject) {
- return UmlPropertyActivator.getInstance().getInjector((Property)sourceModelObject);
- }
-
-}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/StateAdapter.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/StateAdapter.java
deleted file mode 100644
index 9b8bc93..0000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/StateAdapter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.properties.xtext;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.widgets.xtext.adapter.IXtextAdapter;
-
-import com.google.inject.Injector;
-
-
-public class StateAdapter implements IXtextAdapter {
-
- public EObject reconcile(EObject sourceModelObject, EObject xtextObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getText(EObject modelObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Injector getInjector(EObject sourceModelObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/TransitionAdapter.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/TransitionAdapter.java
deleted file mode 100644
index 4d62973..0000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/xtext/TransitionAdapter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 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
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.properties.xtext;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.widgets.xtext.adapter.IXtextAdapter;
-
-import com.google.inject.Injector;
-
-
-public class TransitionAdapter implements IXtextAdapter {
-
- public EObject reconcile(EObject sourceModelObject, EObject xtextObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getText(EObject modelObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Injector getInjector(EObject sourceModelObject) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF
index e2dc881..f844d80 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF
@@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF
index cc48be9..d9eca46 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF
index c46a4f4..884cda0 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
index 64b0eef..9921dd3 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
@@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.classpath
index 5353f0e..ff7e605 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.classpath
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.classpath
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="org/eclipse/papyrus/uml/textedit/parameter/xtext/ui/contributions/ParameterPopupEditor.java" kind="src" path="src"/>
- <classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath> \ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/src/org/eclipse/papyrus/uml/textedit/parameter/xtext/ui/contributions/ParameterPopupEditor.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/src/org/eclipse/papyrus/uml/textedit/parameter/xtext/ui/contributions/ParameterPopupEditor.java
deleted file mode 100644
index 67760f9..0000000
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/src/org/eclipse/papyrus/uml/textedit/parameter/xtext/ui/contributions/ParameterPopupEditor.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contributions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.commands.CheckedOperationHistory;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon.TypeRule;
-import org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.internal.UmlParameterActivator;
-import org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter.ParameterRule;
-import org.eclipse.papyrus.uml.textedit.parameter.xtext.validation.SemanticValidator;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.ParameterDirectionKind;
-import org.eclipse.uml2.uml.ParameterEffectKind;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLPackage;
-
-import com.google.inject.Injector;
-
-
-
-public class ParameterPopupEditor extends PopupEditorConfiguration {
-
- /** the new name for the {@link Parameter} */
- private String newName;
-
- /** the new type for the {@link Parameter} */
- private Type newType;
-
- /** the new visibility for the {@link Parameter} */
- private org.eclipse.uml2.uml.VisibilityKind newVisibility;
-
- /** the managed {@link Parameter} */
- private Parameter parameter;
-
- /** the new value for isException */
- private boolean newIsException = false;
-
- /** the new value for isStream */
- private boolean newIsStream = false;
-
- /** the new value for isOrdered */
- private boolean newIsOrdered = false;
-
- /** the new value for isUnique */
- private boolean newIsUnique = false;
-
- /** the new lowerBound */
- private int newLowerBound = 1;
-
- /** the new upperBound */
- private int newUpperBound = 1;
-
- /** the new effect for the parameter */
- private ParameterEffectKind newEffect;
-
- /** the new direction of the parameter */
- private ParameterDirectionKind newDirection;
-
- //TODO : do an abstract method in the super class to init the validator
- //public abstract initValidator(Element el);
- //with the validator in the super class
-
- /**
- *
- * @see org.eclipse.papyrus.infra.gmfdiag.xtext.glue.PopupEditorConfiguration#createPopupEditorHelper(java.lang.Object)
- *
- * @param editPart
- * @return
- */
- @Override
- public IPopupEditorHelper createPopupEditorHelper(Object editPart) {
- // resolves the edit part, and the associated semantic element
- IGraphicalEditPart graphicalEditPart = null;
- if(!(editPart instanceof IGraphicalEditPart)) {
- return null;
- }
- graphicalEditPart = (IGraphicalEditPart)editPart;
-
- if(!(graphicalEditPart.resolveSemanticElement() instanceof Parameter)) {
- return null;
- }
- parameter = (Parameter)graphicalEditPart.resolveSemanticElement();
-
- // retrieves the XText injector
- Injector injector = UmlParameterActivator.getInstance().getInjector("org.eclipse.papyrus.uml.textedit.parameter.xtext.UmlParameter"); //$NON-NLS-1$
-
- // builds the text content and extension for a temporary file, to be edited by the xtext editor
- String textToEdit = "" + this.getTextToEdit(graphicalEditPart.resolveSemanticElement()); //$NON-NLS-1$
- String fileExtension = "" + ".umlparameter"; //$NON-NLS-1$ //$NON-NLS-2$
-
- // builds a new IXtextEMFReconciler.
- // Its purpose is to extract any relevant information from the textual specification,
- // and then merge it in the context UML model if necessary
- IXtextEMFReconciler reconciler = new IXtextEMFReconciler() {
-
- public void reconcile(EObject modelObject, EObject xtextObject) {
- // first: retrieves / determines if the xtextObject is a CollaborationUseRule object
- EObject modifiedObject = xtextObject;
- if(!(modelObject instanceof Parameter)) {
- return;
- }
- while(xtextObject != null && !(xtextObject instanceof ParameterRule)) {
- modifiedObject = modifiedObject.eContainer();
- }
- if(modifiedObject == null) {
- return;
- }
- ParameterRule parameterRuleObject = (ParameterRule)xtextObject;
-
- // Retrieves the information to be populated in modelObject
- if(parameterRuleObject.getModifiers() != null) {
- for(org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter.ModifierSpecification modifier : parameterRuleObject.getModifiers().getValues()) {
- switch(modifier.getValue()) {
- case ORDERED:
- newIsOrdered = true;
- break;
- case UNIQUE:
- newIsUnique = true;
- break;
- case EXCEPTION:
- newIsException = true;
- break;
- case STREAM:
- newIsStream = true;
- break;
- default:
- break;
- }
- }
- }
-
- if(parameterRuleObject.getMultiplicity() != null) {
- if(parameterRuleObject.getMultiplicity().getBounds().size() == 1) {
- String tempBound = parameterRuleObject.getMultiplicity().getBounds().get(0).getValue();
- if(tempBound.equals("*")) { //$NON-NLS-1$
- newLowerBound = 0;
- newUpperBound = -1;
- } else {
- newLowerBound = new Integer(tempBound).intValue();
- newUpperBound = new Integer(tempBound).intValue();
- }
- } else { //size == 2
- String tempBound = parameterRuleObject.getMultiplicity().getBounds().get(0).getValue();
- newLowerBound = new Integer(tempBound).intValue();
- tempBound = parameterRuleObject.getMultiplicity().getBounds().get(1).getValue();
- if(tempBound.equals("*")) { //$NON-NLS-1$
- newUpperBound = -1;
- } else {
- newUpperBound = new Integer(tempBound).intValue();
- }
- }
- } else {//reset to the default value :
- newLowerBound = 1;
- newUpperBound = 1;
- }
-
- newName = "" + parameterRuleObject.getName(); //$NON-NLS-1$
-
- TypeRule typeRule = parameterRuleObject.getType();
- if(typeRule == null) {
- newType = null;
- } else {
- newType = typeRule.getType();
- }
-
- newVisibility = org.eclipse.uml2.uml.VisibilityKind.PUBLIC_LITERAL;
-
- switch(parameterRuleObject.getVisibility()) {
- case PUBLIC:
- newVisibility = org.eclipse.uml2.uml.VisibilityKind.PUBLIC_LITERAL;
- break;
- case PACKAGE:
- newVisibility = org.eclipse.uml2.uml.VisibilityKind.PACKAGE_LITERAL;
- break;
- case PRIVATE:
- newVisibility = org.eclipse.uml2.uml.VisibilityKind.PRIVATE_LITERAL;
- break;
- case PROTECTED:
- newVisibility = org.eclipse.uml2.uml.VisibilityKind.PROTECTED_LITERAL;
- break;
- default:
- break;
- }
-
- switch(parameterRuleObject.getDirection()) {
- case IN:
- newDirection = ParameterDirectionKind.IN_LITERAL;
- break;
- case OUT:
- newDirection = ParameterDirectionKind.OUT_LITERAL;
- break;
- case INOUT:
- newDirection = ParameterDirectionKind.INOUT_LITERAL;
- break;
- case RETURN:
- newDirection = ParameterDirectionKind.RETURN_LITERAL;
- break;
-
- }
-
- switch(parameterRuleObject.getEffect().getEffectKind()) {
- case CREATE:
- newEffect = ParameterEffectKind.CREATE_LITERAL;
- break;
- case DELETE:
- newEffect = ParameterEffectKind.DELETE_LITERAL;
- break;
- case READ:
- newEffect = ParameterEffectKind.READ_LITERAL;
- break;
- case UPDATE:
- newEffect = ParameterEffectKind.UPDATE_LITERAL;
- break;
- }
-
- IUndoableOperation updateCommand = getUpdateCommand();
-
- try {
- CheckedOperationHistory.getInstance().execute(updateCommand, new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- System.err.println(e);
- }
- }
- };
- return super.createPopupEditorHelper(graphicalEditPart, injector, reconciler, textToEdit, fileExtension, new SemanticValidator());
- }
-
- /**
- *
- * @see org.eclipse.papyrus.infra.gmfdiag.xtext.glue.PopupEditorConfiguration#getTextToEdit(java.lang.Object)
- *
- * @param editedObject
- * @return
- */
- @Override
- public String getTextToEdit(Object editedObject) {
- if(editedObject instanceof Parameter) {
- return UMLParameterEditorUtil.getLabel((Parameter)editedObject).trim();
- }
- return "not a Parameter"; //$NON-NLS-1$
- }
-
- /**
- * Returns the list of requests to update the {@link #parameter}
- *
- * @return
- * the list of requests to update the {@link #parameter}
- */
- protected List<SetRequest> getRequests() {
- List<SetRequest> requests = new ArrayList<SetRequest>();
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getNamedElement_Name(), newName));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getNamedElement_Visibility(), newVisibility));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getTypedElement_Type(), newType));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getParameter_IsException(), newIsException));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getParameter_IsStream(), newIsStream));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getMultiplicityElement_IsOrdered(), newIsOrdered));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getMultiplicityElement_IsUnique(), newIsUnique));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getParameter_Direction(), newDirection));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getMultiplicityElement_Lower(), newLowerBound));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getMultiplicityElement_Upper(), newUpperBound));
- requests.add(new SetRequest(parameter, UMLPackage.eINSTANCE.getParameter_Effect(), newEffect));
- return requests;
- }
-
- /**
- * Returns the update command
- *
- * @return
- * the update command
- */
- protected IUndoableOperation getUpdateCommand() {
- CompositeCommand cc = new CompositeCommand("Set values for Parameter"); //$NON-NLS-1$
- IElementEditService provider = ElementEditServiceUtils.getCommandProvider(parameter);
- if(provider != null) {
-
- ICommand editCommand = null;
- for(SetRequest current : getRequests()) {
- editCommand = provider.getEditCommand(current);
-
- if(editCommand != null && editCommand.canExecute()) {
- cc.add(editCommand);
- }
- }
- }
- return cc;
- }
-}
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF
index e505839..1f816be 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF
@@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
org.eclipse.uml2.uml;bundle-version="3.1.0",
org.eclipse.xtext.util,
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF
index 58e88bb..aff8112 100755
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF
index 22ada56..9c65626 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
com.ibm.icu;resolution:=optional,
- org.eclipse.xtext.xtend;resolution:=optional,
org.eclipse.xtext.util,
org.eclipse.emf.ecore,
org.eclipse.emf.common,