summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Laner <laner@itestra.de>2013-11-11 19:00:35 +0100
committerStefan Laner <laner@itestra.de>2013-11-11 19:00:35 +0100
commit37da80d09fb4c5c3cab883677d9f1d096baeb757 (patch)
tree3d2e1a052fad5289493474756cfe67010bb3f08d
parent266de4da71df56d488d3829cf8e321212d157524 (diff)
downloadgenivi-common-api-runtime-37da80d09fb4c5c3cab883677d9f1d096baeb757.tar.gz
also allowed structs to act as map keys
-rw-r--r--org.genivi.commonapi.core.validator/src/org/genivi/commonapi/core/validator/ResourceValidator.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/org.genivi.commonapi.core.validator/src/org/genivi/commonapi/core/validator/ResourceValidator.java b/org.genivi.commonapi.core.validator/src/org/genivi/commonapi/core/validator/ResourceValidator.java
index a08bc7e..696e34f 100644
--- a/org.genivi.commonapi.core.validator/src/org/genivi/commonapi/core/validator/ResourceValidator.java
+++ b/org.genivi.commonapi.core.validator/src/org/genivi/commonapi/core/validator/ResourceValidator.java
@@ -673,7 +673,7 @@ public class ResourceValidator implements IFrancaExternalValidator {
}
}
- messageAcceptor.acceptError("Key type has to be an primitive type!", m, FrancaPackage.Literals.FMAP_TYPE__KEY_TYPE, -1, null);
+ messageAcceptor.acceptError("Key type has to be a primitive type!", m, FrancaPackage.Literals.FMAP_TYPE__KEY_TYPE, -1, null);
}
private boolean isTypeAcceptableAsMapKey(FTypeRef typeRef) {
@@ -683,6 +683,8 @@ public class ResourceValidator implements IFrancaExternalValidator {
accepted = true; // basic types are ok
} else if (typeRef.getDerived() instanceof FEnumerationType) {
accepted = true; // enums are also ok
+ } else if (typeRef.getDerived() instanceof FStructType) {
+ accepted = true; // structs are also accepted
}
return accepted;