X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2Fcomponent%2FConnectRequiredProvidedEdgeFilter.java;h=a2f918774d3029501c831ff1b8c00df9a39c2ad1;hb=17775e14ecfb286e59f67117e5cee7e21e95ab1f;hp=f04b381f0abb3d0749d132d8a1d66cb4b0ec2b0b;hpb=102eebeba2200f9bb2d8523bdfe7ace4ff663628;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 f04b381f..a2f91877 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,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.
@@ -12,67 +12,73 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
+ */ 
 package org.wamblee.system.graph.component;
 
 import org.wamblee.system.graph.Edge;
 import org.wamblee.system.graph.EdgeFilter;
-import org.wamblee.system.graph.EdgeSelector;
-import org.wamblee.system.graph.Node;
 
 /**
  * Filter used to explicitly connect required and provided interfaces within a
  * container.
  * 
  * @author Erik Brakkee
- * 
  */
 public class ConnectRequiredProvidedEdgeFilter implements EdgeFilter {
+    private String client;
+
+    private String required;
+
+    private String server;
 
-    private String _client;
-    private String _required;
-    private String _server;
-    private String _provided;
+    private String provided;
 
+    /**
+     * Creates a new ConnectRequiredProvidedEdgeFilter object.
+     * 
+     */
     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");
         }
     }
 
     @Override
     public boolean isViolated(Edge aEdge) {
-        if (aEdge.getFrom() instanceof RequiredInterfaceNode
-                && aEdge.getTo() instanceof ProvidedInterfaceNode) {
+        if (aEdge.getFrom() instanceof RequiredInterfaceNode &&
+            aEdge.getTo() instanceof ProvidedInterfaceNode) {
             return isViolated((RequiredInterfaceNode) aEdge.getFrom(),
-                    (ProvidedInterfaceNode) aEdge.getTo());
+                (ProvidedInterfaceNode) aEdge.getTo());
         }
+
         return false;
     }
 
     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.