Bug 553171 - [Moka][Libraries] Some libraries provide by Moka seems not
usefull
Change-Id: I354b4f2381dccba3c03d2989e69b20316bae466c
Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
diff --git a/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/plugin.xml b/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/plugin.xml
index 3d5a8d7..590ca0e 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/plugin.xml
+++ b/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/plugin.xml
@@ -12,6 +12,7 @@
point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
<library
description="Assertions specified with fUML"
+ iconpath="resources/icons/moka_icon.png"
name="AssertionLibrary"
path="pathmap://PAPYRUS_ASSERTION_LIBRARY/AssertionLibrary.uml"
provider="CEA LIST">
diff --git a/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/resources/icons/moka_icon.png b/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/resources/icons/moka_icon.png
new file mode 100644
index 0000000..6739135
--- /dev/null
+++ b/plugins/org.eclipse.papyrus.moka.fuml.assertionlibrary/resources/icons/moka_icon.png
Binary files differ
diff --git a/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.xml b/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.xml
index 73fa15e..a4303e1 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.xml
+++ b/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.xml
@@ -5,6 +5,7 @@
point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
<library
description="Standard fUML Library"
+ iconpath="resources/icons/moka_icon.png"
name="FoundationalModelLibrary"
path="pathmap://PAPYRUS_fUML_LIBRARY/fUML_Library.uml"
provider="CEA LIST">
diff --git a/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/resources/icons/moka_icon.png b/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/resources/icons/moka_icon.png
new file mode 100644
index 0000000..6739135
--- /dev/null
+++ b/plugins/org.eclipse.papyrus.moka.fuml.standardlibrary/resources/icons/moka_icon.png
Binary files differ
diff --git a/plugins/org.eclipse.papyrus.moka.fuml/plugin.xml b/plugins/org.eclipse.papyrus.moka.fuml/plugin.xml
index 6c03830..10e5b32 100644
--- a/plugins/org.eclipse.papyrus.moka.fuml/plugin.xml
+++ b/plugins/org.eclipse.papyrus.moka.fuml/plugin.xml
@@ -2,15 +2,5 @@
<?eclipse version="3.4"?>
<plugin>
<extension-point id="org.eclipse.papyrus.moka.fuml.services" name="SystemServices" schema="schema/org.eclipse.papyrus.moka.fuml.services.exsd"/>
- <extension
- point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
- <library
- description="fUML Semantics"
- iconpath="resources/icons/moka_icon.png"
- name="fUMLSemantics"
- path="pathmap://PAPYRUS_MOKA_FUML_TYPES/fUML_Semantics.uml"
- provider="CEA LIST - 2013">
- </library>
- </extension>
</plugin>
diff --git a/plugins/org.eclipse.papyrus.moka.kernel/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.kernel/META-INF/MANIFEST.MF
index 8300863..b83fa00 100644
--- a/plugins/org.eclipse.papyrus.moka.kernel/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.kernel/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@
org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.18.0,3.0.0)",
org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.2.0,4.0.0)",
org.eclipse.papyrus.moka.utils;bundle-version="4.0.0",
org.eclipse.papyrus.moka.fuml.interfaces,
org.eclipse.paho.client.mqttv3;bundle-version="[1.2.0,2.0.0)"
diff --git a/plugins/org.eclipse.papyrus.moka.kernel/plugin.xml b/plugins/org.eclipse.papyrus.moka.kernel/plugin.xml
index 147cb81..deffd42 100644
--- a/plugins/org.eclipse.papyrus.moka.kernel/plugin.xml
+++ b/plugins/org.eclipse.papyrus.moka.kernel/plugin.xml
@@ -23,5 +23,18 @@
class="org.eclipse.papyrus.moka.kernel.KernelPackage"
genModel="resources/models/Kernel.genmodel"/>
</extension>
+ <extension
+ point="org.eclipse.ui.newWizards">
+ <wizard
+ category="org.eclipse.ui.Examples/org.eclipse.papyrus.examples"
+ class="org.eclipse.papyrus.uml.diagram.wizards.wizards.PapyrusExampleInstallerWizard"
+ finalPerspective="org.eclipse.papyrus.infra.core.perspective"
+ icon="resources/icons/moka_icon.png"
+ id="org.eclipse.papyrus.moka.kernel.wizard.examples"
+ name="Papyrus Moka Examples"
+ preferredPerspectives="org.eclipse.papyrus.infra.core.perspective,org.eclipse.papyrus.moka.ui.debug.perspectives.moka.debug"
+ project="true">
+ </wizard>
+ </extension>
</plugin>
diff --git a/plugins/org.eclipse.papyrus.moka.kernel/resources/icons/moka_icon.png b/plugins/org.eclipse.papyrus.moka.kernel/resources/icons/moka_icon.png
new file mode 100644
index 0000000..6739135
--- /dev/null
+++ b/plugins/org.eclipse.papyrus.moka.kernel/resources/icons/moka_icon.png
Binary files differ
diff --git a/plugins/org.eclipse.papyrus.moka.pssm/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.pssm/META-INF/MANIFEST.MF
index 1491f62..44f66ea 100644
--- a/plugins/org.eclipse.papyrus.moka.pssm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.pssm/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@
Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.pssm.Activator
Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.emf.common.ui;bundle-version="[2.18.0,3.0.0)",
org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)",
diff --git a/plugins/org.eclipse.papyrus.moka.pssm/plugin.xml b/plugins/org.eclipse.papyrus.moka.pssm/plugin.xml
index ef7aa0b..58189d8 100644
--- a/plugins/org.eclipse.papyrus.moka.pssm/plugin.xml
+++ b/plugins/org.eclipse.papyrus.moka.pssm/plugin.xml
@@ -8,25 +8,21 @@
target="platform:/plugin/org.eclipse.papyrus.moka.fuml.statemachines/resources/">
</mapping>
</extension>
- <extension
- point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
- <library
- description="Precise Semantics of UML StateMachines"
- iconpath="resources/icons/moka_icon.png"
- name="StateMachines Semantics"
- path="pathmap://PAPYRUS_MOKA_FUML_STATEMACHINES/UML_StateMachines_Semantics.uml"
- provider="CEA LIST - 2014">
- </library>
- </extension>
<extension
- point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
- <library
- description="UML StateMachines Test Suite"
- iconpath="resources/icons/moka_icon.png"
- name="StateMachines Test Suite"
- path="pathmap://PAPYRUS_MOKA_FUML_STATEMACHINES/tests/StateMachines_TestSuite.uml"
- provider="CEA LIST - 2014">
- </library>
- </extension>
+ point="org.eclipse.emf.common.ui.examples">
+ <example
+ id="org.eclipse.papyrus.moka.pssm.examples.PSSMTestSuite"
+ pageImage="resources/icons/moka_icon.png"
+ wizardID="org.eclipse.papyrus.moka.kernel.wizard.examples">
+ <projectDescriptor
+ contentURI="resources/tests/"
+ description="This example is based on the PSSM Test Suite"
+ name="StateMachineTestSuite">
+ </projectDescriptor>
+ <fileToOpen
+ location="StateMachineTestSuite/PSSM_TestSuite.di">
+ </fileToOpen>
+ </example>
+ </extension>
</plugin>
diff --git a/plugins/org.eclipse.papyrus.moka.pssm/resources/tests/PSSM_TestSuite.notation b/plugins/org.eclipse.papyrus.moka.pssm/resources/tests/PSSM_TestSuite.notation
index cdd61f2..1530e07 100644
--- a/plugins/org.eclipse.papyrus.moka.pssm/resources/tests/PSSM_TestSuite.notation
+++ b/plugins/org.eclipse.papyrus.moka.pssm/resources/tests/PSSM_TestSuite.notation
@@ -104,9 +104,7 @@
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iNjUInYgEeSmvsIVD0njGA" points="[-3, 25, -1, -65]$[-3, 80, -1, -10]"/>
</edges>
</notation:Diagram>
- <css:ModelStyleSheets xmi:id="_SXHZMHYbEeSmvsIVD0njGA">
- <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_9tA_YKi0EeSjT_0dDttASA" path="/pssm-test-suite/common-model-style.css"/>
- </css:ModelStyleSheets>
+ <css:ModelStyleSheets xmi:id="_SXHZMHYbEeSmvsIVD0njGA"/>
<notation:Diagram xmi:id="_xYzEYHYiEeSlH-ceI1IC9Q" type="PapyrusUMLActivityDiagram" name="executeEntry" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_xYzEYXYiEeSlH-ceI1IC9Q" type="2001">
<children xmi:type="notation:DecorationNode" xmi:id="_xYzEYnYiEeSlH-ceI1IC9Q" type="5001"/>
diff --git a/plugins/org.eclipse.papyrus.moka.trace.model/plugin.xml b/plugins/org.eclipse.papyrus.moka.trace.model/plugin.xml
index f53e869..22dd921 100644
--- a/plugins/org.eclipse.papyrus.moka.trace.model/plugin.xml
+++ b/plugins/org.eclipse.papyrus.moka.trace.model/plugin.xml
@@ -21,13 +21,5 @@
target="platform:/plugin/org.eclipse.papyrus.moka.trace.model/resources/model/">
</mapping>
</extension>
- <extension
- point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
- <library
- iconpath="resources/icons/moka_icon.png"
- name="Moka Trace Metamodel"
- path="pathmap://MOKA_TRACE/mokatraceservice.uml">
- </library>
- </extension>
</plugin>
