Repository: struts Updated Branches: refs/heads/master 7873eb910 -> 45c113eaa
replaced constants for marking status with enum Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/45c113ea Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/45c113ea Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/45c113ea Branch: refs/heads/master Commit: 45c113eaa98554ab1ca8d3d184968095e1ac3cca Parents: 7873eb9 Author: Stefaan Dutry <stefaan.du...@gmail.com> Authored: Fri Sep 16 08:17:38 2016 +0200 Committer: Stefaan Dutry <stefaan.du...@gmail.com> Committed: Fri Sep 16 08:17:38 2016 +0200 ---------------------------------------------------------------------- .../xwork2/config/providers/CycleDetector.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/45c113ea/core/src/main/java/com/opensymphony/xwork2/config/providers/CycleDetector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/CycleDetector.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/CycleDetector.java index 82a7266..0e45f5d 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/CycleDetector.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/CycleDetector.java @@ -6,11 +6,11 @@ import java.util.List; import java.util.Map; public class CycleDetector<T> { - private static final String marked = "marked"; - private static final String complete = "complete"; private DirectedGraph<T> graph; - private Map<T, String> marks; + private Map<T, Status> marks; private List<T> verticesInCycles; + + private enum Status { MARKED, COMPLETE }; public CycleDetector(DirectedGraph<T> graph) { this.graph = graph; @@ -35,9 +35,9 @@ public class CycleDetector<T> { * return statements commented out for fail slow behavior detect all nodes in cycles instead of just the first one */ List<T> localCycles = new ArrayList<T>(); - marks.put(vertex, marked); + marks.put(vertex, Status.MARKED); for (T u : graph.edgesFrom(vertex)) { - if (marks.containsKey(u) && marks.get(u).equals(marked)) { + if (marks.get(u) == Status.MARKED) { localCycles.add(vertex); // return true; } else if (!marks.containsKey(u)) { @@ -47,7 +47,7 @@ public class CycleDetector<T> { } } } - marks.put(vertex, complete); + marks.put(vertex, Status.COMPLETE); // return false; verticesInCycles.addAll(localCycles); return !localCycles.isEmpty();