Merge pull request #3 from golej-marci/language-to-store

Language to store bugfix

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-  <viewpoint:DAnalysis uid="_CqOewKA4EeuqkpDnuik1sg" selectedViews="_CsAAYKA4EeuqkpDnuik1sg" version="14.3.1.202003261200">
+  <viewpoint:DAnalysis uid="_CqOewKA4EeuqkpDnuik1sg" selectedViews="_CsAAYKA4EeuqkpDnuik1sg" version="14.5.1.202106111100">
     <semanticResources>src/main/resources/model/problem.ecore</semanticResources>
     <semanticResources>src/main/resources/model/problem.genmodel</semanticResources>
     <semanticResources>build/resources/main/model/problem.ecore</semanticResources>
     <semanticResources>build/resources/main/model/problem.genmodel</semanticResources>
+    <semanticResources>src/main/resources/model/builtin.problem_xmi</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
       <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 {
         //Searches for and gives back a relation in a PartialModelMapperDTO
         private tools.refinery.language.model.problem.Relation findingRelationInDTO(PartialModelMapperDTO partialModelMapperDTO, String searchedRelation, String errorText)
                         throws PartialModelMapperException {
-                tools.refinery.language.model.problem.Relation relation = null;
                 for (tools.refinery.language.model.problem.Relation r : partialModelMapperDTO.getRelationMap().keySet()) {
-                        if (r.getName().equals(searchedRelation)) relation = r;
+                        if (searchedRelation.equals(r.getName())) return r;
                 }
-                if(relation.equals(null)) throw new PartialModelMapperException(errorText);
-                return relation;
+                throw new PartialModelMapperException(errorText);
         }
 
         //Processing assertions and placing them in the model