Skip to content
Snippets Groups Projects
Commit c7f9e1e9 authored by Chrissi's avatar Chrissi
Browse files

remove error in STypeRegistry.scala only allow getType with package and name

parent b129224a
No related branches found
No related tags found
No related merge requests found
......@@ -27,20 +27,6 @@ object STypeRegistry {
PredefTypes.String -> null,
)
/*private var registeredTypes: Set[STypedElement] = Set()
private val defaultTypes: Set[STypedElement] = Set(
PredefTypes.Boolean,
PredefTypes.Byte,
PredefTypes.Short,
PredefTypes.Integer,
PredefTypes.Long,
PredefTypes.Float,
PredefTypes.Double,
PredefTypes.String,
PredefTypes.Date
)*/
def getFromClass(cls: EClass): STypedElement = {
registeredTypes.foreach(r => {
if (r._2 == cls) {
......@@ -93,15 +79,6 @@ object STypeRegistry {
registeredTypes.keySet.find(t => t.getName == name && t.getPackage == sPackage)
}
/** Searches for a type based on its name. It may reside in any package.
*
* @param name the type's name
* @return the type if it was found
*/
def queryForName(name: String): Option[STypedElement] = {
registeredTypes.keySet.find(_.getName == name)
}
/** Provides all types that are currently in the repository.
*/
def allTypes: Set[STypedElement] = registeredTypes.keySet
......
......@@ -103,7 +103,7 @@ class SClassConverter extends Converter[EClass, SClass] {
eClassParents.foreach { p =>
pars ::= STypeRegistry
// check if we already know the parent
.queryForName(p.getName)
.query(p.getName, p.getEPackage.getNsPrefix)
// otherwise we need to create and register it
.getOrElse {
val parentSClass: SClass = new SClass(p.getName, p.getEPackage.getNsPrefix)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment