diff --git a/src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java b/src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java index b3e82603..dd58f4f4 100644 --- a/src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java +++ b/src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java @@ -38,13 +38,13 @@ public class CycleDetector public static List hasCycle( final DAG graph ) { - final List verticies = graph.getVerticies(); + final List vertices = graph.getVertices(); final Map vertexStateMap = new HashMap(); List retValue = null; - for ( Vertex vertex : verticies ) + for ( Vertex vertex : vertices ) { if ( isNotVisited( vertex, vertexStateMap ) ) { diff --git a/src/main/java/org/codehaus/plexus/util/dag/DAG.java b/src/main/java/org/codehaus/plexus/util/dag/DAG.java index 715f7624..791b29e2 100644 --- a/src/main/java/org/codehaus/plexus/util/dag/DAG.java +++ b/src/main/java/org/codehaus/plexus/util/dag/DAG.java @@ -45,7 +45,7 @@ public class DAG implements Cloneable, Serializable private Map vertexMap = new HashMap(); /** - * Conatin list of all verticies + * Conatin list of all vertices */ private List vertexList = new ArrayList(); @@ -68,11 +68,19 @@ public DAG() /** * @return */ - public List getVerticies() + public List getVertices() { return vertexList; } + /** + * @deprecated instead use {@link #getVertices()} + */ + @Deprecated + public List getVerticies() + { + return getVertices(); + } public Set getLabels() { diff --git a/src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java b/src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java index 629c9604..2d32f8f3 100644 --- a/src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java +++ b/src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java @@ -61,7 +61,7 @@ private static List dfs( final DAG graph ) final List retValue = new LinkedList(); final Map vertexStateMap = new HashMap(); - for ( Vertex vertex : graph.getVerticies() ) + for ( Vertex vertex : graph.getVertices() ) { if ( isNotVisited( vertex, vertexStateMap ) ) { diff --git a/src/test/java/org/codehaus/plexus/util/dag/DAGTest.java b/src/test/java/org/codehaus/plexus/util/dag/DAGTest.java index de599ad4..81b2128e 100644 --- a/src/test/java/org/codehaus/plexus/util/dag/DAGTest.java +++ b/src/test/java/org/codehaus/plexus/util/dag/DAGTest.java @@ -36,19 +36,19 @@ public void testDAG() dag.addVertex( "a" ); - assertEquals( 1, dag.getVerticies().size() ); + assertEquals( 1, dag.getVertices().size() ); assertEquals( "a", dag.getVertex( "a" ).getLabel() ); dag.addVertex( "a" ); - assertEquals( 1, dag.getVerticies().size() ); + assertEquals( 1, dag.getVertices().size() ); assertEquals( "a", dag.getVertex( "a" ).getLabel() ); dag.addVertex( "b" ); - assertEquals( 2, dag.getVerticies().size() ); + assertEquals( 2, dag.getVertices().size() ); assertFalse( dag.hasEdge( "a", "b" ) ); @@ -74,7 +74,7 @@ public void testDAG() dag.addEdge( "c", "d" ); - assertEquals( 4, dag.getVerticies().size() ); + assertEquals( 4, dag.getVertices().size() ); final Vertex c = dag.getVertex( "c" );