From fc911c6df5075972e364d8eec62092a0114a25da Mon Sep 17 00:00:00 2001 From: dgelessus <dgelessus@users.noreply.github.com> Date: Wed, 28 Feb 2024 13:58:59 +0100 Subject: [PATCH] Fix feature branding not showing in about window and update old info --- de.prob.core.tests/META-INF/MANIFEST.MF | 2 +- de.prob.core/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 4 ++-- de.prob.eventb.disprover.ui/about.ini | 3 +-- de.prob.symbolic/about.ini | 1 + de.prob.symbolic/build.properties | 1 + de.prob.ui/META-INF/MANIFEST.MF | 2 +- de.prob.ui/about.ini | 3 +-- de.prob.ui/about.properties | 18 ------------------ de.prob.ui/build.properties | 1 + .../de/prob/ui/eventb/ClassicPreferences.java | 3 +-- de.prob2.disprover.feature/feature.xml | 5 +++-- de.prob2.feature/feature.xml | 5 +++-- de.prob2.symbolic.feature/feature.xml | 5 +++-- 15 files changed, 22 insertions(+), 37 deletions(-) create mode 100644 de.prob.symbolic/about.ini delete mode 100644 de.prob.ui/about.properties diff --git a/de.prob.core.tests/META-INF/MANIFEST.MF b/de.prob.core.tests/META-INF/MANIFEST.MF index 920b4abe..f8575d60 100644 --- a/de.prob.core.tests/META-INF/MANIFEST.MF +++ b/de.prob.core.tests/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Tests +Bundle-Name: ProB Animator Tests Bundle-SymbolicName: de.prob.core.tests Bundle-Version: 1.0.0.qualifier Bundle-Activator: de.prob.core.tests.Activator diff --git a/de.prob.core/META-INF/MANIFEST.MF b/de.prob.core/META-INF/MANIFEST.MF index 5871ea0f..3286e086 100644 --- a/de.prob.core/META-INF/MANIFEST.MF +++ b/de.prob.core/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)", org.rodinp.core;bundle-version="[1.9.0,2.0.0)" Bundle-ActivationPolicy: lazy Eclipse-BundleShape: dir -Bundle-Vendor: HHU Dusseldorf STUPS Group +Bundle-Vendor: HHU Düsseldorf STUPS Group Export-Package: de.be4.classicalb.core.parser, de.be4.classicalb.core.parser.analysis, de.be4.classicalb.core.parser.analysis.checking, diff --git a/de.prob.eventb.disprover.core/META-INF/MANIFEST.MF b/de.prob.eventb.disprover.core/META-INF/MANIFEST.MF index 7ef9f77c..2d085bca 100644 --- a/de.prob.eventb.disprover.core/META-INF/MANIFEST.MF +++ b/de.prob.eventb.disprover.core/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: ProB Disprover Core for EventB +Bundle-Name: ProB Disprover Core for Event-B Bundle-SymbolicName: de.prob.eventb.disprover.core;singleton:=true Bundle-Version: 2.1.2.qualifier -Bundle-Vendor: Heinrich-Heine University Dusseldorf +Bundle-Vendor: HHU Düsseldorf STUPS Group Require-Bundle: de.prob.core;bundle-version="[9.5.2,9.6.0)", org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)", org.eventb.core;bundle-version="[3.5.0,4.0.0)", diff --git a/de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF b/de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF index 4dd4b418..89c42d19 100644 --- a/de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF +++ b/de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: ProB Disprover UI for EventB +Bundle-Name: ProB Disprover UI for Event-B Bundle-SymbolicName: de.prob.eventb.disprover.ui;singleton:=true Bundle-Version: 2.1.2.qualifier -Bundle-Vendor: Heinrich-Heine University Dusseldorf +Bundle-Vendor: HHU Düsseldorf STUPS Group Require-Bundle: de.prob.core;bundle-version="[9.5.2,9.6.0)", de.prob.eventb.disprover.core;bundle-version="[2.1.2,2.2.0)", de.prob.ui;bundle-version="[7.5.2,7.6.0)", diff --git a/de.prob.eventb.disprover.ui/about.ini b/de.prob.eventb.disprover.ui/about.ini index f04f5e33..80573c6a 100644 --- a/de.prob.eventb.disprover.ui/about.ini +++ b/de.prob.eventb.disprover.ui/about.ini @@ -1,3 +1,2 @@ -aboutText=ProB Disprover (c) 2009 http://www.stups.uni-duesseldorf.de/ProB +aboutText=ProB Disprover (c) 2009-2024 https://prob.hhu.de/w/ featureImage=icons/feature.png - diff --git a/de.prob.symbolic/about.ini b/de.prob.symbolic/about.ini new file mode 100644 index 00000000..035e39a5 --- /dev/null +++ b/de.prob.symbolic/about.ini @@ -0,0 +1 @@ +aboutText=ProB Symbolic Evaluation Support (c) 2013-2024 https://prob.hhu.de/w/ diff --git a/de.prob.symbolic/build.properties b/de.prob.symbolic/build.properties index e9863e28..87749ea8 100644 --- a/de.prob.symbolic/build.properties +++ b/de.prob.symbolic/build.properties @@ -2,4 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ + about.ini,\ plugin.xml diff --git a/de.prob.ui/META-INF/MANIFEST.MF b/de.prob.ui/META-INF/MANIFEST.MF index cf302f29..eecdef38 100644 --- a/de.prob.ui/META-INF/MANIFEST.MF +++ b/de.prob.ui/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: ProB Ui Plug-in +Bundle-Name: ProB Animator UI Bundle-SymbolicName: de.prob.ui;singleton:=true Bundle-Version: 7.5.2.qualifier Require-Bundle: de.prob.core;bundle-version="[9.5.2,9.6.0)", diff --git a/de.prob.ui/about.ini b/de.prob.ui/about.ini index 2bd589b7..a2883d79 100644 --- a/de.prob.ui/about.ini +++ b/de.prob.ui/about.ini @@ -1,3 +1,2 @@ -# Feature Branding for ProB -aboutText=ProB Model Checker (c) 2009 http://www.stups.uni-duesseldorf.de/ProB +aboutText=ProB Animator (c) 2005-2024 https://prob.hhu.de/w/ featureImage=icons/prob.png diff --git a/de.prob.ui/about.properties b/de.prob.ui/about.properties deleted file mode 100644 index 632c9e48..00000000 --- a/de.prob.ui/about.properties +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################### -# Copyright (c) 2006-2008 Heinrich-Heine University Dusseldorf. -# 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 -############################################################################### - -aboutText=ProB Plug-In for Rodin\n\ -\n\ -Version: {featureVersion}\n\ -\n\ -Copyright (c) 2005-2008 Heinrich-Heine University Dusseldorf. All rights reserved.\n\ -Visit http://www.stups.uni-duesseldorf.de\n\ -\n\ -This offering is powered by Eclipse technology and includes\n\ -Eclipse plug-ins that can be installed and used with other\n\ -Eclipse (3.3)-based offerings. diff --git a/de.prob.ui/build.properties b/de.prob.ui/build.properties index 6c480f39..b357e324 100644 --- a/de.prob.ui/build.properties +++ b/de.prob.ui/build.properties @@ -2,5 +2,6 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ + about.ini,\ plugin.xml,\ icons/ diff --git a/de.prob.ui/src/de/prob/ui/eventb/ClassicPreferences.java b/de.prob.ui/src/de/prob/ui/eventb/ClassicPreferences.java index 1b3d65db..f7166b13 100644 --- a/de.prob.ui/src/de/prob/ui/eventb/ClassicPreferences.java +++ b/de.prob.ui/src/de/prob/ui/eventb/ClassicPreferences.java @@ -89,8 +89,7 @@ public class ClassicPreferences extends PreferencePage implements browseButton.addSelectionListener(new PushButton(pageComponent.getShell(), text)); Label versionRemark = new Label(pageComponent, SWT.WRAP); versionRemark.setText( - "Note: This needs a version of ProB2-UI (jar file) that is at least 1.0.1 or a version of ProB Tcl/Tk that is at least 1.3.1.\nYou can obtain both from http://www.stups.uni-duesseldorf.de/ProB\n"); // precisely - // 1.3.0-beta6 + "Note: This needs a version of ProB2-UI (jar file) that is at least 1.0.1 or a version of ProB Tcl/Tk that is at least 1.3.1.\nYou can obtain both from https://prob.hhu.de/w/index.php/Download\n"); // precisely 1.3.0-beta6 GridData gridData2 = new GridData(); gridData2.horizontalSpan = 3; diff --git a/de.prob2.disprover.feature/feature.xml b/de.prob2.disprover.feature/feature.xml index b30b8231..0f68dfa2 100644 --- a/de.prob2.disprover.feature/feature.xml +++ b/de.prob2.disprover.feature/feature.xml @@ -3,9 +3,10 @@ id="de.prob2.disprover.feature" label="ProB for Rodin - (Dis)Prover" version="3.1.2.qualifier" - provider-name="HHU Düsseldorf STUPS Group"> + provider-name="HHU Düsseldorf STUPS Group" + plugin="de.prob.eventb.disprover.ui"> - <description url="http://www.stups.uni-duesseldorf.de/ProB"> + <description url="https://prob.hhu.de/w/"> ProB is an animator and model checker for the B-Method. It allows fully automatic animation of many B specifications, and can be used to systematically check a specification for errors. diff --git a/de.prob2.feature/feature.xml b/de.prob2.feature/feature.xml index 14b88c23..be05f985 100644 --- a/de.prob2.feature/feature.xml +++ b/de.prob2.feature/feature.xml @@ -3,9 +3,10 @@ id="de.prob2.feature" label="ProB for Rodin" version="3.1.2.qualifier" - provider-name="HHU Düsseldorf STUPS Group"> + provider-name="HHU Düsseldorf STUPS Group" + plugin="de.prob.ui"> - <description url="http://www.stups.uni-duesseldorf.de/ProB"> + <description url="https://prob.hhu.de/w/"> ProB is an animator and model checker for the B-Method. It allows fully automatic animation of many B specifications, and can be used to systematically check a specification for errors. diff --git a/de.prob2.symbolic.feature/feature.xml b/de.prob2.symbolic.feature/feature.xml index f1dce493..b4894c5b 100644 --- a/de.prob2.symbolic.feature/feature.xml +++ b/de.prob2.symbolic.feature/feature.xml @@ -3,9 +3,10 @@ id="de.prob2.symbolic.feature" label="ProB for Rodin - Symbolic Constants Support" version="3.1.2.qualifier" - provider-name="HHU Düsseldorf STUPS Group"> + provider-name="HHU Düsseldorf STUPS Group" + plugin="de.prob.symbolic"> - <description url="http://www.stups.uni-duesseldorf.de/ProB"> + <description url="https://prob.hhu.de/w/"> ProB is an animator and model checker for the B-Method. It allows fully automatic animation of many B specifications, and can be used to systematically check a specification for errors. -- GitLab