Skip to content

Commit 24dba08

Browse files
eboussedvojtise
ebousse
authored and
dvojtise
committed
[ExeFramework] Adapt imports/manifests/code to new debug plugins
1 parent 5dcdc68 commit 24dba08

File tree

27 files changed

+148
-127
lines changed

27 files changed

+148
-127
lines changed

‎framework/execution_framework/plugins/org.executionframework.debugger.ui/.classpath‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
6+
<classpathentry kind="src" path="xtend-gen"/>
67
<classpathentry kind="output" path="bin"/>
78
</classpath>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
<projects>
66
</projects>
77
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
813
<buildCommand>
914
<name>org.eclipse.jdt.core.javabuilder</name>
1015
<arguments>
@@ -24,5 +29,6 @@
2429
<natures>
2530
<nature>org.eclipse.pde.PluginNature</nature>
2631
<nature>org.eclipse.jdt.core.javanature</nature>
32+
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
2733
</natures>
2834
</projectDescription>

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

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,33 @@
1-
Manifest-Version: 1.0
2-
Bundle-ManifestVersion: 2
3-
Bundle-Name: Ui
4-
Bundle-SymbolicName: org.executionframework.debugger.ui
5-
Bundle-Version: 1.0.0.qualifier
6-
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
7-
Export-Package: org.executionframework.debugger.ui;uses:="org.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers",
8-
org.gemoc.executionframework.engine.ui.debug.sirius.action
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: Ui
4+
Bundle-SymbolicName: org.executionframework.debugger.ui;singleton:=true
5+
Bundle-Version: 1.0.0.qualifier
6+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
7+
Bundle-Activator: org.executionframework.debugger.ui.Activator
8+
Export-Package: org.executionframework.debugger.ui;uses:="org.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers",
9+
org.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.gemoc.xdsmlframework.api,
16+
org.eclipse.jface,
17+
org.eclipse.debug.core,
18+
fr.obeo.dsl.debug.ide,
19+
org.eclipse.core.runtime;bundle-version="3.12.0",
20+
org.gemoc.executionframework.engine,
21+
org.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.executionframework.debugger;bundle-version="1.0.0",
26+
fr.obeo.dsl.debug.ide.sirius.ui,
27+
org.gemoc.executionframework.engine.ui,
28+
fr.inria.diverse.melange.resource,
29+
fr.obeo.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.executionframework.debugger.ui/build.properties‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
source.. = src/
1+
source.. = src/,\
2+
xtend-gen/
23
output.. = bin/
34
bin.includes = META-INF/,\
4-
.
5+
.,\
6+
plugin.xml

framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/plugin.xml renamed to framework/execution_framework/plugins/org.executionframework.debugger.ui/plugin.xml

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,30 @@
22
<?eclipse version="3.0"?>
33
<plugin>
44
<extension
5-
id="org.gemoc.gemoc_modeling_workbench.ui.breakpoint.breakpointMarker"
5+
id="org.executionframework.debugger.breakpointMarker"
66
point="org.eclipse.core.resources.markers">
77
<persistent
88
value="true">
99
</persistent>
1010
<super
1111
type="fr.obeo.dsl.debug.ide.breakpointMarker">
1212
</super>
13-
<attribute
14-
name="org.gemoc.gemoc_modeling_workbench.ui.breakpoint.breakOnLogicalStep">
15-
</attribute>
16-
<attribute
17-
name="org.gemoc.gemoc_modeling_workbench.ui.breakpoint.breakOnMSE">
18-
</attribute>
1913
</extension>
2014
<extension
2115
point="org.eclipse.debug.core.breakpoints">
2216
<breakpoint
23-
class="org.gemoc.executionframework.engine.debug.ui.breakpoint.GemocBreakpoint"
24-
id="org.gemoc.gemoc_modeling_workbench.ui.breakpoint.gemocBreakpoint"
25-
markerType="org.gemoc.gemoc_modeling_workbench.ui.breakpoint.breakpointMarker"
17+
class="org.executionframework.debugger.GemocBreakpoint"
18+
id="org.executionframework.debugger.breakpoint"
19+
markerType="org.executionframework.debugger.ui.org.executionframework.debugger.breakpointMarker"
2620
name="Gemoc Breakpoints">
2721
</breakpoint>
2822
</extension>
2923

