Fixed xmi generation with attributes. Added better error messages.

2 files changed, 6 insertions, 2 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/AttributeMapper.xtend b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/AttributeMapper.xtend
index 95be8433..b2f4867b 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/AttributeMapper.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/AttributeMapper.xtend
@@ -112,7 +112,7 @@ class EAttributeMapper_RelationsOverTypes implements EAttributeMapper {
                 else if(attribute.EType.name.equals("EDouble") ||

                             attribute.EType.name.equals("EFloat")) return LogicReal

                 else if(attribute.EType.name.equals("EString")) return LogicString

-                else throw new UnsupportedOperationException('''Unsupported attribute type: «attribute.EType.name»''')

+                else throw new UnsupportedOperationException('''Unsupported attribute type: «attribute.EType.name» of «attribute.EContainingClass.EPackage»::«attribute.EContainingClass.name».«attribute.name»''')

         }

         

         override relationOfAttribute(Ecore2Logic_Trace trace, EAttribute attribute) {

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend
index c7e14362..92deeae6 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend
@@ -91,7 +91,11 @@ class Logic2Ecore {
                                                                         val list = sourceObject.eGet(attributeType) as List<? super Object>

                                                                         list += l.key

                                                                 } else {

-                                                                        sourceObject.eSet(attributeType,l)

+                                                                        try {

+                                                                                sourceObject.eSet(attributeType,l.key)

+                                                                        } catch(Exception e) {

+                                                                                e.printStackTrace

+                                                                        }

                                                                 }

                                                         }

                                                 }