Skip to content
Snippets Groups Projects
Commit 12142a49 authored by Dott. Federico Volpini's avatar Dott. Federico Volpini
Browse files

some little changes in associations and enumerations check

parent 6689fa72
No related branches found
No related tags found
No related merge requests found
...@@ -112,7 +112,9 @@ texttransformation validateOntologyUml (in uml:"http://www.eclipse.org/uml2/3.0. ...@@ -112,7 +112,9 @@ texttransformation validateOntologyUml (in uml:"http://www.eclipse.org/uml2/3.0.
verbose("\n--- Associations Check ---\n",false,true) verbose("\n--- Associations Check ---\n",false,true)
var AssList:list = associationHashtable.keys() var AssList:list = associationHashtable.keys()
if(AssList.size() > 0){ if(AssList.size() > 0){
self.checkEmpty(AssList) verbose("Checking for unnamed Associations... ",false,true)
self.checkEmpty(AssList)
self.checkErrors()
//self.checkUnity(AssList) //self.checkUnity(AssList)
AssList->forEach(ass:uml.Association){ AssList->forEach(ass:uml.Association){
var class:list = associationHashtable.get(ass).get('class') var class:list = associationHashtable.get(ass).get('class')
...@@ -124,6 +126,9 @@ texttransformation validateOntologyUml (in uml:"http://www.eclipse.org/uml2/3.0. ...@@ -124,6 +126,9 @@ texttransformation validateOntologyUml (in uml:"http://www.eclipse.org/uml2/3.0.
else if(class.size()==1) prefix = "Association "+ass.getName()+" (Class "+class.first().getName()+")" else if(class.size()==1) prefix = "Association "+ass.getName()+" (Class "+class.first().getName()+")"
else prefix = "Association "+ass.getName()+" between "+class.first().getName()+" and "+class.last().getName() else prefix = "Association "+ass.getName()+" between "+class.first().getName()+" and "+class.last().getName()
verbose(prefix+"...",false,true)
if (ass.name.trim().replace(validChars,"").size()!=0) verbose("*"+prefix+" has invalid characters in name\n",true,false) if (ass.name.trim().replace(validChars,"").size()!=0) verbose("*"+prefix+" has invalid characters in name\n",true,false)
if(members.first().name.trim().size() != 0 || members.last().name.trim().size() != 0) if(members.first().name.trim().size() != 0 || members.last().name.trim().size() != 0)
...@@ -134,18 +139,20 @@ texttransformation validateOntologyUml (in uml:"http://www.eclipse.org/uml2/3.0. ...@@ -134,18 +139,20 @@ texttransformation validateOntologyUml (in uml:"http://www.eclipse.org/uml2/3.0.
if (members.first().name.trim().replace(validChars,"").size()!=0) verbose("*"+prefix+" has invalid characters\n",true,false) if (members.first().name.trim().replace(validChars,"").size()!=0) verbose("*"+prefix+" has invalid characters\n",true,false)
if (members.last().name.trim().replace(validChars,"").size()!=0) verbose("*"+prefix+": memberEnd "+members.last().name.trim()+" has invalid characters\n",true,false) if (members.last().name.trim().replace(validChars,"").size()!=0) verbose("*"+prefix+": memberEnd "+members.last().name.trim()+" has invalid characters\n",true,false)
} }
self.checkErrors()
} }
self.checkErrors()
} else verbose ("No Associations found\n",false,true) } else verbose ("No Associations found\n",false,true)
verbose("\n--- Enumeration Check ---\n",false,true) verbose("\n--- Enumeration Check ---\n",false,true)
if(enumerationHashtable.size()>0){ if(enumerationHashtable.size()>0){
var EnumKeys:list = enumerationHashtable.keys() var EnumKeys:list = enumerationHashtable.keys()
self.checkEmpty(EnumKeys) verbose("Checking for unnamed Enumerations or duplicated Enumeration's name... ",false,true)
self.checkEmpty(EnumKeys)
self.checkUnity(EnumKeys) self.checkUnity(EnumKeys)
self.checkErrors()
EnumKeys->forEach(key:uml.Enumeration){ EnumKeys->forEach(key:uml.Enumeration){
verbose("Enumeration "+key.getName()+"...",false,true)
key.checkNamingConventions() key.checkNamingConventions()
var literals:list = enumerationHashtable.get(key) var literals:list = enumerationHashtable.get(key)
if(literals.size()>0){ if(literals.size()>0){
...@@ -155,8 +162,10 @@ texttransformation validateOntologyUml (in uml:"http://www.eclipse.org/uml2/3.0. ...@@ -155,8 +162,10 @@ texttransformation validateOntologyUml (in uml:"http://www.eclipse.org/uml2/3.0.
lit.checkNamingConventions() lit.checkNamingConventions()
} }
} else verbose("!Enumeration "+key.name+" is empty\n",true,false) } else verbose("!Enumeration "+key.name+" is empty\n",true,false)
self.checkErrors()
} }
self.checkErrors();
} else verbose ("No Enumerations found\n",false,true) } else verbose ("No Enumerations found\n",false,true)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment