diff options
author | Kristóf Marussy <marussy@mit.bme.hu> | 2021-10-19 19:18:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-19 19:18:20 +0200 |
commit | d61e0258f94d118564f92c8c1603d5317cc7f71f (patch) | |
tree | 1388fdd7d68a59b625decc5ed185f5eeb4bda732 | |
parent | Merge pull request #2 from golej-marci/language-to-store (diff) | |
parent | findingRelationInDTO changed up (diff) | |
download | refinery-d61e0258f94d118564f92c8c1603d5317cc7f71f.tar.gz refinery-d61e0258f94d118564f92c8c1603d5317cc7f71f.tar.zst refinery-d61e0258f94d118564f92c8c1603d5317cc7f71f.zip |
Merge pull request #3 from golej-marci/language-to-store
Language to store bugfix
-rw-r--r-- | language-model/problem.aird | 3 | ||||
-rw-r--r-- | language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/language-model/problem.aird b/language-model/problem.aird index f2192e65..3e3db866 100644 --- a/language-model/problem.aird +++ b/language-model/problem.aird | |||
@@ -1,10 +1,11 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style"> | 2 | <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style"> |
3 | <viewpoint:DAnalysis uid="_CqOewKA4EeuqkpDnuik1sg" selectedViews="_CsAAYKA4EeuqkpDnuik1sg" version="14.3.1.202003261200"> | 3 | <viewpoint:DAnalysis uid="_CqOewKA4EeuqkpDnuik1sg" selectedViews="_CsAAYKA4EeuqkpDnuik1sg" version="14.5.1.202106111100"> |
4 | <semanticResources>src/main/resources/model/problem.ecore</semanticResources> | 4 | <semanticResources>src/main/resources/model/problem.ecore</semanticResources> |
5 | <semanticResources>src/main/resources/model/problem.genmodel</semanticResources> | 5 | <semanticResources>src/main/resources/model/problem.genmodel</semanticResources> |
6 | <semanticResources>build/resources/main/model/problem.ecore</semanticResources> | 6 | <semanticResources>build/resources/main/model/problem.ecore</semanticResources> |
7 | <semanticResources>build/resources/main/model/problem.genmodel</semanticResources> | 7 | <semanticResources>build/resources/main/model/problem.genmodel</semanticResources> |
8 | <semanticResources>src/main/resources/model/builtin.problem_xmi</semanticResources> | ||
8 | <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg"> | 9 | <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg"> |
9 | <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/> | 10 | <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/> |
10 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="problem" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="06203da9-3aa0-4459-90ab-809823eee3f6"> | 11 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="problem" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="06203da9-3aa0-4459-90ab-809823eee3f6"> |
diff --git a/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java b/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java index d37c9ec7..ba32921a 100644 --- a/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java +++ b/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java | |||
@@ -128,12 +128,10 @@ public class PartialModelMapper { | |||
128 | //Searches for and gives back a relation in a PartialModelMapperDTO | 128 | //Searches for and gives back a relation in a PartialModelMapperDTO |
129 | private tools.refinery.language.model.problem.Relation findingRelationInDTO(PartialModelMapperDTO partialModelMapperDTO, String searchedRelation, String errorText) | 129 | private tools.refinery.language.model.problem.Relation findingRelationInDTO(PartialModelMapperDTO partialModelMapperDTO, String searchedRelation, String errorText) |
130 | throws PartialModelMapperException { | 130 | throws PartialModelMapperException { |
131 | tools.refinery.language.model.problem.Relation relation = null; | ||
132 | for (tools.refinery.language.model.problem.Relation r : partialModelMapperDTO.getRelationMap().keySet()) { | 131 | for (tools.refinery.language.model.problem.Relation r : partialModelMapperDTO.getRelationMap().keySet()) { |
133 | if (r.getName().equals(searchedRelation)) relation = r; | 132 | if (searchedRelation.equals(r.getName())) return r; |
134 | } | 133 | } |
135 | if(relation.equals(null)) throw new PartialModelMapperException(errorText); | 134 | throw new PartialModelMapperException(errorText); |
136 | return relation; | ||
137 | } | 135 | } |
138 | 136 | ||
139 | //Processing assertions and placing them in the model | 137 | //Processing assertions and placing them in the model |