Commit 999e9d6a authored by Paff's avatar Paff
Browse files

add for last commit

parent 74219160
...@@ -46,6 +46,7 @@ import secarc.ets.graph.ArchitectureGraph; ...@@ -46,6 +46,7 @@ import secarc.ets.graph.ArchitectureGraph;
import secarc.ets.graph.ArchitectureGraphBuilder; import secarc.ets.graph.ArchitectureGraphBuilder;
import interfaces2.coco.ContextCondition; import interfaces2.coco.ContextCondition;
import interfaces2.helper.EntryLoadingErrorException;
import interfaces2.resolvers.AmbigousException; import interfaces2.resolvers.AmbigousException;
/** /**
...@@ -253,7 +254,7 @@ public class MontiSecArcCheckVisitor extends MontiArcCheckCoCoVisitor { ...@@ -253,7 +254,7 @@ public class MontiSecArcCheckVisitor extends MontiArcCheckCoCoVisitor {
cc.check(node, entry, graph); cc.check(node, entry, graph);
} }
} }
} catch (AmbigousException e) { } catch (AmbigousException | EntryLoadingErrorException e) {
// not handled here // not handled here
MCG.getLogger().info(e.getMessage()); MCG.getLogger().info(e.getMessage());
} }
......
...@@ -3,6 +3,7 @@ package secarc.ets.cocos.common; ...@@ -3,6 +3,7 @@ package secarc.ets.cocos.common;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import interfaces2.helper.EntryLoadingErrorException;
import interfaces2.resolvers.AmbigousException; import interfaces2.resolvers.AmbigousException;
import mc.IErrorCode; import mc.IErrorCode;
import mc.umlp.arcd._ast.ASTArcComponent; import mc.umlp.arcd._ast.ASTArcComponent;
...@@ -28,7 +29,7 @@ public class UniqueDefinitionWithFullQualifiedNames extends ComponentExistence { ...@@ -28,7 +29,7 @@ public class UniqueDefinitionWithFullQualifiedNames extends ComponentExistence {
* @see secarc.ets.cocos.checkers.ISecIdentityChecker#check(secarc._ast.ASTSecArcIdentity, secarc.ets.entries.IdentityEntry) * @see secarc.ets.cocos.checkers.ISecIdentityChecker#check(secarc._ast.ASTSecArcIdentity, secarc.ets.entries.IdentityEntry)
*/ */
@Override @Override
public void check(ASTSecArcIdentity node, IdentityEntry entry, ArchitectureGraph graph) throws AmbigousException { public void check(ASTSecArcIdentity node, IdentityEntry entry, ArchitectureGraph graph) throws AmbigousException, EntryLoadingErrorException {
String refSource = entry.getSource(); String refSource = entry.getSource();
String refTarget = entry.getTarget(); String refTarget = entry.getTarget();
...@@ -43,6 +44,7 @@ public class UniqueDefinitionWithFullQualifiedNames extends ComponentExistence { ...@@ -43,6 +44,7 @@ public class UniqueDefinitionWithFullQualifiedNames extends ComponentExistence {
} }
SecComponentEntry sourceComponent = (SecComponentEntry) sourceSubComoponent.getComponentType().getBestKnownVersion(); SecComponentEntry sourceComponent = (SecComponentEntry) sourceSubComoponent.getComponentType().getBestKnownVersion();
sourceComponent.loadFullVersion(loader, deserializers);
SecComponentEntry targetComponent = (SecComponentEntry) targetSubComoponent.getComponentType().getBestKnownVersion(); SecComponentEntry targetComponent = (SecComponentEntry) targetSubComoponent.getComponentType().getBestKnownVersion();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment