X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2Fcomponent%2FCheckExternallyRequiredVisitor.java;h=67343161f66290f5b71384e65971c0131a968f13;hb=49ce7cb8387601982d5e6ef186ce206d38f6e3d7;hp=63eadfbe49c4a9ec317d718db68251f130ac1221;hpb=ddd261f331280640c5b53c7128230b629ebcd268;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 63eadfbe..67343161 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.
- *
+ * 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.
  * 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,9 +15,6 @@
  */
 package org.wamblee.system.graph.component;
 
-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;
@@ -25,64 +22,48 @@ 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.
- *
+ * Visitor that checks whether all required external interfaces of the container
+ * are provided.
+ * 
  * @author Erik Brakkee
  */
 public class CheckExternallyRequiredVisitor implements Visitor {
-    /**
-     * DOCUMENT ME!
-     */
-    private Log LOG = LogFactory.getLog(CheckExternallyRequiredVisitor.class);
+    private static final Logger LOG = Logger
+        .getLogger(CheckExternallyRequiredVisitor.class.getName());
 
-    /**
-     * DOCUMENT ME!
-     */
     private Graph graph;
 
     /**
      * Creates a new CheckExternallyRequiredVisitor object.
-     *
-     * @param aGraph DOCUMENT ME!
+     * 
      */
     public CheckExternallyRequiredVisitor(Graph aGraph) {
         graph = aGraph;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aEdge DOCUMENT ME!
-     */
     @Override
     public void visitEdge(Edge aEdge) {
         // Empty.
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aNode DOCUMENT ME!
-     */
     @Override
     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) {
@@ -91,11 +72,12 @@ public class CheckExternallyRequiredVisitor implements Visitor {
 
                 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);
+                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);
                 }
             }
         }