3024
<extension
3125
point="org.eclipse.debug.ui.detailPaneFactories">
3226
<detailFactories
33-
class="org.gemoc.executionframework.engine.debug.ui.breakpoint.BreakpointDetailPaneFactory"
34-
id="org.gemoc.gemoc_modeling_workbench.ui.breakpoint.detailFactories">
27+
class="org.executionframework.debugger.ui.breakpoints.BreakpointDetailPaneFactory"
28+
id="org.executionframework.debugger.detailFactories">
3529
<enablement>
3630
<with
3731
variable="selection">
@@ -40,7 +34,7 @@
4034
</count>
4135
<iterate>
4236
<instanceof
43-
value="org.gemoc.executionframework.engine.debug.ui.breakpoint.GemocBreakpoint">
37+
value="org.executionframework.debugger.GemocBreakpoint">
4438
</instanceof>
4539
</iterate>
4640
</with>
@@ -50,7 +44,7 @@
5044
<extension
5145
point="org.eclipse.ui.bindings">
5246
<key
53-
commandId="org.gemoc.executionframework.engine.ui.debug.semanticsopener.commands.openSemantics"
47+
commandId="org.executionframework.debugger.ui.openSemantics"
5448
contextId="org.eclipse.debug.ui.debugging"
5549
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
5650
sequence="M1+6">
@@ -60,15 +54,15 @@
6054
<extension
6155
point="org.eclipse.ui.commands">
6256
<command
63-
id="org.gemoc.executionframework.engine.ui.debug.semanticsopener.commands.openSemantics"
57+
id="org.executionframework.debugger.ui.openSemantics"
6458
name="Open Semantics">
6559
</command>
6660
</extension>
6761
<extension
6862
point="org.eclipse.ui.handlers">
6963
<handler
70-
class="org.gemoc.executionframework.engine.ui.debug.semanticsopener.OpenSemanticsHandler"
71-
commandId="org.gemoc.executionframework.engine.ui.debug.semanticsopener.commands.openSemantics">
64+
class="org.executionframework.debugger.ui.OpenSemanticsHandler"
65+
commandId="org.executionframework.debugger.ui.openSemantics">
7266
</handler>
7367
</extension>
7468
<extension
@@ -77,16 +71,16 @@
7771
allPopups="false"
7872
locationURI="popup:org.eclipse.debug.ui.DebugView">
7973
<command
80-
commandId="org.gemoc.executionframework.engine.ui.debug.semanticsopener.commands.openSemantics"
74+
commandId="org.executionframework.debugger.ui.openSemantics"
8175
label="Open Semantics">
8276
</command>
8377
</menuContribution>
8478
</extension>
8579
<extension
8680
point="org.eclipse.sirius.externalJavaAction">
8781
<javaActions
88-
actionClass="org.gemoc.executionframework.engine.ui.debug.sirius.action.GemocToggleBreakpointAction"
89-
id="org.gemoc.executionframework.engine.ui.debug.sirius.action.GemocToggleBreakpointAction">
82+
actionClass="org.executionframework.debugger.ui.breakpoints.GemocToggleBreakpointAction"
83+
id="org.executionframework.debugger.ui.GemocToggleBreakpointAction">
9084
</javaActions>
9185
</extension>
9286
</plugin>

‎framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/MutableFieldNameProvider.xtend‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
* Contributors:
99
* Inria - initial API and implementation
1010
*******************************************************************************/
11-
package org.gemoc.executionframework.engine.ui.debug
11+
package org.executionframework.debugger.ui
1212

1313
import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider;
1414
import org.eclipse.xtext.naming.QualifiedName;
15-
15+
import org.executionframework.debugger.MutableField
16+
1617
public class MutableFieldNameProvider extends DefaultDeclarativeQualifiedNameProvider{
1718

1819
def QualifiedName qualifiedName(MutableField e) {
@@ -21,4 +22,4 @@ public class MutableFieldNameProvider extends DefaultDeclarativeQualifiedNamePro
2122
return QualifiedName.create(qnameSegments);
2223
}
2324

24-
}
25+
}

‎framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/OpenSemanticsHandler.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import java.util.Arrays;
1717
import java.util.LinkedList;
1818
import java.util.List;
19+
import java.util.function.Supplier;
1920

2021
import org.eclipse.core.commands.AbstractHandler;
2122
import org.eclipse.core.commands.ExecutionEvent;
@@ -28,7 +29,6 @@
2829
import org.eclipse.ui.handlers.HandlerUtil;
2930
import org.gemoc.commons.eclipse.ui.OpenEditor;
3031
import org.gemoc.executionframework.engine.core.AbstractExecutionEngine;
31-
import org.gemoc.executionframework.engine.ui.Activator;
3232
import org.gemoc.xdsmlframework.api.core.IExecutionEngine;
3333
import org.osgi.framework.Bundle;
3434

@@ -102,6 +102,15 @@ public void locateAndOpenSource(TreeSelection selection) {
102102
}
103103

104104
public Object execute(ExecutionEvent event) throws ExecutionException {
105+
Supplier<IExecutionEngine> engineSupplier = org.executionframework.debugger.Activator.getDefault().getEngineSupplier();
106+
Supplier<String> bundleSupplier = org.executionframework.debugger.Activator.getDefault().getBundleSymbolicNameSupplier();
107+
if (engineSupplier != null) {
108+
this.engine = engineSupplier.get();
109+
}
110+
if (bundleSupplier != null) {
111+
this.bundleSymbolicName = bundleSupplier.get();
112+
}
113+
105114
TreeSelection selection = (TreeSelection) HandlerUtil.getCurrentSelection(event);
106115
locateAndOpenSource(selection);
107116
return null;

‎framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.eclipse.debug.ui.IDetailPane;
1818
import org.eclipse.debug.ui.IDetailPaneFactory;
1919
import org.eclipse.jface.viewers.IStructuredSelection;
20+
import org.executionframework.debugger.GemocBreakpoint;
2021

2122
import fr.obeo.dsl.debug.ide.DSLBreakpoint;
2223

‎framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.eclipse.swt.widgets.Composite;
2020
import org.eclipse.swt.widgets.Control;
2121
import org.eclipse.ui.IWorkbenchPartSite;
22+
import org.executionframework.debugger.GemocBreakpoint;
2223

2324
/**
2425
* Gemoc {@link IDetailPane} for breakpoints.

‎framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.eclipse.emf.ecore.EObject;
1515
import org.eclipse.emf.ecore.resource.Resource;
1616
import org.eclipse.emf.ecore.resource.ResourceSet;
17-
import org.executionframework.debugger.ui.breakpoint.GemocBreakpoint;
17+
import org.executionframework.debugger.GemocBreakpoint;
1818
import org.gemoc.executionframework.engine.ui.launcher.AbstractGemocLauncher;
1919

2020
import fr.inria.diverse.melange.resource.MelangeResource;

0 commit comments

Comments
 (0)