git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed DOCUMENT ME comments that were generated and applied source code
[utils]
/
system
/
general
/
src
/
main
/
java
/
org
/
wamblee
/
system
/
graph
/
component
/
ConnectRequiredProvidedEdgeFilter.java
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 bb6b1343631d04b39c7e611ddafec1ee9519ea82..e6604b7d590c11aa5d9d7d409a12d021857b93b0 100644
(file)
--- 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
@@
-18,48
+18,31
@@
package org.wamblee.system.graph.component;
import org.wamblee.system.graph.Edge;
import org.wamblee.system.graph.EdgeFilter;
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 {
* @author Erik Brakkee
*/
public class ConnectRequiredProvidedEdgeFilter implements EdgeFilter {
- /**
- * DOCUMENT ME!
- */
private String client;
private String client;
- /**
- * DOCUMENT ME!
- */
private String required;
private String required;
- /**
- * DOCUMENT ME!
- */
private String server;
private String server;
- /**
- * DOCUMENT ME!
- */
private String provided;
/**
* Creates a new ConnectRequiredProvidedEdgeFilter object.
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) {
*/
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(
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) {
@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());
}
return isViolated((RequiredInterfaceNode) aEdge.getFrom(),
(ProvidedInterfaceNode) aEdge.getTo());
}
@@
-85,27
+61,19
@@
public class ConnectRequiredProvidedEdgeFilter implements EdgeFilter {
return false;
}
return false;
}
- /**
- * DOCUMENT ME!
- *
- * @param aFrom DOCUMENT ME!
- * @param aTo DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
private boolean isViolated(RequiredInterfaceNode aFrom,
ProvidedInterfaceNode aTo) {
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
}
// 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 {
// to part matches also
return false;
} else {