From 2cc69372b96d894921f8a881b708755c25c59e3c Mon Sep 17 00:00:00 2001 From: Sebastian Krings <sebastian@krin.gs> Date: Thu, 15 Jan 2015 12:02:07 +0100 Subject: [PATCH] update to support rodin 3.1 theory plugin --- de.prob.core/META-INF/MANIFEST.MF | 2 +- de.prob.core/prob_target.target | 21 ++++++++++--------- .../de/prob/eventb/translator/Theories.java | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/de.prob.core/META-INF/MANIFEST.MF b/de.prob.core/META-INF/MANIFEST.MF index 854bcb88..d190dec6 100644 --- a/de.prob.core/META-INF/MANIFEST.MF +++ b/de.prob.core/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: de.prob.core;singleton:=true Bundle-Version: 9.4.2.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.rodinp.core;bundle-version="[1.7.0,1.8.0)", - org.eventb.theory.core;bundle-version="[2.0.0,3.0.0)";resolution:=optional, + org.eventb.theory.core;bundle-version="[3.0.0,3.1.0)";resolution:=optional, org.eventb.core.ast;bundle-version="[3.0.0,3.2.0)", org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)", org.eventb.core.seqprover;bundle-version="[3.0.0,3.2.0)", diff --git a/de.prob.core/prob_target.target b/de.prob.core/prob_target.target index 1d4ccde8..9b6eee4f 100644 --- a/de.prob.core/prob_target.target +++ b/de.prob.core/prob_target.target @@ -1,21 +1,22 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="prob_target" sequenceNumber="32"> +<?pde version="3.8"?><target name="prob_target" sequenceNumber="39"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.gef" version="0.0.0"/> -<repository location="http://download.eclipse.org/tools/gef/updates/releases"/> +<unit id="org.eventb.ide.feature.group" version="3.1.0.201412171041-e1a03f3"/> +<unit id="fr.systerel.editor.feature.group" version="0.8.0.201412171041-e1a03f3"/> +<unit id="org.rodinp.feature.group" version="1.7.0.201412171041-e1a03f3"/> +<unit id="org.rodinp.platform.feature.group" version="3.1.0.201412171041-e1a03f3"/> +<unit id="org.rodinp.platform.sources.feature.group" version="3.1.0.201412171041-e1a03f3"/> +<unit id="org.rodinp.platform.tests.feature.group" version="3.1.0.201412171041-e1a03f3"/> +<repository location="http://www.stups.uni-duesseldorf.de/ProB/buildlibs/rodin/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eventb.theory.feature.feature.group" version="3.0.0"/> <repository location="http://rodin-b-sharp.sourceforge.net/updates/"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eventb.ide.feature.group" version="3.0.1.201406111447-5326174"/> -<unit id="fr.systerel.editor.feature.group" version="0.7.0.201406111447-5326174"/> -<unit id="org.rodinp.feature.group" version="1.7.0.201406111447-5326174"/> -<unit id="org.rodinp.platform.feature.group" version="3.0.0.201406111447-5326174"/> -<unit id="org.rodinp.platform.tests.feature.group" version="3.0.0.201406111447-5326174"/> -<unit id="org.rodinp.platform.sources.feature.group" version="3.0.0.201406111447-5326174"/> -<repository location="http://www.stups.uni-duesseldorf.de/ProB/buildlibs/rodin/"/> +<unit id="org.eclipse.gef.sdk.feature.group" version="3.9.101.201408150207"/> +<repository location="http://download.eclipse.org/releases/luna"/> </location> </locations> </target> diff --git a/de.prob.core/src/de/prob/eventb/translator/Theories.java b/de.prob.core/src/de/prob/eventb/translator/Theories.java index cede1459..15d6ace4 100644 --- a/de.prob.core/src/de/prob/eventb/translator/Theories.java +++ b/de.prob.core/src/de/prob/eventb/translator/Theories.java @@ -407,7 +407,7 @@ public class Theories { private static void processDefinitions(FormulaFactory ff, ITypeEnvironment te, IPrologTermOutput prologOutput, ISCDirectOperatorDefinition[] directOperatorDefinitions) - throws RodinDBException { + throws CoreException { for (ISCDirectOperatorDefinition def : directOperatorDefinitions) { Formula<?> scFormula = def.getSCFormula(ff, te); -- GitLab