X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2Fcomponent%2FConnectRequiredProvidedEdgeFilter.java;h=bb6b1343631d04b39c7e611ddafec1ee9519ea82;hb=ddd261f331280640c5b53c7128230b629ebcd268;hp=a1d2481f60d324f9ba89664d250bb5b021896dbe;hpb=e1975449f1bf16ccb441632d68e440f3e3704a79;p=utils

diff --git a/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilter.java b/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilter.java
index a1d2481f..bb6b1343 100644
--- a/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilter.java
+++ b/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilter.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.
@@ -18,59 +18,99 @@ package org.wamblee.system.graph.component;
 import org.wamblee.system.graph.Edge;
 import org.wamblee.system.graph.EdgeFilter;
 
+
 /**
- * Filter used to explicitly connect required and provided interfaces within a
- * container.
- * 
+ * Filter used to explicitly connect required and provided interfaces
+ * within a container.
+ *
  * @author Erik Brakkee
- * 
  */
 public class ConnectRequiredProvidedEdgeFilter implements EdgeFilter {
+    /**
+     * DOCUMENT ME!
+     */
+    private String client;
+
+    /**
+     * DOCUMENT ME!
+     */
+    private String required;
 
-    private String _client;
-    private String _required;
-    private String _server;
-    private String _provided;
+    /**
+     * DOCUMENT ME!
+     */
+    private String server;
 
+    /**
+     * DOCUMENT ME!
+     */
+    private String provided;
+
+    /**
+     * Creates a new ConnectRequiredProvidedEdgeFilter object.
+     *
+     * @param aClient DOCUMENT ME!
+     * @param aRequired DOCUMENT ME!
+     * @param aServer DOCUMENT ME!
+     * @param aProvided DOCUMENT ME!
+     */
     public ConnectRequiredProvidedEdgeFilter(String aClient, String aRequired,
-            String aServer, String aProvided) {
-        _client = aClient;
-        _required = aRequired;
-        _server = aServer;
-        _provided = aProvided;
-        if ( _client == null ) { 
-            throw new IllegalArgumentException("Client component must be specified"); 
+        String aServer, String aProvided) {
+        client       = aClient;
+        required     = aRequired;
+        server       = aServer;
+        provided     = aProvided;
+
+        if (client == null) {
+            throw new IllegalArgumentException(
+                "Client component must be specified");
         }
     }
 
+    /**
+     * DOCUMENT ME!
+     *
+     * @param aEdge DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
     @Override
     public boolean isViolated(Edge aEdge) {
         if (aEdge.getFrom() instanceof RequiredInterfaceNode
                 && aEdge.getTo() instanceof ProvidedInterfaceNode) {
             return isViolated((RequiredInterfaceNode) aEdge.getFrom(),
-                    (ProvidedInterfaceNode) aEdge.getTo());
+                (ProvidedInterfaceNode) aEdge.getTo());
         }
+
         return false;
     }
 
+    /**
+     * DOCUMENT ME!
+     *
+     * @param aFrom DOCUMENT ME!
+     * @param aTo DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
     private boolean isViolated(RequiredInterfaceNode aFrom,
-            ProvidedInterfaceNode aTo) {
-        if (_client.equals(aFrom.getComponent().getName())
-                && (_required == null || _required.equals(aFrom.getRequired()
-                        .getName()))) {
+        ProvidedInterfaceNode aTo) {
+        if (client.equals(aFrom.getComponent().getName())
+                && ((required == null)
+                || required.equals(aFrom.getRequired().getName()))) {
             // From part matches.
-            if ( _server == null ) { 
+            if (server == null) {
                 return true; // all connections are eliminated
             }
-            if (_server.equals(aTo.getComponent().getName())
-                    && (_provided == null || _provided.equals(aTo.getProvided()
-                            .getName()))) {
+
+            if (server.equals(aTo.getComponent().getName())
+                    && ((provided == null)
+                    || provided.equals(aTo.getProvided().getName()))) {
                 // to part matches also
                 return false;
-            }
-            else { 
+            } else {
                 // From matches and to doesn't so edgefilter is violated.
-                return true; 
+                return true;
             }
         } else {
             // From part does not match, restriction does not apply.