X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2Fcomponent%2FConnectRequiredExternallyRequiredEdgeFilter.java;h=13e3ddc07e4162074d5d3b74cb9346387fd47927;hb=8de36ff0206c996baf3ee4adc3e2293b12ff5f39;hp=c70840281ecda2e38e3a4f7cffa98199f97fd610;hpb=ad6e06e3c1ba0c4ae0dea100596b1c5503bfe1c6;p=utils

diff --git a/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilter.java b/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilter.java
index c7084028..13e3ddc0 100644
--- a/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilter.java
+++ b/system/general/src/main/java/org/wamblee/system/graph/component/ConnectRequiredExternallyRequiredEdgeFilter.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.
@@ -23,52 +23,66 @@ import org.wamblee.system.graph.EdgeFilter;
  * container.
  * 
  * @author Erik Brakkee
- * 
  */
 public class ConnectRequiredExternallyRequiredEdgeFilter implements EdgeFilter {
+    private String client;
 
-    private String _client;
-    private String _required;
-    private String _externalRequired;
+    private String required;
 
-    public ConnectRequiredExternallyRequiredEdgeFilter(String aClient, String aRequired,
-            String aExternalRequired) {
-        _client = aClient;
-        _required = aRequired;
-        _externalRequired = aExternalRequired; 
-        if ( _client == null ) { 
-            throw new IllegalArgumentException("Client component must be specified"); 
+    private String externalRequired;
+
+    /**
+     * Creates a new ConnectRequiredExternallyRequiredEdgeFilter object.
+     * 
+     */
+    public ConnectRequiredExternallyRequiredEdgeFilter(String aClient,
+        String aRequired, String aExternalRequired) {
+        client = aClient;
+        required = aRequired;
+        externalRequired = aExternalRequired;
+
+        if (client == null) {
+            throw new IllegalArgumentException(
+                "Client component must be specified");
         }
-        if ( _required == null ) { 
-            throw new IllegalArgumentException("Required interface must be specified");
+
+        if (required == null) {
+            throw new IllegalArgumentException(
+                "Required interface must be specified");
         }
-        if ( _externalRequired == null ) { 
-            throw new IllegalArgumentException("External required interface must be specified");
+
+        if (externalRequired == null) {
+            throw new IllegalArgumentException(
+                "External required interface must be specified");
         }
     }
 
     @Override
     public boolean isViolated(Edge aEdge) {
-        if (aEdge.getFrom() instanceof RequiredInterfaceNode
-                && aEdge.getTo() instanceof ExternalRequiredInterfaceNode) {
+        if (aEdge.getFrom() instanceof RequiredInterfaceNode &&
+            aEdge.getTo() instanceof ExternalRequiredInterfaceNode) {
             return isViolated((RequiredInterfaceNode) aEdge.getFrom(),
-                    (ExternalRequiredInterfaceNode) aEdge.getTo());
+                (ExternalRequiredInterfaceNode) aEdge.getTo());
         }
+
         return false;
     }
 
     private boolean isViolated(RequiredInterfaceNode aFrom,
-            ExternalRequiredInterfaceNode aTo) {
-        if ( !aFrom.getComponent().getName().equals(_client)) { 
-            return false; // wrong component. 
+        ExternalRequiredInterfaceNode aTo) {
+        if (!aFrom.getComponent().getName().equals(client)) {
+            return false; // wrong component.
         }
-        if ( !(_required == null || aFrom.getRequired().getName().equals(_required))) { 
+
+        if (!((required == null) || aFrom.getRequired().getName().equals(
+            required))) {
             return false; // wrong interface
         }
-        if ( !aTo.getRequired().getName().equals(_externalRequired)) { 
-            return true; // wrong externally required interface.  
+
+        if (!aTo.getRequired().getName().equals(externalRequired)) {
+            return true; // wrong externally required interface.
         }
-      
-        return false; 
+
+        return false;
     }
 }