diff --git a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
index aa5115eb57aa0e9ad42b70fd8feebcb98dfd0e6f..6a027fe16854b9da7055d9977431b792c035895a 100644
--- a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
+++ b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BMotion Studio Editor Plug-in
Bundle-SymbolicName: de.bmotionstudio.gef.editor;singleton:=true
-Bundle-Version: 5.2.1
+Bundle-Version: 5.3.0
Bundle-Activator: de.bmotionstudio.gef.editor.BMotionEditorPlugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.jface.databinding;bundle-version="[1.2.1,2.0.0)",
org.eclipse.core.databinding.beans;bundle-version="[1.1.1,2.0.0)",
org.eclipse.gef;bundle-version="[3.7.0,4.0.0)",
- de.prob.core;bundle-version="[9.1.0,9.2.0)",
- org.eventb.core;bundle-version="[2.1.0,2.4.0)"
+ de.prob.core;bundle-version="[9.1.0,9.3.0)",
+ org.eventb.core;bundle-version="[2.1.0,2.5.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Eclipse-BuddyPolicy: registered
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BCheckbox.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BCheckbox.java
index d6984cb85849810f7ae44ef5ebc48d3c7e883d40..32b0235053ac80f1e731fd4c3a05c022bb29aeb2 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BCheckbox.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BCheckbox.java
@@ -9,14 +9,12 @@ package de.bmotionstudio.gef.editor.model;
import org.eclipse.swt.graphics.RGB;
import de.bmotionstudio.gef.editor.AttributeConstants;
-import de.bmotionstudio.gef.editor.attribute.BAttributeButtonGroup;
import de.bmotionstudio.gef.editor.attribute.BAttributeChecked;
import de.bmotionstudio.gef.editor.attribute.BAttributeEnabled;
import de.bmotionstudio.gef.editor.attribute.BAttributeFalseValue;
import de.bmotionstudio.gef.editor.attribute.BAttributeText;
import de.bmotionstudio.gef.editor.attribute.BAttributeTextColor;
import de.bmotionstudio.gef.editor.attribute.BAttributeTrueValue;
-import de.bmotionstudio.gef.editor.attribute.BAttributeValue;
/**
* @author Lukas Ladenberger
@@ -42,9 +40,7 @@ public class BCheckbox extends BControl {
initAttribute(new BAttributeText(DEFAULT_TEXT));
initAttribute(new BAttributeTextColor(new RGB(0, 0, 0)));
initAttribute(new BAttributeChecked(true));
- initAttribute(new BAttributeValue(""));
initAttribute(new BAttributeEnabled(true));
- initAttribute(new BAttributeButtonGroup(""));
initAttribute(new BAttributeTrueValue(""));
initAttribute(new BAttributeFalseValue(""));
getAttribute(AttributeConstants.ATTRIBUTE_HEIGHT).setValue(21);
diff --git a/de.prob.core/.classpath b/de.prob.core/.classpath
index 4885470ebba742687047c196a00ccfa781fcb6f0..9aca83bfbf49c440eead617ce8a1480e0a79e200 100644
--- a/de.prob.core/.classpath
+++ b/de.prob.core/.classpath
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry exported="true" kind="lib" path="lib/keyboard.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="lib/probcliparser.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry exported="true" kind="lib" path="lib/probcliparser.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/de.prob.core/META-INF/MANIFEST.MF b/de.prob.core/META-INF/MANIFEST.MF
index 8cb6e29fca551c07f9282b3619035125fe0e95ab..d77a5fe0aaf5b23a5f344a3dafe13174e178cae3 100644
--- a/de.prob.core/META-INF/MANIFEST.MF
+++ b/de.prob.core/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ProB Animator Core
Bundle-SymbolicName: de.prob.core;singleton:=true
-Bundle-Version: 9.1.2
+Bundle-Version: 9.2.0
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.rodinp.core;bundle-version="[1.3.1,1.6.0)",
- org.eventb.core;bundle-version="[2.1.0,2.4.0)"
+ org.eventb.core;bundle-version="[2.1.0,2.5.0)"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: HHU Düsseldorf STUPS Group
Export-Package: de.be4.classicalb.core.parser,
diff --git a/de.prob.core/lib/keyboard.jar b/de.prob.core/lib/keyboard.jar
deleted file mode 100644
index 6185602505dfdc580db53d2c39aa89ae8cf9ef65..0000000000000000000000000000000000000000
Binary files a/de.prob.core/lib/keyboard.jar and /dev/null differ
diff --git a/de.prob.core/prob/linux/build_info.txt b/de.prob.core/prob/linux/build_info.txt
index 369f2716f8a39a6014b47834fd38991c9cd06591..f107787dc1bd23605ac9c7c8dfad51e60086fd97 100644
--- a/de.prob.core/prob/linux/build_info.txt
+++ b/de.prob.core/prob/linux/build_info.txt
@@ -1,4 +1,4 @@
- Revision: 8306
- June 28 2011 - 2001
+ Revision: 9938
+ January 17 2012 - 2002
\ No newline at end of file
diff --git a/de.prob.core/prob/linux/lib/graphiso.so b/de.prob.core/prob/linux/lib/graphiso.so
old mode 100755
new mode 100644
index 4e4b3a451559da7efc4fc68e4d3c237d3a18ec95..3acdacef777db56f40f83515a67739d9f839edbe
Binary files a/de.prob.core/prob/linux/lib/graphiso.so and b/de.prob.core/prob/linux/lib/graphiso.so differ
diff --git a/de.prob.core/prob/linux/lib/ltlc.so b/de.prob.core/prob/linux/lib/ltlc.so
old mode 100755
new mode 100644
index 310e63a78bd490e0269b69a3b27a391c4048c9bb..8082c639829d994d19efb2122b0ed31ad7975c75
Binary files a/de.prob.core/prob/linux/lib/ltlc.so and b/de.prob.core/prob/linux/lib/ltlc.so differ
diff --git a/de.prob.core/prob/linux/lib/user_signal.so b/de.prob.core/prob/linux/lib/user_signal.so
old mode 100755
new mode 100644
index 634025d44f39b3585d17b4966305f1444c94b295..38f598bf247fc84eeedacd22d02571c4bd388676
Binary files a/de.prob.core/prob/linux/lib/user_signal.so and b/de.prob.core/prob/linux/lib/user_signal.so differ
diff --git a/de.prob.core/prob/linux/probcli b/de.prob.core/prob/linux/probcli
old mode 100755
new mode 100644
index 5e8e0202d9217d1e985fcdbe04be7ea9910e0271..cb76a450c9863b9425c7aee5eb663d0b53752dd0
Binary files a/de.prob.core/prob/linux/probcli and b/de.prob.core/prob/linux/probcli differ
diff --git a/de.prob.core/prob/linux/send_user_interrupt b/de.prob.core/prob/linux/send_user_interrupt
old mode 100755
new mode 100644
index c5daa025c2be077b11d0854b839a7dd5f33032c6..7f321c3ee9935ddfe83ec8d717b36bc826893ff6
Binary files a/de.prob.core/prob/linux/send_user_interrupt and b/de.prob.core/prob/linux/send_user_interrupt differ
diff --git a/de.prob.core/prob/linux64/build_info.txt b/de.prob.core/prob/linux64/build_info.txt
new file mode 100644
index 0000000000000000000000000000000000000000..11b9fcfa1f566bd1e991c87defcab521fa9a96f9
--- /dev/null
+++ b/de.prob.core/prob/linux64/build_info.txt
@@ -0,0 +1,4 @@
+
+ Revision: 9938
+ January 17 2012 - 1948
+
\ No newline at end of file
diff --git a/de.prob.core/prob/linux64/lib/graphiso.so b/de.prob.core/prob/linux64/lib/graphiso.so
new file mode 100644
index 0000000000000000000000000000000000000000..ba2a5cbe43f72a5d77fcb1389527a9f5630b1d40
Binary files /dev/null and b/de.prob.core/prob/linux64/lib/graphiso.so differ
diff --git a/de.prob.core/prob/linux64/lib/ltlc.so b/de.prob.core/prob/linux64/lib/ltlc.so
new file mode 100644
index 0000000000000000000000000000000000000000..9ffd67c1afac43c6a40f55d791562b34816915a7
Binary files /dev/null and b/de.prob.core/prob/linux64/lib/ltlc.so differ
diff --git a/de.prob.core/prob/linux64/lib/user_signal.so b/de.prob.core/prob/linux64/lib/user_signal.so
new file mode 100644
index 0000000000000000000000000000000000000000..321b53945170582d452ea331b8446cb695c68615
Binary files /dev/null and b/de.prob.core/prob/linux64/lib/user_signal.so differ
diff --git a/de.prob.core/prob/linux64/probcli b/de.prob.core/prob/linux64/probcli
new file mode 100644
index 0000000000000000000000000000000000000000..911582d99d46e001688e4706f051a0d739e54225
Binary files /dev/null and b/de.prob.core/prob/linux64/probcli differ
diff --git a/de.prob.core/prob/linux64/probcli.sh b/de.prob.core/prob/linux64/probcli.sh
new file mode 100644
index 0000000000000000000000000000000000000000..9611d3df6b8a0d0b2799921cc4fa5ca6a55bb41b
--- /dev/null
+++ b/de.prob.core/prob/linux64/probcli.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+PROBCOMMAND=probcli
+INTERRUPT_COMMAND=send_user_interrupt
+
+
+# Shell wrapper for PROBCOMMAND
+
+echo "Running ProB Command-line Interface"
+echo "$PROBCOMMAND" "$@"
+
+# dirname
+dirname=`dirname "$0"`
+
+ulimit -d unlimited
+
+chmod a+x "$dirname/$PROBCOMMAND"
+chmod a+x "$dirname/$INTERRUPT_COMMAND"
+exec "$dirname/$PROBCOMMAND" "$@"
diff --git a/de.prob.core/prob/linux64/send_user_interrupt b/de.prob.core/prob/linux64/send_user_interrupt
new file mode 100644
index 0000000000000000000000000000000000000000..7dc8be7365939c369e93830b85a02212024c9c8a
Binary files /dev/null and b/de.prob.core/prob/linux64/send_user_interrupt differ
diff --git a/de.prob.core/prob/macos/build_info.txt b/de.prob.core/prob/macos/build_info.txt
index ce200c097fd45a4ca89648394971783695c007f1..f107787dc1bd23605ac9c7c8dfad51e60086fd97 100644
--- a/de.prob.core/prob/macos/build_info.txt
+++ b/de.prob.core/prob/macos/build_info.txt
@@ -1,4 +1,4 @@
- Revision: 8306
- June 28 2011 - 2002
+ Revision: 9938
+ January 17 2012 - 2002
\ No newline at end of file
diff --git a/de.prob.core/prob/macos/lib/graphiso.bundle b/de.prob.core/prob/macos/lib/graphiso.bundle
old mode 100755
new mode 100644
index de34ec7f197755bfa519f234a98abf72a1cb70b5..fdd67300b6260bc98ac9cf3437dcf58f373078e8
Binary files a/de.prob.core/prob/macos/lib/graphiso.bundle and b/de.prob.core/prob/macos/lib/graphiso.bundle differ
diff --git a/de.prob.core/prob/macos/lib/ltlc.bundle b/de.prob.core/prob/macos/lib/ltlc.bundle
old mode 100755
new mode 100644
index c9ca5e94f707086a7364c3bd8b4e878e79a7daaf..30fca6092ba337e873d441ccc84bb8dcc48f81e1
Binary files a/de.prob.core/prob/macos/lib/ltlc.bundle and b/de.prob.core/prob/macos/lib/ltlc.bundle differ
diff --git a/de.prob.core/prob/macos/lib/user_signal.bundle b/de.prob.core/prob/macos/lib/user_signal.bundle
old mode 100755
new mode 100644
index dade658ef1d82ac0e5bfcb32baeea1bebc6d1f95..0f9237b7936ba91ca2cefc88de607103e553700e
Binary files a/de.prob.core/prob/macos/lib/user_signal.bundle and b/de.prob.core/prob/macos/lib/user_signal.bundle differ
diff --git a/de.prob.core/prob/macos/probcli b/de.prob.core/prob/macos/probcli
old mode 100755
new mode 100644
index bb7f3fb16b5fb9d10ed690e792a78431a08ce548..3d9def99af8549a69f0f1d90b56165cc245da654
Binary files a/de.prob.core/prob/macos/probcli and b/de.prob.core/prob/macos/probcli differ
diff --git a/de.prob.core/prob/macos/probcli.sh b/de.prob.core/prob/macos/probcli.sh
old mode 100755
new mode 100644
diff --git a/de.prob.core/prob/macos/send_user_interrupt b/de.prob.core/prob/macos/send_user_interrupt
old mode 100755
new mode 100644
index eb65c6e230622c6658b628df7e2b8ca16a2b1b34..25324629cdfad0ce76ee2487434653941b765c0e
Binary files a/de.prob.core/prob/macos/send_user_interrupt and b/de.prob.core/prob/macos/send_user_interrupt differ
diff --git a/de.prob.core/prob/windows/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest b/de.prob.core/prob/windows/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest
old mode 100755
new mode 100644
diff --git a/de.prob.core/prob/windows/Microsoft.VC80.CRT/msvcm80.dll b/de.prob.core/prob/windows/Microsoft.VC80.CRT/msvcm80.dll
old mode 100755
new mode 100644
diff --git a/de.prob.core/prob/windows/Microsoft.VC80.CRT/msvcp80.dll b/de.prob.core/prob/windows/Microsoft.VC80.CRT/msvcp80.dll
old mode 100755
new mode 100644
diff --git a/de.prob.core/prob/windows/Microsoft.VC80.CRT/msvcr80.dll b/de.prob.core/prob/windows/Microsoft.VC80.CRT/msvcr80.dll
old mode 100755
new mode 100644
diff --git a/de.prob.core/prob/windows/build_info.txt b/de.prob.core/prob/windows/build_info.txt
index 6e8a5c94e0672e77a08320c3a02f054f97cc80f9..ccc0f9c5d1f27f96c32b7bd76cb94a2ebc07cb60 100644
--- a/de.prob.core/prob/windows/build_info.txt
+++ b/de.prob.core/prob/windows/build_info.txt
@@ -1,4 +1,4 @@
- Last build: ${build} Revision: 8306
- June 28 2011
+ Last build: ${build} Revision: 9938
+ January 17 2012
\ No newline at end of file
diff --git a/de.prob.core/prob/windows/lib/graphiso.dll b/de.prob.core/prob/windows/lib/graphiso.dll
old mode 100755
new mode 100644
index e45d8fb0fe8561f79ff04587c507558a95b80251..806da6ee6b1d44f5e1cc3149a42ec98f4e5b1d69
Binary files a/de.prob.core/prob/windows/lib/graphiso.dll and b/de.prob.core/prob/windows/lib/graphiso.dll differ
diff --git a/de.prob.core/prob/windows/lib/ltlc.dll b/de.prob.core/prob/windows/lib/ltlc.dll
old mode 100755
new mode 100644
index 52180048e11a77a1ec5978afa7a38b2610509306..6f97e65670e7e998de08c26f0a9c61941820e837
Binary files a/de.prob.core/prob/windows/lib/ltlc.dll and b/de.prob.core/prob/windows/lib/ltlc.dll differ
diff --git a/de.prob.core/prob/windows/lib/myheap.dll b/de.prob.core/prob/windows/lib/myheap.dll
deleted file mode 100644
index 7529b4025d518decf217f0db330b5f1aeebc05e8..0000000000000000000000000000000000000000
Binary files a/de.prob.core/prob/windows/lib/myheap.dll and /dev/null differ
diff --git a/de.prob.core/prob/windows/lib/user_signal.dll b/de.prob.core/prob/windows/lib/user_signal.dll
index 013e0540a3a513e2ce60479216bc772dfce69baf..bcb60340c3ff624144af8601e1fc1b91ef100090 100644
Binary files a/de.prob.core/prob/windows/lib/user_signal.dll and b/de.prob.core/prob/windows/lib/user_signal.dll differ
diff --git a/de.prob.core/prob/windows/probcli.exe b/de.prob.core/prob/windows/probcli.exe
index 346e163480a796ec7cbbf394e4c81ea043601065..a35cd566609afa7bdafebcb611ff81429a631e4c 100644
Binary files a/de.prob.core/prob/windows/probcli.exe and b/de.prob.core/prob/windows/probcli.exe differ
diff --git a/de.prob.core/prob/windows/send_user_interrupt.exe b/de.prob.core/prob/windows/send_user_interrupt.exe
index 878021faa421be7f43698b2099393233cf9d1def..89c59203ddbcfcdbf52e89ee884a1ac874a00878 100644
Binary files a/de.prob.core/prob/windows/send_user_interrupt.exe and b/de.prob.core/prob/windows/send_user_interrupt.exe differ
diff --git a/de.prob.core/src/de/prob/cli/CliStarter.java b/de.prob.core/src/de/prob/cli/CliStarter.java
index a1fd1bb431a6f0bf2b6a59cd0985662ee12d6a0b..fa142a5eb0fada6925fd9b14a5e38a689da1b8ff 100644
--- a/de.prob.core/src/de/prob/cli/CliStarter.java
+++ b/de.prob.core/src/de/prob/cli/CliStarter.java
@@ -41,8 +41,6 @@ public final class CliStarter {
private static final String[] JARS = new String[] { "BParser.jar",
"ParserAspects.jar", "aspectjrt.jar", "prolog.jar" };
- private static Map<String, OsSpecificInfo> OSINFOS = createOsInfos();
-
private Process prologProcess;
private String debuggingKey;
@@ -56,17 +54,6 @@ public final class CliStarter {
this(null);
}
- private static Map<String, OsSpecificInfo> createOsInfos() {
- Map<String, OsSpecificInfo> infos = new HashMap<String, CliStarter.OsSpecificInfo>();
- infos.put(Platform.OS_MACOSX, new OsSpecificInfo("macos", "probcli.sh",
- "sh", "send_user_interrupt"));
- infos.put(Platform.OS_LINUX, new OsSpecificInfo("linux", "probcli.sh",
- "sh", "send_user_interrupt"));
- infos.put(Platform.OS_WIN32, new OsSpecificInfo("windows",
- "probcli.exe", null, "send_user_interrupt.exe"));
- return Collections.unmodifiableMap(infos);
- }
-
public CliStarter(final File file) throws CliException {
startProlog(file);
}
@@ -97,10 +84,13 @@ public final class CliStarter {
debuggingKey = null;
final String os = Platform.getOS();
+ final String arch = Platform.getOSArch();
final File applicationPath = getCliPath();
final String fullcp = createFullClasspath(os, applicationPath);
- final OsSpecificInfo osInfo = getOsInfo(os);
+
+ final OsSpecificInfo osInfo = getOsInfo(os,arch);
+
final String osPath = applicationPath + File.separator + osInfo.subdir;
final String executable = osPath + File.separator + osInfo.cliName;
@@ -161,15 +151,28 @@ public final class CliStarter {
}
- private OsSpecificInfo getOsInfo(final String os) throws CliException {
- final OsSpecificInfo osInfo = OSINFOS.get(os);
- if (osInfo == null) {
+ private OsSpecificInfo getOsInfo(final String os, String architecture) throws CliException {
+ if (os.equals(Platform.OS_MACOSX)) {
+ return new OsSpecificInfo("macos", "probcli.sh",
+ "sh", "send_user_interrupt");
+ }
+ if (os.equals(Platform.OS_WIN32)) {
+ return new OsSpecificInfo("windows",
+ "probcli.exe", null, "send_user_interrupt.exe");
+ }
+
+ if (os.equals(Platform.OS_LINUX)) {
+ String linux = "linux";
+ if (architecture.equals(Platform.ARCH_X86_64)) {
+ linux = "linux64";
+ }
+ return new OsSpecificInfo(linux, "probcli.sh",
+ "sh", "send_user_interrupt");
+ }
final CliException cliException = new CliException(
"ProB does not support the plattform: " + os);
cliException.notifyUserOnce();
throw cliException;
- }
- return osInfo;
}
@SuppressWarnings("unchecked")
@@ -333,7 +336,8 @@ public final class CliStarter {
public void sendUserInterruptReference() {
if (userInterruptReference != null) {
try {
- final OsSpecificInfo osInfo = getOsInfo(Platform.getOS());
+ final OsSpecificInfo osInfo = getOsInfo(Platform.getOS(),
+ Platform.getOSArch());
final String command = getCliPath() + File.separator
+ osInfo.subdir + File.separator
+ osInfo.userInterruptCmd;
diff --git a/de.prob.plugin/META-INF/MANIFEST.MF b/de.prob.plugin/META-INF/MANIFEST.MF
index a3d6015bd8c44b1077ef85556d7b56b10079f093..365657961c3fe555365191342d0f3acdc5da4f90 100644
--- a/de.prob.plugin/META-INF/MANIFEST.MF
+++ b/de.prob.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ProB Rodin2 UI Bindings
Bundle-SymbolicName: de.prob.plugin;singleton:=true
-Bundle-Version: 2.1.1
-Fragment-Host: de.prob.ui;bundle-version="[7.1.0,7.2)"
+Bundle-Version: 2.1.2
+Fragment-Host: de.prob.ui;bundle-version="[7.1.0,7.3.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: HHU Düsseldorf STUPS Group
diff --git a/de.prob.standalone/META-INF/MANIFEST.MF b/de.prob.standalone/META-INF/MANIFEST.MF
index 27a7eaa5fe4ac5d9cb37c62a978c007227ae02ea..84d4c0d75134f4d3752d28065944905b138fcb3d 100644
--- a/de.prob.standalone/META-INF/MANIFEST.MF
+++ b/de.prob.standalone/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: de.prob.standalone.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
de.prob.ui;bundle-version="4.1.0",
- de.prob.core;bundle-version="9.1.1",
+ de.prob.core;bundle-version="9.2.0",
de.bmotionstudio.gef.editor;bundle-version="5.2.0",
org.rodinp.core;bundle-version="1.2.0",
org.eventb.core;bundle-version="1.2.0",
diff --git a/de.prob.ui/META-INF/MANIFEST.MF b/de.prob.ui/META-INF/MANIFEST.MF
index c4ccd1586532750027ba2952e3a7d0ddf8ed379d..40c7d8b22d6a49fd8de8b3c8ca029b44110047bd 100644
--- a/de.prob.ui/META-INF/MANIFEST.MF
+++ b/de.prob.ui/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ProB Ui Plug-in
Bundle-SymbolicName: de.prob.ui;singleton:=true
-Bundle-Version: 7.1.2
+Bundle-Version: 7.2.0
Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- de.prob.core;bundle-version="[9.1.0,9.2.0)",
- org.eventb.core;bundle-version="[2.1.0,2.4.0)",
+ de.prob.core;bundle-version="[9.1.0,9.3.0)",
+ org.eventb.core;bundle-version="[2.1.0,2.5.0)",
org.eclipse.core.expressions;bundle-version="[3.4.101,4.0.0)",
org.eclipse.gef;bundle-version="[3.5.0,4.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/de.prob.ui/src/de/prob/ui/stateview/LoadShortestTraceHandler.java b/de.prob.ui/src/de/prob/ui/stateview/LoadShortestTraceHandler.java
index aee72bf1b6b50c0bdf3a7ea0b92472f379598314..298aefbdf675d27108bea061aeb163bb0dbf4458 100644
--- a/de.prob.ui/src/de/prob/ui/stateview/LoadShortestTraceHandler.java
+++ b/de.prob.ui/src/de/prob/ui/stateview/LoadShortestTraceHandler.java
@@ -51,7 +51,7 @@ public class LoadShortestTraceHandler extends AbstractHandler implements
final Operation op = getOperationByDstId(nextState,
state.getEnabledOperations());
- state = ExploreStateCommand.exploreState(animator, stateId);
+ state = ExploreStateCommand.exploreState(animator, nextState);
// append state- and operation objects to history
animator.getHistory().add(state, op);
diff --git a/de.prob.update_site/feature.xml b/de.prob.update_site/feature.xml
index 2888f307eeda7dde8f80037215e1262aace973ec..9f7635349c7d089138de1dcd3f6b6ce4b57104d3 100644
--- a/de.prob.update_site/feature.xml
+++ b/de.prob.update_site/feature.xml
@@ -2,7 +2,7 @@
<feature
id="de.prob.update_site"
label="Update_site"
- version="1.0.2">
+ version="1.0.3">
<description url="http://www.stups.uni-duesseldorf.de/ProB">
ProB is an animator and model checker for the B-Method. It allows
diff --git a/de.prob2.feature/feature.xml b/de.prob2.feature/feature.xml
index aecea8a1b96b65fb7c41056b6d01dd8700fc0030..7becfe17405b4aed000cc72e34df6de1be036d52 100644
--- a/de.prob2.feature/feature.xml
+++ b/de.prob2.feature/feature.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="de.prob2.feature"
- label="ProB for Rodin2"
- version="2.2.7"
- provider-name="HHU Düsseldorf STUPS Group">
-
- <description url="http://www.stups.uni-duesseldorf.de/ProB">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="de.prob2.feature"
+ label="ProB for Rodin2"
+ version="2.3.0"
+ provider-name="HHU Düsseldorf STUPS Group">
+
+ <description url="http://www.stups.uni-duesseldorf.de/ProB">
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.
Part of the research and development was conducted within the EPSRC funded projects ABCD and iMoc, and within the EU funded project Rodin.
Development is continued under the EU funded project Deploy and the DFG project Gepavas.
-ProB has been successfully used on various industrial specifications and is now being used within Siemens.
- </description>
-
- <copyright>
- (C) 2000-2011 Michael Leuschel (and many others) All rights reserved.
- </copyright>
-
- <license url="http://www.eclipse.org/org/documents/epl-v10.html">
+ProB has been successfully used on various industrial specifications and is now being used within Siemens.
+ </description>
+
+ <copyright>
+ (C) 2000-2011 Michael Leuschel (and many others) All rights reserved.
+ </copyright>
+
+ <license url="http://www.eclipse.org/org/documents/epl-v10.html">
ProB can be used freely for commercial, non-commercial and academic
use under the Eclipse Public Licence v. 1.0. (below)
For availability of commercial support, please contact the author
@@ -220,69 +220,69 @@ and the intellectual property laws of the United States of America.
No party to this Agreement will bring a legal action under this
Agreement more than one year after the cause of action arose.
Each party waives its rights to a jury trial in any resulting
-litigation.
- </license>
-
- <requires>
- <import plugin="fr.systerel.explorer" version="1.3.2" match="equivalent"/>
- <import plugin="org.eclipse.ui.navigator" version="3.4.0" match="compatible"/>
- <import plugin="org.eclipse.core.databinding" version="1.2.0" match="compatible"/>
- <import plugin="org.eclipse.jface.databinding" version="1.2.1" match="compatible"/>
- <import plugin="org.eclipse.core.databinding.beans" version="1.1.1" match="compatible"/>
- <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.4.1" match="compatible"/>
- <import plugin="de.prob.ui" version="7.1.0" match="equivalent"/>
- <import plugin="de.prob.core" version="9.1.0" match="equivalent"/>
- <import plugin="org.eclipse.core.databinding.property" version="1.2.0" match="compatible"/>
- <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.ui.editors" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.ui.views" version="3.4.1" match="compatible"/>
- <import plugin="org.rodinp.core" version="1.3.1"/>
- <import plugin="org.eclipse.gef" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.ui.ide" version="3.5.0" match="compatible"/>
- <import plugin="org.eventb.core" version="2.1.0"/>
- <import plugin="org.rodinp.keyboard" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.jface" version="3.6.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.resources" version="3.5.0" match="compatible"/>
- <import plugin="org.eclipse.core.expressions" version="3.4.101" match="compatible"/>
- </requires>
-
- <plugin
- id="de.bmotionstudio.gef.editor"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="de.prob.core"
- download-size="0"
- 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"
- install-size="0"
- 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>
+litigation.
+ </license>
+
+ <requires>
+ <import plugin="fr.systerel.explorer" version="1.3.2" match="equivalent"/>
+ <import plugin="org.eclipse.ui.navigator" version="3.4.0" match="compatible"/>
+ <import plugin="org.eclipse.core.databinding" version="1.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jface.databinding" version="1.2.1" match="compatible"/>
+ <import plugin="org.eclipse.core.databinding.beans" version="1.1.1" match="compatible"/>
+ <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.4.1" match="compatible"/>
+ <import plugin="de.prob.ui" version="7.1.0" match="equivalent"/>
+ <import plugin="de.prob.core" version="9.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.core.databinding.property" version="1.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
+ <import plugin="org.eclipse.jface.text" version="3.5.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.editors" version="3.5.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.views" version="3.4.1" match="compatible"/>
+ <import plugin="org.rodinp.core" version="1.3.1"/>
+ <import plugin="org.eclipse.gef" version="3.5.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.ide" version="3.5.0" match="compatible"/>
+ <import plugin="org.eventb.core" version="2.1.0"/>
+ <import plugin="org.rodinp.keyboard" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.jface" version="3.6.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.resources" version="3.5.0" match="compatible"/>
+ <import plugin="org.eclipse.core.expressions" version="3.4.101" match="compatible"/>
+ </requires>
+
+ <plugin
+ id="de.bmotionstudio.gef.editor"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="de.prob.core"
+ download-size="0"
+ 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"
+ install-size="0"
+ 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>