Handles incompatibility between actions in imported models

And correctly reports in which models the actions are defined.
gama-platform · Dec 29, 2021 · dd9e554 · dd9e554
1 parent af3a507
commit dd9e554
Show file tree

Hide file tree

Showing 4 changed files with 351 additions and 30 deletions.
diff --git a/msi.gama.core/src/msi/gaml/descriptions/SymbolDescription.java b/msi.gama.core/src/msi/gaml/descriptions/SymbolDescription.java
@@ -1,7 +1,7 @@
 /*******************************************************************************************************
  *
  * SymbolDescription.java, in msi.gama.core, is part of the source code of the GAMA modeling and simulation platform
- * (v.2.0.0).
+ * (v.1.8.2).
  *
  * (c) 2007-2021 UMI 209 UMMISCO IRD/SU & Partners (IRIT, MIAT, TLU, CTU)
  *
@@ -98,7 +98,10 @@ public SymbolDescription(final String keyword, final IDescription superDesc, fin
 		this.keyword = keyword;
 		this.facets = facets;
 		element = source;
-		if (superDesc != null) { originName = superDesc.getName(); }
+		if (facets != null && facets.containsKey(ORIGIN)) {
+			originName = facets.getLabel(ORIGIN);
+			facets.remove(ORIGIN);
+		} else if (superDesc != null) { originName = superDesc.getName(); }
 		setEnclosingDescription(superDesc);
 		proto = DescriptionFactory.getProto(getKeyword(), getSpeciesContext());
 	}