X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2Fcomponent%2FConnectRequiredProvidedEdgeFilter.java;h=a3c3f6d585cf4a1d61038a1515b3141690445a5e;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;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..a3c3f6d5 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 @@ -17,8 +17,6 @@ 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 @@ -29,18 +27,18 @@ import org.wamblee.system.graph.Node; */ public class ConnectRequiredProvidedEdgeFilter implements EdgeFilter { - private String _client; - private String _required; - private String _server; - private String _provided; + private String client; + private String required; + private String server; + private String provided; public ConnectRequiredProvidedEdgeFilter(String aClient, String aRequired, String aServer, String aProvided) { - _client = aClient; - _required = aRequired; - _server = aServer; - _provided = aProvided; - if ( _client == null ) { + client = aClient; + required = aRequired; + server = aServer; + provided = aProvided; + if ( client == null ) { throw new IllegalArgumentException("Client component must be specified"); } } @@ -57,15 +55,15 @@ public class ConnectRequiredProvidedEdgeFilter implements EdgeFilter { private boolean isViolated(RequiredInterfaceNode aFrom, ProvidedInterfaceNode aTo) { - if (_client.equals(aFrom.getComponent().getName()) - && (_required == null || _required.equals(aFrom.getRequired() + 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() + if (server.equals(aTo.getComponent().getName()) + && (provided == null || provided.equals(aTo.getProvided() .getName()))) { // to part matches also return false;