Skip to content

Commit ad4326a

Browse files
ebousseebousse
committed
Merge branch 'master' of github.com:SiriusLab/ModelDebugging into startSynchronous
framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java
2 parents 5367ba2 + 554603a commit ad4326a

2,073 files changed

Lines changed: 37843 additions & 30554 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.project‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>ModelDebugging</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
</buildSpec>
9+
<natures>
10+
</natures>
11+
</projectDescription>

‎.travis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ before_script:
2323
script:
2424
-
2525
# Build update-site
26-
- travis_retry mvn -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository verify
26+
- travis_retry mvn -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository verify -Dmaven.test.failure.ignore=true
2727
# Rename the zipped update site to nightly
28-
- mv releng/org.gemoc.siriusanimation.repository/target/org.gemoc.siriusanimation.repository-*-SNAPSHOT.zip
29-
releng/org.gemoc.siriusanimation.repository/target/org.gemoc.siriusanimation.repository-nightly.zip
28+
- mv releng/org.eclipse.gemoc.modeldebugging.repository/target/org.eclipse.gemoc.modeldebugging.repository-*-SNAPSHOT.zip
29+
releng/org.eclipse.gemoc.modeldebugging.repository/target/org.eclipse.gemoc.modeldebugging.repository-nightly.zip
3030
# Prepare local dirs to deploy: copy repository
3131
- chmod a+x prepare-deploy-local-dir.sh
3232
- ./prepare-deploy-local-dir.sh $TRAVIS_BUILD_DIR/simulationmodelanimation/nightly

framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.classpath renamed to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/.classpath

File renamed without changes.

‎framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/.project‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.eclipse.gemoc.executionframework.debugger.ui</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.jdt.core.javabuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.pde.ManifestBuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.pde.SchemaBuilder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
</buildSpec>
29+
<natures>
30+
<nature>org.eclipse.pde.PluginNature</nature>
31+
<nature>org.eclipse.jdt.core.javanature</nature>
32+
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
33+
</natures>
34+
</projectDescription>

framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs renamed to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs

File renamed without changes.

‎framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: org.eclipse.gemoc.executionframework.debugger.ui
4+
Bundle-SymbolicName: org.eclipse.gemoc.executionframework.debugger.ui;singleton:=true
5+
Bundle-Version: 2.3.0.qualifier
6+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
7+
Bundle-Activator: org.eclipse.gemoc.executionframework.debugger.ui.Activator
8+
Export-Package: org.eclipse.gemoc.executionframework.debugger.ui;uses:="org.eclipse.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers",
9+
org.eclipse.gemoc.executionframework.debugger.ui.breakpoints
10+
Require-Bundle: com.google.guava,
11+
org.eclipse.xtext.xbase.lib,
12+
org.eclipse.xtend.lib,
13+
org.eclipse.xtend.lib.macro,
14+
org.eclipse.core.commands,
15+
org.eclipse.gemoc.xdsmlframework.api,
16+
org.eclipse.jface,
17+
org.eclipse.debug.core,
18+
org.eclipse.gemoc.dsl.debug.ide,
19+
org.eclipse.core.runtime;bundle-version="3.12.0",
20+
org.eclipse.gemoc.executionframework.engine,
21+
org.eclipse.gemoc.commons.eclipse.ui,
22+
org.eclipse.equinox.registry,
23+
org.eclipse.ui.workbench,
24+
org.eclipse.xtext;bundle-version="2.10.0",
25+
org.eclipse.gemoc.executionframework.debugger;bundle-version="1.0.0",
26+
org.eclipse.gemoc.dsl.debug.ide.sirius.ui,
27+
org.eclipse.gemoc.executionframework.engine.ui,
28+
fr.inria.diverse.melange.resource,
29+
org.eclipse.gemoc.dsl.debug.ide.ui;bundle-version="2.3.0",
30+
org.eclipse.sirius;bundle-version="4.1.3",
31+
org.eclipse.debug.ui
32+
Bundle-ActivationPolicy: lazy
33+

‎framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/build.properties‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
###############################################################################
2+
# Copyright (c) 2017 Inria and others.
3+
# All rights reserved. This program and the accompanying materials
4+
# are made available under the terms of the Eclipse Public License v1.0
5+
# which accompanies this distribution, and is available at
6+
# http://www.eclipse.org/legal/epl-v10.html
7+
#
8+
# Contributors:
9+
# Inria - initial API and implementation
10+
###############################################################################
11+
source.. = src/,\
12+
xtend-gen/
13+
output.. = bin/
14+
bin.includes = META-INF/,\
15+
.,\
16+
plugin.xml

