From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Thu, 3 Aug 2017 06:48:31 +0000 (+0300)
Subject: Merge "PropertyMap.get does not return null if there is no mapping for the key"
X-Git-Tag: v1.31.0~264^2~8
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=d80b82a0c48b42604258ee1dc22cd8cf0bbcbb8e;hp=214582bae00873fb90141b41d030e9c173a72e5f

Merge "PropertyMap.get does not return null if there is no mapping for the key"
---

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EAmbiguous.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EAmbiguous.java
index 7434bf2ac..09397ba05 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EAmbiguous.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EAmbiguous.java
@@ -76,7 +76,7 @@ public class EAmbiguous extends SimplifiableExpression {
         StringBuilder b = new StringBuilder();
         b.append("Expected <");
         requiredType.toString(new TypeUnparsingContext(), b);
-        b.append(">, but no alteratives match the type: ");
+        b.append(">, but no alternatives match the type: ");
         for(int i=0;i<alternatives.length;++i) {
             b.append("\n    ");
             b.append(alternatives[i]);