X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2Fcomponent%2FCheckExternallyRequiredVisitor.java;h=86ba2761b51dd110a21b9efcb4e9001e146d82d3;hb=8de36ff0206c996baf3ee4adc3e2293b12ff5f39;hp=4ab72426212eb23d8ca1ab89e5c056f700dcc5d8;hpb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;p=utils diff --git a/system/general/src/main/java/org/wamblee/system/graph/component/CheckExternallyRequiredVisitor.java b/system/general/src/main/java/org/wamblee/system/graph/component/CheckExternallyRequiredVisitor.java index 4ab72426..86ba2761 100644 --- a/system/general/src/main/java/org/wamblee/system/graph/component/CheckExternallyRequiredVisitor.java +++ b/system/general/src/main/java/org/wamblee/system/graph/component/CheckExternallyRequiredVisitor.java @@ -1,12 +1,12 @@ /* * Copyright 2008 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,29 +15,32 @@ */ package org.wamblee.system.graph.component; -import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.wamblee.system.core.SystemAssemblyException; import org.wamblee.system.graph.Edge; import org.wamblee.system.graph.Graph; import org.wamblee.system.graph.Node; import org.wamblee.system.graph.Visitor; +import java.util.List; + /** * Visitor that checks whether all required external interfaces of the container * are provided. * * @author Erik Brakkee - * */ public class CheckExternallyRequiredVisitor implements Visitor { - private Log LOG = LogFactory.getLog(CheckExternallyRequiredVisitor.class); private Graph graph; + /** + * Creates a new CheckExternallyRequiredVisitor object. + * + */ public CheckExternallyRequiredVisitor(Graph aGraph) { graph = aGraph; } @@ -51,10 +54,11 @@ public class CheckExternallyRequiredVisitor implements Visitor { public void visitNode(Node aNode) { if (aNode instanceof ExternalRequiredInterfaceNode) { ExternalRequiredInterfaceNode required = (ExternalRequiredInterfaceNode) aNode; - if (!required.getRequired().isOptional() - && required.getRequired().getProvider() == null) { - throw new SystemAssemblyException(aNode - + ": External required interface is not provided"); + + if (!required.getRequired().isOptional() && + (required.getRequired().getProvider() == null)) { + throw new SystemAssemblyException(aNode + + ": External required interface is not provided"); } List edges = graph.findIncoming(aNode); @@ -62,19 +66,21 @@ public class CheckExternallyRequiredVisitor implements Visitor { if (edges.isEmpty()) { LOG.warn(aNode + ": Superfluous required interface"); } + for (Edge edge : edges) { Node from = edge.getFrom(); assert from instanceof RequiredInterfaceNode; - RequiredInterfaceNode reqNode = (RequiredInterfaceNode)from; - if (!reqNode.getRequired().isOptional() - && required.getRequired().isOptional()) { + + RequiredInterfaceNode reqNode = (RequiredInterfaceNode) from; + + if (!reqNode.getRequired().isOptional() && + required.getRequired().isOptional()) { throw new SystemAssemblyException( - aNode - + ": externally required interface is optional but a corresponding internal required interface is mandatory: " - + reqNode); + aNode + + ": externally required interface is optional but a corresponding internal required interface is mandatory: " + + reqNode); } } } } - }