From ebe6742ec21f30c5153967406493c4289c289440 Mon Sep 17 00:00:00 2001 From: dgelessus <dgelessus@users.noreply.github.com> Date: Tue, 9 Jul 2024 15:19:49 +0200 Subject: [PATCH] Combine de.bmotionstudio.rodin fragment into de.bmotionstudio.gef.editor There seems to be no benefit to having this packaged separately. --- de.bmotionstudio.feature/feature.xml | 10 +- .../META-INF/MANIFEST.MF | 3 +- .../about.ini | 0 de.bmotionstudio.gef.editor/build.properties | 3 +- .../icons/logo_bmotion_32.png | Bin de.bmotionstudio.gef.editor/plugin.xml | 95 +++++++++++++++ .../bmotionstudio/rodin/ActionCollection.java | 0 .../rodin/BMotionLabelProvider.java | 0 .../rodin/BMotionStudioActionProvider.java | 0 .../rodin/BMotionStudioContentProvider.java | 0 .../rodin/BMotionStudioRodinFile.java | 0 .../rodin/PerspectiveEditFactory.java | 0 .../rodin/PerspectiveRunFactory.java | 0 .../StartEventBVisualizationHandler.java | 0 .../rodin/YesToAllMessageDialog.java | 0 de.bmotionstudio.rodin/.classpath | 7 -- de.bmotionstudio.rodin/.project | 28 ----- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.core.runtime.prefs | 2 - de.bmotionstudio.rodin/META-INF/MANIFEST.MF | 10 -- de.bmotionstudio.rodin/build.properties | 7 -- de.bmotionstudio.rodin/fragment.xml | 108 ------------------ de.bmotionstudio.rodin/icons/icon_run.png | Bin 1316 -> 0 bytes de.bmotionstudio.rodin/icons/logo_bmotion.png | Bin 1356 -> 0 bytes settings.gradle | 2 +- 25 files changed, 101 insertions(+), 176 deletions(-) rename {de.bmotionstudio.rodin => de.bmotionstudio.gef.editor}/about.ini (100%) rename {de.bmotionstudio.rodin => de.bmotionstudio.gef.editor}/icons/logo_bmotion_32.png (100%) rename {de.bmotionstudio.rodin => de.bmotionstudio.gef.editor}/src/de/bmotionstudio/rodin/ActionCollection.java (100%) rename {de.bmotionstudio.rodin => de.bmotionstudio.gef.editor}/src/de/bmotionstudio/rodin/BMotionLabelProvider.java (100%) rename {de.bmotionstudio.rodin => de.bmotionstudio.gef.editor}/src/de/bmotionstudio/rodin/BMotionStudioActionProvider.java (100%) rename {de.bmotionstudio.rodin => de.bmotionstudio.gef.editor}/src/de/bmotionstudio/rodin/BMotionStudioContentProvider.java (100%) rename {de.bmotionstudio.rodin => de.bmotionstudio.gef.editor}/src/de/bmotionstudio/rodin/BMotionStudioRodinFile.java (100%) rename {de.bmotionstudio.rodin => de.bmotionstudio.gef.editor}/src/de/bmotionstudio/rodin/PerspectiveEditFactory.java (100%) rename {de.bmotionstudio.rodin => de.bmotionstudio.gef.editor}/src/de/bmotionstudio/rodin/PerspectiveRunFactory.java (100%) rename {de.bmotionstudio.rodin => de.bmotionstudio.gef.editor}/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java (100%) rename {de.bmotionstudio.rodin => de.bmotionstudio.gef.editor}/src/de/bmotionstudio/rodin/YesToAllMessageDialog.java (100%) delete mode 100644 de.bmotionstudio.rodin/.classpath delete mode 100644 de.bmotionstudio.rodin/.project delete mode 100644 de.bmotionstudio.rodin/.settings/org.eclipse.core.resources.prefs delete mode 100644 de.bmotionstudio.rodin/.settings/org.eclipse.core.runtime.prefs delete mode 100644 de.bmotionstudio.rodin/META-INF/MANIFEST.MF delete mode 100644 de.bmotionstudio.rodin/build.properties delete mode 100644 de.bmotionstudio.rodin/fragment.xml delete mode 100644 de.bmotionstudio.rodin/icons/icon_run.png delete mode 100644 de.bmotionstudio.rodin/icons/logo_bmotion.png diff --git a/de.bmotionstudio.feature/feature.xml b/de.bmotionstudio.feature/feature.xml index cf9a4e4d..ba945c89 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 2e18c6f4..bfea7eaa 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 bb491748..3e895de4 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 f08929a7..c35d015c 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 b862a296..00000000 --- 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 8d9f97ef..00000000 --- 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 99f26c02..00000000 --- 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 5a0ad22d..00000000 --- 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 0704539d..00000000 --- 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 ced5dbef..00000000 --- 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 f9f29ddd..00000000 --- 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 GIT binary patch literal 0 HcmV?d00001 literal 1316 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<L*TmUKs7M+S!VC(K#9UNSH+ zNS3%plmzFem6RtIr7}3C<R_&nc;+Uirv{}arc@T5OtoQPU|JC16XGg1fm2ag)n}E{ zi6{R9f<nZ61w<!soP75G>#wg|BAkL=+=j-cBK_?A;{1Y19E{8?oFW{jp8uDUkrSW5 zB`c>OE3afaUn@4PfQySuK}p5VGuYN6NLXB!kDuRko>u0xL+Tn@?s=2B6-_H<@6$6h zHZ(G^w6x^QV-eG~x3IDi?qkz&3cvsK&HZO@D(39B^$1Z@)6mp4G;;~`UFGasI=guC z8uzT;#LU9ukN;aadHR*i;1lEZU+pSV$d#O&dhp@Ch1-rxN=l0KaESJE2uLX#dd7Ed zx@{R#!>wp$5niUDr7c*<9$Gawbe&H~ScKgoV+je#*tWG5v-j6ep7;It_sG`uO4G#7 zKKozLw@O6YQ8%vl@%vx<E<O?#70>8d-!N;FKt7wko{ocekklmJto}_4*6;Sno7A!4 z#;o&GR$g0DvM0woBx?Kio#hjkbT8d|`0!zUef_XWXP51}E-59+o5$>)(|hm1ol778 z=S<!y3IbxOb1q6v<du_G6c?9}4iMEbGV{)8;q_pbR@Ro1Q*?B4shzndv~0TN0==iN zKTg{HsCwEOBc~unM#hTDYJogf@m_9iT|K@8Rz44Qbwe8iBa``ScgRf;5_c=U_59tW z1*>e5T9048m)Nt#ziLTVc5ZCj>V`!JB_+fq`*=H-A8kBbb>iBS4M(rD2}o&%);)Uk zh@G8XFp-mAoKHnv>-E=H%Asu+-~PXT`_9K7AD+K?W9{ZEARwsc9FdTitYGfLr(*f* z@2}=rt3ApVUwrppYla-Zisky7tCf_L4_tU~@cdmXQ$uMbE&o-nGJ)dGei4R7#<B{^ zPhNlOTzk>k#qGzRACWU}2o|u5i;0<ATIKaDX<KulrKRQYh1=qiQoOm$t2S(W`1(uV zwtEVSO8>ziUGLy;1_p))B|(0{V1eOFFl=8eG>?ISQO?uFF{I)ag8<|Ee+=RK^1KST zxmo&H&duL(xz&!rLa@ud`O>1wSRux#nvAM`49x6z&Ms-(K4qOqvCxgWDgy>)cDH4> zqpvR9G|f}A;pEnA24=zZ!+OeRDwfaO+mh6lyN6+8d64-renaupEfF%(rdPTd9D)U! zZZ5W+EO4vrP|w^2DGUmnll-&7*lPGVXC2kp5H*h>fQ!d?x4jJ;1D8?aff=(`GHkoZ zz{GLye1=@YiqlGII;9M&Cx8U*-8(p)U(!QSH=aSQpMfdl-uk8c)m<2OnasJ)aE(># z_~y(G9%oi<#>l`UoeZni@`?E-3k$EYwz|7hz9@#_em-w~iIevUUbE0z*9(Q!4EOKn pOqA`Fa8$9BI;G$46UW5Euxw9yPmhIO4+8@OgQu&X%Q~loCIGz3fjR&H 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 GIT binary patch literal 0 HcmV?d00001 literal 1356 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<L*TmUKs7M+S!VC(K#9UNSH+ zNS3%plmzFem6RtIr7}3C<R_&nc;+Uirv{}arc@T5OtoQPVA>bp6XL3<ta{?f|B$eV zQ_ue!8k<VV$a&;V3J3}j7ZW@A?7y97uqX(K`IXL6Qc|A3c88&niMY6gp^>q$xGcYl zrHHnpf7KFUQE?-uAW137i*NrsySQcatiSi*j<Siftb($3Oz+dzAD_Jbq^GN^8`rC^ zudlDCv-9-r(1w-PZoWE3X4TWybS^)d*S$O|JGXPwZD+rThp)dMxbQ&2vr0hI!MkFa zO;W3lj<$D5)b7)_%V+Gq`0l@b-W)SilY+ig8d};*cbzp!pZWgt_gjx%=TF(b_wY&g zoZkD--`CDubN|_!ut{eRTzuTUbgy~V+<=M&CdrexoVe{-Jm=u~yC<$aku&wNGBvE2 zvw!)Xi$||MUApB!#q51;Yc4b_I_O@$tZe$uoXI<tL)-RUe6;iQ9aFEws+l{yGg^Fo zygz;V^!UZQ#GWnJ9=uXf*Ru5pI{WPZ)}vR7C$HIf_^OGy)vf36xE0MJTi2(zEZThZ zM&Gu3;vSW1Y8tX~3SYkcG`F-86B9QuFccP(@-3ZhlR0(k)@}3G>`*gzKX?A3f})a+ zu6{ydvZIsBnfo8#zJ1%V;YMut4l!+eJ$=LC+57jOyO-O$T3T6q&zU=xF*VJzR^NN} zV*jBd>yF%7f9Psx)!gHk?;U^qUs6Imt$ST;+v?D==?tdXlXgFfXkOE~_G0{meV0D| z-*EJLM)RD<?|)steMic@q<rEM&ysn3Dwg7I#i?^HR!rHLoSdqlq#`A!Xc1oKo;UgA zr8{{&OBxm&aPSV&jGHJfDYf<3WwV4X10xfAM<>nDy2#G$ku~!VU$`CHwzgr`rfuh* z=s8C`fAdC8Ua_LG+M{f-m6K=hhRd?@O12&$mf<B4T|3*?Uzhi<&!4by-j0h4w;j*w z-{j`u_3-r<ZbefIE1Ts0oeJhY_n*EAtzWim-}TICheX_~B4^%McHq3BXS}+h&Hw-Z z8TsP=F)%Q^Dhcun{y$Ox!;+aj(-{~T<vd*+Ln>}D2r$0?$B=97W3S4>!hVKbTCby~ zb2GzS=EYMdbIjuwXJt5WmqCDufswO(sZQ$27ui*kta}A{Dj66#^@DG(ijG;$zwLsS zfu;omBXf^YSd>!yilVbycYCaz#vrx)ilvofQrW&!cEUONJGB{ZJe!~%w`XFw&2(8l ziOdBz8QN=23Y@1@&tI1k8QPbiBF4~f8{$x^o55@RWTl$O2D3v9x6+bl9a*#~uj1+& z`8#Y6+!)fkn***XG-mnv@843q-SarZ%a=R6clnySyTk@EtZ$fel;Pz|*XxEeBb@FX z)?g4l7Np4V@@13Uq!V4|FE3ltcK`9CM243yXK>WFTw;6JTXOpOQ?HE-FJHDY9W+<2 lD?G;~baCNq873ZvJ*`D|)3>qTV_;xl@O1TaS?83{1OR#J-_8I4 diff --git a/settings.gradle b/settings.gradle index 6559a519..9361a185 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' -- GitLab