Skip to content
This repository was archived by the owner on Jan 7, 2019. It is now read-only.

Commit f3190e5

Browse files
RolandKlugeRolandKluge
authored
Merge pull request #325 from eMoflon/rkluge-dev
Create installable eMoflon Tool 3.0.0
2 parents 40b3ae4 + c1a00c4 commit f3190e5

File tree

21 files changed

+79
-119
lines changed

21 files changed

+79
-119
lines changed

‎org.moflon.ide.core/resources/templates/TGGMain.stg

+8-8
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.EObject;
3333
// Forward Transformation
3434
<className> helper = new <className>();
3535
helper.performForward("instances/fwd.src.xmi");
36-
36+
3737
// Backward Transformation
3838
helper = new <className>();
3939
helper.performBackward("instances/bwd.src.xmi");
@@ -101,7 +101,7 @@ import org.moflon.tgg.runtime.CorrespondenceModel;
101101
import java.util.function.BiConsumer;
102102

103103
<basic()>
104-
104+
105105
public static void main(String[] args) throws IOException {
106106
// Create helper
107107
BasicConfigurator.configure();
@@ -111,7 +111,7 @@ import java.util.function.BiConsumer;
111111
String delta = "instances/fwd.trg.delta.xmi";
112112
String corr = "instances/fwd.corr.xmi";
113113
BiConsumer\<String, String\> synchronizer = helper::syncBackward;
114-
114+
115115
// Propagate changes
116116
synchronizer.accept(corr, delta);
117117
}
@@ -164,7 +164,7 @@ import org.moflon.tgg.algorithm.modelgenerator.ModelGenerator;
164164
import org.moflon.tgg.algorithm.modelgenerator.controller.*;
165165

