From f0e7fed7a6e2bd76b1429820483ebdb567597eec Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 28 Feb 2024 12:57:25 +0100
Subject: [PATCH] Remove de.prob.plugin fragment and combine it into de.prob.ui
---
de.prob.plugin/.classpath | 7 -----
de.prob.plugin/.project | 28 ------------------
.../org.eclipse.core.resources.prefs | 3 --
.../.settings/org.eclipse.core.runtime.prefs | 3 --
de.prob.plugin/META-INF/MANIFEST.MF | 8 -----
de.prob.plugin/build.properties | 5 ----
de.prob.plugin/fragment.xml | 13 --------
de.prob.plugin/icons/prob.png | Bin 3598 -> 0 bytes
de.prob.ui/plugin.xml | 11 +++++--
de.prob2.feature/feature.xml | 8 -----
settings.gradle | 2 +-
11 files changed, 10 insertions(+), 78 deletions(-)
delete mode 100644 de.prob.plugin/.classpath
delete mode 100644 de.prob.plugin/.project
delete mode 100644 de.prob.plugin/.settings/org.eclipse.core.resources.prefs
delete mode 100644 de.prob.plugin/.settings/org.eclipse.core.runtime.prefs
delete mode 100644 de.prob.plugin/META-INF/MANIFEST.MF
delete mode 100644 de.prob.plugin/build.properties
delete mode 100644 de.prob.plugin/fragment.xml
delete mode 100644 de.prob.plugin/icons/prob.png
diff --git a/de.prob.plugin/.classpath b/de.prob.plugin/.classpath
deleted file mode 100644
index eca7bdba..00000000
--- a/de.prob.plugin/.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.prob.plugin/.project b/de.prob.plugin/.project
deleted file mode 100644
index a00f814c..00000000
--- a/de.prob.plugin/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>de.prob.plugin</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.prob.plugin/.settings/org.eclipse.core.resources.prefs b/de.prob.plugin/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index ba4759a9..00000000
--- a/de.prob.plugin/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Nov 29 16:16:29 CET 2011
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/de.prob.plugin/.settings/org.eclipse.core.runtime.prefs b/de.prob.plugin/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 2cbb0641..00000000
--- a/de.prob.plugin/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Nov 29 16:16:29 CET 2011
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/de.prob.plugin/META-INF/MANIFEST.MF b/de.prob.plugin/META-INF/MANIFEST.MF
deleted file mode 100644
index f002bda1..00000000
--- a/de.prob.plugin/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ProB Rodin2 UI Bindings
-Bundle-SymbolicName: de.prob.plugin;singleton:=true
-Bundle-Version: 2.4.2.qualifier
-Fragment-Host: de.prob.ui;bundle-version="[7.5.2,7.6.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-Vendor: HHU Düsseldorf STUPS Group
diff --git a/de.prob.plugin/build.properties b/de.prob.plugin/build.properties
deleted file mode 100644
index e3023e14..00000000
--- a/de.prob.plugin/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- fragment.xml
diff --git a/de.prob.plugin/fragment.xml b/de.prob.plugin/fragment.xml
deleted file mode 100644
index 96f3d639..00000000
--- a/de.prob.plugin/fragment.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<fragment>
- <extension
- point="org.eclipse.ui.perspectives">
- <perspective
- class="de.prob.ui.PerspectiveFactory"
- icon="icons/prob.png"
- id="de.prob.ui.perspective"
- name="ProB">
- </perspective>
- </extension>
-</fragment>
diff --git a/de.prob.plugin/icons/prob.png b/de.prob.plugin/icons/prob.png
deleted file mode 100644
index 36d5d6278be2e2226de7b9d4d0fc9da720e47f1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3598
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
diff --git a/de.prob.ui/plugin.xml b/de.prob.ui/plugin.xml
index ea19fd95..db1089d0 100644
--- a/de.prob.ui/plugin.xml
+++ b/de.prob.ui/plugin.xml
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
-
-
+ <extension
+ point="org.eclipse.ui.perspectives">
+ <perspective
+ class="de.prob.ui.PerspectiveFactory"
+ icon="icons/prob.png"
+ id="de.prob.ui.perspective"
+ name="ProB">
+ </perspective>
+ </extension>
<extension
point="org.eclipse.ui.preferencePages">
<page
diff --git a/de.prob2.feature/feature.xml b/de.prob2.feature/feature.xml
index 1598487d..d090ab96 100644
--- a/de.prob2.feature/feature.xml
+++ b/de.prob2.feature/feature.xml
@@ -267,14 +267,6 @@ litigation.
install-size="0"
version="0.0.0"/>
- <plugin
- id="de.prob.plugin"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
<plugin
id="de.prob.ui"
download-size="0"
diff --git a/settings.gradle b/settings.gradle
index 80933621..e230fd59 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include 'de.prob.core', 'de.prob.core.tests', 'de.bmotionstudio.gef.editor' ,'de.bmotionstudio.rodin' , 'de.prob.plugin', 'de.prob.ui', 'de.prob2.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.bmotionstudio.gef.editor', 'de.bmotionstudio.rodin', 'de.prob.ui', 'de.prob2.feature', 'de.prob.symbolic', 'de.prob2.symbolic.feature', 'de.prob.eventb.disprover.core', 'de.prob.eventb.disprover.ui', 'de.prob2.disprover.feature'
--
GitLab