- final List<StatementContext> subStatements = module.statement();
- for (final StatementContext subStatementContext : subStatements) {
- if (subStatementContext
- .keyword()
- .getText()
- .equals(Rfc6020Mapping.IMPORT.getStatementName()
- .getLocalName())) {
- final String revisionDateStr = getRevisionDateString(subStatementContext);
- final String importedModuleName = Utils
- .stringFromStringContext(subStatementContext.argument());
- final Date revisionDate = (revisionDateStr == null) ? null : QName
- .parseRevision(revisionDateStr);
- final Optional<SemVer> importSemVer = Optional.fromNullable(getSemanticVersion(subStatementContext));
- result.add(new ModuleImportImpl(importedModuleName,
- revisionDate, importSemVer));
+ for (final StatementContext subStatementContext : module.statement()) {
+ if (IMPORT.equals(subStatementContext.keyword().getText())) {
+ final String revisionDateStr = getRevisionDateString(subStatementContext, sourceName);
+ final String importedModuleName = Utils.stringFromStringContext(subStatementContext.argument(),
+ getReference(sourceName, subStatementContext));
+ final Revision revisionDate = revisionDateStr == null ? null : Revision.valueOf(revisionDateStr);
+ final SemVer importSemVer = findSemanticVersion(subStatementContext, sourceName);
+ result.add(new ModuleImportImpl(importedModuleName, revisionDate, importSemVer));