X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2Fcomponent%2FConnectExternalProvidedProvidedFilter.java;h=92ba1d11dc691cc9d25a826b5ff16e345e14c489;hb=49ce7cb8387601982d5e6ef186ce206d38f6e3d7;hp=62b1604d5c7fb9d15ce7b749a62fb5b15eb8a2c2;hpb=083acc90cf96997244a46066f26f468c6a9420ae;p=utils

diff --git a/system/general/src/main/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedFilter.java b/system/general/src/main/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedFilter.java
index 62b1604d..92ba1d11 100644
--- a/system/general/src/main/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedFilter.java
+++ b/system/general/src/main/java/org/wamblee/system/graph/component/ConnectExternalProvidedProvidedFilter.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.
@@ -17,57 +17,68 @@ 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 ConnectExternalProvidedProvidedFilter implements EdgeFilter {
+    private String externalProvided;
+
+    private String component;
 
-    private String _externalProvided;
-    private String _component;
-    private String _provided;
+    private String provided;
 
-    public ConnectExternalProvidedProvidedFilter(String aExternalProvided, String aComponent,
-            String aProvided) {
-        _externalProvided = aExternalProvided; 
-        _component = aComponent; 
-        _provided = aProvided; 
-        if ( _externalProvided == null ) { 
-            throw new IllegalArgumentException("External provided interface name must be specified."); 
+    /**
+     * Creates a new ConnectExternalProvidedProvidedFilter object.
+     * 
+     */
+    public ConnectExternalProvidedProvidedFilter(String aExternalProvided,
+        String aComponent, String aProvided) {
+        externalProvided = aExternalProvided;
+        component = aComponent;
+        provided = aProvided;
+
+        if (externalProvided == null) {
+            throw new IllegalArgumentException(
+                "External provided interface name must be specified.");
         }
-        if ( _component == null ) { 
-            throw new IllegalArgumentException("Component name must be specified");
+
+        if (component == null) {
+            throw new IllegalArgumentException(
+                "Component name must be specified");
         }
-        if ( _provided == null ) { 
-            throw new IllegalArgumentException("Provided interface name of internal component must be specified");
+
+        if (provided == null) {
+            throw new IllegalArgumentException(
+                "Provided interface name of internal component must be specified");
         }
     }
 
     @Override
     public boolean isViolated(Edge aEdge) {
-        if (aEdge.getFrom() instanceof ExternalProvidedInterfaceNode
-                && aEdge.getTo() instanceof ProvidedInterfaceNode) {
+        if (aEdge.getFrom() instanceof ExternalProvidedInterfaceNode &&
+            aEdge.getTo() instanceof ProvidedInterfaceNode) {
             return isViolated((ExternalProvidedInterfaceNode) aEdge.getFrom(),
-                    (ProvidedInterfaceNode) aEdge.getTo());
+                (ProvidedInterfaceNode) aEdge.getTo());
         }
+
         return false;
     }
 
     private boolean isViolated(ExternalProvidedInterfaceNode aFrom,
-            ProvidedInterfaceNode aTo) {
-        if ( !aFrom.getName().equals(_externalProvided)) { 
+        ProvidedInterfaceNode aTo) {
+        if (!aFrom.getName().equals(externalProvided)) {
             return false; // wrong provided interface.
         }
-        if ( aTo.getComponent().getName().equals(_component) && 
-               aTo.getProvided().getName().equals(_provided) ) { 
-            return false; // ok 
+
+        if (aTo.getComponent().getName().equals(component) &&
+            aTo.getProvided().getName().equals(provided)) {
+            return false; // ok
         }
-        return true; 
+
+        return true;
     }
 }