From c7f9e1e9d4f91ae329d4fd836ddec81bfa289c14 Mon Sep 17 00:00:00 2001
From: Chrissi <christopher@hbsc-werner.de>
Date: Fri, 7 Jun 2019 10:01:42 +0200
Subject: [PATCH] remove error in STypeRegistry.scala only allow getType with
package and name
---
.../generator/acr_model/STypeRegistry.scala | 23 -------------------
.../conversion/SClassConverter.scala | 2 +-
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/src/main/scala/org/rosi_project/model_sync/generator/acr_model/STypeRegistry.scala b/src/main/scala/org/rosi_project/model_sync/generator/acr_model/STypeRegistry.scala
index 60053ed..2368fb3 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/acr_model/STypeRegistry.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/acr_model/STypeRegistry.scala
@@ -26,20 +26,6 @@ object STypeRegistry {
PredefTypes.Short -> null,
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 => {
@@ -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
diff --git a/src/main/scala/org/rosi_project/model_sync/generator/conversion/SClassConverter.scala b/src/main/scala/org/rosi_project/model_sync/generator/conversion/SClassConverter.scala
index 346a2f2..7e5ed25 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/conversion/SClassConverter.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/conversion/SClassConverter.scala
@@ -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)
--
GitLab