(no commit message)

[utils] / system / general / src / main / java / org / wamblee / system / graph / component / CheckExternallyRequiredVisitor.java

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 4ab72426212eb23d8ca1ab89e5c056f700dcc5d8..67343161f66290f5b71384e65971c0131a968f13 100644 (file)
--- 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,5 +1,5 @@
 /*
- * Copyright 2008 the original author or authors.
+ * Copyright 2005-2010 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.
@@ -15,29 +15,31 @@
  */
 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;
+import java.util.logging.Logger;
+
 /**
  * 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 static final Logger LOG = Logger
+        .getLogger(CheckExternallyRequiredVisitor.class.getName());
 
     private Graph graph;
 
+    /**
+     * Creates a new CheckExternallyRequiredVisitor object.
+     * 
+     */
     public CheckExternallyRequiredVisitor(Graph aGraph) {
         graph = aGraph;
     }
@@ -51,30 +53,33 @@ 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<Edge> edges = graph.findIncoming(aNode);
 
             if (edges.isEmpty()) {
-                LOG.warn(aNode + ": Superfluous required interface");
+                LOG.warning(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);
                 }
             }
         }
     }
-
 }