summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Laner <laner@itestra.de>2013-11-11 19:56:15 +0100
committerStefan Laner <laner@itestra.de>2013-11-11 19:56:15 +0100
commitb03866f5a6daf7ce7f77aacc34e8b3691ad79e21 (patch)
treea0439cfc62a77781e957bb7aca77d7adedfec282
parent37da80d09fb4c5c3cab883677d9f1d096baeb757 (diff)
downloadgenivi-common-api-runtime-b03866f5a6daf7ce7f77aacc34e8b3691ad79e21.tar.gz
Revert "also allowed structs to act as map keys"
This reverts commit 37da80d09fb4c5c3cab883677d9f1d096baeb757.
-rw-r--r--org.genivi.commonapi.core.validator/src/org/genivi/commonapi/core/validator/ResourceValidator.java4
1 files changed, 1 insertions, 3 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 696e34f..a08bc7e 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 a primitive type!", m, FrancaPackage.Literals.FMAP_TYPE__KEY_TYPE, -1, null);
+ messageAcceptor.acceptError("Key type has to be an primitive type!", m, FrancaPackage.Literals.FMAP_TYPE__KEY_TYPE, -1, null);
}
private boolean isTypeAcceptableAsMapKey(FTypeRef typeRef) {
@@ -683,8 +683,6 @@ 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;