Merge branch 'master' of github-as-ebousse:gemoc/modelanimation

ebousse · ebousse · commit f84b00ea8b02 · 2016-04-01T16:57:07.000+02:00
diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java
@@ -428,7 +428,7 @@ private void selectLastStackframe() {
 					if (s.getName().startsWith("Global context :")) {
 						tree.showItem(item);
 						tree.select(item);
-						TreeSelection selection = (TreeSelection)viewer.getSelection();
+						final TreeSelection selection = (TreeSelection)viewer.getSelection();
 						final TreePath[] paths = selection.getPathsFor(stackFrameAdapter);
 						selectionProvider.setSelection(new TreeSelection(paths));
 						break;
diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java
@@ -357,7 +357,7 @@ public void acceptSearchMatch(SearchMatch match) throws CoreException {
 			// return new Status(IStatus.ERROR, Activator.PLUGIN_ID, );
 		}
 
-		return binaryType.get(0);
+		return binaryType.isEmpty() ? null : binaryType.get(0);
 	}
 
 	private static TransactionalEditingDomain getEditingDomain(EObject o) {
diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/Activator.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/Activator.java
@@ -12,7 +12,9 @@
 
 import java.util.function.Supplier;
 
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.gemoc.sequential_addons.multidimensional.timeline.views.timeline.MultidimensionalTimeLineView;
 import org.osgi.framework.BundleContext;
@@ -45,8 +47,14 @@ public Activator() {
 	 * )
 	 */
 	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
+		try {
+			Class.forName("javafx.embed.swt.FXCanvas");
+			super.start(context);
+			plugin = this;	
+		} catch (ClassNotFoundException e) {
+			ErrorDialog.openError(null,"Multidimensional Timeline Unavailable", "Please install JavaFX or use the Oracle JRE",
+					new Status(IStatus.ERROR,PLUGIN_ID,"JavaFX is needed for the timeline to work"));
+		}	
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ public void acceptSearchMatch(SearchMatch match) throws CoreException {`
`357`	`357`	`// return new Status(IStatus.ERROR, Activator.PLUGIN_ID, );`
`358`	`358`	`}`
`359`	`359`
`360`		`- return binaryType.get(0);`
	`360`	`+ return binaryType.isEmpty() ? null : binaryType.get(0);`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`private static TransactionalEditingDomain getEditingDomain(EObject o) {`