166166
<basic()>
167-
167+
168168
public static void main(String[] args) throws IOException {
169169
// Set up logging
170170
BasicConfigurator.configure();
@@ -187,23 +187,23 @@ TGGMainConsistencyCheck(projects, corrPackage, projectName, className) ::= <<
187187
public static void main(String[] args) throws IOException {
188188
// Set up logging
189189
BasicConfigurator.configure();
190-
190+
191191
<className> helper = new <className>();
192192
helper.loadSrc("instances/src.xmi");
193193
helper.loadTrg("instances/trg.xmi");
194194

195195
boolean prepareDeltas = true;
196196
helper.createCorrespondences(prepareDeltas);
197-
197+
198198
if(prepareDeltas){
199199
//src and trg models are modified when preparing deltas.
200200
//save all files in a separate location
201201
helper.saveSrc("instances/cc_result/src.xmi");
202202
helper.saveTrg("instances/cc_result/trg.xmi");
203203
helper.saveCorr("instances/cc_result/corr.xmi");
204204
helper.saveConsistencyCheckProtocol("instances/cc_result/protocol.xmi");
205-
helper.saveInconsistentSourceDelta("instances/cc_result/src.delta.xmi");
206-
helper.saveInconsistentTargetDelta("instances/cc_result/trg.delta.xmi");
205+
helper.saveInconsistentSourceDelta();
206+
helper.saveInconsistentTargetDelta();
207207
}
208208
else{
209209
//src and trg models are not modified.

‎org.moflon.ide.visualization.dot.ecore.eclassviz/injection/.keepinjection

Whitespace-only changes.

‎org.moflon.ide.workspaceinstaller.psf/resources/psf/development/Core_SDM_Modules.psf

-23
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,15 @@
33
<provider id="org.eclipse.egit.core.GitProvider">
44
<!-- Core projects -->
55
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.core.moca.tree"/>
6-
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.core.propertycontainer"/>
76
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.core.backend.specification"/>
87
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.core.dfs"/>
98
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.core.ecore2mocaxmi"/>
109
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.core.ecore2mocaxmi.specification"/>
1110
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.core.ecoreutils"/>
1211
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.core.languages.specification"/>
13-
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.core.moca.inject"/>
1412
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.core.moca.processing"/>
1513
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.core.mocatomoflon"/>
1614

17-
<!-- EMF-related projects -->
18-
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.core.injection"/>
19-
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.emf.injection"/>
20-
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.emf.injection.ide"/>
21-
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.emf.injection.ui"/>
22-
2315
<!-- SDM-related projects -->
2416
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.sdm.compiler.democles"/>
2517
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.sdm.compiler.democles.pattern"/>
@@ -52,12 +44,9 @@
5244
<item elementID="=org.moflon.sdm.democles.literalexpressionsolver" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
5345
<item elementID="=org.moflon.core.dfs" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
5446
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.core.dfs" type="4"/>
55-
<item elementID="=org.moflon.core.moca.inject" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
5647
<item elementID="=org.moflon.core.moca.processing" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
57-
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.core.moca.inject" type="4"/>
5848
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.core.moca.processing" type="4"/>
5949
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.core.languages.specification" type="4"/>
60-
<item elementID="=org.moflon.core.injection" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
6150
<item elementID="=org.moflon.sdm.compiler.eclipse" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
6251
<item elementID="=org.moflon.sdm.constraints.operationspecification" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
6352
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.sdm.constraints.operationspecification" type="4"/>
@@ -69,16 +58,6 @@
6958
<item elementID="=org.moflon.sdm.runtime.democles" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
7059
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.sdm.runtime.democles.specification" type="4"/>
7160
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.sdm.runtime.democles" type="4"/>
72-
<item elementID="=org.moflon.core.propertycontainer" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
73-
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.core.propertycontainer" type="4"/>
74-
75-
<!-- EMF-related projects -->
76-
<item elementID="=org.moflon.emf.injection" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
77-
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.emf.injection" type="4"/>
78-
<item elementID="=org.moflon.emf.injection.ide" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
79-
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.emf.injection.ide" type="4"/>
80-
<item elementID="=org.moflon.emf.injection.ui" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
81-
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.emf.injection.ui" type="4"/>
8261

8362
<item elementID="=org.moflon.sdm.compiler.democles.validation.result" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
8463
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.sdm.compiler.democles.validation.result" type="4"/>
@@ -103,12 +82,10 @@
10382
<item elementID="=MocaTree" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
10483
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/MocaTree" type="4"/>
10584
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.core.backend.specification" type="4"/>
106-
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.core.propertycontainer" type="4"/>
10785
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.core.mocatomoflon" type="4"/>
10886
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.core.ecore2mocaxmi" type="4"/>
10987
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/MocaTree" type="4"/>
11088
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/SDMLanguage" type="4"/>
111-
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.core.moca.inject" type="4"/>
11289
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.core.moca.processing" type="4"/>
11390
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.sdm.compiler.democles.validation.result" type="4"/>
11491
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.core.dfs" type="4"/>

‎org.moflon.ide.workspaceinstaller.psf/resources/psf/development/GT_MOSL_Modules.psf

-35
This file was deleted.

‎org.moflon.ide.workspaceinstaller.psf/resources/psf/development/IDE_Rest_Modules.psf

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.ide.core"/>
55
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.ide.eaaddin"/>
66
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.ide.editor"/>
7-
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.ide.plugins"/>
87
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.ide.ui"/>
98
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.ide.workspaceinstaller.psf"/>
109
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.testing.autotester"/>
@@ -17,7 +16,6 @@
1716
<item elementID="=org.moflon.ide.core" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
1817
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.ide.eaaddin" type="4"/>
1918
<item elementID="=org.moflon.testing.testframework" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
20-
<item elementID="=org.moflon.ide.plugins" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
2119
<item elementID="=org.moflon.testing.autotester" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
2220
</workingSets>
2321
</psf>

‎org.moflon.ide.workspaceinstaller.psf/resources/psf/development/Meta_Modules.psf

-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@
44
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.deployment.feature"/>
55
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.deployment.pdefragment"/>
66
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.deployment.updatesite"/>
7-
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.deployment.signing"/>
87
<project reference="1.0,https://github.com/eMoflon/emoflon-tool.git,master,org.moflon.doc.workspace.configuration"/>
98
</provider>
109
<workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1450098202083_8" label="eMoflon Meta" name="eMoflon Meta">
1110
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.deployment.updatesite" type="4"/>
1211
<item elementID="=org.moflon.deployment.pdefragment" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
1312
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.deployment.feature" type="4"/>
14-
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.deployment.signing" type="4"/>
1513
<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.moflon.doc.workspace.configuration" type="4"/>
1614
</workingSets>
17-
1815
</psf>

‎org.moflon.ide.workspaceinstaller.psf/src/org/moflon/ide/workspaceinstaller/psf/EMoflonStandardWorkspaces.java

+10-13
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class EMoflonStandardWorkspaces {
1515
* This string separates the name of a workspace from the name of the branch to
1616
* be used If this separator is missing from a workspace name, a sensible
1717
* default choice is not to modify the branch name in the PSF file.
18-
*
18+
*
1919
* Important: the separator must be a valid character within directory names
2020
* (NOT: /, \, #,...)
2121
*/
@@ -24,7 +24,7 @@ public class EMoflonStandardWorkspaces {
2424
/*
2525
* !!! Danger Zone !!! !!! Danger Zone !!! !!! Danger Zone !!! !!! Danger Zone
2626
* !!! !!! Danger Zone !!!
27-
*
27+
*
2828
* ATTENTION: The following names are also used in the plugin.xml and in the
2929
* autotest script to load the correct workspaces.
3030
*/
@@ -70,8 +70,6 @@ public class EMoflonStandardWorkspaces {
7070

7171
public static final String MODULE_CORE_SDM = "ModuleCoreSDM";
7272

73-
public static final String MODULE_GT = "ModuleGT";
74-
7573
public static final String MODULE_TGG = "ModuleTGG";
7674

7775
public static final String MODULE_TGG_CORE = "ModuleTGGCore";
@@ -102,14 +100,13 @@ public class EMoflonStandardWorkspaces {
102100
addPathLookup(MODULE_IDE, Arrays.asList("development/IDE_Rest_Modules.psf"));
103101
addPathLookup(MODULE_TGG_CORE, Arrays.asList("development/TGG_Core_Modules.psf"));
104102
addPathLookup(MODULE_TGG_MOSL, Arrays.asList("development/TGG_MOSL_Modules.psf"));
105-
addPathLookup(MODULE_GT, Arrays.asList("development/GT_MOSL_Modules.psf"));
106103
addPathLookup(MODULE_VISUALIZATION, Arrays.asList("development/IDE_Vis_Modules.psf"));
107104
addPathLookup(MODULE_DOCUMENTATION, Arrays.asList("development/Documentation.psf"));
108105

109106
addPathLookup(MODULE_TGG, joinLists(MODULE_TGG_CORE, MODULE_TGG_MOSL));
110107
addPathLookup(MODULE_ALL,
111108
joinLists(MODULE_META, MODULE_IDE, MODULE_CORE_SDM, MODULE_TGG_CORE, MODULE_VISUALIZATION)); // "development/All_Modules.psf"
112-
addPathLookup(MODULE_ALL_INCL_MOSL, joinLists(MODULE_ALL, MODULE_GT, MODULE_TGG_MOSL)); // "development/All_Modules_incl_MOSL.psf"
109+
addPathLookup(MODULE_ALL_INCL_MOSL, joinLists(MODULE_ALL, MODULE_TGG_MOSL)); // "development/All_Modules_incl_MOSL.psf"
113110

114111
// Handbook workspace modules
115112
addPathLookup(DEMO_WORKSPACE_NAME, Arrays.asList("examples/DemoWorkspace.psf"));
@@ -133,7 +130,7 @@ public class EMoflonStandardWorkspaces {
133130
/**
134131
* Returns the project-relative path to the PSF file that corresponds to the
135132
* given workspace name.
136-
*
133+
*
137134
* If no such path exists, the list is empty
138135
*/
139136
public static List<String> getPathToPsfFileForWorkspace(final String workspaceName) {
@@ -150,7 +147,7 @@ public static List<String> getPathToPsfFileForWorkspace(final String workspaceNa
150147

151148
/**
152149
* Registers the given list of paths to PSF files for the given module name
153-
*
150+
*
154151
* @param moduleName
155152
* @param paths
156153
*/
@@ -160,7 +157,7 @@ private static void addPathLookup(String moduleName, List<String> paths) {
160157

161158
/**
162159
* Joins the paths corresponding to the given module names to a new (flat) list.
163-
*
160+
*
164161
* The resulting list preserves the order of the paths of the given modules (and
165162
* their corresponding paths) but does not contain duplicates. Only the first
166163
* path of a set of duplicates is kept.
@@ -180,7 +177,7 @@ private static List<String> joinLists(final String... moduleNames) {
180177
* Creates a binary operator on string lists that uses
181178
* {@link Collection#addAll(Collection)} to add all elements of the second
182179
* operand to the first operand
183-
*
180+
*
184181
* @return
185182
*/
186183
private static BinaryOperator<List<String>> createListJoiner() {
@@ -193,12 +190,12 @@ private static BinaryOperator<List<String>> createListJoiner() {
193190
/**
194191
* Extracts the component of the workspace name that describes the desired
195192
* branch to use
196-
*
193+
*
197194
* Anything beyond the {@link #BRANCH_NAME_SEPARATOR} is interpreted as branch
198195
* name. If {@link #BRANCH_NAME_SEPARATOR} does not appear within the
199196
* workspaceName, then null is returned If {@link #BRANCH_NAME_SEPARATOR} is the
200197
* last character, then the result is also null.
201-
*
198+
*
202199
* @param workspaceName
203200
* the raw workspace name
204201
* @return the branch specificator as described above
@@ -213,7 +210,7 @@ public static String extractCustomBranchName(String workspaceName) {
213210
/**
214211
* Returns the name part of the workspace name (i.e., without the branch
215212
* specificator)
216-
*
213+
*
217214
* @param workspaceName
218215
* the raw workspace name
219216
* @return the name part

‎org.moflon.sdm.compiler.democles/src/org/moflon/compiler/sdm/democles/eclipse/EclipseErrorReporter.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.eclipse.core.resources.IFile;
44
import org.eclipse.core.resources.IMarker;
5+
import org.eclipse.core.resources.IResource;
56
import org.eclipse.core.runtime.CoreException;
67
import org.eclipse.core.runtime.IStatus;
78
import org.eclipse.core.runtime.Status;
@@ -77,7 +78,8 @@ private String getLocationDescription(final ErrorMessage message) {
7778
}
7879

7980
private IMarker createMarker(final String markerId, final ErrorMessage message) throws CoreException {
80-
IMarker validationMarker = file.createMarker(markerId);
81+
final IResource markedResource = file.exists() ? file : file.getProject();
82+
IMarker validationMarker = markedResource.createMarker(markerId);
8183
validationMarker.setAttribute(IMarker.MESSAGE, message.getId());
8284
validationMarker.setAttribute(IMarker.LOCATION, getLocationDescription(message));
8385
validationMarker.setAttribute(IMarker.PRIORITY, IMarker.PRIORITY_HIGH);

‎org.moflon.sdm.constraints.democles/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src"/>
4+
<classpathentry kind="src" path="injection"/>
45
<classpathentry kind="src" path="gen">
56
<attributes>
67
<attribute name="ignore_optional_problems" value="true"/>
78
</attributes>
89
</classpathentry>
910
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
1011
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
11-
<classpathentry kind="src" path="injection"/>
1212
<classpathentry kind="output" path="bin"/>
1313
</classpath>

‎org.moflon.sdm.constraints.democles/injection/.keepinjection

Whitespace-only changes.

‎org.moflon.sdm.language/injection/.keepinjection

Whitespace-only changes.

‎org.moflon.sdm.runtime.democles/injection/.keepinjection

Whitespace-only changes.

0 commit comments

Comments
 (0)