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=96c8961955a306314dfe0cf9ca192252de39fc1c;hp=bb6b1343631d04b39c7e611ddafec1ee9519ea82;hpb=f4d446b84fa1a38ed83cd157f79fdb8233822145;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 bb6b1343..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,65 +1,48 @@
 /*
- * 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.
  * 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;
 
-
 /**
- * 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;
 
-    /**
-     * 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;
+        client = aClient;
+        required = aRequired;
+        server = aServer;
+        provided = aProvided;
 
         if (client == null) {
             throw new IllegalArgumentException(
@@ -67,17 +50,10 @@ public class ConnectRequiredProvidedEdgeFilter implements EdgeFilter {
         }
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aEdge DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
     @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());
         }
@@ -85,27 +61,19 @@ public class ConnectRequiredProvidedEdgeFilter implements EdgeFilter {
         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()))) {
+        if (client.equals(aFrom.getComponent().getName()) &&
+            ((required == null) || required.equals(aFrom.getRequired()
+                .getName()))) {
             // From part matches.
             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 {