‎framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/plugin.xml‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?eclipse version="3.0"?>
3+
<!--
4+
Copyright (c) 2017 Inria and others.
5+
All rights reserved. This program and the accompanying materials
6+
are made available under the terms of the Eclipse Public License v1.0
7+
which accompanies this distribution, and is available at
8+
http://www.eclipse.org/legal/epl-v10.html
9+
10+
Contributors:
11+
Inria - initial API and implementation
12+
-->
13+
14+
<plugin>
15+
<extension
16+
id="org.eclipse.gemoc.executionframework.debugger.breakpointMarker"
17+
point="org.eclipse.core.resources.markers">
18+
<persistent
19+
value="true">
20+
</persistent>
21+
<super
22+
type="org.eclipse.gemoc.dsl.debug.ide.breakpointMarker">
23+
</super>
24+
</extension>
25+
<extension
26+
point="org.eclipse.debug.core.breakpoints">
27+
<breakpoint
28+
class="org.eclipse.gemoc.executionframework.debugger.GemocBreakpoint"
29+
id="org.eclipse.gemoc.executionframework.debugger.breakpoint"
30+
markerType="org.eclipse.gemoc.executionframework.debugger.ui.org.eclipse.gemoc.executionframework.debugger.breakpointMarker"
31+
name="Gemoc Breakpoints">
32+
</breakpoint>
33+
</extension>
34+
35+
<extension
36+
point="org.eclipse.debug.ui.detailPaneFactories">
37+
<detailFactories
38+
class="org.eclipse.gemoc.executionframework.debugger.ui.breakpoints.BreakpointDetailPaneFactory"
39+
id="org.eclipse.gemoc.executionframework.debugger.detailFactories">
40+
<enablement>
41+
<with
42+
variable="selection">
43+
<count
44+
value="1">
45+
</count>
46+
<iterate>
47+
<instanceof
48+
value="org.eclipse.gemoc.executionframework.debugger.GemocBreakpoint">
49+
</instanceof>
50+
</iterate>
51+
</with>
52+
</enablement>
53+
</detailFactories>
54+
</extension>
55+
<extension
56+
point="org.eclipse.ui.bindings">
57+
<key
58+
commandId="org.eclipse.gemoc.executionframework.debugger.ui.openSemantics"
59+
contextId="org.eclipse.debug.ui.debugging"
60+
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
61+
sequence="M1+6">
62+
</key>
63+
</extension>
64+
65+
<extension
66+
point="org.eclipse.ui.commands">
67+
<command
68+
id="org.eclipse.gemoc.executionframework.debugger.ui.openSemantics"
69+
name="Open Semantics">
70+
</command>
71+
</extension>
72+
<extension
73+
point="org.eclipse.ui.handlers">
74+
<handler
75+
class="org.eclipse.gemoc.executionframework.debugger.ui.OpenSemanticsHandler"
76+
commandId="org.eclipse.gemoc.executionframework.debugger.ui.openSemantics">
77+
</handler>
78+
</extension>
79+
<extension
80+
point="org.eclipse.ui.menus">
81+
<menuContribution
82+
allPopups="false"
83+
locationURI="popup:org.eclipse.debug.ui.DebugView">
84+
<command
85+
commandId="org.eclipse.gemoc.executionframework.debugger.ui.openSemantics"
86+
label="Open Semantics">
87+
</command>
88+
</menuContribution>
89+
</extension>
90+
<extension
91+
point="org.eclipse.sirius.externalJavaAction">
92+
<javaActions
93+
actionClass="org.eclipse.gemoc.executionframework.debugger.ui.breakpoints.GemocToggleBreakpointAction"
94+
id="org.eclipse.gemoc.executionframework.debugger.ui.GemocToggleBreakpointAction">
95+
</javaActions>
96+
</extension>
97+
</plugin>

