Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/SccAlgorithm.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/SccAlgorithm.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/SccAlgorithm.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/SccAlgorithm.java Wed Mar 7 09:40:01 2012 @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.commons.graph.Vertex; -interface SccAlgorithm<V extends Vertex> +interface SccAlgorithm<V> { Set<Set<V>> perform();
Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/SccAlgorithmSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/SccAlgorithmSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/SccAlgorithmSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/SccAlgorithmSelector.java Wed Mar 7 09:40:01 2012 @@ -31,7 +31,7 @@ import org.apache.commons.graph.Vertex; * @param <V> the Graph vertices type. * @param <E> the Graph edges type. */ -public interface SccAlgorithmSelector<V extends Vertex, E extends Edge, G extends DirectedGraph<V, E>> +public interface SccAlgorithmSelector<V, E, G extends DirectedGraph<V, E>> { /** Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/TarjanAlgorithm.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/TarjanAlgorithm.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/TarjanAlgorithm.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/TarjanAlgorithm.java Wed Mar 7 09:40:01 2012 @@ -39,7 +39,7 @@ import org.apache.commons.graph.Vertex; * @param <E> the Graph edges type. * @param <G> the directed graph type */ -final class TarjanAlgorithm<V extends Vertex, E extends Edge, G extends DirectedGraph<V, E>> +final class TarjanAlgorithm<V, E, G extends DirectedGraph<V, E>> implements SccAlgorithm<V> { @@ -91,7 +91,7 @@ final class TarjanAlgorithm<V extends Ve return vertexMetaInfo; } - private static <V extends Vertex, E extends Edge> void strongConnect( DirectedGraph<V, E> graph, + private static <V, E> void strongConnect( DirectedGraph<V, E> graph, V vertex, Map<V, TarjanVertexMetaInfo> verticesMetaInfo, Stack<V> s, Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/AllVertexPairsShortestPath.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/AllVertexPairsShortestPath.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/AllVertexPairsShortestPath.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/AllVertexPairsShortestPath.java Wed Mar 7 09:40:01 2012 @@ -37,7 +37,7 @@ import org.apache.commons.graph.weight.O * @param <WE> the Graph weighted edges type * @param <W> the weight type */ -public final class AllVertexPairsShortestPath<V extends Vertex, WE extends WeightedEdge<W>, W> +public final class AllVertexPairsShortestPath<V, WE, W> { private final Map<VertexPair<V>, WeightedPath<V, WE, W>> paths = new HashMap<VertexPair<V>, WeightedPath<V, WE, W>>(); Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultHeuristicBuilder.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultHeuristicBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultHeuristicBuilder.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultHeuristicBuilder.java Wed Mar 7 09:40:01 2012 @@ -33,7 +33,7 @@ import org.apache.commons.graph.Weighted import org.apache.commons.graph.collections.FibonacciHeap; import org.apache.commons.graph.weight.OrderedMonoid; -final class DefaultHeuristicBuilder<V extends Vertex, WE extends WeightedEdge<W>, W, G extends WeightedGraph<V, WE, W>, WO extends OrderedMonoid<W>> +final class DefaultHeuristicBuilder<V, WE, W, G extends WeightedGraph<V, WE, W>, WO extends OrderedMonoid<W>> implements HeuristicBuilder<V, WE, W, G, WO> { Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultPathSourceSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultPathSourceSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultPathSourceSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultPathSourceSelector.java Wed Mar 7 09:40:01 2012 @@ -32,7 +32,7 @@ import org.apache.commons.graph.Weighted import org.apache.commons.graph.WeightedPath; import org.apache.commons.graph.weight.OrderedMonoid; -public final class DefaultPathSourceSelector<V extends Vertex, WE extends WeightedEdge<W>, W, G extends WeightedGraph<V, WE, W>> +public final class DefaultPathSourceSelector<V, WE, W, G extends WeightedGraph<V, WE, W>> implements PathSourceSelector<V, WE, W, G> { Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultShortestPathAlgorithmSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultShortestPathAlgorithmSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultShortestPathAlgorithmSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultShortestPathAlgorithmSelector.java Wed Mar 7 09:40:01 2012 @@ -32,7 +32,7 @@ import org.apache.commons.graph.Weighted import org.apache.commons.graph.collections.FibonacciHeap; import org.apache.commons.graph.weight.OrderedMonoid; -final class DefaultShortestPathAlgorithmSelector<V extends Vertex, WE extends WeightedEdge<W>, W, G extends WeightedGraph<V, WE, W>> +final class DefaultShortestPathAlgorithmSelector<V, WE, W, G extends WeightedGraph<V, WE, W>> implements ShortestPathAlgorithmSelector<V, WE, W, G> { Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultTargetSourceSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultTargetSourceSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultTargetSourceSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultTargetSourceSelector.java Wed Mar 7 09:40:01 2012 @@ -28,7 +28,7 @@ import org.apache.commons.graph.Weighted import org.apache.commons.graph.WeightedPath; import org.apache.commons.graph.weight.OrderedMonoid; -final class DefaultTargetSourceSelector<V extends Vertex, WE extends WeightedEdge<W>, W, G extends WeightedGraph<V, WE, W>> +final class DefaultTargetSourceSelector<V, WE, W, G extends WeightedGraph<V, WE, W>> implements TargetSourceSelector<V, WE, W, G> { Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/Heuristic.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/Heuristic.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/Heuristic.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/Heuristic.java Wed Mar 7 09:40:01 2012 @@ -28,7 +28,7 @@ import org.apache.commons.graph.Vertex; * @param <V> the Graph vertices type * @param <W> the weight type */ -public interface Heuristic<V extends Vertex, W> +public interface Heuristic<V, W> { /** Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/HeuristicBuilder.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/HeuristicBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/HeuristicBuilder.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/HeuristicBuilder.java Wed Mar 7 09:40:01 2012 @@ -32,7 +32,7 @@ import org.apache.commons.graph.weight.O * @param <W> * @param <G> */ -public interface HeuristicBuilder<V extends Vertex, WE extends WeightedEdge<W>, W, G extends WeightedGraph<V, WE, W>, WO extends OrderedMonoid<W>> +public interface HeuristicBuilder<V, WE, W, G extends WeightedGraph<V, WE, W>, WO extends OrderedMonoid<W>> { /** Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PathSourceSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PathSourceSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PathSourceSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PathSourceSelector.java Wed Mar 7 09:40:01 2012 @@ -32,7 +32,7 @@ import org.apache.commons.graph.weight.O * @param <WE> * @param <G> */ -public interface PathSourceSelector<V extends Vertex, WE extends WeightedEdge<W>, W, G extends WeightedGraph<V, WE, W>> +public interface PathSourceSelector<V, WE, W, G extends WeightedGraph<V, WE, W>> { /** Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PredecessorsList.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PredecessorsList.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PredecessorsList.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PredecessorsList.java Wed Mar 7 09:40:01 2012 @@ -38,7 +38,7 @@ import org.apache.commons.graph.weight.M * @param <WE> the Graph weighted edges type * @param <W> the weight type */ -public final class PredecessorsList<V extends Vertex, WE extends WeightedEdge<W>, W> +public final class PredecessorsList<V, WE, W> { private final Graph<V, WE> graph; Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/ShortestDistances.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/ShortestDistances.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/ShortestDistances.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/ShortestDistances.java Wed Mar 7 09:40:01 2012 @@ -32,7 +32,7 @@ import org.apache.commons.graph.weight.O * @param <V> the Graph vertices type * @param <W> the weight type */ -final class ShortestDistances<V extends Vertex, W> +final class ShortestDistances<V, W> implements Comparator<V> { Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/ShortestPathAlgorithmSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/ShortestPathAlgorithmSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/ShortestPathAlgorithmSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/ShortestPathAlgorithmSelector.java Wed Mar 7 09:40:01 2012 @@ -33,7 +33,7 @@ import org.apache.commons.graph.weight.O * @param <WE> * @param <G> */ -public interface ShortestPathAlgorithmSelector<V extends Vertex, WE extends WeightedEdge<W>, W, G extends WeightedGraph<V, WE, W>> +public interface ShortestPathAlgorithmSelector<V, WE, W, G extends WeightedGraph<V, WE, W>> { /** Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/TargetSourceSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/TargetSourceSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/TargetSourceSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/TargetSourceSelector.java Wed Mar 7 09:40:01 2012 @@ -32,7 +32,7 @@ import org.apache.commons.graph.weight.O * @param <WE> * @param <G> */ -public interface TargetSourceSelector<V extends Vertex, WE extends WeightedEdge<W>, W, G extends WeightedGraph<V, WE, W>> +public interface TargetSourceSelector<V, WE, W, G extends WeightedGraph<V, WE, W>> { /** Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeAlgorithmSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeAlgorithmSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeAlgorithmSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeAlgorithmSelector.java Wed Mar 7 09:40:01 2012 @@ -48,7 +48,7 @@ import org.apache.commons.graph.weight.O * @param <WE> the Graph weighted edges type * @param <G> the input Graph type */ -final class DefaultSpanningTreeAlgorithmSelector<V extends Vertex, W, WE extends WeightedEdge<W>, G extends Graph<V, WE>> +final class DefaultSpanningTreeAlgorithmSelector<V, W, WE, G extends Graph<V, WE>> implements SpanningTreeAlgorithmSelector<V, W, WE, G> { /** The graph. */ Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeSourceSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeSourceSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeSourceSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeSourceSelector.java Wed Mar 7 09:40:01 2012 @@ -47,7 +47,7 @@ import org.apache.commons.graph.weight.O * @param <WE> the Graph weighted edges type * @param <G> the input Graph type */ -public final class DefaultSpanningTreeSourceSelector<V extends Vertex, W, WE extends WeightedEdge<W>, G extends Graph<V, WE>> +public final class DefaultSpanningTreeSourceSelector<V, W, WE, G extends Graph<V, WE>> implements SpanningTreeSourceSelector<V, W, WE, G> { Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/ReverseDeleteGraph.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/ReverseDeleteGraph.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/ReverseDeleteGraph.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/ReverseDeleteGraph.java Wed Mar 7 09:40:01 2012 @@ -34,7 +34,7 @@ import org.apache.commons.graph.Weighted * @param <WE> * @param <W> */ -final class ReverseDeleteGraph<V extends Vertex, WE extends WeightedEdge<W>, W> +final class ReverseDeleteGraph<V, WE, W> implements WeightedGraph<V, WE, W> { Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/ShortestEdges.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/ShortestEdges.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/ShortestEdges.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/ShortestEdges.java Wed Mar 7 09:40:01 2012 @@ -41,7 +41,7 @@ import org.apache.commons.graph.weight.O * @param <E> the Graph edges type * @param <W> the weight type */ -final class ShortestEdges<V extends Vertex, WE extends WeightedEdge<W>, W> +final class ShortestEdges<V, WE, W> implements Comparator<V> { @@ -96,7 +96,7 @@ final class ShortestEdges<V extends Vert return spanningTree; } - private static <V extends Vertex, WE extends WeightedEdge<W>, W> void addEdgeIgnoringExceptions( V vertex, + private static <V, WE, W> void addEdgeIgnoringExceptions( V vertex, MutableSpanningTree<V, WE, W> spanningTree ) { try Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeAlgorithmSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeAlgorithmSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeAlgorithmSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeAlgorithmSelector.java Wed Mar 7 09:40:01 2012 @@ -33,7 +33,7 @@ import org.apache.commons.graph.weight.O * @param <WE> the Graph weighted edges type * @param <G> the input Graph type */ -public interface SpanningTreeAlgorithmSelector<V extends Vertex, W, WE extends WeightedEdge<W>, G extends Graph<V, WE>> +public interface SpanningTreeAlgorithmSelector<V, W, WE, G extends Graph<V, WE>> { /** Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeSourceSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeSourceSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeSourceSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeSourceSelector.java Wed Mar 7 09:40:01 2012 @@ -33,7 +33,7 @@ import org.apache.commons.graph.weight.O * @param <WE> the Graph weighted edges type * @param <G> the input Graph type */ -public interface SpanningTreeSourceSelector<V extends Vertex, W, WE extends WeightedEdge<W>, G extends Graph<V, WE>> +public interface SpanningTreeSourceSelector<V, W, WE, G extends Graph<V, WE>> { /** Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SuperVertex.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SuperVertex.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SuperVertex.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SuperVertex.java Wed Mar 7 09:40:01 2012 @@ -40,7 +40,7 @@ import org.apache.commons.graph.Weighted * @param <G> the input Graph type * @param <WC> the weight operations */ -class SuperVertex<V extends Vertex, W, WE extends WeightedEdge<W>, G extends Graph<V, WE>, WC extends Comparator<W>> +class SuperVertex<V, W, WE, G extends Graph<V, WE>, WC extends Comparator<W>> implements Iterable<V> { /** The reference to the graph. */ Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/WeightedEdgesComparator.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/WeightedEdgesComparator.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/WeightedEdgesComparator.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/WeightedEdgesComparator.java Wed Mar 7 09:40:01 2012 @@ -28,7 +28,7 @@ import java.util.Comparator; * @param <W> * @param <WE> */ -public class WeightedEdgesComparator<W, WE extends WeightedEdge<W>> +public class WeightedEdgesComparator<W, WE> implements Comparator<WE> { Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/BaseGraphVisitHandler.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/BaseGraphVisitHandler.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/BaseGraphVisitHandler.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/BaseGraphVisitHandler.java Wed Mar 7 09:40:01 2012 @@ -29,7 +29,7 @@ import org.apache.commons.graph.Vertex; * @param <V> the Graph vertices type * @param <E> the Graph edges type */ -public class BaseGraphVisitHandler<V extends Vertex, E extends Edge, G extends Graph<V, E>, O> +public class BaseGraphVisitHandler<V, E, G extends Graph<V, E>, O> implements GraphVisitHandler<V, E, G, O> { Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/DefaultVisitAlgorithmsSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/DefaultVisitAlgorithmsSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/DefaultVisitAlgorithmsSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/DefaultVisitAlgorithmsSelector.java Wed Mar 7 09:40:01 2012 @@ -39,7 +39,7 @@ import org.apache.commons.graph.VertexPa * @param <E> the Graph edges type * @param <G> the Graph type */ -final class DefaultVisitAlgorithmsSelector<V extends Vertex, E extends Edge, G extends Graph<V, E>> +final class DefaultVisitAlgorithmsSelector<V, E, G extends Graph<V, E>> implements VisitAlgorithmsSelector<V, E, G> { Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/DefaultVisitSourceSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/DefaultVisitSourceSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/DefaultVisitSourceSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/DefaultVisitSourceSelector.java Wed Mar 7 09:40:01 2012 @@ -33,7 +33,7 @@ import org.apache.commons.graph.Vertex; * @param <E> the Graph edges type * @param <G> the Graph type */ -public final class DefaultVisitSourceSelector<V extends Vertex, E extends Edge, G extends Graph<V, E>> +public final class DefaultVisitSourceSelector<V, E, G extends Graph<V, E>> implements VisitSourceSelector<V, E, G> { Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/GraphVisitHandler.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/GraphVisitHandler.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/GraphVisitHandler.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/GraphVisitHandler.java Wed Mar 7 09:40:01 2012 @@ -27,7 +27,7 @@ import org.apache.commons.graph.Vertex; * A {@link GraphVisitHandler} controls the execution of breadth-first and depth-first search * algorithms in {@link Visit}. */ -public interface GraphVisitHandler<V extends Vertex, E extends Edge, G extends Graph<V, E>, O> +public interface GraphVisitHandler<V, E, G extends Graph<V, E>, O> { /** Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitAlgorithmsSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitAlgorithmsSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitAlgorithmsSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitAlgorithmsSelector.java Wed Mar 7 09:40:01 2012 @@ -30,7 +30,7 @@ import org.apache.commons.graph.Vertex; * @param <E> the Graph edges type * @param <G> the Graph type */ -public interface VisitAlgorithmsSelector<V extends Vertex, E extends Edge, G extends Graph<V, E>> +public interface VisitAlgorithmsSelector<V, E, G extends Graph<V, E>> { /** Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitGraphBuilder.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitGraphBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitGraphBuilder.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitGraphBuilder.java Wed Mar 7 09:40:01 2012 @@ -33,7 +33,7 @@ import org.apache.commons.graph.model.Un * @param <V> the Graph vertices type. * @param <E> the Graph edges type. */ -final class VisitGraphBuilder<V extends Vertex, E extends Edge, G extends Graph<V, E>> +final class VisitGraphBuilder<V, E, G extends Graph<V, E>> extends BaseGraphVisitHandler<V, E, G, Graph<V, E>> { Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitSourceSelector.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitSourceSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitSourceSelector.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitSourceSelector.java Wed Mar 7 09:40:01 2012 @@ -30,7 +30,7 @@ import org.apache.commons.graph.Vertex; * @param <E> the Graph edges type * @param <G> the Graph type */ -public interface VisitSourceSelector<V extends Vertex, E extends Edge, G extends Graph<V, E>> +public interface VisitSourceSelector<V, E, G extends Graph<V, E>> { /** Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/builder/GraphBuilderTestCase.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/builder/GraphBuilderTestCase.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/builder/GraphBuilderTestCase.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/builder/GraphBuilderTestCase.java Wed Mar 7 09:40:01 2012 @@ -20,12 +20,11 @@ package org.apache.commons.graph.builder */ import static org.apache.commons.graph.CommonsGraph.newUndirectedMutableWeightedGraph; - import static org.junit.Assert.assertEquals; import org.apache.commons.graph.model.BaseLabeledVertex; import org.apache.commons.graph.model.BaseLabeledWeightedEdge; -import org.apache.commons.graph.model.UndirectedMutableWeightedGraph; +import org.apache.commons.graph.model.UndirectedMutableGraph; import org.junit.Test; public final class GraphBuilderTestCase @@ -34,8 +33,8 @@ public final class GraphBuilderTestCase @Test public void verifyProducedGraphesAreEquals() { - UndirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Double>, Double> expected = - new UndirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Double>, Double>(); + UndirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Double>> expected = + new UndirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Double>>(); // building Graph with traditional APIs... @@ -67,7 +66,7 @@ public final class GraphBuilderTestCase // ... and using the EDSL :) - UndirectedMutableWeightedGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Double>, Double> actual = + UndirectedMutableGraph<BaseLabeledVertex, BaseLabeledWeightedEdge<Double>> actual = newUndirectedMutableWeightedGraph( new AbstractGraphConnection<BaseLabeledVertex, BaseLabeledWeightedEdge<Double>>() { Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/coloring/AbstractColoringTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/coloring/AbstractColoringTest.java?rev=1297912&r1=1297911&r2=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/coloring/AbstractColoringTest.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/coloring/AbstractColoringTest.java Wed Mar 7 09:40:01 2012 @@ -79,7 +79,7 @@ abstract class AbstractColoringTest * @param g * @param coloredVertices */ - protected <V extends Vertex, E extends Edge, C> void checkColoring( UndirectedMutableGraph<V, E> g, + protected <V, E, C> void checkColoring( UndirectedMutableGraph<V, E> g, ColoredVertices<V, C> coloredVertices ) { for ( E e : g.getEdges() ) Copied: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledEdge.java (from r1297891, commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledEdge.java) URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledEdge.java?p2=commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledEdge.java&p1=commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledEdge.java&r1=1297891&r2=1297912&rev=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledEdge.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledEdge.java Wed Mar 7 09:40:01 2012 @@ -22,15 +22,9 @@ package org.apache.commons.graph.model; import static java.lang.String.format; import static org.apache.commons.graph.utils.Assertions.checkNotNull; -import org.apache.commons.graph.Edge; -import org.apache.commons.graph.Labeled; - public class BaseLabeledEdge - implements Edge, Labeled { - private static final long serialVersionUID = 1L; - private final String label; public BaseLabeledEdge( String label ) Copied: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledVertex.java (from r1297891, commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledVertex.java) URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledVertex.java?p2=commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledVertex.java&p1=commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledVertex.java&r1=1297891&r2=1297912&rev=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledVertex.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledVertex.java Wed Mar 7 09:40:01 2012 @@ -22,15 +22,9 @@ package org.apache.commons.graph.model; import static java.lang.String.format; import static org.apache.commons.graph.utils.Assertions.checkNotNull; -import org.apache.commons.graph.Labeled; -import org.apache.commons.graph.Vertex; - public class BaseLabeledVertex - implements Labeled, Vertex { - private static final long serialVersionUID = 1895831541078075882L; - private final String label; public BaseLabeledVertex( String label ) Copied: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledWeightedEdge.java (from r1297891, commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledWeightedEdge.java) URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledWeightedEdge.java?p2=commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledWeightedEdge.java&p1=commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledWeightedEdge.java&r1=1297891&r2=1297912&rev=1297912&view=diff ============================================================================== --- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledWeightedEdge.java (original) +++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledWeightedEdge.java Wed Mar 7 09:40:01 2012 @@ -22,18 +22,13 @@ package org.apache.commons.graph.model; import static java.lang.String.format; import static org.apache.commons.graph.utils.Assertions.checkNotNull; -import org.apache.commons.graph.WeightedEdge; - /** * */ public class BaseLabeledWeightedEdge<W> extends BaseLabeledEdge - implements WeightedEdge<W> { - private static final long serialVersionUID = 4093288823907255359L; - private final W weight; public BaseLabeledWeightedEdge( String label, W weight )
