Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Le Fevre - CEA2016-03-23 08:37:44 -0400
committerFrancois Le Fevre - CEA2016-12-02 09:22:45 -0500
commit80a748cad3053b544719a88bc169df66346c083e (patch)
treea9f35bca86fa4c59c485cb10010ba74105f79443
parent941bb615fd965cab791ab55c37a57dd3337de21a (diff)
downloadorg.eclipse.papyrus-80a748cad3053b544719a88bc169df66346c083e.tar.gz
org.eclipse.papyrus-80a748cad3053b544719a88bc169df66346c083e.tar.xz
org.eclipse.papyrus-80a748cad3053b544719a88bc169df66346c083e.zip
Bug 476222: [examples] how to add the examples
- trying to integrate examples as a separate features - creation of intermediate poms Change-Id: I20af1ad53555a9256a2590fdd84fb0e8d60627e4 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=476222 Signed-off-by: Francois Le Fevre - CEA <francois.le-fevre@cea.fr>
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF5
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.lifecycleevents/pom.xml5
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.lifecycleevents/src/org/eclipse/papyrus/example/core/lifecycleevents/LifeCycleEventsMonitorService.java8
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/pom.xml8
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/pom.xml8
-rw-r--r--examples/core/pom.xml16
-rw-r--r--examples/emf/org.eclipse.papyrus.outline.emftree/META-INF/MANIFEST.MF1
-rw-r--r--examples/emf/org.eclipse.papyrus.outline.emftree/plugin.xml24
-rw-r--r--examples/emf/org.eclipse.papyrus.outline.emftree/pom.xml9
-rw-r--r--examples/emf/org.eclipse.papyrus.outline.emftree/src/org/eclipse/papyrus/outline/emftree/ContentOutline.java508
-rw-r--r--examples/emf/pom.xml14
-rw-r--r--examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/pom.xml7
-rw-r--r--examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.settings/org.eclipse.jdt.core.prefs14
-rw-r--r--examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/plugin.xml26
-rw-r--r--examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/pom.xml7
-rw-r--r--examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/src/org/eclipse/papyrus/infra/gmfdiag/connectionpoint/preferences/Activator.java141
-rw-r--r--examples/infra/pom.xml15
-rw-r--r--examples/others/org.eclipse.papyrus.example.diagram.simplediagram/pom.xml7
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/.classpath (renamed from examples/org.eclipse.papyrus.example.text.instance/.classpath)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/.project (renamed from examples/org.eclipse.papyrus.example.text.instance/.project)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF (renamed from examples/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/about.html (renamed from examples/org.eclipse.papyrus.example.text.instance/about.html)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/build.properties (renamed from examples/org.eclipse.papyrus.example.text.instance/build.properties)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/model/papyrustextinstance.ecore (renamed from examples/org.eclipse.papyrus.example.text.instance/model/papyrustextinstance.ecore)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/model/papyrustextinstance.genmodel (renamed from examples/org.eclipse.papyrus.example.text.instance/model/papyrustextinstance.genmodel)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/plugin.properties (renamed from examples/org.eclipse.papyrus.example.text.instance/plugin.properties)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/plugin.xml (renamed from examples/org.eclipse.papyrus.example.text.instance/plugin.xml)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/pom.xml (renamed from examples/org.eclipse.papyrus.example.text.instance/pom.xml)7
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrusTextInstance.java (renamed from examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrusTextInstance.java)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrustextinstanceFactory.java (renamed from examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrustextinstanceFactory.java)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrustextinstancePackage.java (renamed from examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrustextinstancePackage.java)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrusTextInstanceImpl.java (renamed from examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrusTextInstanceImpl.java)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrustextinstanceFactoryImpl.java (renamed from examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrustextinstanceFactoryImpl.java)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrustextinstancePackageImpl.java (renamed from examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrustextinstancePackageImpl.java)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/util/PapyrustextinstanceAdapterFactory.java (renamed from examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/util/PapyrustextinstanceAdapterFactory.java)0
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/util/PapyrustextinstanceSwitch.java (renamed from examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/util/PapyrustextinstanceSwitch.java)0
-rw-r--r--examples/others/pom.xml15
-rw-r--r--examples/pom.xml54
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.classpath (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/.classpath)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.project (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/.project)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.settings/org.eclipse.jdt.core.prefs (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/about.html (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/about.html)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/icons/texteditorv2.bmp (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/icons/texteditorv2.bmp)bin822 -> 822 bytes
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml)134
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/pom.xml (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/pom.xml)7
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/Activator.java (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/Activator.java)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/editor/PapyrusCommentEditor.java (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/editor/PapyrusCommentEditor.java)441
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/factory/CommentEditorFactory.java (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/factory/CommentEditorFactory.java)6
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/handler/CommentEditorHandler.java (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/handler/CommentEditorHandler.java)354
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java)191
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.classpath (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.classpath)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.project (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.project)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.settings/org.eclipse.jdt.core.prefs (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/about.html (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/about.html)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/icons/texteditor.bmp (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/icons/texteditor.bmp)bin1078 -> 1078 bytes
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.xml (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.xml)134
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/pom.xml (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/pom.xml)7
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/Activator.java (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/Activator.java)0
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/editor/PapyrusCommentEditor.java (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/editor/PapyrusCommentEditor.java)442
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/factory/CommentEditorFactory.java (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/factory/CommentEditorFactory.java)4
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/handler/CommentEditorHandler.java (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/handler/CommentEditorHandler.java)354
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/modelresource/TextEditorModelSharedResource.java (renamed from examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/modelresource/TextEditorModelSharedResource.java)0
-rw-r--r--examples/uml/org.eclipse.papyrus.thousandcreation/pom.xml7
-rw-r--r--examples/uml/org.eclipse.papyrus.thousandcreation/test/thousandcreation/HugeModelGenerationAction.java204
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.classpath (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/.classpath)0
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.project (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/.project)0
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.core.prefs (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.ui.prefs (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.ui.prefs)0
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.pde.api.tools.prefs (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.pde.api.tools.prefs)0
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF)2
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/about.html (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/about.html)0
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/build.properties (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/build.properties)0
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/icons/EmfTree.gif (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/icons/EmfTree.gif)bin369 -> 369 bytes
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/plugin.properties (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/plugin.properties)0
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/plugin.xml (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/plugin.xml)0
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/pom.xml (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/pom.xml)6
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/Activator.java (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/Activator.java)0
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/CreateEMFTreeDiagramHandler.java (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/CreateEMFTreeDiagramHandler.java)0
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/EmfTreeDiagramEditorFactory.java (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/EmfTreeDiagramEditorFactory.java)0
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/UMLEditor.java (renamed from examples/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/UMLEditor.java)0
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF1
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/pom.xml7
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateCompositeDiagramElementsCommand.java15
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateSequenceDiagramElementsCommand.java16
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.textual.editors.example/pom.xml7
-rw-r--r--examples/uml/pom.xml19
-rw-r--r--examples/user/pom.xml15
-rw-r--r--examples/user/referencediagrams/pom.xml16
-rw-r--r--features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/.project35
-rwxr-xr-xfeatures/papyrus-examples-features/org.eclipse.papyrus.examples.feature/build.properties6
-rw-r--r--features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/epl-v10.html304
-rwxr-xr-xfeatures/papyrus-examples-features/org.eclipse.papyrus.examples.feature/feature.properties132
-rw-r--r--features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/feature.xml116
-rw-r--r--features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/license.html107
-rw-r--r--features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/pom.xml29
-rw-r--r--features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/pom.xml~29
-rw-r--r--features/papyrus-examples-features/pom.xml19
-rw-r--r--pom.xml301
-rwxr-xr-xreleng/main/pom.xml2
-rw-r--r--releng/main/site/category.xml11
-rw-r--r--releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target2
107 files changed, 2793 insertions, 1588 deletions
diff --git a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF
index 5b74056ed94..6965c2e4f15 100644
--- a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF
+++ b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF
@@ -2,11 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.example.core.lifecycleevents;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-Activator: org.eclipse.papyrus.example.core.lifecycleevents.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.1.0"
+ org.eclipse.papyrus.infra.core,
+ org.eclipse.papyrus.infra.ui
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
diff --git a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/pom.xml b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/pom.xml
index 032789c897d..2a19d6bb685 100644
--- a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/pom.xml
+++ b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/pom.xml
@@ -2,10 +2,9 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../../releng/top-pom-main.xml</relativePath>
+ <artifactId>org.eclipse.papyrus.examples.core</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.example.core.lifecycleevents</artifactId>
<groupId>org.eclipse.papyrus</groupId>
diff --git a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/src/org/eclipse/papyrus/example/core/lifecycleevents/LifeCycleEventsMonitorService.java b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/src/org/eclipse/papyrus/example/core/lifecycleevents/LifeCycleEventsMonitorService.java
index 7acf5db4f13..ab2bae7b2ee 100644
--- a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/src/org/eclipse/papyrus/example/core/lifecycleevents/LifeCycleEventsMonitorService.java
+++ b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/src/org/eclipse/papyrus/example/core/lifecycleevents/LifeCycleEventsMonitorService.java
@@ -13,10 +13,10 @@
*****************************************************************************/
package org.eclipse.papyrus.example.core.lifecycleevents;
-import org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent;
-import org.eclipse.papyrus.infra.core.lifecycleevents.ILifeCycleEventsProvider;
-import org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener;
-import org.eclipse.papyrus.infra.core.lifecycleevents.LifeCycleEventsProvider;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.ILifeCycleEventsProvider;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider;
import org.eclipse.papyrus.infra.core.services.IService;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/pom.xml b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/pom.xml
index f055712b954..87f26333893 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/pom.xml
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/pom.xml
@@ -2,13 +2,11 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../../releng/top-pom-main.xml</relativePath>
+ <artifactId>org.eclipse.papyrus.examples.core</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.eclipse.papyrus</groupId>
<artifactId>org.eclipse.papyrus.example.core.sashwindows.fulleditor</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/pom.xml b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/pom.xml
index cb9ae5538e5..2556c4cb50d 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/pom.xml
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/pom.xml
@@ -2,13 +2,11 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../../releng/top-pom-main.xml</relativePath>
+ <artifactId>org.eclipse.papyrus.examples.core</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.example.core.sashwindows.simpleeditor</artifactId>
- <groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
new file mode 100644
index 00000000000..a6e10f2898d
--- /dev/null
+++ b/examples/core/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.examples</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.examples.core</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>org.eclipse.papyrus.example.core.lifecycleevents</module>
+ <module>org.eclipse.papyrus.example.core.sashwindows.fulleditor</module>
+ <module>org.eclipse.papyrus.example.core.sashwindows.simpleeditor</module>
+ </modules>
+</project> \ No newline at end of file
diff --git a/examples/emf/org.eclipse.papyrus.outline.emftree/META-INF/MANIFEST.MF b/examples/emf/org.eclipse.papyrus.outline.emftree/META-INF/MANIFEST.MF
index c3cea1cf703..ba569604806 100644
--- a/examples/emf/org.eclipse.papyrus.outline.emftree/META-INF/MANIFEST.MF
+++ b/examples/emf/org.eclipse.papyrus.outline.emftree/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.ui,
org.eclipse.emf.ecore.editor;bundle-version="2.5.0",
org.eclipse.uml2.uml.edit;bundle-version="3.0.0",
org.eclipse.core.runtime;bundle-version="3.7.0",
diff --git a/examples/emf/org.eclipse.papyrus.outline.emftree/plugin.xml b/examples/emf/org.eclipse.papyrus.outline.emftree/plugin.xml
index add958c9cbb..b56066c5a7f 100644
--- a/examples/emf/org.eclipse.papyrus.outline.emftree/plugin.xml
+++ b/examples/emf/org.eclipse.papyrus.outline.emftree/plugin.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.papyrus.infra.core.papyrusContentOutline">
- <contentoutline
- class="org.eclipse.papyrus.outline.emftree.ContentOutline"
- priority="1">
- </contentoutline>
- </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension
+ point="org.eclipse.papyrus.infra.ui.papyrusContentOutline">
+ <contentoutline
+ class="org.eclipse.papyrus.outline.emftree.ContentOutline"
+ priority="1">
+ </contentoutline>
+ </extension>
+
+</plugin>
diff --git a/examples/emf/org.eclipse.papyrus.outline.emftree/pom.xml b/examples/emf/org.eclipse.papyrus.outline.emftree/pom.xml
index 401adb773b9..7774594b139 100644
--- a/examples/emf/org.eclipse.papyrus.outline.emftree/pom.xml
+++ b/examples/emf/org.eclipse.papyrus.outline.emftree/pom.xml
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>org.eclipse.papyrus</artifactId>
+ <parent>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../../releng/top-pom-main.xml</relativePath>
+ <artifactId>org.eclipse.papyrus.examples.emf</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.outline.emftree</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/examples/emf/org.eclipse.papyrus.outline.emftree/src/org/eclipse/papyrus/outline/emftree/ContentOutline.java b/examples/emf/org.eclipse.papyrus.outline.emftree/src/org/eclipse/papyrus/outline/emftree/ContentOutline.java
index 35685f11be5..b6ff2f637ea 100644
--- a/examples/emf/org.eclipse.papyrus.outline.emftree/src/org/eclipse/papyrus/outline/emftree/ContentOutline.java
+++ b/examples/emf/org.eclipse.papyrus.outline.emftree/src/org/eclipse/papyrus/outline/emftree/ContentOutline.java
@@ -1,254 +1,254 @@
-/*****************************************************************************
- * Copyright (c) 2008 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:
- * Cedric Dumoulin Cedric.Dumoulin@lifl.fr- Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.outline.emftree;
-
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
-import org.eclipse.emf.edit.domain.EditingDomain;
-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.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.papyrus.infra.core.contentoutline.IPapyrusContentOutlinePage;
-import org.eclipse.papyrus.infra.core.editor.BackboneException;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.outline.emftree.internal.OutlineDragAdapter;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;
-
-/**
- * A Content outline based on the one generated from the DI2 metamodel. This ContentOutlinePage can
- * be used by the multi editor page.
- *
- * @author dumoulin
- *
- */
-public class ContentOutline extends ContentOutlinePage implements IMenuListener, IPapyrusContentOutlinePage {
-
- /**
- * This keeps track of the editing domain that is used to track all changes to the model. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EditingDomain editingDomain;
-
- /**
- * This is the one adapter factory used for providing views of the model. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ComposedAdapterFactory adapterFactory;
-
- /**
- * This is the content outline page's viewer. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected TreeViewer contentOutlineViewer;
-
- private IEditorSite editorSite;
-
- public ContentOutline() {
- super();
- };
-
- /**
- * Constructor.
- *
- * @param editorSite
- * @param editingDomain
- * @param adapterFactory
- */
- public ContentOutline(IEditorSite editorSite, EditingDomain editingDomain, ComposedAdapterFactory adapterFactory) {
- super();
- this.editorSite = editorSite;
- this.editingDomain = editingDomain;
- this.adapterFactory = adapterFactory;
- }
-
- /**
- * Constructor.
- *
- * @param editorSite
- * @param editingDomain
- * @param adapterFactory
- */
- public ContentOutline(IEditorSite editorSite, EditingDomain editingDomain) {
- super();
- this.editorSite = editorSite;
- this.editingDomain = editingDomain;
- initAdapterFactory();
- }
-
- /**
- * Init the outline. This method is used by the MultiPageEditor to initialize the Outline.
- *
- * @param multiEditor
- * @param site
- * @throws BackboneException
- */
- public void init(IMultiDiagramEditor multiEditor) throws BackboneException {
-
- // Get the EditorActionBarContributor requested by this particular EMF editor.
- // The EditorActionBarContributor should be registered in extensions under the specified name
- // String EditorActionBarContributorId = "DiActionBarContributor";
- // EditorActionBarContributor actionBarContributor = multiEditor.getActionBarContributorRegistry().getActionBarContributor(EditorActionBarContributorId);
- // IEditorSite site = new MultiPageAdapterSite(multiEditor.getEditorSite(), actionBarContributor);
- this.editorSite = multiEditor.getEditorSite();
- try {
- this.editingDomain = multiEditor.getServicesRegistry().getService(TransactionalEditingDomain.class);
- } catch (ServiceException e) {
- throw new BackboneException("Can't get TransactionalEditingDomain", e);
- }
- initAdapterFactory();
-
- }
-
- @Override
- public void createControl(Composite parent) {
- super.createControl(parent);
- contentOutlineViewer = getTreeViewer();
- contentOutlineViewer.addSelectionChangedListener(this);
-
- // Set up the tree viewer.
- //
- contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
- contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
- contentOutlineViewer.setInput(editingDomain.getResourceSet());
-
- // Make sure our popups work.
- //
- createContextMenuFor(contentOutlineViewer);
-
- if(!editingDomain.getResourceSet().getResources().isEmpty()) {
- // Select the root object in the view.
- //
- contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
- }
- // initDragAndDrop();
- }
-
- /**
- * Add drag and drop ability between the outline to the editor.
- */
- protected void initDragAndDrop() {
- int ops = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
- // Enable Drag
- OutlineDragAdapter dragAdapter = new OutlineDragAdapter(contentOutlineViewer);
- contentOutlineViewer.addDragSupport(ops, dragAdapter.getSupportedDragTransfers(), dragAdapter);
- }
-
- @Override
- public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
- super.makeContributions(menuManager, toolBarManager, statusLineManager);
- // contentOutlineStatusLineManager = statusLineManager;
- }
-
- @Override
- public void setActionBars(IActionBars actionBars) {
- super.setActionBars(actionBars);
- if(getActionBarContributor() != null) {
- getActionBarContributor().shareGlobalActions(this, actionBars);
- }
- }
-
- private EditingDomainActionBarContributor getActionBarContributor() {
- if(editorSite.getActionBarContributor() instanceof EditingDomainActionBarContributor) {
- return (EditingDomainActionBarContributor)editorSite.getActionBarContributor();
- }
- return null;
- }
-
- /**
- * This creates a context menu for the viewer and adds a listener as well registering the menu
- * for extension. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private void createContextMenuFor(StructuredViewer viewer) {
- MenuManager contextMenu = new MenuManager("#PopUp");
- contextMenu.add(new Separator("additions"));
- contextMenu.setRemoveAllWhenShown(true);
- contextMenu.addMenuListener(this);
- Menu menu = contextMenu.createContextMenu(viewer.getControl());
- viewer.getControl().setMenu(menu);
- getEditorSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
-
- 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 EditingDomainViewerDropAdapter(editingDomain, viewer));
-
- }
-
- /**
- * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus
- * with contributions from the Edit menu. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public void menuAboutToShow(IMenuManager menuManager) {
- ((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- // private EditingDomainActionBarContributor getActionBarContributor() {
- // return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
- // }
- /**
- *
- * @return
- */
- private IEditorSite getEditorSite() {
- return editorSite;
- }
-
- /**
- *
- */
- private void initAdapterFactory() {
- adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
- adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new UMLItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
-
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2008 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:
+ * Cedric Dumoulin Cedric.Dumoulin@lifl.fr- Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.outline.emftree;
+
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.emf.edit.domain.EditingDomain;
+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.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.papyrus.infra.ui.contentoutline.IPapyrusContentOutlinePage;
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.outline.emftree.internal.OutlineDragAdapter;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;
+
+/**
+ * A Content outline based on the one generated from the DI2 metamodel. This ContentOutlinePage can
+ * be used by the multi editor page.
+ *
+ * @author dumoulin
+ *
+ */
+public class ContentOutline extends ContentOutlinePage implements IMenuListener, IPapyrusContentOutlinePage {
+
+ /**
+ * This keeps track of the editing domain that is used to track all changes to the model. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected EditingDomain editingDomain;
+
+ /**
+ * This is the one adapter factory used for providing views of the model. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected ComposedAdapterFactory adapterFactory;
+
+ /**
+ * This is the content outline page's viewer. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected TreeViewer contentOutlineViewer;
+
+ private IEditorSite editorSite;
+
+ public ContentOutline() {
+ super();
+ };
+
+ /**
+ * Constructor.
+ *
+ * @param editorSite
+ * @param editingDomain
+ * @param adapterFactory
+ */
+ public ContentOutline(IEditorSite editorSite, EditingDomain editingDomain, ComposedAdapterFactory adapterFactory) {
+ super();
+ this.editorSite = editorSite;
+ this.editingDomain = editingDomain;
+ this.adapterFactory = adapterFactory;
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param editorSite
+ * @param editingDomain
+ * @param adapterFactory
+ */
+ public ContentOutline(IEditorSite editorSite, EditingDomain editingDomain) {
+ super();
+ this.editorSite = editorSite;
+ this.editingDomain = editingDomain;
+ initAdapterFactory();
+ }
+
+ /**
+ * Init the outline. This method is used by the MultiPageEditor to initialize the Outline.
+ *
+ * @param multiEditor
+ * @param site
+ * @throws BackboneException
+ */
+ public void init(IMultiDiagramEditor multiEditor) throws BackboneException {
+
+ // Get the EditorActionBarContributor requested by this particular EMF editor.
+ // The EditorActionBarContributor should be registered in extensions under the specified name
+ // String EditorActionBarContributorId = "DiActionBarContributor";
+ // EditorActionBarContributor actionBarContributor = multiEditor.getActionBarContributorRegistry().getActionBarContributor(EditorActionBarContributorId);
+ // IEditorSite site = new MultiPageAdapterSite(multiEditor.getEditorSite(), actionBarContributor);
+ this.editorSite = multiEditor.getEditorSite();
+ try {
+ this.editingDomain = multiEditor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+ } catch (ServiceException e) {
+ throw new BackboneException("Can't get TransactionalEditingDomain", e);
+ }
+ initAdapterFactory();
+
+ }
+
+ @Override
+ public void createControl(Composite parent) {
+ super.createControl(parent);
+ contentOutlineViewer = getTreeViewer();
+ contentOutlineViewer.addSelectionChangedListener(this);
+
+ // Set up the tree viewer.
+ //
+ contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+ contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+ // Make sure our popups work.
+ //
+ createContextMenuFor(contentOutlineViewer);
+
+ if(!editingDomain.getResourceSet().getResources().isEmpty()) {
+ // Select the root object in the view.
+ //
+ contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+ }
+ // initDragAndDrop();
+ }
+
+ /**
+ * Add drag and drop ability between the outline to the editor.
+ */
+ protected void initDragAndDrop() {
+ int ops = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+ // Enable Drag
+ OutlineDragAdapter dragAdapter = new OutlineDragAdapter(contentOutlineViewer);
+ contentOutlineViewer.addDragSupport(ops, dragAdapter.getSupportedDragTransfers(), dragAdapter);
+ }
+
+ @Override
+ public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+ super.makeContributions(menuManager, toolBarManager, statusLineManager);
+ // contentOutlineStatusLineManager = statusLineManager;
+ }
+
+ @Override
+ public void setActionBars(IActionBars actionBars) {
+ super.setActionBars(actionBars);
+ if(getActionBarContributor() != null) {
+ getActionBarContributor().shareGlobalActions(this, actionBars);
+ }
+ }
+
+ private EditingDomainActionBarContributor getActionBarContributor() {
+ if(editorSite.getActionBarContributor() instanceof EditingDomainActionBarContributor) {
+ return (EditingDomainActionBarContributor)editorSite.getActionBarContributor();
+ }
+ return null;
+ }
+
+ /**
+ * This creates a context menu for the viewer and adds a listener as well registering the menu
+ * for extension. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private void createContextMenuFor(StructuredViewer viewer) {
+ MenuManager contextMenu = new MenuManager("#PopUp");
+ contextMenu.add(new Separator("additions"));
+ contextMenu.setRemoveAllWhenShown(true);
+ contextMenu.addMenuListener(this);
+ Menu menu = contextMenu.createContextMenu(viewer.getControl());
+ viewer.getControl().setMenu(menu);
+ getEditorSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+ 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 EditingDomainViewerDropAdapter(editingDomain, viewer));
+
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus
+ * with contributions from the Edit menu. <!-- begin-user-doc --> <!-- end-user-doc -->
+ */
+ public void menuAboutToShow(IMenuManager menuManager) {
+ ((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ */
+ // private EditingDomainActionBarContributor getActionBarContributor() {
+ // return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+ // }
+ /**
+ *
+ * @return
+ */
+ private IEditorSite getEditorSite() {
+ return editorSite;
+ }
+
+ /**
+ *
+ */
+ private void initAdapterFactory() {
+ adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+ adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new UMLItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+ }
+
+}
diff --git a/examples/emf/pom.xml b/examples/emf/pom.xml
new file mode 100644
index 00000000000..d13d00e68f9
--- /dev/null
+++ b/examples/emf/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.examples</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.examples.emf</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>org.eclipse.papyrus.outline.emftree</module>
+ </modules>
+</project> \ No newline at end of file
diff --git a/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/pom.xml b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/pom.xml
index 1a474e84ad6..28c27a40959 100644
--- a/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/pom.xml
+++ b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/pom.xml
@@ -2,13 +2,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../../releng/top-pom-main.xml</relativePath>
+ <artifactId>org.eclipse.papyrus.examples.infra</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.example.infra.servicesregistry.retrieval</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.settings/org.eclipse.jdt.core.prefs b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.settings/org.eclipse.jdt.core.prefs
index f287d53cf45..af0f20f97a5 100644
--- a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/plugin.xml b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/plugin.xml
index 855bbcc82b5..8b582792d99 100644
--- a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/plugin.xml
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/plugin.xml
@@ -1,15 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.core.runtime.preferences">
- <initializer
- class="org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences.CustomPreferenceInitializer">
- </initializer>
- </extension>
- <extension
- point="org.eclipse.ui.startup">
- <startup></startup>
- </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.core.runtime.preferences">
+ <initializer
+ class="org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences.CustomPreferenceInitializer">
+ </initializer>
+ </extension>
+
+</plugin>
diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/pom.xml b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/pom.xml
index e4d3d4c6e5d..11e3caa9a41 100644
--- a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/pom.xml
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/pom.xml
@@ -2,13 +2,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../../releng/top-pom-main.xml</relativePath>
+ <artifactId>org.eclipse.papyrus.examples.infra</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/src/org/eclipse/papyrus/infra/gmfdiag/connectionpoint/preferences/Activator.java b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/src/org/eclipse/papyrus/infra/gmfdiag/connectionpoint/preferences/Activator.java
index 54bf01264cc..09689bdf479 100644
--- a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/src/org/eclipse/papyrus/infra/gmfdiag/connectionpoint/preferences/Activator.java
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/src/org/eclipse/papyrus/infra/gmfdiag/connectionpoint/preferences/Activator.java
@@ -1,71 +1,70 @@
-/*****************************************************************************
- * Copyright (c) 2013 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.infra.gmfdiag.connectionpoint.preferences;
-
-import org.eclipse.ui.IStartup;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin implements IStartup {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- @Override
- public void earlyStartup() {
- new CustomPreferenceInitializer().initializeDefaultPreferences();
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2013 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.infra.gmfdiag.connectionpoint.preferences;
+
+import org.eclipse.ui.IStartup;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin implements IStartup {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+ public void earlyStartup() {
+ new CustomPreferenceInitializer().initializeDefaultPreferences();
+ }
+
+}
diff --git a/examples/infra/pom.xml b/examples/infra/pom.xml
new file mode 100644
index 00000000000..b33eb5ee72f
--- /dev/null
+++ b/examples/infra/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.examples</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.examples.infra</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <!-- module>org.eclipse.papyrus.example.infra.servicesregistry.retrieval</module-->
+ <module>org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences</module>
+ </modules>
+</project> \ No newline at end of file
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/pom.xml b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/pom.xml
index fa08ff4ef2b..e1ac123cb6f 100644
--- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/pom.xml
+++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/pom.xml
@@ -2,13 +2,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../../releng/top-pom-main.xml</relativePath>
+ <artifactId>org.eclipse.papyrus.examples.others</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.example.diagram.simplediagram</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/examples/org.eclipse.papyrus.example.text.instance/.classpath b/examples/others/org.eclipse.papyrus.example.text.instance/.classpath
index 45f024e850e..45f024e850e 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/.classpath
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/.classpath
diff --git a/examples/org.eclipse.papyrus.example.text.instance/.project b/examples/others/org.eclipse.papyrus.example.text.instance/.project
index 1f1bbbf348a..1f1bbbf348a 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/.project
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/.project
diff --git a/examples/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF b/examples/others/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF
index 118a54ecb88..118a54ecb88 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF
diff --git a/examples/org.eclipse.papyrus.example.text.instance/about.html b/examples/others/org.eclipse.papyrus.example.text.instance/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/about.html
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/about.html
diff --git a/examples/org.eclipse.papyrus.example.text.instance/build.properties b/examples/others/org.eclipse.papyrus.example.text.instance/build.properties
index 83183307edb..83183307edb 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/build.properties
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/build.properties
diff --git a/examples/org.eclipse.papyrus.example.text.instance/model/papyrustextinstance.ecore b/examples/others/org.eclipse.papyrus.example.text.instance/model/papyrustextinstance.ecore
index 1efefbcdd3e..1efefbcdd3e 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/model/papyrustextinstance.ecore
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/model/papyrustextinstance.ecore
diff --git a/examples/org.eclipse.papyrus.example.text.instance/model/papyrustextinstance.genmodel b/examples/others/org.eclipse.papyrus.example.text.instance/model/papyrustextinstance.genmodel
index 02d981047ff..02d981047ff 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/model/papyrustextinstance.genmodel
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/model/papyrustextinstance.genmodel
diff --git a/examples/org.eclipse.papyrus.example.text.instance/plugin.properties b/examples/others/org.eclipse.papyrus.example.text.instance/plugin.properties
index 6cb01adb217..6cb01adb217 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/plugin.properties
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/plugin.properties
diff --git a/examples/org.eclipse.papyrus.example.text.instance/plugin.xml b/examples/others/org.eclipse.papyrus.example.text.instance/plugin.xml
index 35c4d727312..35c4d727312 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/plugin.xml
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/plugin.xml
diff --git a/examples/org.eclipse.papyrus.example.text.instance/pom.xml b/examples/others/org.eclipse.papyrus.example.text.instance/pom.xml
index 690c1c3dbde..e90eee59933 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/pom.xml
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/pom.xml
@@ -2,13 +2,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../releng/top-pom-main.xml</relativePath>
+ <artifactId>org.eclipse.papyrus.examples.others</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.example.text.instance</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrusTextInstance.java b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrusTextInstance.java
index bfc86b555f1..bfc86b555f1 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrusTextInstance.java
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrusTextInstance.java
diff --git a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrustextinstanceFactory.java b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrustextinstanceFactory.java
index b63d4820bdc..b63d4820bdc 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrustextinstanceFactory.java
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrustextinstanceFactory.java
diff --git a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrustextinstancePackage.java b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrustextinstancePackage.java
index 098e6014f2e..098e6014f2e 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrustextinstancePackage.java
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/PapyrustextinstancePackage.java
diff --git a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrusTextInstanceImpl.java b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrusTextInstanceImpl.java
index ac9c90a6d53..ac9c90a6d53 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrusTextInstanceImpl.java
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrusTextInstanceImpl.java
diff --git a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrustextinstanceFactoryImpl.java b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrustextinstanceFactoryImpl.java
index 109a41b16f6..109a41b16f6 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrustextinstanceFactoryImpl.java
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrustextinstanceFactoryImpl.java
diff --git a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrustextinstancePackageImpl.java b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrustextinstancePackageImpl.java
index 88af35e9cfc..88af35e9cfc 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrustextinstancePackageImpl.java
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/impl/PapyrustextinstancePackageImpl.java
diff --git a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/util/PapyrustextinstanceAdapterFactory.java b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/util/PapyrustextinstanceAdapterFactory.java
index 43e0df23636..43e0df23636 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/util/PapyrustextinstanceAdapterFactory.java
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/util/PapyrustextinstanceAdapterFactory.java
diff --git a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/util/PapyrustextinstanceSwitch.java b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/util/PapyrustextinstanceSwitch.java
index 9807eb9bf56..9807eb9bf56 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/util/PapyrustextinstanceSwitch.java
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/src/org/eclipse/papyrus/example/text/instance/papyrustextinstance/util/PapyrustextinstanceSwitch.java
diff --git a/examples/others/pom.xml b/examples/others/pom.xml
new file mode 100644
index 00000000000..6b8071cc98c
--- /dev/null
+++ b/examples/others/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.examples</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.examples.others</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <!-- FIXME compilation error <module>org.eclipse.papyrus.example.diagram.simplediagram</module>-->
+ <module>org.eclipse.papyrus.example.text.instance</module>
+ </modules>
+</project> \ No newline at end of file
diff --git a/examples/pom.xml b/examples/pom.xml
index dbc6b08ed0f..f303340a35f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -1,30 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
- <groupId>org.eclipse.papyrus</groupId>
- <version>1.0.1-SNAPSHOT</version>
- <relativePath>../releng/top-pom-main.xml</relativePath>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.releng</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../releng/main/pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.papyrus.examples</artifactId>
- <groupId>org.eclipse.papyrus</groupId>
+ <name>Papyrus Examples Plugins</name>
<version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
- <module>./core/org.eclipse.papyrus.example.core.lifecycleevents</module>
- <module>./core/org.eclipse.papyrus.example.core.sashwindows.fulleditor</module>
- <module>./core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor</module>
- <!-- FIXME compilation error <module>./others/org.eclipse.papyrus.example.diagram.simplediagram</module> -->
- <module>./infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval</module>
- <module>./org.eclipse.papyrus.example.text.instance</module>
- <module>./org.eclipse.papyrus.example.uml.comment.editor.newresource</module>
- <module>./org.eclipse.papyrus.example.uml.comment.editor.sharedresource</module>
- <module>./infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences</module>
- <module>./emf/org.eclipse.papyrus.outline.emftree</module>
- <module>./uml/org.eclipse.papyrus.thousandcreation</module>
- <module>./uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation</module>
- <module>org.eclipse.papyrus.uml.diagram.emftree</module>
- <!-- <module>../examples/uml/org.eclipse.papyrus.uml.textual.editors.example</module> -->
+ <module>core</module>
+ <module>emf</module>
+ <module>infra</module>
+ <module>others</module>
+ <module>uml</module>
+ <module>user</module>
</modules>
+
+ <profiles>
+ <profile>
+ <id>defaultProfile</id>
+ <repositories>
+ <repository>
+ <id>papyrus-main</id>
+ <layout>p2</layout>
+ <url>${papyrus.repo.main}</url>
+ </repository>
+ <repository>
+ <id>papyrus-extra</id>
+ <layout>p2</layout>
+ <url>${papyrus.repo.extra}</url>
+ </repository>
+ </repositories>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ </profiles>
</project> \ No newline at end of file
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/.classpath b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/.classpath
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.classpath
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/.project b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.project
index 8a94e000222..8a94e000222 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/.project
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.project
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/.settings/org.eclipse.jdt.core.prefs b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..44217f8c068 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.settings/org.eclipse.jdt.core.prefs
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF
index 35871a92f13..35871a92f13 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/about.html b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/about.html
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/about.html
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties
index 274b1327ea1..274b1327ea1 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/icons/texteditorv2.bmp b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/icons/texteditorv2.bmp
index 1376f03a47e..1376f03a47e 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/icons/texteditorv2.bmp
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/icons/texteditorv2.bmp
Binary files differ
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties
index 0bf1dafb010..0bf1dafb010 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml
index 33ccade6695..c0e4f5d6e0d 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.papyrus.infra.core.model">
- <model
- classname="org.eclipse.papyrus.example.uml.comment.editor.newresource.modelresource.TextEditorModelCommentResource">
- </model>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <command
- description="Open a Comment Editor (Comment Resource)"
- id="org.eclipse.papyrus.example.uml.comment.editor.command.newresource"
- name="Open a Comment Editor (Comment Resource)">
- </command>
- </extension>
- <extension
- point="org.eclipse.ui.handlers">
- <handler
- class="org.eclipse.papyrus.example.uml.comment.editor.newresource.handler.CommentEditorHandler"
- commandId="org.eclipse.papyrus.example.uml.comment.editor.command.newresource">
- <activeWhen>
- <and>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
- </and>
- </activeWhen>
- </handler>
- </extension>
- <extension
- point="org.eclipse.papyrus.infra.core.papyrusDiagram">
- <editorDiagram
- factoryClass="org.eclipse.papyrus.example.uml.comment.editor.newresource.factory.CommentEditorFactory"
- icon="icons/texteditorv2.bmp">
- </editorDiagram>
- </extension>
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- allPopups="false"
- locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
- <command
- commandId="org.eclipse.papyrus.example.uml.comment.editor.command.newresource"
- icon="icons/texteditorv2.bmp"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <and>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
- </and>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
-
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.papyrus.infra.core.model">
+ <model
+ classname="org.eclipse.papyrus.example.uml.comment.editor.newresource.modelresource.TextEditorModelCommentResource">
+ </model>
+ </extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ description="Open a Comment Editor (Comment Resource)"
+ id="org.eclipse.papyrus.example.uml.comment.editor.command.newresource"
+ name="Open a Comment Editor (Comment Resource)">
+ </command>
+ </extension>
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ class="org.eclipse.papyrus.example.uml.comment.editor.newresource.handler.CommentEditorHandler"
+ commandId="org.eclipse.papyrus.example.uml.comment.editor.command.newresource">
+ <activeWhen>
+ <and>
+ <with
+ variable="activeEditorId">
+ <equals
+ value="org.eclipse.papyrus.infra.core.papyrusEditor">
+ </equals>
+ </with>
+ </and>
+ </activeWhen>
+ </handler>
+ </extension>
+ <extension
+ point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
+ <editorDiagram
+ factoryClass="org.eclipse.papyrus.example.uml.comment.editor.newresource.factory.CommentEditorFactory"
+ icon="icons/texteditorv2.bmp">
+ </editorDiagram>
+ </extension>
+ <extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ allPopups="false"
+ locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
+ <command
+ commandId="org.eclipse.papyrus.example.uml.comment.editor.command.newresource"
+ icon="icons/texteditorv2.bmp"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <and>
+ <with
+ variable="activeEditorId">
+ <equals
+ value="org.eclipse.papyrus.infra.core.papyrusEditor">
+ </equals>
+ </with>
+ </and>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+
+
+</plugin>
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/pom.xml b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/pom.xml
index fd22e468e46..4b1742ab2ba 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/pom.xml
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/pom.xml
@@ -2,13 +2,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../releng/top-pom-main.xml</relativePath>
+ <artifactId>org.eclipse.papyrus.examples.uml</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.example.uml.comment.editor.newresource</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/Activator.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/Activator.java
index 5f975ee9b57..5f975ee9b57 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/Activator.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/Activator.java
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/editor/PapyrusCommentEditor.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/editor/PapyrusCommentEditor.java
index 14d2b3edb7b..f6e6e894653 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/editor/PapyrusCommentEditor.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/editor/PapyrusCommentEditor.java
@@ -1,221 +1,220 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.example.uml.comment.editor.newresource.editor;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.ITextListener;
-import org.eclipse.jface.text.TextEvent;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.IVerticalRuler;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
-import org.eclipse.papyrus.example.uml.comment.editor.newresource.Activator;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.editors.text.TextEditor;
-import org.eclipse.uml2.uml.Comment;
-
-public class PapyrusCommentEditor extends TextEditor {
-
- /** the service registry */
- protected final ServicesRegistry registry;
-
- /** the papyrus text instance */
- protected final PapyrusTextInstance papyrusTextInstance;
-
- /** the text listener */
- protected ITextListener listener;
-
- /** the editing domain */
- protected TransactionalEditingDomain domain;
-
- public static final String EDITOR_DEFAULT_NAME = "Comment Editor New Resource";
-
- public static final String EDITOR_TYPE = "CommentEditorNewResource";
-
- /**
- *
- * Constructor.
- *
- * @param registry
- * @param papyrusTextInstance
- */
- public PapyrusCommentEditor(final ServicesRegistry registry, final PapyrusTextInstance papyrusTextInstance) {
- super();
- this.registry = registry;
- this.papyrusTextInstance = papyrusTextInstance;
- try {
- domain = ServiceUtils.getInstance().getTransactionalEditingDomain(registry);
- } catch (ServiceException e) {
- Activator.log.error(e);
- }
- }
-
-
- /**
- *
- * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#createSourceViewer(org.eclipse.swt.widgets.Composite,
- * org.eclipse.jface.text.source.IVerticalRuler, int)
- *
- * @param parent
- * @param ruler
- * @param styles
- * @return
- */
- @Override
- protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
- ISourceViewer viewer = super.createSourceViewer(parent, ruler, styles);
- //we add a listener on the viewer to be notified when the text is edited
- //TODO try to improve, because we execute a command for each character
- listener = new ITextListener() {
-
- //we edit the uml.Comment
- public void textChanged(TextEvent event) {
- String currentText = getSourceViewer().getTextWidget().getText();
- Comment cmt = (Comment)papyrusTextInstance.getEditedObject();
- EStructuralFeature feature = cmt.eClass().getEStructuralFeature("body");
- IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(cmt);
- SetRequest request = new SetRequest(domain, cmt, feature, currentText);
- ICommand command = elementEditService.getEditCommand(request);
- if(command.canExecute()) {
- domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(command));
- }
- }
- };
-
- viewer.addTextListener(listener);
-
- return viewer;
- }
-
- /**
- * We override this method because setInput can't be overriden for TextEditor.
- * We replace the default papyrus input by our input for Comment
- *
- * @see org.eclipse.ui.editors.text.TextEditor#doSetInput(org.eclipse.ui.IEditorInput)
- *
- * @param input
- * @throws CoreException
- */
- @Override
- protected void doSetInput(IEditorInput input) throws CoreException {
- String string = ((Comment)papyrusTextInstance.getEditedObject()).getBody();
- if(string == null) {
- string = "";
- }
- IStorage storage = new TextStorage(string);
- super.doSetInput(new TextInput(storage));
- }
-
- /**
- *
- * @see org.eclipse.ui.editors.text.TextEditor#dispose()
- *
- */
- @Override
- public void dispose() {
- //we remove the listener
- getSourceViewer().removeTextListener(listener);
- super.dispose();
- }
-
-
- //for this classes , see : http://wiki.eclipse.org/FAQ_How_do_I_open_an_editor_on_something_that_is_not_a_file%3F
- class TextStorage implements IStorage {
-
- private String string;
-
- TextStorage(String input) {
- this.string = input;
- }
-
- public InputStream getContents() throws CoreException {
- return new ByteArrayInputStream(string.getBytes());
- }
-
- public IPath getFullPath() {
- return null;
- }
-
- public Object getAdapter(Class adapter) {
- return null;
- }
-
- public String getName() {
- int len = Math.min(5, string.length());
- return string.substring(0, len).concat("..."); //$NON-NLS-1$
- }
-
- public boolean isReadOnly() {
- return false;
- }
- }
-
- //for this classes , see : http://wiki.eclipse.org/FAQ_How_do_I_open_an_editor_on_something_that_is_not_a_file%3F
- class TextInput implements IStorageEditorInput {
-
- private IStorage storage;
-
- TextInput(IStorage storage) {
- this.storage = storage;
- }
-
- public boolean exists() {
- return true;
- }
-
- public ImageDescriptor getImageDescriptor() {
- return null;
- }
-
- public String getName() {
- return storage.getName();
- }
-
- public IPersistableElement getPersistable() {
- return null;
- }
-
- public IStorage getStorage() {
- return storage;
- }
-
- public String getToolTipText() {
- return "String-based file: " + storage.getName();
- }
-
- public Object getAdapter(Class adapter) {
- return null;
- }
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.example.uml.comment.editor.newresource.editor;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.text.ITextListener;
+import org.eclipse.jface.text.TextEvent;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.IVerticalRuler;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
+import org.eclipse.papyrus.example.uml.comment.editor.newresource.Activator;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IPersistableElement;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.editors.text.TextEditor;
+import org.eclipse.uml2.uml.Comment;
+
+public class PapyrusCommentEditor extends TextEditor {
+
+ /** the service registry */
+ protected final ServicesRegistry registry;
+
+ /** the papyrus text instance */
+ protected final PapyrusTextInstance papyrusTextInstance;
+
+ /** the text listener */
+ protected ITextListener listener;
+
+ /** the editing domain */
+ protected TransactionalEditingDomain domain;
+
+ public static final String EDITOR_DEFAULT_NAME = "Comment Editor New Resource";
+
+ public static final String EDITOR_TYPE = "CommentEditorNewResource";
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param registry
+ * @param papyrusTextInstance
+ */
+ public PapyrusCommentEditor(final ServicesRegistry registry, final PapyrusTextInstance papyrusTextInstance) {
+ super();
+ this.registry = registry;
+ this.papyrusTextInstance = papyrusTextInstance;
+ try {
+ domain = ServiceUtils.getInstance().getTransactionalEditingDomain(registry);
+ } catch (ServiceException e) {
+ Activator.log.error(e);
+ }
+ }
+
+
+ /**
+ *
+ * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#createSourceViewer(org.eclipse.swt.widgets.Composite,
+ * org.eclipse.jface.text.source.IVerticalRuler, int)
+ *
+ * @param parent
+ * @param ruler
+ * @param styles
+ * @return
+ */
+ @Override
+ protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
+ ISourceViewer viewer = super.createSourceViewer(parent, ruler, styles);
+ //we add a listener on the viewer to be notified when the text is edited
+ //TODO try to improve, because we execute a command for each character
+ listener = new ITextListener() {
+
+ //we edit the uml.Comment
+ public void textChanged(TextEvent event) {
+ String currentText = getSourceViewer().getTextWidget().getText();
+ Comment cmt = (Comment)papyrusTextInstance.getEditedObject();
+ EStructuralFeature feature = cmt.eClass().getEStructuralFeature("body");
+ IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(cmt);
+ SetRequest request = new SetRequest(domain, cmt, feature, currentText);
+ ICommand command = elementEditService.getEditCommand(request);
+ if(command.canExecute()) {
+ domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(command));
+ }
+ }
+ };
+
+ viewer.addTextListener(listener);
+
+ return viewer;
+ }
+
+ /**
+ * We override this method because setInput can't be overriden for TextEditor.
+ * We replace the default papyrus input by our input for Comment
+ *
+ * @see org.eclipse.ui.editors.text.TextEditor#doSetInput(org.eclipse.ui.IEditorInput)
+ *
+ * @param input
+ * @throws CoreException
+ */
+ @Override
+ protected void doSetInput(IEditorInput input) throws CoreException {
+ String string = ((Comment)papyrusTextInstance.getEditedObject()).getBody();
+ if(string == null) {
+ string = "";
+ }
+ IStorage storage = new TextStorage(string);
+ super.doSetInput(new TextInput(storage));
+ }
+
+ /**
+ *
+ * @see org.eclipse.ui.editors.text.TextEditor#dispose()
+ *
+ */
+ @Override
+ public void dispose() {
+ //we remove the listener
+ getSourceViewer().removeTextListener(listener);
+ super.dispose();
+ }
+
+
+ //for this classes , see : http://wiki.eclipse.org/FAQ_How_do_I_open_an_editor_on_something_that_is_not_a_file%3F
+ class TextStorage implements IStorage {
+
+ private String string;
+
+ TextStorage(String input) {
+ this.string = input;
+ }
+
+ public InputStream getContents() throws CoreException {
+ return new ByteArrayInputStream(string.getBytes());
+ }
+
+ public IPath getFullPath() {
+ return null;
+ }
+
+ public Object getAdapter(Class adapter) {
+ return null;
+ }
+
+ public String getName() {
+ int len = Math.min(5, string.length());
+ return string.substring(0, len).concat("..."); //$NON-NLS-1$
+ }
+
+ public boolean isReadOnly() {
+ return false;
+ }
+ }
+
+ //for this classes , see : http://wiki.eclipse.org/FAQ_How_do_I_open_an_editor_on_something_that_is_not_a_file%3F
+ class TextInput implements IStorageEditorInput {
+
+ private IStorage storage;
+
+ TextInput(IStorage storage) {
+ this.storage = storage;
+ }
+
+ public boolean exists() {
+ return true;
+ }
+
+ public ImageDescriptor getImageDescriptor() {
+ return null;
+ }
+
+ public String getName() {
+ return storage.getName();
+ }
+
+ public IPersistableElement getPersistable() {
+ return null;
+ }
+
+ public IStorage getStorage() {
+ return storage;
+ }
+
+ public String getToolTipText() {
+ return "String-based file: " + storage.getName();
+ }
+
+ public Object getAdapter(Class adapter) {
+ return null;
+ }
+ }
+
+}
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/factory/CommentEditorFactory.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/factory/CommentEditorFactory.java
index aa2c7aca472..251d18c11b7 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/factory/CommentEditorFactory.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/factory/CommentEditorFactory.java
@@ -13,15 +13,13 @@
*****************************************************************************/
package org.eclipse.papyrus.example.uml.comment.editor.newresource.factory;
-import java.lang.reflect.Constructor;
-
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
import org.eclipse.papyrus.example.uml.comment.editor.newresource.Activator;
import org.eclipse.papyrus.example.uml.comment.editor.newresource.editor.PapyrusCommentEditor;
import org.eclipse.papyrus.infra.core.editor.BackboneException;
-import org.eclipse.papyrus.infra.core.extension.diagrameditor.AbstractEditorFactory;
-import org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor.ActionBarContributorRegistry;
+import org.eclipse.papyrus.infra.ui.extension.diagrameditor.AbstractEditorFactory;
+import org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor.ActionBarContributorRegistry;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
import org.eclipse.papyrus.infra.core.services.ServiceException;
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/handler/CommentEditorHandler.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/handler/CommentEditorHandler.java
index 52857fd9f45..9c568b671eb 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/handler/CommentEditorHandler.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/handler/CommentEditorHandler.java
@@ -1,177 +1,177 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.example.uml.comment.editor.newresource.handler;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.commands.CheckedOperationHistory;
-import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
-import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrustextinstanceFactory;
-import org.eclipse.papyrus.example.uml.comment.editor.newresource.Activator;
-import org.eclipse.papyrus.example.uml.comment.editor.newresource.editor.PapyrusCommentEditor;
-import org.eclipse.papyrus.example.uml.comment.editor.newresource.modelresource.TextEditorModelCommentResource;
-import org.eclipse.papyrus.infra.core.resource.NotFoundException;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Comment;
-
-
-public class CommentEditorHandler extends AbstractHandler {
-
-
- public CommentEditorHandler(){
- }
- /**
- *
- * @see org.eclipse.core.commands.AbstractHandler#isEnabled()
- *
- * @return
- */
- @Override
- public boolean isEnabled() {
- return getSelection().size() == 1;
- }
-
- /**
- *
- * @return
- * the current selection
- */
- protected List<EObject> getSelection() {
- ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
- List<EObject> currentSelection = new ArrayList<EObject>();
- Iterator<?> iter = ((IStructuredSelection)selection).iterator();
- while(iter.hasNext()) {
- Object current = iter.next();
- if(current instanceof IAdaptable){
- EObject tmp = (EObject)((IAdaptable)current).getAdapter(EObject.class);
- if(tmp!=null){
- if(tmp instanceof Comment){
- currentSelection.add(tmp);
- }
- }
- }
- }
- return currentSelection;
- }
-
- /**
- * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
- *
- * @param event
- * @return
- * @throws ExecutionException
- */
- public Object execute(final ExecutionEvent event) throws ExecutionException {
- try {
-
- runAsTransaction();
- } catch (ServiceException e) {
- throw new ExecutionException("I can't create CompareEditor", e); //$NON-NLS-1$
- }
- return null;
- }
-
- /**
- * Run the command as a transaction.
- * Create a Transaction and delegate the command to {@link #doExecute(ServicesRegistry)}.
- *
- * @throws ServiceException
- *
- */
- public void runAsTransaction() throws ServiceException {
- final ServicesRegistry serviceRegistry = ServiceUtilsForActionHandlers.getInstance().getServiceRegistry();
- TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(serviceRegistry);
-
- //Create the transactional command
- AbstractEMFOperation command = new AbstractEMFOperation(domain, "Create CompareEditor") { //$NON-NLS-1$
-
- @Override
- protected IStatus doExecute(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- try {
- CommentEditorHandler.this.doExecute(serviceRegistry);
- } catch (ServiceException e) {
- Activator.log.error(e);
- return Status.CANCEL_STATUS;
- } catch (NotFoundException e) {
- Activator.log.error(e);
- return Status.CANCEL_STATUS;
- }
- return Status.OK_STATUS;
- }
- };
-
- // Execute the command
- try {
- CheckedOperationHistory.getInstance().execute(command, new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- Activator.log.error("I can't create CompareEditor", e); //$NON-NLS-1$
- }
-
- }
-
-
- /**
- * Do the execution of the command.
- *
- * @param serviceRegistry
- * @throws ServiceException
- * @throws NotFoundException
- */
- public void doExecute(final ServicesRegistry serviceRegistry) throws ServiceException, NotFoundException {
- Object editorModel = createEditorModel(serviceRegistry);
- // Get the mngr allowing to add/open new editor.
- IPageMngr pageMngr = ServiceUtils.getInstance().getIPageMngr(serviceRegistry);
- // add the new editor model to the sash.
- pageMngr.openPage(editorModel);
-
- }
-
- /**
- * Create a model identifying the editor. This model will be saved with the sash
- *
- * @return
- * @throws ServiceException
- * @throws NotFoundException
- * The model where to save the TableInstance is not found.
- */
- protected Object createEditorModel(final ServicesRegistry serviceRegistry) throws ServiceException, NotFoundException {
- PapyrusTextInstance editorModel = PapyrustextinstanceFactory.eINSTANCE.createPapyrusTextInstance();
- editorModel.setEditedObject(getSelection().get(0));
- editorModel.setType(PapyrusCommentEditor.EDITOR_TYPE);
- editorModel.setName(PapyrusCommentEditor.EDITOR_DEFAULT_NAME);
- TextEditorModelCommentResource model = (TextEditorModelCommentResource)ServiceUtils.getInstance().getModelSet(serviceRegistry).getModelChecked(TextEditorModelCommentResource.MODEL_ID);
- model.addPapyrusTextInstance(editorModel);
- return editorModel;
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.example.uml.comment.editor.newresource.handler;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.workspace.AbstractEMFOperation;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.commands.CheckedOperationHistory;
+import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
+import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrustextinstanceFactory;
+import org.eclipse.papyrus.example.uml.comment.editor.newresource.Activator;
+import org.eclipse.papyrus.example.uml.comment.editor.newresource.editor.PapyrusCommentEditor;
+import org.eclipse.papyrus.example.uml.comment.editor.newresource.modelresource.TextEditorModelCommentResource;
+import org.eclipse.papyrus.infra.core.resource.NotFoundException;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForActionHandlers;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Comment;
+
+
+public class CommentEditorHandler extends AbstractHandler {
+
+
+ public CommentEditorHandler(){
+ }
+ /**
+ *
+ * @see org.eclipse.core.commands.AbstractHandler#isEnabled()
+ *
+ * @return
+ */
+ @Override
+ public boolean isEnabled() {
+ return getSelection().size() == 1;
+ }
+
+ /**
+ *
+ * @return
+ * the current selection
+ */
+ protected List<EObject> getSelection() {
+ ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
+ List<EObject> currentSelection = new ArrayList<EObject>();
+ Iterator<?> iter = ((IStructuredSelection)selection).iterator();
+ while(iter.hasNext()) {
+ Object current = iter.next();
+ if(current instanceof IAdaptable){
+ EObject tmp = (EObject)((IAdaptable)current).getAdapter(EObject.class);
+ if(tmp!=null){
+ if(tmp instanceof Comment){
+ currentSelection.add(tmp);
+ }
+ }
+ }
+ }
+ return currentSelection;
+ }
+
+ /**
+ * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+ *
+ * @param event
+ * @return
+ * @throws ExecutionException
+ */
+ public Object execute(final ExecutionEvent event) throws ExecutionException {
+ try {
+
+ runAsTransaction();
+ } catch (ServiceException e) {
+ throw new ExecutionException("I can't create CompareEditor", e); //$NON-NLS-1$
+ }
+ return null;
+ }
+
+ /**
+ * Run the command as a transaction.
+ * Create a Transaction and delegate the command to {@link #doExecute(ServicesRegistry)}.
+ *
+ * @throws ServiceException
+ *
+ */
+ public void runAsTransaction() throws ServiceException {
+ final ServicesRegistry serviceRegistry = ServiceUtilsForActionHandlers.getInstance().getServiceRegistry();
+ TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(serviceRegistry);
+
+ //Create the transactional command
+ AbstractEMFOperation command = new AbstractEMFOperation(domain, "Create CompareEditor") { //$NON-NLS-1$
+
+ @Override
+ protected IStatus doExecute(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
+ try {
+ CommentEditorHandler.this.doExecute(serviceRegistry);
+ } catch (ServiceException e) {
+ Activator.log.error(e);
+ return Status.CANCEL_STATUS;
+ } catch (NotFoundException e) {
+ Activator.log.error(e);
+ return Status.CANCEL_STATUS;
+ }
+ return Status.OK_STATUS;
+ }
+ };
+
+ // Execute the command
+ try {
+ CheckedOperationHistory.getInstance().execute(command, new NullProgressMonitor(), null);
+ } catch (ExecutionException e) {
+ Activator.log.error("I can't create CompareEditor", e); //$NON-NLS-1$
+ }
+
+ }
+
+
+ /**
+ * Do the execution of the command.
+ *
+ * @param serviceRegistry
+ * @throws ServiceException
+ * @throws NotFoundException
+ */
+ public void doExecute(final ServicesRegistry serviceRegistry) throws ServiceException, NotFoundException {
+ Object editorModel = createEditorModel(serviceRegistry);
+ // Get the mngr allowing to add/open new editor.
+ IPageManager pageMngr = ServiceUtils.getInstance().getIPageManager(serviceRegistry);
+ // add the new editor model to the sash.
+ pageMngr.openPage(editorModel);
+
+ }
+
+ /**
+ * Create a model identifying the editor. This model will be saved with the sash
+ *
+ * @return
+ * @throws ServiceException
+ * @throws NotFoundException
+ * The model where to save the TableInstance is not found.
+ */
+ protected Object createEditorModel(final ServicesRegistry serviceRegistry) throws ServiceException, NotFoundException {
+ PapyrusTextInstance editorModel = PapyrustextinstanceFactory.eINSTANCE.createPapyrusTextInstance();
+ editorModel.setEditedObject(getSelection().get(0));
+ editorModel.setType(PapyrusCommentEditor.EDITOR_TYPE);
+ editorModel.setName(PapyrusCommentEditor.EDITOR_DEFAULT_NAME);
+ TextEditorModelCommentResource model = (TextEditorModelCommentResource)ServiceUtils.getInstance().getModelSet(serviceRegistry).getModelChecked(TextEditorModelCommentResource.MODEL_ID);
+ model.addPapyrusTextInstance(editorModel);
+ return editorModel;
+ }
+}
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java
index 4a20d8eb412..3df157f7cc5 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/src/org/eclipse/papyrus/example/uml/comment/editor/newresource/modelresource/TextEditorModelCommentResource.java
@@ -1,89 +1,102 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.example.uml.comment.editor.newresource.modelresource;
-
-import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
-import org.eclipse.papyrus.infra.core.resource.AbstractDynamicModel;
-import org.eclipse.papyrus.infra.core.resource.IModel;
-
-
-public class TextEditorModelCommentResource extends AbstractDynamicModel<PapyrusTextInstance> implements IModel {
-
- /**
- * File extension used for comment.
- */
- public static final String COMMENT_FILE_EXTENSION = "comment"; //$NON-NLS-1$
-
- /**
- * Model ID.
- */
- public static final String MODEL_ID = "org.eclipse.papyrus.example.text.TextEditorModelCommentResource"; //$NON-NLS-1$
-
-
- /**
- *
- * Constructor.
- *
- */
- public TextEditorModelCommentResource() {
-
- }
-
-
- /**
- * Get the file extension used for this model.
- *
- * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
- *
- * @return
- */
- @Override
- protected String getModelFileExtension() {
- return COMMENT_FILE_EXTENSION;
- }
-
- /**
- * Get the identifier used to register this model.
- *
- * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
- *
- * @return
- */
- @Override
- public String getIdentifier() {
- return MODEL_ID;
- }
-
-
- /**
- * Add a new initialized {@link PapyrusEMFCompareInstance} to the model.
- *
- * @param compareInstance
- * The compareInstance to add.
- */
- public void addPapyrusTextInstance(PapyrusTextInstance compareInstance) {
- addModelRoot(compareInstance);
- }
-
- /**
- * Add a new initialized {@link PapyrusEMFCompareInstance} to the model.
- *
- * @param compareInstance
- * The compareInstance to add.
- */
- public void removePapyrusTextInstance(PapyrusTextInstance compareInstance) {
- getResource().getContents().remove(compareInstance);
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.example.uml.comment.editor.newresource.modelresource;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
+import org.eclipse.papyrus.infra.core.resource.AbstractDynamicModel;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+
+
+public class TextEditorModelCommentResource extends AbstractDynamicModel<PapyrusTextInstance> implements IModel {
+
+ /**
+ * File extension used for comment.
+ */
+ public static final String COMMENT_FILE_EXTENSION = "comment"; //$NON-NLS-1$
+
+ /**
+ * Model ID.
+ */
+ public static final String MODEL_ID = "org.eclipse.papyrus.example.text.TextEditorModelCommentResource"; //$NON-NLS-1$
+
+
+ /**
+ *
+ * Constructor.
+ *
+ */
+ public TextEditorModelCommentResource() {
+
+ }
+
+
+ /**
+ * Get the file extension used for this model.
+ *
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
+ *
+ * @return
+ */
+ @Override
+ protected String getModelFileExtension() {
+ return COMMENT_FILE_EXTENSION;
+ }
+
+ /**
+ * Get the identifier used to register this model.
+ *
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
+ *
+ * @return
+ */
+ @Override
+ public String getIdentifier() {
+ return MODEL_ID;
+ }
+
+
+ /**
+ * Add a new initialized {@link PapyrusEMFCompareInstance} to the model.
+ *
+ * @param compareInstance
+ * The compareInstance to add.
+ */
+ public void addPapyrusTextInstance(PapyrusTextInstance compareInstance) {
+ addModelRoot(compareInstance);
+ }
+
+ /**
+ * Add a new initialized {@link PapyrusEMFCompareInstance} to the model.
+ *
+ * @param compareInstance
+ * The compareInstance to add.
+ */
+ public void removePapyrusTextInstance(PapyrusTextInstance compareInstance) {
+ getResource().getContents().remove(compareInstance);
+ }
+
+
+ public boolean canPersist(EObject object) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+
+ public void persist(EObject object) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.classpath b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.classpath
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.classpath
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.project b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.project
index fc3da8cd541..fc3da8cd541 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.project
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.project
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.settings/org.eclipse.jdt.core.prefs b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..44217f8c068 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.settings/org.eclipse.jdt.core.prefs
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF
index e3c5f28a918..e3c5f28a918 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/about.html b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/about.html
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/about.html
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties
index 1bf7b240421..1bf7b240421 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/icons/texteditor.bmp b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/icons/texteditor.bmp
index 79df55de06b..79df55de06b 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/icons/texteditor.bmp
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/icons/texteditor.bmp
Binary files differ
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties
index 239f4eed2c8..239f4eed2c8 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.xml b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.xml
index cb5d3c3b68e..4595bebec0a 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.xml
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.papyrus.infra.core.model">
- <model
- classname="org.eclipse.papyrus.example.uml.comment.editor.sharedresource.modelresource.TextEditorModelSharedResource">
- </model>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <command
- description="Open a Comment Editor (Shared Resource)"
- id="org.eclipse.papyrus.example.uml.comment.editor.command.sharedresource"
- name="Open a Comment Editor (Shared Resource)">
- </command>
- </extension>
- <extension
- point="org.eclipse.ui.handlers">
- <handler
- class="org.eclipse.papyrus.example.uml.comment.editor.sharedresource.handler.CommentEditorHandler"
- commandId="org.eclipse.papyrus.example.uml.comment.editor.command.sharedresource">
- <activeWhen>
- <and>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
- </and>
- </activeWhen>
- </handler>
- </extension>
- <extension
- point="org.eclipse.papyrus.infra.core.papyrusDiagram">
- <editorDiagram
- factoryClass="org.eclipse.papyrus.example.uml.comment.editor.sharedresource.factory.CommentEditorFactory"
- icon="icons/texteditor.bmp">
- </editorDiagram>
- </extension>
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- allPopups="false"
- locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
- <command
- commandId="org.eclipse.papyrus.example.uml.comment.editor.command.sharedresource"
- icon="icons/texteditor.bmp"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <and>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
- </and>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
-
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.papyrus.infra.core.model">
+ <model
+ classname="org.eclipse.papyrus.example.uml.comment.editor.sharedresource.modelresource.TextEditorModelSharedResource">
+ </model>
+ </extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ description="Open a Comment Editor (Shared Resource)"
+ id="org.eclipse.papyrus.example.uml.comment.editor.command.sharedresource"
+ name="Open a Comment Editor (Shared Resource)">
+ </command>
+ </extension>
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ class="org.eclipse.papyrus.example.uml.comment.editor.sharedresource.handler.CommentEditorHandler"
+ commandId="org.eclipse.papyrus.example.uml.comment.editor.command.sharedresource">
+ <activeWhen>
+ <and>
+ <with
+ variable="activeEditorId">
+ <equals
+ value="org.eclipse.papyrus.infra.core.papyrusEditor">
+ </equals>
+ </with>
+ </and>
+ </activeWhen>
+ </handler>
+ </extension>
+ <extension
+ point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
+ <editorDiagram
+ factoryClass="org.eclipse.papyrus.example.uml.comment.editor.sharedresource.factory.CommentEditorFactory"
+ icon="icons/texteditor.bmp">
+ </editorDiagram>
+ </extension>
+ <extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ allPopups="false"
+ locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
+ <command
+ commandId="org.eclipse.papyrus.example.uml.comment.editor.command.sharedresource"
+ icon="icons/texteditor.bmp"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <and>
+ <with
+ variable="activeEditorId">
+ <equals
+ value="org.eclipse.papyrus.infra.core.papyrusEditor">
+ </equals>
+ </with>
+ </and>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+
+
+</plugin>
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/pom.xml b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/pom.xml
index 3d2f7669f84..e3c1fa27640 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/pom.xml
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/pom.xml
@@ -2,13 +2,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../releng/top-pom-main.xml</relativePath>
+ <artifactId>org.eclipse.papyrus.examples.uml</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.example.uml.comment.editor.sharedresource</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/Activator.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/Activator.java
index 0195681d372..0195681d372 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/Activator.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/Activator.java
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/editor/PapyrusCommentEditor.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/editor/PapyrusCommentEditor.java
index 02bc18d994d..90faad4d747 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/editor/PapyrusCommentEditor.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/editor/PapyrusCommentEditor.java
@@ -1,221 +1,221 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.example.uml.comment.editor.sharedresource.editor;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.ITextListener;
-import org.eclipse.jface.text.TextEvent;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.IVerticalRuler;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
-import org.eclipse.papyrus.example.uml.comment.editor.sharedresource.Activator;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.editors.text.TextEditor;
-import org.eclipse.uml2.uml.Comment;
-
-public class PapyrusCommentEditor extends TextEditor {
-
- /** the service registry */
- protected final ServicesRegistry registry;
-
- /** the papyrus text instance */
- protected final PapyrusTextInstance papyrusTextInstance;
-
- /** the text listener */
- protected ITextListener listener;
-
- /** the editing domain */
- protected TransactionalEditingDomain domain;
-
- public static final String EDITOR_DEFAULT_NAME = "Comment Editor Shared Resource";
-
- public static final String EDITOR_TYPE = "CommentEditorSharedResource";
-
- /**
- *
- * Constructor.
- *
- * @param registry
- * @param papyrusTextInstance
- */
- public PapyrusCommentEditor(final ServicesRegistry registry, final PapyrusTextInstance papyrusTextInstance) {
- super();
- this.registry = registry;
- this.papyrusTextInstance = papyrusTextInstance;
- try {
- domain = ServiceUtils.getInstance().getTransactionalEditingDomain(registry);
- } catch (ServiceException e) {
- Activator.log.error(e);
- }
- }
-
-
- /**
- *
- * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#createSourceViewer(org.eclipse.swt.widgets.Composite,
- * org.eclipse.jface.text.source.IVerticalRuler, int)
- *
- * @param parent
- * @param ruler
- * @param styles
- * @return
- */
- @Override
- protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
- ISourceViewer viewer = super.createSourceViewer(parent, ruler, styles);
- //we add a listener on the viewer to be notified when the text is edited
- //TODO try to improve, because we execute a command for each character
- listener = new ITextListener() {
-
- //we edit the uml.Comment
- public void textChanged(TextEvent event) {
- String currentText = getSourceViewer().getTextWidget().getText();
- Comment cmt = (Comment)papyrusTextInstance.getEditedObject();
- EStructuralFeature feature = cmt.eClass().getEStructuralFeature("body");
- IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(cmt);
- SetRequest request = new SetRequest(domain, cmt, feature, currentText);
- ICommand command = elementEditService.getEditCommand(request);
- if(command.canExecute()) {
- domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(command));
- }
- }
- };
-
- viewer.addTextListener(listener);
-
- return viewer;
- }
-
- /**
- * We override this method because setInput can't be overriden for TextEditor.
- * We replace the default papyrus input by our input for Comment
- *
- * @see org.eclipse.ui.editors.text.TextEditor#doSetInput(org.eclipse.ui.IEditorInput)
- *
- * @param input
- * @throws CoreException
- */
- @Override
- protected void doSetInput(IEditorInput input) throws CoreException {
- String string = ((Comment)papyrusTextInstance.getEditedObject()).getBody();
- if(string == null) {
- string = "";
- }
- IStorage storage = new TextStorage(string);
- super.doSetInput(new TextInput(storage));
- }
-
- /**
- *
- * @see org.eclipse.ui.editors.text.TextEditor#dispose()
- *
- */
- @Override
- public void dispose() {
- //we remove the listener
- getSourceViewer().removeTextListener(listener);
- super.dispose();
- }
-
-
- //for this classes , see : http://wiki.eclipse.org/FAQ_How_do_I_open_an_editor_on_something_that_is_not_a_file%3F
- class TextStorage implements IStorage {
-
- private String string;
-
- TextStorage(String input) {
- this.string = input;
- }
-
- public InputStream getContents() throws CoreException {
- return new ByteArrayInputStream(string.getBytes());
- }
-
- public IPath getFullPath() {
- return null;
- }
-
- public Object getAdapter(Class adapter) {
- return null;
- }
-
- public String getName() {
- int len = Math.min(5, string.length());
- return string.substring(0, len).concat("..."); //$NON-NLS-1$
- }
-
- public boolean isReadOnly() {
- return false;
- }
- }
-
- //for this classes , see : http://wiki.eclipse.org/FAQ_How_do_I_open_an_editor_on_something_that_is_not_a_file%3F
- class TextInput implements IStorageEditorInput {
-
- private IStorage storage;
-
- TextInput(IStorage storage) {
- this.storage = storage;
- }
-
- public boolean exists() {
- return true;
- }
-
- public ImageDescriptor getImageDescriptor() {
- return null;
- }
-
- public String getName() {
- return storage.getName();
- }
-
- public IPersistableElement getPersistable() {
- return null;
- }
-
- public IStorage getStorage() {
- return storage;
- }
-
- public String getToolTipText() {
- return "String-based file: " + storage.getName();
- }
-
- public Object getAdapter(Class adapter) {
- return null;
- }
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.example.uml.comment.editor.sharedresource.editor;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.util.TransactionUtil;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.text.ITextListener;
+import org.eclipse.jface.text.TextEvent;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.IVerticalRuler;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
+import org.eclipse.papyrus.example.uml.comment.editor.sharedresource.Activator;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IPersistableElement;
+import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.editors.text.TextEditor;
+import org.eclipse.uml2.uml.Comment;
+
+public class PapyrusCommentEditor extends TextEditor {
+
+ /** the service registry */
+ protected final ServicesRegistry registry;
+
+ /** the papyrus text instance */
+ protected final PapyrusTextInstance papyrusTextInstance;
+
+ /** the text listener */
+ protected ITextListener listener;
+
+ /** the editing domain */
+ protected TransactionalEditingDomain domain;
+
+ public static final String EDITOR_DEFAULT_NAME = "Comment Editor Shared Resource";
+
+ public static final String EDITOR_TYPE = "CommentEditorSharedResource";
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param registry
+ * @param papyrusTextInstance
+ */
+ public PapyrusCommentEditor(final ServicesRegistry registry, final PapyrusTextInstance papyrusTextInstance) {
+ super();
+ this.registry = registry;
+ this.papyrusTextInstance = papyrusTextInstance;
+ try {
+ domain = ServiceUtils.getInstance().getTransactionalEditingDomain(registry);
+ } catch (ServiceException e) {
+ Activator.log.error(e);
+ }
+ }
+
+
+ /**
+ *
+ * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#createSourceViewer(org.eclipse.swt.widgets.Composite,
+ * org.eclipse.jface.text.source.IVerticalRuler, int)
+ *
+ * @param parent
+ * @param ruler
+ * @param styles
+ * @return
+ */
+ @Override
+ protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
+ ISourceViewer viewer = super.createSourceViewer(parent, ruler, styles);
+ //we add a listener on the viewer to be notified when the text is edited
+ //TODO try to improve, because we execute a command for each character
+ listener = new ITextListener() {
+
+ //we edit the uml.Comment
+ public void textChanged(TextEvent event) {
+ String currentText = getSourceViewer().getTextWidget().getText();
+ Comment cmt = (Comment)papyrusTextInstance.getEditedObject();
+ EStructuralFeature feature = cmt.eClass().getEStructuralFeature("body");
+ IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(cmt);
+ SetRequest request = new SetRequest(domain, cmt, feature, currentText);
+ ICommand command = elementEditService.getEditCommand(request);
+ if(command.canExecute()) {
+ domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(command));
+ }
+ }
+ };
+
+ viewer.addTextListener(listener);
+
+ return viewer;
+ }
+
+ /**
+ * We override this method because setInput can't be overriden for TextEditor.
+ * We replace the default papyrus input by our input for Comment
+ *
+ * @see org.eclipse.ui.editors.text.TextEditor#doSetInput(org.eclipse.ui.IEditorInput)
+ *
+ * @param input
+ * @throws CoreException
+ */
+ @Override
+ protected void doSetInput(IEditorInput input) throws CoreException {
+ String string = ((Comment)papyrusTextInstance.getEditedObject()).getBody();
+ if(string == null) {
+ string = "";
+ }
+ IStorage storage = new TextStorage(string);
+ super.doSetInput(new TextInput(storage));
+ }
+
+ /**
+ *
+ * @see org.eclipse.ui.editors.text.TextEditor#dispose()
+ *
+ */
+ @Override
+ public void dispose() {
+ //we remove the listener
+ getSourceViewer().removeTextListener(listener);
+ super.dispose();
+ }
+
+
+ //for this classes , see : http://wiki.eclipse.org/FAQ_How_do_I_open_an_editor_on_something_that_is_not_a_file%3F
+ class TextStorage implements IStorage {
+
+ private String string;
+
+ TextStorage(String input) {
+ this.string = input;
+ }
+
+ public InputStream getContents() throws CoreException {
+ return new ByteArrayInputStream(string.getBytes());
+ }
+
+ public IPath getFullPath() {
+ return null;
+ }
+
+ public Object getAdapter(Class adapter) {
+ return null;
+ }
+
+ public String getName() {
+ int len = Math.min(5, string.length());
+ return string.substring(0, len).concat("..."); //$NON-NLS-1$
+ }
+
+ public boolean isReadOnly() {
+ return false;
+ }
+ }
+
+ //for this classes , see : http://wiki.eclipse.org/FAQ_How_do_I_open_an_editor_on_something_that_is_not_a_file%3F
+ class TextInput implements IStorageEditorInput {
+
+ private IStorage storage;
+
+ TextInput(IStorage storage) {
+ this.storage = storage;
+ }
+
+ public boolean exists() {
+ return true;
+ }
+
+ public ImageDescriptor getImageDescriptor() {
+ return null;
+ }
+
+ public String getName() {
+ return storage.getName();
+ }
+
+ public IPersistableElement getPersistable() {
+ return null;
+ }
+
+ public IStorage getStorage() {
+ return storage;
+ }
+
+ public String getToolTipText() {
+ return "String-based file: " + storage.getName();
+ }
+
+ public Object getAdapter(Class adapter) {
+ return null;
+ }
+ }
+
+}
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/factory/CommentEditorFactory.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/factory/CommentEditorFactory.java
index 4dffd8c8c12..bce2f93e84e 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/factory/CommentEditorFactory.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/factory/CommentEditorFactory.java
@@ -18,8 +18,8 @@ import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusText
import org.eclipse.papyrus.example.uml.comment.editor.sharedresource.Activator;
import org.eclipse.papyrus.example.uml.comment.editor.sharedresource.editor.PapyrusCommentEditor;
import org.eclipse.papyrus.infra.core.editor.BackboneException;
-import org.eclipse.papyrus.infra.core.extension.diagrameditor.AbstractEditorFactory;
-import org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor.ActionBarContributorRegistry;
+import org.eclipse.papyrus.infra.ui.extension.diagrameditor.AbstractEditorFactory;
+import org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor.ActionBarContributorRegistry;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
import org.eclipse.papyrus.infra.core.services.ServiceException;
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/handler/CommentEditorHandler.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/handler/CommentEditorHandler.java
index c557a58933c..b34859ca5eb 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/handler/CommentEditorHandler.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/handler/CommentEditorHandler.java
@@ -1,177 +1,177 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.example.uml.comment.editor.sharedresource.handler;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.commands.CheckedOperationHistory;
-import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
-import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrustextinstanceFactory;
-import org.eclipse.papyrus.example.uml.comment.editor.sharedresource.Activator;
-import org.eclipse.papyrus.example.uml.comment.editor.sharedresource.editor.PapyrusCommentEditor;
-import org.eclipse.papyrus.example.uml.comment.editor.sharedresource.modelresource.TextEditorModelSharedResource;
-import org.eclipse.papyrus.infra.core.resource.NotFoundException;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Comment;
-
-
-public class CommentEditorHandler extends AbstractHandler {
-
-
- public CommentEditorHandler(){
- }
- /**
- *
- * @see org.eclipse.core.commands.AbstractHandler#isEnabled()
- *
- * @return
- */
- @Override
- public boolean isEnabled() {
- return getSelection().size() == 1;
- }
-
- /**
- *
- * @return
- * the current selection
- */
- protected List<EObject> getSelection() {
- ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
- List<EObject> currentSelection = new ArrayList<EObject>();
- Iterator<?> iter = ((IStructuredSelection)selection).iterator();
- while(iter.hasNext()) {
- Object current = iter.next();
- if(current instanceof IAdaptable){
- EObject tmp = (EObject)((IAdaptable)current).getAdapter(EObject.class);
- if(tmp!=null){
- if(tmp instanceof Comment){
- currentSelection.add(tmp);
- }
- }
- }
- }
- return currentSelection;
- }
-
- /**
- * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
- *
- * @param event
- * @return
- * @throws ExecutionException
- */
- public Object execute(final ExecutionEvent event) throws ExecutionException {
- try {
-
- runAsTransaction();
- } catch (ServiceException e) {
- throw new ExecutionException("I can't create CompareEditor", e); //$NON-NLS-1$
- }
- return null;
- }
-
- /**
- * Run the command as a transaction.
- * Create a Transaction and delegate the command to {@link #doExecute(ServicesRegistry)}.
- *
- * @throws ServiceException
- *
- */
- public void runAsTransaction() throws ServiceException {
- final ServicesRegistry serviceRegistry = ServiceUtilsForActionHandlers.getInstance().getServiceRegistry();
- TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(serviceRegistry);
-
- //Create the transactional command
- AbstractEMFOperation command = new AbstractEMFOperation(domain, "Create CompareEditor") { //$NON-NLS-1$
-
- @Override
- protected IStatus doExecute(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- try {
- CommentEditorHandler.this.doExecute(serviceRegistry);
- } catch (ServiceException e) {
- Activator.log.error(e);
- return Status.CANCEL_STATUS;
- } catch (NotFoundException e) {
- Activator.log.error(e);
- return Status.CANCEL_STATUS;
- }
- return Status.OK_STATUS;
- }
- };
-
- // Execute the command
- try {
- CheckedOperationHistory.getInstance().execute(command, new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- Activator.log.error("I can't create CompareEditor", e); //$NON-NLS-1$
- }
-
- }
-
-
- /**
- * Do the execution of the command.
- *
- * @param serviceRegistry
- * @throws ServiceException
- * @throws NotFoundException
- */
- public void doExecute(final ServicesRegistry serviceRegistry) throws ServiceException, NotFoundException {
- Object editorModel = createEditorModel(serviceRegistry);
- // Get the mngr allowing to add/open new editor.
- IPageMngr pageMngr = ServiceUtils.getInstance().getIPageMngr(serviceRegistry);
- // add the new editor model to the sash.
- pageMngr.openPage(editorModel);
-
- }
-
- /**
- * Create a model identifying the editor. This model will be saved with the sash
- *
- * @return
- * @throws ServiceException
- * @throws NotFoundException
- * The model where to save the TableInstance is not found.
- */
- protected Object createEditorModel(final ServicesRegistry serviceRegistry) throws ServiceException, NotFoundException {
- PapyrusTextInstance editorModel = PapyrustextinstanceFactory.eINSTANCE.createPapyrusTextInstance();
- editorModel.setEditedObject(getSelection().get(0));
- editorModel.setType(PapyrusCommentEditor.EDITOR_TYPE);
- editorModel.setName(PapyrusCommentEditor.EDITOR_DEFAULT_NAME);
- TextEditorModelSharedResource model = (TextEditorModelSharedResource)ServiceUtils.getInstance().getModelSet(serviceRegistry).getModelChecked(TextEditorModelSharedResource.MODEL_ID);
- model.addPapyrusTextInstance(editorModel);
- return editorModel;
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.example.uml.comment.editor.sharedresource.handler;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.workspace.AbstractEMFOperation;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.commands.CheckedOperationHistory;
+import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrusTextInstance;
+import org.eclipse.papyrus.example.text.instance.papyrustextinstance.PapyrustextinstanceFactory;
+import org.eclipse.papyrus.example.uml.comment.editor.sharedresource.Activator;
+import org.eclipse.papyrus.example.uml.comment.editor.sharedresource.editor.PapyrusCommentEditor;
+import org.eclipse.papyrus.example.uml.comment.editor.sharedresource.modelresource.TextEditorModelSharedResource;
+import org.eclipse.papyrus.infra.core.resource.NotFoundException;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForActionHandlers;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Comment;
+
+
+public class CommentEditorHandler extends AbstractHandler {
+
+
+ public CommentEditorHandler(){
+ }
+ /**
+ *
+ * @see org.eclipse.core.commands.AbstractHandler#isEnabled()
+ *
+ * @return
+ */
+ @Override
+ public boolean isEnabled() {
+ return getSelection().size() == 1;
+ }
+
+ /**
+ *
+ * @return
+ * the current selection
+ */
+ protected List<EObject> getSelection() {
+ ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
+ List<EObject> currentSelection = new ArrayList<EObject>();
+ Iterator<?> iter = ((IStructuredSelection)selection).iterator();
+ while(iter.hasNext()) {
+ Object current = iter.next();
+ if(current instanceof IAdaptable){
+ EObject tmp = (EObject)((IAdaptable)current).getAdapter(EObject.class);
+ if(tmp!=null){
+ if(tmp instanceof Comment){
+ currentSelection.add(tmp);
+ }
+ }
+ }
+ }
+ return currentSelection;
+ }
+
+ /**
+ * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+ *
+ * @param event
+ * @return
+ * @throws ExecutionException
+ */
+ public Object execute(final ExecutionEvent event) throws ExecutionException {
+ try {
+
+ runAsTransaction();
+ } catch (ServiceException e) {
+ throw new ExecutionException("I can't create CompareEditor", e); //$NON-NLS-1$
+ }
+ return null;
+ }
+
+ /**
+ * Run the command as a transaction.
+ * Create a Transaction and delegate the command to {@link #doExecute(ServicesRegistry)}.
+ *
+ * @throws ServiceException
+ *
+ */
+ public void runAsTransaction() throws ServiceException {
+ final ServicesRegistry serviceRegistry = ServiceUtilsForActionHandlers.getInstance().getServiceRegistry();
+ TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(serviceRegistry);
+
+ //Create the transactional command
+ AbstractEMFOperation command = new AbstractEMFOperation(domain, "Create CompareEditor") { //$NON-NLS-1$
+
+ @Override
+ protected IStatus doExecute(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
+ try {
+ CommentEditorHandler.this.doExecute(serviceRegistry);
+ } catch (ServiceException e) {
+ Activator.log.error(e);
+ return Status.CANCEL_STATUS;
+ } catch (NotFoundException e) {
+ Activator.log.error(e);
+ return Status.CANCEL_STATUS;
+ }
+ return Status.OK_STATUS;
+ }
+ };
+
+ // Execute the command
+ try {
+ CheckedOperationHistory.getInstance().execute(command, new NullProgressMonitor(), null);
+ } catch (ExecutionException e) {
+ Activator.log.error("I can't create CompareEditor", e); //$NON-NLS-1$
+ }
+
+ }
+
+
+ /**
+ * Do the execution of the command.
+ *
+ * @param serviceRegistry
+ * @throws ServiceException
+ * @throws NotFoundException
+ */
+ public void doExecute(final ServicesRegistry serviceRegistry) throws ServiceException, NotFoundException {
+ Object editorModel = createEditorModel(serviceRegistry);
+ // Get the mngr allowing to add/open new editor.
+ IPageManager pageMngr = ServiceUtils.getInstance().getIPageManager(serviceRegistry);
+ // add the new editor model to the sash.
+ pageMngr.openPage(editorModel);
+
+ }
+
+ /**
+ * Create a model identifying the editor. This model will be saved with the sash
+ *
+ * @return
+ * @throws ServiceException
+ * @throws NotFoundException
+ * The model where to save the TableInstance is not found.
+ */
+ protected Object createEditorModel(final ServicesRegistry serviceRegistry) throws ServiceException, NotFoundException {
+ PapyrusTextInstance editorModel = PapyrustextinstanceFactory.eINSTANCE.createPapyrusTextInstance();
+ editorModel.setEditedObject(getSelection().get(0));
+ editorModel.setType(PapyrusCommentEditor.EDITOR_TYPE);
+ editorModel.setName(PapyrusCommentEditor.EDITOR_DEFAULT_NAME);
+ TextEditorModelSharedResource model = (TextEditorModelSharedResource)ServiceUtils.getInstance().getModelSet(serviceRegistry).getModelChecked(TextEditorModelSharedResource.MODEL_ID);
+ model.addPapyrusTextInstance(editorModel);
+ return editorModel;
+ }
+}
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/modelresource/TextEditorModelSharedResource.java b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/modelresource/TextEditorModelSharedResource.java
index 608e4b0e868..608e4b0e868 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/modelresource/TextEditorModelSharedResource.java
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/src/org/eclipse/papyrus/example/uml/comment/editor/sharedresource/modelresource/TextEditorModelSharedResource.java
diff --git a/examples/uml/org.eclipse.papyrus.thousandcreation/pom.xml b/examples/uml/org.eclipse.papyrus.thousandcreation/pom.xml
index 2a8ce92c66e..f4f7262ecd8 100644
--- a/examples/uml/org.eclipse.papyrus.thousandcreation/pom.xml
+++ b/examples/uml/org.eclipse.papyrus.thousandcreation/pom.xml
@@ -2,13 +2,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../../releng/top-pom-main.xml</relativePath>
+ <artifactId>org.eclipse.papyrus.examples.uml</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.thousandcreation</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/examples/uml/org.eclipse.papyrus.thousandcreation/test/thousandcreation/HugeModelGenerationAction.java b/examples/uml/org.eclipse.papyrus.thousandcreation/test/thousandcreation/HugeModelGenerationAction.java
index 5c348eea1e1..3f0fefe7d47 100644
--- a/examples/uml/org.eclipse.papyrus.thousandcreation/test/thousandcreation/HugeModelGenerationAction.java
+++ b/examples/uml/org.eclipse.papyrus.thousandcreation/test/thousandcreation/HugeModelGenerationAction.java
@@ -1,102 +1,102 @@
-/*****************************************************************************
- * 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:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package thousandcreation;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.uml2.uml.Package;
-
-
-public class HugeModelGenerationAction implements IActionDelegate {
-
- protected Package selectedPackage;
- protected final static int packageNumber=200;
- protected final static int classNumber=1000;
- protected final static String chars = "abcdefghijklmnopqrstuvwxyz";
- protected final static String mchars="ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
- public HugeModelGenerationAction() {
- // TODO Auto-generated constructor stub
- }
-
-/**
- * generate a string
- * @param length the length of the string
- * @return a string
- */
- public static String generateName(int length)
- {
-
- String pass = "";
- for(int i=0;i<length;i++)
- {
- if( i==0){
- int integer = (int)Math.floor(Math.random() * 26);
- pass += mchars.charAt(integer);
- }
- else{
- int integer = (int)Math.floor(Math.random() * 26);
- pass += chars.charAt(integer);
- }
- }
- return pass;
- }
-
-
- public void run(IAction action) {
- TransactionalEditingDomain editingDomain = EditorUtils
- .getTransactionalEditingDomain();
- if (editingDomain != null && selectedPackage!=null) {
- Command command = new RecordingCommand(editingDomain) {
-
- @Override
- protected void doExecute() {
- for(int i=0; i<packageNumber;i++){
- //create packages
- Package currentPackage=selectedPackage.createNestedPackage(generateName(10));
- for( int j=0; j<classNumber;j++){
- //create classes
- currentPackage.createOwnedClass(generateName(10), false);
- }
- System.out.println("package "+i +"/"+packageNumber+" done.");
- }
- }
- };
- editingDomain.getCommandStack().execute(command);
- }
-
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- if (selection instanceof IStructuredSelection){
- if( ((IStructuredSelection)selection).getFirstElement() instanceof IAdaptable){
- EObject eObject=(EObject)((IAdaptable)((IStructuredSelection)selection).getFirstElement()).getAdapter(EObject.class);
- if( eObject instanceof Package){
- selectedPackage=(org.eclipse.uml2.uml.Package)eObject;
- }
- }
-
- }
-
- }
-
-}
+/*****************************************************************************
+ * 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:
+ * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package thousandcreation;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.ui.util.EditorUtils;
+import org.eclipse.ui.IActionDelegate;
+import org.eclipse.uml2.uml.Package;
+
+
+public class HugeModelGenerationAction implements IActionDelegate {
+
+ protected Package selectedPackage;
+ protected final static int packageNumber=200;
+ protected final static int classNumber=1000;
+ protected final static String chars = "abcdefghijklmnopqrstuvwxyz";
+ protected final static String mchars="ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+ public HugeModelGenerationAction() {
+ // TODO Auto-generated constructor stub
+ }
+
+/**
+ * generate a string
+ * @param length the length of the string
+ * @return a string
+ */
+ public static String generateName(int length)
+ {
+
+ String pass = "";
+ for(int i=0;i<length;i++)
+ {
+ if( i==0){
+ int integer = (int)Math.floor(Math.random() * 26);
+ pass += mchars.charAt(integer);
+ }
+ else{
+ int integer = (int)Math.floor(Math.random() * 26);
+ pass += chars.charAt(integer);
+ }
+ }
+ return pass;
+ }
+
+
+ public void run(IAction action) {
+ TransactionalEditingDomain editingDomain = EditorUtils
+ .getTransactionalEditingDomain();
+ if (editingDomain != null && selectedPackage!=null) {
+ Command command = new RecordingCommand(editingDomain) {
+
+ @Override
+ protected void doExecute() {
+ for(int i=0; i<packageNumber;i++){
+ //create packages
+ Package currentPackage=selectedPackage.createNestedPackage(generateName(10));
+ for( int j=0; j<classNumber;j++){
+ //create classes
+ currentPackage.createOwnedClass(generateName(10), false);
+ }
+ System.out.println("package "+i +"/"+packageNumber+" done.");
+ }
+ }
+ };
+ editingDomain.getCommandStack().execute(command);
+ }
+
+ }
+
+ public void selectionChanged(IAction action, ISelection selection) {
+ if (selection instanceof IStructuredSelection){
+ if( ((IStructuredSelection)selection).getFirstElement() instanceof IAdaptable){
+ EObject eObject=(EObject)((IAdaptable)((IStructuredSelection)selection).getFirstElement()).getAdapter(EObject.class);
+ if( eObject instanceof Package){
+ selectedPackage=(org.eclipse.uml2.uml.Package)eObject;
+ }
+ }
+
+ }
+
+ }
+
+}
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/.classpath b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/.classpath
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.classpath
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/.project b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.project
index 515b3812d81..515b3812d81 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/.project
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.project
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.core.prefs b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..4759947300a 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.core.prefs
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.ui.prefs b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.ui.prefs
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.ui.prefs
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.pde.api.tools.prefs b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.pde.api.tools.prefs
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
index 1a079fe90ef..d331539e3e0 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Export-Package: org.eclipse.papyrus.uml.diagram.emftree
Require-Bundle: org.eclipse.uml2.uml.editor;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.core.sasheditor
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/about.html b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/about.html
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/about.html
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/build.properties b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/build.properties
index 87464c141b5..87464c141b5 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/build.properties
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/build.properties
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/icons/EmfTree.gif b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/icons/EmfTree.gif
index d07712589ae..d07712589ae 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/icons/EmfTree.gif
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/icons/EmfTree.gif
Binary files differ
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/plugin.properties b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/plugin.properties
index 906e7b71ec0..906e7b71ec0 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/plugin.properties
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/plugin.properties
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/plugin.xml b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/plugin.xml
index 1a42a4f00f2..1a42a4f00f2 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/plugin.xml
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/plugin.xml
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/pom.xml b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/pom.xml
index b65813a9748..1cc885d3352 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/pom.xml
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/pom.xml
@@ -2,9 +2,9 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.examples</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.examples.uml</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.diagram.emftree</artifactId>
<version>1.2.0-SNAPSHOT</version>
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/Activator.java b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/Activator.java
index 699b363b9a4..699b363b9a4 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/Activator.java
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/Activator.java
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/CreateEMFTreeDiagramHandler.java b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/CreateEMFTreeDiagramHandler.java
index 7594893fe91..7594893fe91 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/CreateEMFTreeDiagramHandler.java
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/CreateEMFTreeDiagramHandler.java
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/EmfTreeDiagramEditorFactory.java b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/EmfTreeDiagramEditorFactory.java
index ed4e8ae6085..ed4e8ae6085 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/EmfTreeDiagramEditorFactory.java
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/EmfTreeDiagramEditorFactory.java
diff --git a/examples/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/UMLEditor.java b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/UMLEditor.java
index 9e4d085a03d..9e4d085a03d 100644
--- a/examples/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/UMLEditor.java
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/src/org/eclipse/papyrus/uml/diagram/emftree/UMLEditor.java
diff --git a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF
index a0685ac1aba..0656075699f 100644
--- a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.emf.ecore;bundle-version="2.9.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.ui,
org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.1.0",
org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.1.0",
org.eclipse.uml2.uml;bundle-version="4.1.0",
diff --git a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/pom.xml b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/pom.xml
index d774667f25b..1bde7c09627 100644
--- a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/pom.xml
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/pom.xml
@@ -2,13 +2,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../../releng/top-pom-main.xml</relativePath>
+ <artifactId>org.eclipse.papyrus.examples.uml</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.papyrus</groupId>
<artifactId>org.eclipse.papyrus.uml.diagram.example.programmaticcreation</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateCompositeDiagramElementsCommand.java b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateCompositeDiagramElementsCommand.java
index 5beaccdd388..61fad175c9c 100644
--- a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateCompositeDiagramElementsCommand.java
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateCompositeDiagramElementsCommand.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForHandlers;
import org.eclipse.papyrus.uml.diagram.composite.providers.UMLViewProvider;
import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;
import org.eclipse.uml2.uml.Class;
@@ -52,9 +52,9 @@ public class CreateCompositeDiagramElementsCommand extends AbstractEMFOperation
protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
- try {
- ISashWindowsContainer windowsContainer =
- ServiceUtilsForHandlers.getInstance().getISashWindowsContainer(m_event);
+
+ ISashWindowsContainer windowsContainer = null;
+ //ServiceUtilsForHandlers.getInstance().getISashWindowsContainer(m_event);
Object model = windowsContainer.getActiveSashWindowsPage().getRawModel();
if(model instanceof PageRef) {
EObject diagramEObj = ((PageRef)model).getEmfPageIdentifier();
@@ -73,10 +73,7 @@ public class CreateCompositeDiagramElementsCommand extends AbstractEMFOperation
addCuToCompositeDiagram((Class) m_context, (Class) m_context, cu, view, diagram);
}
}
- }
- catch (ServiceException svcE) {
- System.err.println(svcE.toString());
- }
+
return Status.OK_STATUS;
}
@@ -84,7 +81,7 @@ public class CreateCompositeDiagramElementsCommand extends AbstractEMFOperation
{
// add CU to compartment
Object compartment = view.getChildren().get(1);
- View roleBindingView = compViewProvider.createCollaborationUse_3071(cu, (BasicCompartment)compartment, -1, true,
+ View roleBindingView = compViewProvider.createCollaborationUse_Shape(cu, (BasicCompartment)compartment, -1, true,
UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
Location location = NotationFactory.eINSTANCE.createLocation();
location.setX(50);
diff --git a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateSequenceDiagramElementsCommand.java b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateSequenceDiagramElementsCommand.java
index 9880ef8edc6..dfc4263ecef 100644
--- a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateSequenceDiagramElementsCommand.java
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateSequenceDiagramElementsCommand.java
@@ -31,7 +31,7 @@ import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForHandlers;
import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;
import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLViewProvider;
@@ -61,9 +61,9 @@ public class CreateSequenceDiagramElementsCommand extends AbstractEMFOperation {
protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
- try {
- ISashWindowsContainer windowsContainer =
- ServiceUtilsForHandlers.getInstance().getISashWindowsContainer(m_event);
+ //try {
+ ISashWindowsContainer windowsContainer = null;
+ //ServiceUtilsForHandlers.getInstance().getISashWindowsContainer(m_event);
Object model = windowsContainer.getActiveSashWindowsPage().getRawModel();
if(model instanceof PageRef) {
EObject diagramEObj = ((PageRef)model).getEmfPageIdentifier();
@@ -109,10 +109,10 @@ public class CreateSequenceDiagramElementsCommand extends AbstractEMFOperation {
addMessage(message, diagram, lifelineV1, lifelineV2);
}
}
- }
+ /*}
catch (ServiceException svcE) {
System.err.println(svcE.toString());
- }
+ }*/
return Status.OK_STATUS;
}
@@ -158,7 +158,7 @@ public class CreateSequenceDiagramElementsCommand extends AbstractEMFOperation {
{
// get first compartment of view
Object compartment = interactionView.getChildren().get(1);
- Node lifelineView = sequenceDiagViewProvider.createDurationConstraint_3021(durationContraint, (View) compartment, -1, true,
+ Node lifelineView = sequenceDiagViewProvider.createDurationConstraint_Shape(durationContraint, (View) compartment, -1, true,
UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
Bounds location = NotationFactory.eINSTANCE.createBounds();
location.setX(x);
@@ -178,7 +178,7 @@ public class CreateSequenceDiagramElementsCommand extends AbstractEMFOperation {
*/
public void addMessage(Message message, Diagram diagram, View lifelineSrcV, View lifelineDstV)
{
- View messageView = sequenceDiagViewProvider.createMessage_4004(message, diagram, -1, true,
+ View messageView = sequenceDiagViewProvider.createMessage_AsynchEdge(message, diagram, -1, true,
UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
if(messageView instanceof Edge) {
Edge messageEdge = (Edge) messageView;
diff --git a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/pom.xml b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/pom.xml
index cf605599461..0160e8208af 100644
--- a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/pom.xml
+++ b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/pom.xml
@@ -2,13 +2,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../../releng/top-pom-main.xml</relativePath>
+ <artifactId>org.eclipse.papyrus.examples.uml</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.textual.editors.example</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/examples/uml/pom.xml b/examples/uml/pom.xml
new file mode 100644
index 00000000000..3c40b40dd88
--- /dev/null
+++ b/examples/uml/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.examples</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.examples.uml</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>org.eclipse.papyrus.example.uml.comment.editor.newresource</module>
+ <module>org.eclipse.papyrus.example.uml.comment.editor.sharedresource</module>
+ <module>org.eclipse.papyrus.uml.diagram.emftree</module>
+ <module>org.eclipse.papyrus.thousandcreation</module>
+ <module>org.eclipse.papyrus.uml.diagram.example.programmaticcreation</module>
+ <!-- module>org.eclipse.papyrus.uml.textual.editors.example</module-->
+ </modules>
+</project> \ No newline at end of file
diff --git a/examples/user/pom.xml b/examples/user/pom.xml
new file mode 100644
index 00000000000..7038253844f
--- /dev/null
+++ b/examples/user/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.examples</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.examples.user</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <!-- non maven project module>org.eclipse.papyrus.examples.user.QVToExamples</module-->
+ <module>referencediagrams</module>
+ </modules>
+</project> \ No newline at end of file
diff --git a/examples/user/referencediagrams/pom.xml b/examples/user/referencediagrams/pom.xml
new file mode 100644
index 00000000000..69153ba5199
--- /dev/null
+++ b/examples/user/referencediagrams/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.examples.user</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.examples.user.referencediagrams</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <!-- module>org.eclipse.papyrus.examples.user.referencediagrams.ClassDiagramTestEditor</module>
+ <module>org.eclipse.papyrus.examples.user.referencediagrams.TC1</module>
+ <module>org.eclipse.papyrus.examples.user.referencediagrams.UseCaseTestEditor</module-->
+ </modules>
+</project> \ No newline at end of file
diff --git a/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/.project b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/.project
new file mode 100644
index 00000000000..17da5a7a1c3
--- /dev/null
+++ b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/.project
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.dev.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.papyrus.releng.dev.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/build.properties b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/build.properties
new file mode 100755
index 00000000000..cff2bd50c57
--- /dev/null
+++ b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/build.properties
@@ -0,0 +1,6 @@
+bin.includes = feature.xml,\
+ epl-v10.html,\
+ license.html,\
+ feature.properties
+src.includes = epl-v10.html,\
+ license.html
diff --git a/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/epl-v10.html b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/epl-v10.html
new file mode 100644
index 00000000000..cb1073a4bad
--- /dev/null
+++ b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/epl-v10.html
@@ -0,0 +1,304 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+ {
+ panose-1:2 11 6 4 3 5 4 4 2 4;
+ mso-font-charset:0;
+ mso-font-pitch:variable;
+ mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+ {mso-style-parent:"";
+ margin:0in;
+ margin-bottom:.0001pt;
+ mso-pagination:widow-orphan;
+ font-size:12.0pt;
+ }
+p
+ {margin-right:0in;
+ mso-margin-top-alt:auto;
+ mso-margin-bottom-alt:auto;
+ margin-left:0in;
+ mso-pagination:widow-orphan;
+ font-size:12.0pt;
+ }
+p.BalloonText, li.BalloonText, div.BalloonText
+ {mso-style-name:"Balloon Text";
+ margin:0in;
+ margin-bottom:.0001pt;
+ mso-pagination:widow-orphan;
+ font-size:8.0pt;
+
+ }
+@page Section1
+ {size:8.5in 11.0in;
+ margin:1.0in 1.25in 1.0in 1.25in;
+ mso-header-margin:.5in;
+ mso-footer-margin:.5in;
+ mso-paper-source:0;}
+div.Section1
+ {page:Section1;}
+-->
+</style>
+</head>
+
+<body lang="EN-US" style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal></p>
+
+</div>
+
+</body>
+
+</html> \ No newline at end of file
diff --git a/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/feature.properties b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/feature.properties
new file mode 100755
index 00000000000..11ac9ede269
--- /dev/null
+++ b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/feature.properties
@@ -0,0 +1,132 @@
+# NLS_MESSAGEFORMAT_VAR
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 9, 2014\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+\t- Content may be structured and packaged into modules to facilitate delivering,\n\
+\t extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+\t plug-in fragments ("Fragments"), and features ("Features").\n\
+\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+\t in a directory named "plugins".\n\
+\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+\t Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+\t Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+\t numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
+\t named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+\t- The top-level (root) directory\n\
+\t- Plug-in and Fragment directories\n\
+\t- Inside Plug-ins and Fragments packaged as JARs\n\
+\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
+\t- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+\t- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+\t the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+\t extending or updating the functionality of an Eclipse-based product.\n\
+\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+\t Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+\t govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+\t Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+\t with the Specification. Such Installable Software Agreement must inform the user of the\n\
+\t terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+\t the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+\t indication of agreement by the user, the provisioning Technology will complete installation\n\
+\t of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/feature.xml b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/feature.xml
new file mode 100644
index 00000000000..9b225a4e0c6
--- /dev/null
+++ b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/feature.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.papyrus.examples.feature"
+ label="Papyrus Examples (Incubation)"
+ version="0.0.1.qualifier"
+ provider-name="Eclipse Modeling Project">
+
+ <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+ Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <!--Examples Core-->
+
+ <plugin
+ id="org.eclipse.papyrus.example.core.lifecycleevents"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.example.core.sashwindows.fulleditor"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.example.core.sashwindows.simpleeditor"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <!--Examples EMF-->
+
+ <plugin
+ id="org.eclipse.papyrus.outline.emftree"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <!--Examples INFRA-->
+
+ <plugin
+ id="org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <!--Examples OTHERS-->
+
+ <plugin
+ id="org.eclipse.papyrus.example.text.instance"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <!--Examples UML-->
+
+ <plugin
+ id="org.eclipse.papyrus.example.uml.comment.editor.newresource"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.example.uml.comment.editor.sharedresource"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.diagram.emftree"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.thousandcreation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.diagram.example.programmaticcreation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <!--Examples USERS-->
+
+ <plugin
+ id="org.eclipse.papyrus.uml.diagram.example.programmaticcreation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/license.html b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/license.html
new file mode 100644
index 00000000000..c3d34c3c21e
--- /dev/null
+++ b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/license.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!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>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+ on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/pom.xml b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/pom.xml
new file mode 100644
index 00000000000..d7b2c047781
--- /dev/null
+++ b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.examples.features</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.examples.feature</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <plugin id="org.eclipse.upr.utp"/> <!-- UPR doesn't provide sources -->
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/pom.xml~ b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/pom.xml~
new file mode 100644
index 00000000000..2a8e9925f09
--- /dev/null
+++ b/features/papyrus-examples-features/org.eclipse.papyrus.examples.feature/pom.xml~
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.examples.features</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.examples.feature</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <plugin id="org.eclipse.upr.utp"/> <!-- UPR doesn't provide sources -->
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project> \ No newline at end of file
diff --git a/features/papyrus-examples-features/pom.xml b/features/papyrus-examples-features/pom.xml
new file mode 100644
index 00000000000..fed2827735a
--- /dev/null
+++ b/features/papyrus-examples-features/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.releng</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../releng/main/pom.xml</relativePath>
+ </parent>
+ <artifactId>org.eclipse.papyrus.examples.features</artifactId>
+ <packaging>pom</packaging>
+ <name>Papyrus Examples Features</name>
+ <description>Container of the Eclipse Feature definition projects for the Examples Papyrus distribution.</description>
+
+ <modules>
+ <module>org.eclipse.papyrus.examples.feature</module>
+ </modules>
+</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000000..8136b67ff51
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <tycho-version>0.23.1</tycho-version>
+ <tychoExtrasVersion>0.23.1</tychoExtrasVersion>
+ <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus</tycho.scmUrl>
+ <jarSignerVersion>1.1.2</jarSignerVersion>
+ <findbugs.version>3.0.1</findbugs.version>
+ <xtext.version>2.7.3</xtext.version>
+ <java.source.version>1.8</java.source.version>
+ <java.target.version>1.8</java.target.version>
+ <mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
+ <skipAllTests>false</skipAllTests>
+ <skipInnerTests>true</skipInnerTests>
+ <eclipse.download>http://download.eclipse.org</eclipse.download> <!-- Set to file:/home/data/httpd/download.eclipse.org when building on Eclipse
+ servers to improve performances -->
+
+ <!-- TODO: Is it possible to automatically detect that we are building
+ this pom rather than a child pom? That would remove the need for this manual
+ variable -->
+ <buildAll>false</buildAll> <!-- Set to true when building this pom directly (Rather than individual
+ components). This will disable Papyrus Update Sites (Since they are being
+ built by this POM). -->
+
+ <!-- manualUpdate -->
+ <nattable.repo.url>${eclipse.download}/nattable/snapshots/488/repository/</nattable.repo.url>
+
+ <!-- manualUpdate -->
+ <nebula-tablecombo.repo.url>${eclipse.download}/technology/nebula/archives/Q12015/release/</nebula-tablecombo.repo.url>
+
+ <!-- manualUpdate -->
+ <orbit.repo.url>${eclipse.download}/tools/orbit/downloads/drops/R20150821153341/repository</orbit.repo.url>
+
+ <!-- updateFrom("Extended Editing Framework (EEF)",0) -->
+ <eef.repo.url>${eclipse.download}/modeling/emft/eef/updates/releases/1.5/R201601141612/</eef.repo.url>
+
+ <!-- manualUpdate -->
+ <rmf.repo.url>${eclipse.download}/rmf/updates/releases</rmf.repo.url>
+
+ <!-- manualUpdate -->
+ <swtbot.repo.url>${eclipse.download}/technology/swtbot/snapshots</swtbot.repo.url>
+
+ <!-- updateFrom("CDT",0) -->
+ <cdt.repo.url>${eclipse.download}/tools/cdt/builds/neon/milestones/m6</cdt.repo.url>
+
+ <!-- updateFrom("CDT",1) -->
+ <cdt.launchbar.repo.url>${eclipse.download}/tools/cdt/launchbar/neon.m5</cdt.launchbar.repo.url>
+
+ <!-- updateFrom("EMF CDO",0) -->
+ <emf-cdo.repo.url>${eclipse.download}/modeling/emf/cdo/drops/S20151216-1133</emf-cdo.repo.url>
+
+ <!-- updateFrom("EMF COMPARE",0) -->
+ <emf-compare.repo.url>${eclipse.download}/modeling/emf/compare/updates/milestones/3.2/S201603200413</emf-compare.repo.url>
+
+ <!-- updateFrom("EMF Query",0) -->
+ <emf-query.repo.url>${eclipse.download}/modeling/emf/query/updates/milestones</emf-query.repo.url>
+
+ <!-- updateFrom("M2T ACCELEO",0) -->
+ <m2t-acceleo.repo.url>${eclipse.download}/acceleo/updates/milestones/3.6/S201603211409</m2t-acceleo.repo.url>
+
+ <!-- manualUpdate -->
+ <upr.repo.url>${eclipse.download}/upr/0.9RC1/update/</upr.repo.url>
+
+ <!-- manualUpdate -->
+ <b3.repo.url>${eclipse.download}/modeling/emft/b3/updates-4.4</b3.repo.url>
+
+ <!-- updateFrom("Mylyn",0) -->
+ <mylyn.repo.url>${eclipse.download}/mylyn/drops/3.19.0/v20160309-0410</mylyn.repo.url>
+
+ <!-- updateFrom("EGIT",0) -->
+ <egit.repo.url>${eclipse.download}/egit/updates-4.2</egit.repo.url>
+
+ <!-- updateFrom("EPP Logging",0) -->
+ <epp-logging.repo.url>${eclipse.download}/technology/epp/logging/milestones/</epp-logging.repo.url>
+
+ <!-- updateFrom("oomph",0) -->
+ <oomph.repo.url>${eclipse.download}/oomph/drops/milestone/S20160203-080059-1.3.0-M5</oomph.repo.url>
+
+ <!-- Papyrus repositories. Used when we're building individual components
+ (vs building the parent pom including everything) -->
+ <papyrus.eclipse.target>neon</papyrus.eclipse.target>
+ <papyrus.repo.main>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/main</papyrus.repo.main>
+ <papyrus.repo.extra>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/extra</papyrus.repo.extra>
+ <papyrus.repo.dev>https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/</papyrus.repo.dev>
+
+ </properties>
+
+ <modules>
+ <module>main</module>
+ <module>extra</module>
+ <module>dev</module>
+ <module>main-tests</module>
+ <module>extra-tests</module>
+ </modules>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>org.eclipse.cbi.maven.plugins</id>
+ <name>Eclipse CBI</name>
+ <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>eclipse.org-mylyn</id>
+ <!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->
+ <url>https://repo.eclipse.org/content/repositories/mylyn/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <repositories>
+ <repository>
+ <id>emf-emf</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMF (Core)",0) -->
+ <url>${eclipse.download}/modeling/emf/emf/updates/2.12milestones/</url>
+ </repository>
+ <repository>
+ <id>emft-mwe</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMFT MWE",0) -->
+ <url>${eclipse.download}/modeling/emft/mwe/updates/milestones/S201603221009/</url>
+ </repository>
+ <repository>
+ <id>emf-transaction</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMF TRANSACTION",0) -->
+ <url>${eclipse.download}/modeling/emf/transaction/updates/milestones</url>
+ </repository>
+ <repository>
+ <id>emf-validation</id>
+ <layout>p2</layout>
+ <!-- updateFrom("EMF VALIDATION",0) -->
+ <url>${eclipse.download}/modeling/emf/validation/updates/milestones</url>
+ </repository>
+ <repository>
+ <id>ep</id>
+ <layout>p2</layout>
+ <!-- updateFrom("Eclipse",0) -->
+ <url>${eclipse.download}/eclipse/updates/4.6milestones/S-4.6M6-201603170200/</url>
+ </repository>
+ <repository>
+ <id>gef</id>
+ <layout>p2</layout>
+ <!-- updateFrom("GEF",0) -->
+ <url>${eclipse.download}/tools/gef/updates/milestones/4.0.0M6_gef-master_1868</url>
+ </repository>
+ <repository>
+ <id>gmp-gmf-notation</id>
+ <layout>p2</layout>
+ <!-- updateFrom("GMF Notation",0) -->
+ <url>${eclipse.download}/modeling/gmp/gmf-notation/updates/milestones</url>
+ </repository>
+ <repository>
+ <id>gmp-gmf-runtime</id>
+ <layout>p2</layout>
+ <!-- updateFrom("GMF Runtime",0) -->
+ <url>${eclipse.download}/modeling/gmp/gmf-runtime/updates/milestones</url>
+ </repository>
+ <repository>
+ <id>gmf-tooling</id>
+ <layout>p2</layout>
+ <!-- updateFrom("GMF Tooling",0) -->
+ <url>${eclipse.download}/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500</url>
+ </repository>
+ <repository>
+ <id>m2t-xpand</id>
+ <layout>p2</layout>
+ <!-- updateFrom("M2T XPAND",0) -->
+ <url>${eclipse.download}/modeling/m2t/xpand/updates/milestones/S201603220642/</url>
+ </repository>
+ <repository>
+ <id>mdt-ocl</id>
+ <layout>p2</layout>
+ <!-- updateFrom("MDT OCL 6.0",0) -->
+ <url>${eclipse.download}/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840</url>
+ </repository>
+ <repository>
+ <id>mdt-uml2</id>
+ <layout>p2</layout>
+ <!-- updateFrom("MDT UML2",0) -->
+ <url>${eclipse.download}/modeling/mdt/uml2/updates/5.2milestones</url>
+ </repository>
+ <repository>
+ <id>mmt-qvto</id>
+ <layout>p2</layout>
+ <!-- updateFrom("QVT Operational",0) -->
+ <url>${eclipse.download}/mmt/qvto/updates/milestones/3.6.0/S201603210408</url>
+ </repository>
+ <repository>
+ <id>nattable</id>
+ <layout>p2</layout>
+ <!-- manualUpdate -->
+ <url>${nattable.repo.url}</url>
+ </repository>
+
+ <!-- Bug 468668: Reinstate and update this when the TableCombo has a new
+ release for Mars or later. <repository> <id>nebula-tablecombo</id> <layout>p2</layout>
+ <url>http://download.eclipse.org/technology/nebula/archives/Q12015/release/</url>
+ </repository> -->
+
+ <repository>
+ <id>orbit</id>
+ <layout>p2</layout>
+ <!-- manualUpdate -->
+ <url>${orbit.repo.url}</url>
+ </repository>
+ <repository>
+ <id>tmf-xtext</id>
+ <layout>p2</layout>
+ <!-- updateFrom("Xtext, Xtend",0) -->
+ <url>${eclipse.download}/modeling/tmf/xtext/updates/milestones/head/S201603220719/</url>
+ </repository>
+ <repository>
+ <id>webtools</id>
+ <layout>p2</layout>
+ <!-- updateFrom("WebTools",0) -->
+ <url>${eclipse.download}/webtools/downloads/drops/R3.8.0/S-3.8.0M5-20160202064558/repository/</url>
+ </repository>
+ <repository>
+ <id>XWT</id>
+ <layout>p2</layout>
+ <!-- updateFrom("XWT",0) -->
+ <url>${eclipse.download}/xwt/release-1.1.0</url>
+ </repository>
+ <repository>
+ <id>subversive</id>
+ <layout>p2</layout>
+ <!-- updateFrom("Subversive",0) -->
+ <url>${eclipse.download}/technology/subversive/4.0/neon-site/</url>
+ </repository>
+ </repositories>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.xtend</groupId>
+ <artifactId>xtend-maven-plugin</artifactId>
+ <version>${xtext.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/releng/main/pom.xml b/releng/main/pom.xml
index 2b7f0fff860..ec2bbb2e1bd 100755
--- a/releng/main/pom.xml
+++ b/releng/main/pom.xml
@@ -10,8 +10,10 @@
</parent>
<modules>
<module>../../plugins</module>
+ <module>../../examples</module>
<module>../../features/papyrus-main-features</module>
<module>../../features/papyrus-toolsmiths-features</module>
+ <module>../../features/papyrus-examples-features</module>
<module>targetPlatform</module>
<module>site</module>
</modules>
diff --git a/releng/main/site/category.xml b/releng/main/site/category.xml
index d675074a74f..3f24aadb161 100644
--- a/releng/main/site/category.xml
+++ b/releng/main/site/category.xml
@@ -12,6 +12,12 @@
<feature url="features/org.eclipse.papyrus.toolsmiths.feature.source_0.0.1.qualifier.jar" id="org.eclipse.papyrus.toolsmiths.feature.source" version="0.0.1.qualifier">
<category name="org.eclipse.papyrus.toolsmiths.category"/>
</feature>
+ <feature url="features/org.eclipse.papyrus.examples.feature_0.0.1.qualifier.jar" id="org.eclipse.papyrus.examples.feature" version="0.0.1.qualifier">
+ <category name="org.eclipse.papyrus.examples.category"/>
+ </feature>
+ <feature url="features/org.eclipse.papyrus.examples.feature.source_0.0.1.qualifier.jar" id="org.eclipse.papyrus.examples.feature.source" version="0.0.1.qualifier">
+ <category name="org.eclipse.papyrus.examples.category"/>
+ </feature>
<category-def name="org.eclipse.papyrus.category" label="Papyrus">
<description>
Papyrus Category
@@ -22,5 +28,10 @@
Papyrus Toolsmiths offers a set of plugins dedicated to speedup the process to create your own customization on top of Papyrus.
</description>
</category-def>
+ <category-def name="org.eclipse.papyrus.examples.category" label="Papyrus Examples">
+ <description>
+ Papyrus Examples offers a set of plugins dedicated to gather examples of Papyrus usage.
+ </description>
+ </category-def>
<repository-reference location="http://download.eclipse.org/releases/oxygen/" enabled="true" />
</site>
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
index e1ef3237181..6f6624ebf5a 100644
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
@@ -103,4 +103,4 @@
<repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.22.0/v20161130-0517"/>
</location>
</locations>
-</target>
+</target> \ No newline at end of file

Back to the top