‎framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/pom.xml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 2017 Inria and others.
4+
All rights reserved. This program and the accompanying materials
5+
are made available under the terms of the Eclipse Public License v1.0
6+
which accompanies this distribution, and is available at
7+
http://www.eclipse.org/legal/epl-v10.html
8+
9+
Contributors:
10+
Inria - initial API and implementation
11+
-->
12+
13+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
14+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
15+
<modelVersion>4.0.0</modelVersion>
16+
17+
<parent>
18+
<relativePath>../..</relativePath>
19+
<groupId>org.gemoc.modeldebugging.executionframework</groupId>
20+
<artifactId>org.gemoc.modeldebugging.executionframework.root</artifactId>
21+
<version>2.3.0-SNAPSHOT</version>
22+
</parent>
23+
24+
<artifactId>org.eclipse.gemoc.executionframework.debugger.ui</artifactId>
25+
<version>2.3.0-SNAPSHOT</version>
26+
<packaging>eclipse-plugin</packaging>
27+
28+
29+
<build>
30+
<plugins>
31+
<plugin>
32+
<groupId>org.eclipse.xtend</groupId>
33+
<artifactId>xtend-maven-plugin</artifactId>
34+
<version>${xtend.version}</version>
35+
<executions>
36+
<execution>
37+
<goals>
38+
<goal>compile</goal>
39+
</goals>
40+
<configuration>
41+
<outputDirectory>xtend-gen</outputDirectory>
42+
</configuration>
43+
</execution>
44+
</executions>
45+
</plugin>
46+
47+
<plugin>
48+
<groupId>org.apache.maven.plugins</groupId>
49+
<artifactId>maven-clean-plugin</artifactId>
50+
<version>2.5</version>
51+
<configuration>
52+
<filesets>
53+
<fileset>
54+
<directory>xtend-gen</directory>
55+
</fileset>
56+
</filesets>
57+
</configuration>
58+
</plugin>
59+
</plugins>
60+
</build>
61+
62+
63+
64+
</project>

‎framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/Activator.java‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
/*******************************************************************************
2+
* Copyright (c) 2016, 2017 Inria and others.
3+
* All rights reserved. This program and the accompanying materials
4+
* are made available under the terms of the Eclipse Public License v1.0
5+
* which accompanies this distribution, and is available at
6+
* http://www.eclipse.org/legal/epl-v10.html
7+
*
8+
* Contributors:
9+
* Inria - initial API and implementation
10+
*******************************************************************************/
11+
package org.eclipse.gemoc.executionframework.debugger.ui;
12+
13+
import org.eclipse.core.runtime.Status;
14+
import org.eclipse.jface.resource.ImageDescriptor;
15+
import org.eclipse.ui.plugin.AbstractUIPlugin;
16+
//import org.gemoc.gemoc_language_workbench.extensions.sirius.services.AbstractGemocDebuggerServices;
17+
import org.osgi.framework.BundleContext;
18+
19+
/**
20+
* The activator class controls the plug-in life cycle
21+
*/
22+
public class Activator extends AbstractUIPlugin {
23+
24+
// The plug-in ID
25+
public static final String PLUGIN_ID = "org.executionframework.debugger.ui"; //$NON-NLS-1$
26+
27+
// The shared instance
28+
private static Activator plugin;
29+
30+
private OpenSemanticsHandler handler;
31+
32+
/**
33+
* The constructor
34+
*/
35+
public Activator() {
36+
}
37+
38+
/*
39+
* (non-Javadoc)
40+
*
41+
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.
42+
* BundleContext)
43+
*/
44+
public void start(BundleContext context) throws Exception {
45+
super.start(context);
46+
plugin = this;
47+
}
48+
49+
/*
50+
* (non-Javadoc)
51+
*
52+
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.
53+
* BundleContext)
54+
*/
55+
public void stop(BundleContext context) throws Exception {
56+
// AbstractGemocDebuggerServices.LISTENER.uninstall();
57+
plugin = null;
58+
super.stop(context);
59+
}
60+
61+
/**
62+
* Returns the shared instance
63+
*
64+
* @return the shared instance
65+
*/
66+
public static Activator getDefault() {
67+
return plugin;
68+
}
69+
70+
/**
71+
* Returns an image descriptor for the image file at the given plug-in
72+
* relative path
73+
*
74+
* @param path
75+
* the path
76+
* @return the image descriptor
77+
*/
78+
public static ImageDescriptor getImageDescriptor(String path) {
79+
return imageDescriptorFromPlugin(PLUGIN_ID, path);
80+
}
81+
82+
public static void warn(String msg, Throwable e) {
83+
Activator.getDefault().getLog().log(new Status(Status.WARNING, PLUGIN_ID, Status.OK, msg, e));
84+
}
85+
86+
public static void error(String msg, Throwable e) {
87+
Activator.getDefault().getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, msg, e));
88+
}
89+
90+
public OpenSemanticsHandler getHandler() {
91+
return handler;
92+
}
93+
94+
void setHandler(OpenSemanticsHandler handler) {
95+
this.handler = handler;
96+
}
97+
98+
}

0 commit comments

Comments
 (0)