diff --git a/de.bmotionstudio.feature/feature.xml b/de.bmotionstudio.feature/feature.xml
index cf9a4e4d24622b7820fd1c8358143ae53b1c6361..ba945c89c2addd4003540a5411580703420f9226 100644
--- a/de.bmotionstudio.feature/feature.xml
+++ b/de.bmotionstudio.feature/feature.xml
@@ -4,7 +4,7 @@
label="ProB for Rodin - BMotion Studio"
version="3.2.0.qualifier"
provider-name="HHU Düsseldorf STUPS Group"
- plugin="de.bmotionstudio.rodin">
+ plugin="de.bmotionstudio.gef.editor">
<description url="https://prob.hhu.de/w/">
The BMotion Studio interactive visualization tool based on the ProB animator.
@@ -258,12 +258,4 @@ litigation.
version="0.0.0"
unpack="false"/>
- <plugin
- id="de.bmotionstudio.rodin"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
</feature>
diff --git a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
index 2e18c6f4b2095c8c3b4329ef7c4de17f99836cb8..bfea7eaa01ec3c3f1c7830d7487fd1a853b0c8e3 100644
--- a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
+++ b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: BMotion Studio Editor Plug-in
+Bundle-Name: BMotion Studio for Rodin
Bundle-SymbolicName: de.bmotionstudio.gef.editor;singleton:=true
Bundle-Version: 5.7.0.qualifier
Bundle-Activator: de.bmotionstudio.gef.editor.BMotionEditorPlugin
@@ -15,6 +15,7 @@ Require-Bundle: de.prob.core;bundle-version="[9.6.0,9.7.0)";visibility:=reexport
org.eclipse.jface.databinding;bundle-version="[1.12.0,2.0.0)",
org.eclipse.ui;bundle-version="[3.118.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.9.0,4.0.0)",
org.eclipse.ui.views;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
org.eventb.core;bundle-version="[3.5.0,4.0.0)",
org.eventb.core.ast;bundle-version="[3.5.0,4.0.0)",
diff --git a/de.bmotionstudio.rodin/about.ini b/de.bmotionstudio.gef.editor/about.ini
similarity index 100%
rename from de.bmotionstudio.rodin/about.ini
rename to de.bmotionstudio.gef.editor/about.ini
diff --git a/de.bmotionstudio.gef.editor/build.properties b/de.bmotionstudio.gef.editor/build.properties
index bb491748de41c8dd30488c2b1d35dcbe5e0c7654..3e895de4d7b464c86549140e27ec0999f8372a67 100644
--- a/de.bmotionstudio.gef.editor/build.properties
+++ b/de.bmotionstudio.gef.editor/build.properties
@@ -1,6 +1,7 @@
source.. = src/
output.. = bin/
-bin.includes = plugin.xml,\
+bin.includes = about.ini,\
+ plugin.xml,\
META-INF/,\
.,\
icons/,\
diff --git a/de.bmotionstudio.rodin/icons/logo_bmotion_32.png b/de.bmotionstudio.gef.editor/icons/logo_bmotion_32.png
similarity index 100%
rename from de.bmotionstudio.rodin/icons/logo_bmotion_32.png
rename to de.bmotionstudio.gef.editor/icons/logo_bmotion_32.png
diff --git a/de.bmotionstudio.gef.editor/plugin.xml b/de.bmotionstudio.gef.editor/plugin.xml
index f08929a71990808f1a4cfe0269f4e9fb55c320b8..c35d015c9eb64762a163ee3f1d98ed1a135be6de 100644
--- a/de.bmotionstudio.gef.editor/plugin.xml
+++ b/de.bmotionstudio.gef.editor/plugin.xml
@@ -10,6 +10,21 @@
<extension-point id="de.bmotionstudio.gef.editor.observer" name="BMotion Studio Observer" schema="schema/de.bmotionstudio.gef.editor.observer.exsd"/>
<extension-point id="de.bmotionstudio.gef.editor.paletteEntry" name="Add a custom Palette Entry" schema="schema/de.bmotionstudio.gef.editor.paletteEntry.exsd"/>
<extension-point id="de.bmotionstudio.gef.editor.includeObserver" name="Include Observer Extension Point" schema="schema/de.bmotionstudio.gef.editor.includeObserver.exsd"/>
+ <extension
+ point="org.eclipse.ui.perspectives">
+ <perspective
+ class="de.bmotionstudio.rodin.PerspectiveEditFactory"
+ icon="icons/logo_bmotion.png"
+ id="de.bmotionstudio.perspective.edit"
+ name="BMS Edit">
+ </perspective>
+ <perspective
+ class="de.bmotionstudio.rodin.PerspectiveRunFactory"
+ icon="icons/icon_run.png"
+ id="de.bmotionstudio.perspective.run"
+ name="BMS Run">
+ </perspective>
+ </extension>
<extension
point="org.eclipse.ui.editors">
<editor
@@ -94,6 +109,26 @@
</command>
</toolbar>
</menuContribution>
+ <menuContribution
+ locationURI="popup:fr.systerel.explorer.navigator.view">
+ <command
+ commandId="de.bmotionstudio.rodin.command.startVisualization"
+ icon="icons/icon_run.png"
+ label="Start Visualization"
+ style="push">
+ <visibleWhen>
+ <with
+ variable="selection">
+ <iterate
+ operator="or">
+ <instanceof
+ value="de.bmotionstudio.rodin.BMotionStudioRodinFile">
+ </instanceof>
+ </iterate>
+ </with>
+ </visibleWhen>
+ </command>
+ </menuContribution>
</extension>
<extension
point="org.eclipse.ui.commands">
@@ -106,6 +141,11 @@
id="de.bmotionstudio.command.startVisualizationFromFile"
name="Start Visualization from File">
</command>
+ <command
+ defaultHandler="de.bmotionstudio.rodin.StartEventBVisualizationHandler"
+ id="de.bmotionstudio.rodin.command.startVisualization"
+ name="Start Visualization">
+ </command>
</extension>
<extension
point="org.eclipse.ui.handlers">
@@ -122,6 +162,61 @@
</enabledWhen>
</handler>
</extension>
+ <extension
+ point="org.eclipse.ui.navigator.navigatorContent">
+ <navigatorContent
+ contentProvider="de.bmotionstudio.rodin.BMotionStudioContentProvider"
+ id="de.bmotionstudio.ui.navigatorContent"
+ labelProvider="de.bmotionstudio.rodin.BMotionLabelProvider"
+ name="BMotion Studio Navigator Content"
+ priority="normal">
+ <triggerPoints>
+ <instanceof
+ value="org.eclipse.core.resources.IProject">
+ </instanceof>
+ </triggerPoints>
+ <possibleChildren>
+ <instanceof
+ value="de.bmotionstudio.rodin.BMotionStudioRodinFile">
+ </instanceof>
+ </possibleChildren>
+ <actionProvider
+ class="de.bmotionstudio.rodin.BMotionStudioActionProvider"
+ id="de.bmotionstudio.ui.navigatorAction"
+ priority="normal">
+ <enablement>
+ <instanceof value="de.bmotionstudio.rodin.BMotionStudioRodinFile">
+ </instanceof>
+ </enablement>
+ </actionProvider>
+ </navigatorContent>
+ </extension>
+ <extension
+ point="org.eclipse.ui.navigator.viewer">
+ <viewerContentBinding
+ viewerId="fr.systerel.explorer.navigator.view">
+ <includes>
+ <contentExtension
+ pattern="de.bmotionstudio.ui.navigatorContent">
+ </contentExtension>
+ </includes>
+ </viewerContentBinding>
+ <viewerActionBinding
+ viewerId="fr.systerel.explorer.navigator.view">
+ <includes>
+ <actionExtension
+ pattern="de.bmotionstudio.ui.navigatorAction">
+ </actionExtension>
+ </includes>
+ </viewerActionBinding>
+ </extension>
+ <extension
+ point="org.rodinp.core.fileAssociations">
+ <fileAssociation
+ content-type-id="de.bmotionstudio.gef.editor.BMotionStudioFile"
+ root-element-type="de.bmotionstudio.gef.editor.BMotionStudioFile">
+ </fileAssociation>
+ </extension>
<extension
point="de.prob.core.animation">
<listener
diff --git a/de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/ActionCollection.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/ActionCollection.java
similarity index 100%
rename from de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/ActionCollection.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/ActionCollection.java
diff --git a/de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/BMotionLabelProvider.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionLabelProvider.java
similarity index 100%
rename from de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/BMotionLabelProvider.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionLabelProvider.java
diff --git a/de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/BMotionStudioActionProvider.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioActionProvider.java
similarity index 100%
rename from de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/BMotionStudioActionProvider.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioActionProvider.java
diff --git a/de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/BMotionStudioContentProvider.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioContentProvider.java
similarity index 100%
rename from de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/BMotionStudioContentProvider.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioContentProvider.java
diff --git a/de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/BMotionStudioRodinFile.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioRodinFile.java
similarity index 100%
rename from de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/BMotionStudioRodinFile.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioRodinFile.java
diff --git a/de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/PerspectiveEditFactory.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveEditFactory.java
similarity index 100%
rename from de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/PerspectiveEditFactory.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveEditFactory.java
diff --git a/de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/PerspectiveRunFactory.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveRunFactory.java
similarity index 100%
rename from de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/PerspectiveRunFactory.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveRunFactory.java
diff --git a/de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java
similarity index 100%
rename from de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java
diff --git a/de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/YesToAllMessageDialog.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/YesToAllMessageDialog.java
similarity index 100%
rename from de.bmotionstudio.rodin/src/de/bmotionstudio/rodin/YesToAllMessageDialog.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/YesToAllMessageDialog.java
diff --git a/de.bmotionstudio.rodin/.classpath b/de.bmotionstudio.rodin/.classpath
deleted file mode 100644
index b862a296d38fe04269faeee6c9d77d11ff77380d..0000000000000000000000000000000000000000
--- a/de.bmotionstudio.rodin/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/de.bmotionstudio.rodin/.project b/de.bmotionstudio.rodin/.project
deleted file mode 100644
index 8d9f97eff9f9c8ec6a6f9557facc69527e870a19..0000000000000000000000000000000000000000
--- a/de.bmotionstudio.rodin/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>de.bmotionstudio.rodin</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/de.bmotionstudio.rodin/.settings/org.eclipse.core.resources.prefs b/de.bmotionstudio.rodin/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0203a7844de00dbfc56e6a35d8ed3c022c..0000000000000000000000000000000000000000
--- a/de.bmotionstudio.rodin/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/de.bmotionstudio.rodin/.settings/org.eclipse.core.runtime.prefs b/de.bmotionstudio.rodin/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22d2a76684139fad95f6b8d209c7cd0d078..0000000000000000000000000000000000000000
--- a/de.bmotionstudio.rodin/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/de.bmotionstudio.rodin/META-INF/MANIFEST.MF b/de.bmotionstudio.rodin/META-INF/MANIFEST.MF
deleted file mode 100644
index 0704539d901680ab3e929a97f8fca142745cfead..0000000000000000000000000000000000000000
--- a/de.bmotionstudio.rodin/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: BMotion Studio Rodin Integration
-Bundle-SymbolicName: de.bmotionstudio.rodin;singleton:=true
-Bundle-Version: 1.4.0.qualifier
-Fragment-Host: de.bmotionstudio.gef.editor;bundle-version="[5.7.0,5.8.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-Vendor: HHU Düsseldorf STUPS Group
-Require-Bundle: de.prob.ui;bundle-version="[7.6.0,7.7.0)",
- org.eclipse.ui.navigator;bundle-version="[3.9.0,4.0.0)"
diff --git a/de.bmotionstudio.rodin/build.properties b/de.bmotionstudio.rodin/build.properties
deleted file mode 100644
index ced5dbef09b100bea6cd4b058c66cd493729cd8b..0000000000000000000000000000000000000000
--- a/de.bmotionstudio.rodin/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.ini,\
- fragment.xml,\
- icons/
diff --git a/de.bmotionstudio.rodin/fragment.xml b/de.bmotionstudio.rodin/fragment.xml
deleted file mode 100644
index f9f29ddd233d9c904af5a31fbc782ecb5f47d933..0000000000000000000000000000000000000000
--- a/de.bmotionstudio.rodin/fragment.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<fragment>
- <extension
- point="org.eclipse.ui.perspectives">
- <perspective
- class="de.bmotionstudio.rodin.PerspectiveEditFactory"
- icon="icons/logo_bmotion.png"
- id="de.bmotionstudio.perspective.edit"
- name="BMS Edit">
- </perspective>
- <perspective
- class="de.bmotionstudio.rodin.PerspectiveRunFactory"
- icon="icons/icon_run.png"
- id="de.bmotionstudio.perspective.run"
- name="BMS Run">
- </perspective>
- </extension>
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- locationURI="popup:fr.systerel.explorer.navigator.view">
- <command
- commandId="de.bmotionstudio.rodin.command.startVisualization"
- icon="icons/icon_run.png"
- label="Start Visualization"
- style="push">
- <visibleWhen>
- <with
- variable="selection">
- <iterate
- operator="or">
- <instanceof
- value="de.bmotionstudio.rodin.BMotionStudioRodinFile">
- </instanceof>
- </iterate>
- </with>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <command
- defaultHandler="de.bmotionstudio.rodin.StartEventBVisualizationHandler"
- id="de.bmotionstudio.rodin.command.startVisualization"
- name="Start Visualization">
- </command>
- </extension>
- <extension
- point="org.rodinp.core.fileAssociations">
- <fileAssociation
- content-type-id="de.bmotionstudio.gef.editor.BMotionStudioFile"
- root-element-type="de.bmotionstudio.gef.editor.BMotionStudioFile">
- </fileAssociation>
- </extension>
- <extension
- point="org.eclipse.ui.navigator.navigatorContent">
- <navigatorContent
- contentProvider="de.bmotionstudio.rodin.BMotionStudioContentProvider"
- id="de.bmotionstudio.ui.navigatorContent"
- labelProvider="de.bmotionstudio.rodin.BMotionLabelProvider"
- name="BMotion Studio Navigator Content"
- priority="normal">
- <triggerPoints>
- <instanceof
- value="org.eclipse.core.resources.IProject">
- </instanceof>
- </triggerPoints>
- <possibleChildren>
- <instanceof
- value="de.bmotionstudio.rodin.BMotionStudioRodinFile">
- </instanceof>
- </possibleChildren>
- <actionProvider
- class="de.bmotionstudio.rodin.BMotionStudioActionProvider"
- id="de.bmotionstudio.ui.navigatorAction"
- priority="normal">
- <enablement>
- <instanceof value="de.bmotionstudio.rodin.BMotionStudioRodinFile">
- </instanceof>
- </enablement>
- </actionProvider>
- </navigatorContent>
- </extension>
- <extension
- point="org.eclipse.ui.navigator.viewer">
- <viewerContentBinding
- viewerId="fr.systerel.explorer.navigator.view">
- <includes>
- <contentExtension
- pattern="de.bmotionstudio.ui.navigatorContent">
- </contentExtension>
- </includes>
- </viewerContentBinding>
- <viewerActionBinding
- viewerId="fr.systerel.explorer.navigator.view">
- <includes>
- <actionExtension
- pattern="de.bmotionstudio.ui.navigatorAction">
- </actionExtension>
- </includes>
- </viewerActionBinding>
- </extension>
-
-
-
-</fragment>
diff --git a/de.bmotionstudio.rodin/icons/icon_run.png b/de.bmotionstudio.rodin/icons/icon_run.png
deleted file mode 100644
index f5808d2dfd5b042b5584ce1c81aa40835ebc8055..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.rodin/icons/icon_run.png and /dev/null differ
diff --git a/de.bmotionstudio.rodin/icons/logo_bmotion.png b/de.bmotionstudio.rodin/icons/logo_bmotion.png
deleted file mode 100644
index 2bcb148a75ce4d1f5d9257033306b5b12b5d295d..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.rodin/icons/logo_bmotion.png and /dev/null differ
diff --git a/settings.gradle b/settings.gradle
index 6559a519fa52d07c264534c02a4978dcbd6a71eb..9361a1857bdcf800ed1cfbf9bbefbe961573ed41 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include 'de.prob.core', 'de.prob.core.tests', 'de.prob.ui', 'de.prob2.feature', 'de.bmotionstudio.gef.editor', 'de.bmotionstudio.rodin', 'de.bmotionstudio.feature', 'de.prob.symbolic', 'de.prob2.symbolic.feature', 'de.prob.eventb.disprover.core', 'de.prob.eventb.disprover.ui', 'de.prob2.disprover.feature'
+include 'de.prob.core', 'de.prob.core.tests', 'de.prob.ui', 'de.prob2.feature', 'de.bmotionstudio.gef.editor', 'de.bmotionstudio.feature', 'de.prob.symbolic', 'de.prob2.symbolic.feature', 'de.prob.eventb.disprover.core', 'de.prob.eventb.disprover.ui', 'de.prob2.disprover.feature'