Skip to content

GitLab

C
codeling
Commit 74f3b6c6 authored by Marco Konersmann's avatar Marco Konersmann
Browse files
Options

Merge branch 'master' into design-decisions

parents d7f1626f c98af9fe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 14506 additions and 15196 deletions
.gitignore
View file @ 74f3b6c6
......@@ -3,4 +3,5 @@
**/.classpath
**/.project
**/.settings/
**/backup.*
\ No newline at end of file
**/backup.*
**/xtend-gen/
\ No newline at end of file
Build/feature/feature.xml
View file @ 74f3b6c6
......@@ -17,10 +17,6 @@
[Enter License Description here.]
</license>
<includes
id="org.codeling.lang.ejb.feature"
version="0.0.0"/>
<requires>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.emf.ecore" version="2.6.0" match="greaterOrEqual"/>
......@@ -42,30 +38,48 @@
<import plugin="de.uka.ipd.sdq.pcm.gmf.seff" version="2.0.0" match="greaterOrEqual"/>
<import plugin="de.uka.ipd.sdq.pcm.gmf.usage" version="2.0.0" match="greaterOrEqual"/>
<import plugin="org.palladiosimulator.pcm" version="2.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.henshin.model" version="1.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.henshin.trace" version="1.4.0" match="greaterOrEqual"/>
<import plugin="org.codeling.lang.base.java" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.henshin.interpreter" version="1.4.0" match="greaterOrEqual"/>
<import plugin="org.codeling.henshintgg.api" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.11.1" match="greaterOrEqual"/>
<import plugin="de.tub.tfs.henshin.tgg.editor" version="1.0.0" match="greaterOrEqual"/>
<import plugin="de.tub.tfs.henshin.tgg.interpreter" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.modelversioning.emfprofile.project" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.codeling.ial.mm" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.registry"/>
<import plugin="org.eclipse.e4.core.di" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi"/>
<import plugin="org.eclipse.core.commands"/>
<import plugin="org.eclipse.swt"/>
<import plugin="org.eclipse.jface"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="javax.inject"/>
<import plugin="org.eclipse.text"/>
<import plugin="org.eclipse.core.filebuffers"/>
<import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.henshin.model" version="1.4.0" match="greaterOrEqual"/>
<import plugin="org.codeling.henshintgg.api" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ltk.core.refactoring"/>
<import plugin="org.eclipse.jdt.core.manipulation"/>
<import plugin="org.eclipse.core.filebuffers"/>
<import plugin="org.eclipse.core.runtime" version="3.9.0" match="greaterOrEqual"/>
<import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.commands"/>
<import plugin="org.eclipse.jface"/>
<import plugin="org.modelversioning.emfprofile.project" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.codeling.lang.base.java" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.launching"/>
<import plugin="org.codeling.core" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore" version="2.13.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.expressions"/>
<import plugin="org.eclipse.jdt"/>
<import plugin="org.eclipse.core.resources" version="3.10.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.common" version="2.11.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore.xmi" version="2.11.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.gmf.runtime.notation" version="1.8.0" match="greaterOrEqual"/>
<import plugin="com.google.guava"/>
<import plugin="mechanisms"/>
<import plugin="org.codeling.lang.cocome.metamodel" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.ui"/>
<import plugin="org.eclipse.ui.ide" version="3.9.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.ui.editors"/>
<import plugin="de.tub.tfs.muvitor" version="1.0.0" match="greaterOrEqual"/>
<import plugin="mechanisms" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.uml2.uml" version="5.3.0" match="greaterOrEqual"/>
<import plugin="org.codeling.lang.jee.metamodel" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.12.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.13.0" match="greaterOrEqual"/>
</requires>
<plugin
......@@ -110,4 +124,39 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.codeling.lang.cocome.metamodel"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.codeling.lang.cocome.transformation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.codeling.lang.jee.metamodel"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.codeling.lang.jee.transformation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.codeling.lang.uml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>
Build/p2updatesite/category.xml
View file @ 74f3b6c6
......@@ -6,9 +6,6 @@
<feature url="features/org.palladiosimulator.editors.gmf.feature_4.0.0.201511051149.jar" id="org.palladiosimulator.editors.gmf.feature" version="4.0.0.201511051149">
<category name="org.codeling.dependencies"/>
</feature>
<feature url="features/org.modelversioning.emfprofile.feature_1.0.0.qualifier.jar" id="org.modelversioning.emfprofile.feature" version="1.0.0.qualifier">
<category name="org.codeling.dependencies"/>
</feature>
<feature url="features/org.eclipse.emf.henshin.sdk_1.4.0.201611301400.jar" id="org.eclipse.emf.henshin.sdk" version="1.4.0.201611301400">
<category name="org.codeling.dependencies"/>
</feature>
......@@ -24,10 +21,10 @@
<feature url="features/org.codeling.feature_1.0.0.qualifier.jar" id="org.codeling.feature" version="1.0.0.qualifier">
<category name="org.codeling"/>
</feature>
<feature url="features/org.codeling.lang.ejb.feature_1.0.0.qualifier.jar" id="org.codeling.lang.ejb.feature" version="1.0.0.qualifier" os="linux,macosx,win32" ws="cocoa,gtk,win32" arch="x86,x86_64">
<category name="org.codeling"/>
<feature url="features/org.modelversioning.emfprofile.feature_1.0.0.201612051406.jar" id="org.modelversioning.emfprofile.feature" version="1.0.0.201612051406">
<category name="org.codeling.dependencies"/>
</feature>
<category-def name="org.codeling" label="Codeling"/>
<category-def name="org.codeling.dependencies" label="Codeling Dependencies"/>
<repository-reference location="http://downloads.eclipse.org/releases/mars" enabled="true" />
<repository-reference location="http://downloads.eclipse.org/releases/oxygen" enabled="true" />
</site>
Build/p2updatesite/org.codeling.product
View file @ 74f3b6c6
......@@ -99,15 +99,18 @@
<plugin id="org.apache.log4j"/>
<plugin id="org.codeling.core"/>
<plugin id="org.codeling.core.test" fragment="true"/>
<plugin id="org.codeling.examples.case_studies" fragment="true"/>
<plugin id="org.codeling.henshintgg.api"/>
<plugin id="org.codeling.henshintgg.api.test" fragment="true"/>
<plugin id="org.codeling.ial.mm"/>
<plugin id="org.codeling.lang.base.java"/>
<plugin id="org.codeling.lang.base.java.tests" fragment="true"/>
<plugin id="org.codeling.lang.ejb.embed"/>
<plugin id="org.codeling.lang.ejb.embed.test" fragment="true"/>
<plugin id="org.codeling.lang.ejb.metamodel"/>
<plugin id="org.codeling.lang.cocome.metamodel"/>
<plugin id="org.codeling.lang.cocome.transformation"/>
<plugin id="org.codeling.lang.jee.metamodel"/>
<plugin id="org.codeling.lang.jee.transformation"/>
<plugin id="org.codeling.lang.pcm"/>
<plugin id="org.codeling.lang.uml"/>
<plugin id="org.codeling.test.common"/>
<plugin id="org.codeling.utils"/>
<plugin id="org.eclipse.ant.core"/>
......@@ -169,6 +172,7 @@
<plugin id="org.eclipse.emf.henshin.interpreter"/>
<plugin id="org.eclipse.emf.henshin.model"/>
<plugin id="org.eclipse.emf.henshin.trace"/>
<plugin id="org.eclipse.emf.mapping.ecore2xml"/>
<plugin id="org.eclipse.emf.mwe.core"/>
<plugin id="org.eclipse.emf.mwe.utils"/>
<plugin id="org.eclipse.emf.mwe2.lib"/>
......@@ -199,6 +203,7 @@
<plugin id="org.eclipse.equinox.security.macosx" fragment="true"/>
<plugin id="org.eclipse.equinox.security.ui"/>
<plugin id="org.eclipse.equinox.simpleconfigurator"/>
<plugin id="org.eclipse.equinox.supplement"/>
<plugin id="org.eclipse.equinox.transforms.hook" fragment="true"/>
<plugin id="org.eclipse.equinox.util"/>
<plugin id="org.eclipse.equinox.weaving.hook" fragment="true"/>
......@@ -237,6 +242,7 @@
<plugin id="org.eclipse.gmf.runtime.notation.providers"/>
<plugin id="org.eclipse.gmf.tooling.runtime"/>
<plugin id="org.eclipse.help"/>
<plugin id="org.eclipse.jdt"/>
<plugin id="org.eclipse.jdt.compiler.apt" fragment="true"/>
<plugin id="org.eclipse.jdt.compiler.tool" fragment="true"/>
<plugin id="org.eclipse.jdt.core"/>
......@@ -264,11 +270,13 @@
<plugin id="org.eclipse.team.ui"/>
<plugin id="org.eclipse.text"/>
<plugin id="org.eclipse.ui"/>
<plugin id="org.eclipse.ui.cheatsheets"/>
<plugin id="org.eclipse.ui.cocoa" fragment="true"/>
<plugin id="org.eclipse.ui.console"/>
<plugin id="org.eclipse.ui.editors"/>
<plugin id="org.eclipse.ui.forms"/>
<plugin id="org.eclipse.ui.ide"/>
<plugin id="org.eclipse.ui.intro"/>
<plugin id="org.eclipse.ui.navigator"/>
<plugin id="org.eclipse.ui.navigator.resources"/>
<plugin id="org.eclipse.ui.views"/>
......@@ -278,6 +286,7 @@
<plugin id="org.eclipse.uml2.common"/>
<plugin id="org.eclipse.uml2.common.edit"/>
<plugin id="org.eclipse.uml2.types"/>
<plugin id="org.eclipse.uml2.uml"/>
<plugin id="org.eclipse.xsd"/>
<plugin id="org.eclipse.xtend"/>
<plugin id="org.eclipse.xtend.lib"/>
......@@ -285,6 +294,8 @@
<plugin id="org.eclipse.xtend.typesystem.emf"/>
<plugin id="org.eclipse.xtext"/>
<plugin id="org.eclipse.xtext.common.types"/>
<plugin id="org.eclipse.xtext.logging" fragment="true"/>
<plugin id="org.eclipse.xtext.smap"/>
<plugin id="org.eclipse.xtext.util"/>
<plugin id="org.eclipse.xtext.xbase.lib"/>
<plugin id="org.hamcrest.core"/>
......
Build/targetdefinition/org.codeling.target.target
View file @ 74f3b6c6
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="org.codeling.target" sequenceNumber="39">
<?pde version="3.8"?><target name="org.codeling.target" sequenceNumber="44">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.palladiosimulator.editors.gmf.feature.feature.group" version="4.0.0.201511051149"/>
<unit id="org.palladiosimulator.pcm.feature.feature.group" version="4.0.0.201511051136"/>
<repository location="https://sdqweb.ipd.kit.edu/eclipse/palladiosimulator/releases/1.0.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.emf.henshin.sdk.feature.group" version="1.4.0.201611301400"/>
<repository location="http://download.eclipse.org/modeling/emft/henshin/updates/1.4.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.apache.batik.css" version="1.6.0.v201011041432"/>
<unit id="org.apache.batik.util" version="1.6.0.v201011041432"/>
<unit id="org.apache.batik.util.gui" version="1.6.0.v201011041432"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/>
<unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.1.v20170928-1405"/>
<unit id="org.eclipse.gmf.feature.group" version="1.11.0.201706061437"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.8.2.20171007-0217"/>
<unit id="org.eclipse.m2e.wtp.feature.feature.group" version="1.3.3.20170823-1905"/>
<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.1.0.201709130748"/>
<unit id="org.eclipse.pde.feature.group" version="3.13.1.v20171009-0537"/>
<repository location="http://download.eclipse.org/releases/oxygen"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="de.tub.tfs.henshin.editor.feature.feature.group" version="1.0.0"/>
......@@ -25,21 +20,25 @@
<repository location="http://www.s3.uni-due.de/pub/p2/codeling/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201605250459"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
<unit id="org.palladiosimulator.editors.gmf.feature.feature.group" version="4.0.0.201511051149"/>
<unit id="org.palladiosimulator.pcm.feature.feature.group" version="4.0.0.201511051136"/>
<repository location="https://sdqweb.ipd.kit.edu/eclipse/palladiosimulator/releases/1.0.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.0.v20170531-1133"/>
<unit id="org.eclipse.gmf.feature.group" version="1.11.0.201706061437"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.8.0.20170516-2043"/>
<unit id="org.eclipse.m2e.wtp.feature.feature.group" version="1.3.2.20170517-2015"/>
<unit id="org.eclipse.pde.feature.group" version="3.13.0.v20170612-0950"/>
<unit id="org.eclipse.platform.sdk" version="4.7.0.I20170612-0950"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.3.0.v20170605-1616"/>
<unit id="org.eclipse.uml2.uml.feature.group" version="5.3.0.v20170605-1616"/>
<repository location="http://download.eclipse.org/releases/oxygen"/>
<unit id="org.eclipse.emf.henshin.sdk.feature.group" version="1.4.0.201611301400"/>
<repository location="http://download.eclipse.org/modeling/emft/henshin/updates/1.4.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
<unit id="org.apache.batik.css" version="1.7.0.v201011041433"/>
<unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
<unit id="org.apache.batik.util.gui" version="1.7.0.v200903091627"/>
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.xtend.sdk.feature.group" version="2.13.0.v20171013-1050"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/milestones/"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
......
Core/core.test/META-INF/MANIFEST.MF
View file @ 74f3b6c6
......@@ -21,7 +21,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.junit;bundle-version="4.0.0",
org.codeling.test.common,
org.codeling.lang.ejb.metamodel,
org.palladiosimulator.pcm;bundle-version="4.0.0",
org.codeling.lang.base.java
Bundle-ActivationPolicy: lazy
......
Core/core/src/main/java/de/mkonersmann/advert/transformationmanager/internal/TransformationManager.java
View file @ 74f3b6c6
package de.mkonersmann.advert.transformationmanager.internal;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
......
Core/core/src/main/java/de/mkonersmann/advert/ui/MultiListSelectionDialog.java
View file @ 74f3b6c6
......@@ -49,7 +49,7 @@ public class MultiListSelectionDialog extends Dialog {
container.setLayout(null);
txtSearchOne = new Text(container, SWT.BORDER);
txtSearchOne.setBounds(10, 35, 285, 20);
txtSearchOne.setBounds(10, 35, 435, 20);
txtSearchOne.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent arg0) {
refreshListDataOne();
......@@ -57,7 +57,7 @@ public class MultiListSelectionDialog extends Dialog {
});
txtSearchTwo = new Text(container, SWT.BORDER);
txtSearchTwo.setBounds(301, 62, 285, 20);
txtSearchTwo.setBounds(451, 62, 435, 20);
txtSearchTwo.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent arg0) {
refreshListDataTwo();
......@@ -65,7 +65,7 @@ public class MultiListSelectionDialog extends Dialog {
});
listDataOne = new List(container, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
listDataOne.setBounds(10, 62, 285, 240);
listDataOne.setBounds(10, 62, 435, 240);
refreshListDataOne();
listDataOne.setSelection(0);
if (listDataOne.getSelectionIndex() != -1)
......@@ -79,7 +79,7 @@ public class MultiListSelectionDialog extends Dialog {
});
listDataTwo = new List(container, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
listDataTwo.setBounds(301, 87, 285, 214);
listDataTwo.setBounds(451, 87, 435, 214);
refreshListDataTwo();
listDataTwo.setSelection(0);
if (listDataTwo.getSelectionIndex() != -1)
......@@ -94,17 +94,17 @@ public class MultiListSelectionDialog extends Dialog {
Label lblCaptionOne = new Label(container, SWT.NONE);
lblCaptionOne.setAlignment(SWT.CENTER);
lblCaptionOne.setBounds(10, 14, 285, 15);
lblCaptionOne.setBounds(10, 14, 435, 15);
lblCaptionOne.setText("Source Language");
Label lblCaptionTwo = new Label(container, SWT.NONE);
lblCaptionTwo.setAlignment(SWT.CENTER);
lblCaptionTwo.setBounds(301, 14, 285, 15);
lblCaptionTwo.setBounds(451, 14, 435, 15);
lblCaptionTwo.setText("Target Language");
Button implementationMigrationBox = new Button(container, SWT.CHECK | SWT.BORDER);
implementationMigrationBox.setAlignment(SWT.CENTER);
implementationMigrationBox.setBounds(301, 35, 285, 20);
implementationMigrationBox.setBounds(451, 35, 435, 20);
implementationMigrationBox.setText("Target Implementation Language");
implementationMigrationBox.addSelectionListener(new SelectionAdapter() {
@Override
......@@ -133,7 +133,7 @@ public class MultiListSelectionDialog extends Dialog {
filteredDataOne.remove(ld);
}
listDataOne.setItems(filteredDataOne.stream().map(ld -> ld.getName()).collect(Collectors.toList())
listDataOne.setItems(filteredDataOne.stream().map(ld -> String.format("%s (%s)", ld.getName(), ld.getVersion())).collect(Collectors.toList())
.toArray(new String[filteredDataOne.size()]));
listDataOne.redraw();
}
......@@ -158,7 +158,7 @@ public class MultiListSelectionDialog extends Dialog {
filteredDataTwo.remove(ld);
}
listDataTwo.setItems(filteredDataTwo.stream().map(ld -> ld.getName()).collect(Collectors.toList())
listDataTwo.setItems(filteredDataTwo.stream().map(ld -> String.format("%s (%s)", ld.getName(), ld.getVersion())).collect(Collectors.toList())
.toArray(new String[filteredDataTwo.size()]));
listDataTwo.redraw();
}
......@@ -171,7 +171,7 @@ public class MultiListSelectionDialog extends Dialog {
@Override
protected Point getInitialSize() {
return new Point(600, 403);
return new Point(900, 403);
}
public void setDataOne(LanguageDefinition[] o) {
......
Core/core/src/main/java/de/mkonersmann/advert/ui/SingleListSelectionDialog.java
View file @ 74f3b6c6
......@@ -110,7 +110,7 @@ public class SingleListSelectionDialog extends Dialog {
filteredDataTwo.remove(ld);
}
listDataTwo.setItems(filteredDataTwo.stream().map(ld -> ld.getName()).collect(Collectors.toList())
listDataTwo.setItems(filteredDataTwo.stream().map(ld -> String.format("%s (%s)", ld.getName(), ld.getVersion())).collect(Collectors.toList())
.toArray(new String[filteredDataTwo.size()]));
listDataTwo.redraw();
}
......
Core/core/src/main/java/org/codeling/lang/base/amt/henshin/HenshinTransformation.java
View file @ 74f3b6c6
......@@ -7,8 +7,10 @@ import java.util.List;
import org.codeling.lang.base.amt.ModelTransformation;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.henshin.interpreter.ApplicationMonitor;
import org.eclipse.emf.henshin.interpreter.EGraph;
import org.eclipse.emf.henshin.interpreter.Engine;
import org.eclipse.emf.henshin.interpreter.UnitApplication;
......@@ -67,12 +69,14 @@ public class HenshinTransformation extends ModelTransformation {
// Find the unit to be applied:
final Unit unit = module.getUnit("main");
// Apply the unit:
// Prepare unit application
final UnitApplication application = new UnitApplicationImpl(engine, graph, unit, null);
application.execute(new LoggingApplicationMonitor());
// Map<EObject, String> eObject2id =
// idRegistry.getAllEObject2Id(graph.getRoots());
// Log only in debug mode
ApplicationMonitor henshinMonitor = Platform.inDebugMode() ? new LoggingApplicationMonitor() : null;
// Actually execute the unit
application.execute(henshinMonitor);
return new TransformationResult(graph.getRoots(), idRegistry);
}
......
Core/core/src/main/resources/componenthierarchy/flat_to_scoped.henshin.fragment 0 → 100644
View file @ 74f3b6c6
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
Core/core/src/main/resources/componenthierarchy/flat_to_scoped.henshin_diagram
View file @ 74f3b6c6
......@@ -127,7 +127,7 @@
</children>
</children>
<element xmi:type="henshin:SequentialUnit" href="flat_to_scoped.henshin#_4UzKIGEOEeSP2I5FFumd6Q"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_4UzxMWEOEeSP2I5FFumd6Q" x="34" y="7" width="671" height="67"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_4UzxMWEOEeSP2I5FFumd6Q" x="34" y="13" width="671" height="67"/>
</children>
<children xmi:type="notation:Shape" xmi:id="__UmD8Pp1EeaDa6z2ptka-A" type="2001" fontName=".Helvetica Neue DeskInterface" italic="true" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ElZPM_p2EeaDa6z2ptka-A" source="defaultAction">
......
Core/core/src/main/resources/componenthierarchy/sharedcontext_to_scoped.henshin.fragment 0 → 100644
View file @ 74f3b6c6
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
Core/core/src/main/resources/componenthierarchy/sharedcontext_to_scoped.henshin_diagram
View file @ 74f3b6c6
......@@ -401,7 +401,7 @@
<styles xmi:type="notation:FontStyle" xmi:id="_e-ZQwWV1EeeKn_As2JRV9w" fontName=".Helvetica Neue DeskInterface"/>
<element xmi:type="henshin:Edge" href="sharedcontext_to_scoped.henshin#_e-YpsGV1EeeKn_As2JRV9w"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e-ZQwmV1EeeKn_As2JRV9w" points="[20, 2, -118, -12]$[133, 20, -5, 6]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e-bF8GV1EeeKn_As2JRV9w" id="(0.5294117647058824,0.975)"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e-bF8GV1EeeKn_As2JRV9w" id="(0.49019607843137253,0.925)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e-bF8WV1EeeKn_As2JRV9w" id="(0.47058823529411764,0.075)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_fb8IYGV1EeeKn_As2JRV9w" type="4001" source="_cUvt8GV1EeeKn_As2JRV9w" target="_X3Q2AGV1EeeKn_As2JRV9w">
......
Core/core/src/main/resources/interfaces/shared_to_scoped.henshin.fragment 0 → 100644
View file @ 74f3b6c6
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
Core/core/src/main/resources/interfaces/shared_to_scoped.henshin_diagram
View file @ 74f3b6c6
......@@ -24,7 +24,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_qwgyhvqOEeafaY4xPusIVw"/>
</children>
<element xmi:type="henshin:Node" href="shared_to_scoped.henshin#_qwfkYPqOEeafaY4xPusIVw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_qwgygfqOEeafaY4xPusIVw" x="195"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_qwgygfqOEeafaY4xPusIVw" x="141"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_rzX9sPqOEeafaY4xPusIVw" type="3001" fontName=".Helvetica Neue DeskInterface">
<children xmi:type="notation:DecorationNode" xmi:id="_rzX9svqOEeafaY4xPusIVw" type="5002"/>
......@@ -34,11 +34,11 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_rzX9tvqOEeafaY4xPusIVw"/>
</children>
<element xmi:type="henshin:Node" href="shared_to_scoped.henshin#_rR2lBPqOEeafaY4xPusIVw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_rzX9sfqOEeafaY4xPusIVw" x="195" y="51"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_rzX9sfqOEeafaY4xPusIVw" x="141" y="51"/>
</children>
</children>
<element xmi:type="henshin:Rule" href="shared_to_scoped.henshin#_Rs3u4PqOEeafaY4xPusIVw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_oBr0wfqOEeafaY4xPusIVw" x="27" y="117" width="334" height="128"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_oBr0wfqOEeafaY4xPusIVw" x="27" y="117" width="298" height="128"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_oBr0xPqOEeafaY4xPusIVw" type="2002" fontName=".Helvetica Neue DeskInterface" italic="true" lineColor="0">
<children xmi:type="notation:DecorationNode" xmi:id="_oBr0xvqOEeafaY4xPusIVw" type="5004"/>
......@@ -50,7 +50,7 @@
<styles xmi:type="notation:DescriptionStyle" xmi:id="_oBr0yfqOEeafaY4xPusIVw"/>
<styles xmi:type="notation:FontStyle" xmi:id="_oBr0yvqOEeafaY4xPusIVw" fontName=".Helvetica Neue DeskInterface"/>
<element xmi:type="henshin:SequentialUnit" href="shared_to_scoped.henshin#_XnnPAPqOEeafaY4xPusIVw"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_oBsb0vqOEeafaY4xPusIVw" x="23" y="8"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_oBsb0vqOEeafaY4xPusIVw" x="13" y="8"/>
</children>
<children xmi:type="notation:Node" xmi:id="_oBsb0_qOEeafaY4xPusIVw" type="3004">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oBsb1_qOEeafaY4xPusIVw" source="symbol">
......@@ -59,30 +59,30 @@
<styles xmi:type="notation:DescriptionStyle" xmi:id="_oBsb1PqOEeafaY4xPusIVw"/>
<styles xmi:type="notation:FontStyle" xmi:id="_oBsb1fqOEeafaY4xPusIVw" fontName=".Helvetica Neue DeskInterface"/>
<element xmi:type="henshin:SequentialUnit" href="shared_to_scoped.henshin#_XnnPAPqOEeafaY4xPusIVw"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_oBsb2fqOEeafaY4xPusIVw" x="638" y="8"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_oBsb2fqOEeafaY4xPusIVw" x="584" y="8"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_oCOnUPqOEeafaY4xPusIVw" type="3003" fontName=".Helvetica Neue DeskInterface" italic="true" lineColor="0">
<children xmi:type="notation:DecorationNode" xmi:id="_oCPOYPqOEeafaY4xPusIVw" type="5005"/>
<element xmi:type="henshin:Rule" href="shared_to_scoped.henshin#_Rs3u4PqOEeafaY4xPusIVw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_oCOnUfqOEeafaY4xPusIVw" x="124" y="5"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_oCOnUfqOEeafaY4xPusIVw" x="103" y="5"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_RvbowPqQEeafaY4xPusIVw" type="3003" fontName=".Helvetica Neue DeskInterface" italic="true" lineColor="0">
<children xmi:type="notation:DecorationNode" xmi:id="_RvbowvqQEeafaY4xPusIVw" type="5005">
<element xmi:type="henshin:Rule" href="shared_to_scoped.henshin#_u8u7UPqOEeafaY4xPusIVw"/>
</children>
<element xmi:type="henshin:Rule" href="shared_to_scoped.henshin#_u8u7UPqOEeafaY4xPusIVw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_RvbowfqQEeafaY4xPusIVw" x="286" y="5"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_RvbowfqQEeafaY4xPusIVw" x="254" y="5"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_wMI_8GcGEeeVhJWR74Cvjw" type="3003" fontName=".Helvetica Neue DeskInterface" italic="true" lineColor="0">
<children xmi:type="notation:DecorationNode" xmi:id="_wMJnAGcGEeeVhJWR74Cvjw" type="5005">
<element xmi:type="henshin:Rule" href="shared_to_scoped.henshin#_3aul4PqPEeafaY4xPusIVw"/>
</children>
<element xmi:type="henshin:Rule" href="shared_to_scoped.henshin#_3aul4PqPEeafaY4xPusIVw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_wMI_8WcGEeeVhJWR74Cvjw" x="430" y="5"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_wMI_8WcGEeeVhJWR74Cvjw" x="387" y="5"/>
</children>
</children>
<element xmi:type="henshin:SequentialUnit" href="shared_to_scoped.henshin#_XnnPAPqOEeafaY4xPusIVw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_oBr0xfqOEeafaY4xPusIVw" x="27" y="37" width="696" height="72"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_oBr0xfqOEeafaY4xPusIVw" x="27" y="37" width="632" height="72"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_u8xXkPqOEeafaY4xPusIVw" type="2001" fontName=".Helvetica Neue DeskInterface" italic="true" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xmvDcvqOEeafaY4xPusIVw" source="defaultAction">
......@@ -108,7 +108,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_G6e4dPqQEeafaY4xPusIVw"/>
</children>
<element xmi:type="henshin:Node" href="shared_to_scoped.henshin#_G6dqUPqQEeafaY4xPusIVw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_G6eRYfqQEeafaY4xPusIVw" x="185" y="5"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_G6eRYfqQEeafaY4xPusIVw" x="153" y="5"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_lZxCgGcGEeeVhJWR74Cvjw" type="3001" fontName=".Helvetica Neue DeskInterface">
<children xmi:type="notation:DecorationNode" xmi:id="_lZyQoGcGEeeVhJWR74Cvjw" type="5002"/>
......@@ -118,11 +118,11 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_lZyQpGcGEeeVhJWR74Cvjw"/>
</children>
<element xmi:type="henshin:Node" href="shared_to_scoped.henshin#_lNVwEGcGEeeVhJWR74Cvjw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_lZxCgWcGEeeVhJWR74Cvjw" x="185" y="55"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_lZxCgWcGEeeVhJWR74Cvjw" x="153" y="55"/>
</children>
</children>
<element xmi:type="henshin:Rule" href="shared_to_scoped.henshin#_u8u7UPqOEeafaY4xPusIVw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_u8xXkfqOEeafaY4xPusIVw" x="370" y="116" width="353" height="129"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_u8xXkfqOEeafaY4xPusIVw" x="332" y="116" width="327" height="129"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_3asJoPqPEeafaY4xPusIVw" type="2001" fontName=".Helvetica Neue DeskInterface" italic="true" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3asJofqPEeafaY4xPusIVw" source="defaultAction">
......@@ -138,7 +138,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_3asJv_qPEeafaY4xPusIVw"/>
</children>
<element xmi:type="henshin:Node" href="shared_to_scoped.henshin#_3aul9fqPEeafaY4xPusIVw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_3asJwPqPEeafaY4xPusIVw" x="334" y="7"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_3asJwPqPEeafaY4xPusIVw" x="259" y="7"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_CQvtMPqQEeafaY4xPusIVw" type="3001" fontName=".Helvetica Neue DeskInterface">
<children xmi:type="notation:DecorationNode" xmi:id="_CQwUQPqQEeafaY4xPusIVw" type="5002"/>
......@@ -158,11 +158,11 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_0bbq42cGEeeVhJWR74Cvjw"/>
</children>
<element xmi:type="henshin:Node" href="shared_to_scoped.henshin#_0bWyYGcGEeeVhJWR74Cvjw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_0bbD0WcGEeeVhJWR74Cvjw" x="518" y="7"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_0bbD0WcGEeeVhJWR74Cvjw" x="431" y="7"/>
</children>
</children>
<element xmi:type="henshin:Rule" href="shared_to_scoped.henshin#_3aul4PqPEeafaY4xPusIVw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_3asJwfqPEeafaY4xPusIVw" x="27" y="254" width="696" height="95"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_3asJwfqPEeafaY4xPusIVw" x="27" y="254" width="632" height="95"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_oAzrAfqOEeafaY4xPusIVw"/>
<element xmi:type="henshin:Module" href="shared_to_scoped.henshin#_5f2KMPqNEeafaY4xPusIVw"/>
......@@ -197,10 +197,10 @@
</edges>
<edges xmi:type="notation:Connector" xmi:id="_EX0ucPqQEeafaY4xPusIVw" type="4001" source="_CQvtMPqQEeafaY4xPusIVw" target="_3asJuvqPEeafaY4xPusIVw">
<children xmi:type="notation:DecorationNode" xmi:id="_EX1VgPqQEeafaY4xPusIVw" type="6001">
<layoutConstraint xmi:type="notation:Location" xmi:id="_EX1VgfqQEeafaY4xPusIVw" x="-8" y="10"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_EX1VgfqQEeafaY4xPusIVw" x="2" y="10"/>
</children>