[468303] - Indicate module which fails to import
diff --git a/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/parser/QvtOperationalVisitorCS.java b/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/parser/QvtOperationalVisitorCS.java
index a277a3a..2cebe34 100644
--- a/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/parser/QvtOperationalVisitorCS.java
+++ b/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/parser/QvtOperationalVisitorCS.java
@@ -2825,7 +2825,7 @@
return multiplicityDef;
}
-
+
private void importsCS(MappingModuleCS parsedModuleCS, UnitProxy unit, Module module, QvtOperationalModuleEnv env, ExternalUnitElementsProvider importResolver) {
EMap<String, List<QvtOperationalModuleEnv>> importMap = new BasicEMap<String, List<QvtOperationalModuleEnv>>(5);
@@ -5311,7 +5311,7 @@
}
if (!isCorrespondanceFound) {
env.reportWarning(
- NLS.bind(ValidationMessages.QvtOperationalVisitorCS_incompatibleTransfSignature, importedModule.getName()),
+ NLS.bind(ValidationMessages.QvtOperationalVisitorCS_incompatibleTransfSignature, importedModule.getName(), module.getName()),
astNode.getStartPosition(), astNode.getEndPosition());
return;
}
diff --git a/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/parser/ValidationMessages.properties b/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/parser/ValidationMessages.properties
index 46d0062..aaa4e4d 100644
--- a/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/parser/ValidationMessages.properties
+++ b/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/parser/ValidationMessages.properties
@@ -157,7 +157,7 @@
QvtOperationalVisitorCS_ifExpNonBooleanCond=If expression condition must be boolean-valued
QvtOperationalParserUtil_inoutParamAssignmentError=Can''t assign a value to ''inout'' parameter ''{0}''
QvtOperationalParserUtil_outParamAssignmentError=Can''t assign a value to ''out'' parameter ''{0}'' outside ''init'' section
-QvtOperationalVisitorCS_incompatibleTransfSignature=Signature of the imported transformation ''{0}'' is not compatible with the given transformation
+QvtOperationalVisitorCS_incompatibleTransfSignature=Signature of the imported transformation ''{0}'' is not compatible with the importing transformation ''{1}''
QvtOperationalVisitorCS_mapKeywordNotUsed=Mapping operation ''{0}'' should be called using ''(x)map'' keyword
QvtOperationalVisitorCS_WrongImperativeIteratorConditionType=Condition must be a TypeExp or Boolean\!
returnNotAllowedInMappingYet=Using ''return'' from mapping operation is not yet supported
diff --git a/tests/org.eclipse.m2m.tests.qvt.oml/parserTestData/sources/bug468303/bug468303.qvto b/tests/org.eclipse.m2m.tests.qvt.oml/parserTestData/sources/bug468303/bug468303.qvto
index 21a64e7..6a09ed4 100644
--- a/tests/org.eclipse.m2m.tests.qvt.oml/parserTestData/sources/bug468303/bug468303.qvto
+++ b/tests/org.eclipse.m2m.tests.qvt.oml/parserTestData/sources/bug468303/bug468303.qvto
@@ -1,6 +1,4 @@
import compatible;
/*<warn>*/import incompatible;/*</warn>*/
-modeltype ecore uses 'http://www.eclipse.org/emf/2002/Ecore';
-
transformation bug468303();
\ No newline at end of file
