commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1297912 [1/2] - in /commons/sandbox/graph/branches/drop-marker-interfaces-feature/src: main/java/org/apache/commons/graph/ main/java/org/apache/commons/graph/builder/ main/java/org/apache/commons/graph/coloring/ main/java/org/apache/common...
Date Wed, 07 Mar 2012 09:40:04 GMT
Author: simonetripodi
Date: Wed Mar  7 09:40:01 2012
New Revision: 1297912

URL: http://svn.apache.org/viewvc?rev=1297912&view=rev
Log:
[SANDBOX-409] started brute-forcing dropping all marker interfaces - code obviously doesn't compile but anyway this is the experimental branch

Added:
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledEdge.java
      - copied, changed from r1297891, commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledEdge.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledVertex.java
      - copied, changed from r1297891, commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledVertex.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/model/BaseLabeledWeightedEdge.java
      - copied, changed from r1297891, commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledWeightedEdge.java
Removed:
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/Edge.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/Labeled.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/SpanningTree.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/Vertex.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/WeightedEdge.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/WeightedGraph.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledEdge.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledVertex.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseLabeledWeightedEdge.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/DirectedMutableWeightedGraph.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/UndirectedMutableWeightedGraph.java
Modified:
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/CommonsGraph.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/DirectedGraph.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/Graph.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/MutableGraph.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/Path.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/UndirectedGraph.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/VertexPair.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/WeightedPath.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/AbstractGraphConnection.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultGrapher.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultHeadVertexConnector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultLinkedConnectionBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultTailVertexConnector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/GraphConnection.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/GraphConnector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/HeadVertexConnector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/LinkedConnectionBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/TailVertexConnector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColoredVertices.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColoringAlgorithmsSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColorsBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/DefaultColoringAlgorithmsSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/DefaultColorsBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/UncoloredOrderedVertices.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectedComponentHandler.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectivityAlgorithmsSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectivityBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/DefaultConnectivityAlgorithmsSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/DefaultConnectivityBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/AbstractExporter.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DefaultNamedExportSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DefaultToStreamBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DotExporter.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/ExportSelctor.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/GraphMLExporter.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/NamedExportSelctor.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/ToStreamBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultFromHeadBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultMaxFlowAlgorithmSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultToTailBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FlowNetworkHandler.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FromHeadBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/MaxFlowAlgorithmSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/ToTailBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseGraph.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseMutableGraph.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/DirectedMutableGraph.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/InMemoryPath.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/InMemoryWeightedPath.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/MutableSpanningTree.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/RevertedGraph.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/UndirectedMutableGraph.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/CheriyanMehlhornGabowAlgorithm.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/DefaultSccAlgorithmSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/KosarajuSharirAlgorithm.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/SccAlgorithm.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/SccAlgorithmSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/TarjanAlgorithm.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/AllVertexPairsShortestPath.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultHeuristicBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultPathSourceSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultShortestPathAlgorithmSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultTargetSourceSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/Heuristic.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/HeuristicBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PathSourceSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PredecessorsList.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/ShortestDistances.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/ShortestPathAlgorithmSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/TargetSourceSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeAlgorithmSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeSourceSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/ReverseDeleteGraph.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/ShortestEdges.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeAlgorithmSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeSourceSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SuperVertex.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/WeightedEdgesComparator.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/BaseGraphVisitHandler.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/DefaultVisitAlgorithmsSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/DefaultVisitSourceSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/GraphVisitHandler.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitAlgorithmsSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitGraphBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/visit/VisitSourceSelector.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/builder/GraphBuilderTestCase.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/test/java/org/apache/commons/graph/coloring/AbstractColoringTest.java

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/CommonsGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/CommonsGraph.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/CommonsGraph.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/CommonsGraph.java Wed Mar  7 09:40:01 2012
@@ -55,16 +55,16 @@ import org.apache.commons.graph.visit.Vi
 /**
  * The Apache Commons Graph package is a toolkit for managing graphs and graph based data structures.
  */
-public final class CommonsGraph<V extends Vertex, E extends Edge, G extends Graph<V, E>>
+public final class CommonsGraph<V, E, G extends Graph<V, E>>
 {
 
-    public static <V extends Vertex, E extends Edge, G extends Graph<V, E>> ToStreamBuilder<V, E, G> export( G graph )
+    public static <V, E, G extends Graph<V, E>> ToStreamBuilder<V, E, G> export( G graph )
     {
         graph = checkNotNull( graph, "Null graph can not be exported" );
         return new DefaultToStreamBuilder<V, E, G>( graph );
     }
 
-    public static <V extends Vertex, E extends Edge, G extends UndirectedGraph<V, E>> ColorsBuilder<V, E, G> coloring( G graph )
+    public static <V, E, G extends UndirectedGraph<V, E>> ColorsBuilder<V, E, G> coloring( G graph )
     {
         graph = checkNotNull( graph, "Coloring can not be calculated on null graph"  );
         return new DefaultColorsBuilder<V, E, G>( graph );
@@ -80,7 +80,7 @@ public final class CommonsGraph<V extend
      * @param graph the input edge-weighted graph
      * @return
      */
-    public static <V extends Vertex, WE extends WeightedEdge<W>, W, G extends DirectedGraph<V, WE> & WeightedGraph<V, WE, W>> FromHeadBuilder<V, WE, W, G> findMaxFlow( G graph )
+    public static <V, WE, W, G extends DirectedGraph<V, WE> & WeightedGraph<V, WE, W>> FromHeadBuilder<V, WE, W, G> findMaxFlow( G graph )
     {
         graph = checkNotNull( graph, "Max flow can not be calculated on null graph" );
         return new DefaultFromHeadBuilder<V, WE, W, G>( graph );
@@ -91,7 +91,7 @@ public final class CommonsGraph<V extend
      * @param graph
      * @return
      */
-    public static <V extends Vertex, WE extends WeightedEdge<W>, W, G extends WeightedGraph<V, WE, W>> SpanningTreeSourceSelector<V, W, WE, G> minimumSpanningTree( G graph )
+    public static <V, WE, W, G extends WeightedGraph<V, WE, W>> SpanningTreeSourceSelector<V, W, WE, G> minimumSpanningTree( G graph )
     {
         graph = checkNotNull( graph, "Minimum spanning tree can not be calculated on null graph" );
         return new DefaultSpanningTreeSourceSelector<V, W, WE, G>( graph );
@@ -106,7 +106,7 @@ public final class CommonsGraph<V extend
      * @param <G>
      * @param graph
      */
-    public static <V extends Vertex, WE extends WeightedEdge<W>, W, G extends WeightedGraph<V, WE, W>> PathSourceSelector<V, WE, W, G> findShortestPath( G graph )
+    public static <V, WE, W, G extends WeightedGraph<V, WE, W>> PathSourceSelector<V, WE, W, G> findShortestPath( G graph )
     {
         graph = checkNotNull( graph, "Minimum spanning tree can not be calculated on null graph" );
         return new DefaultPathSourceSelector<V, WE, W, G>( graph );
@@ -121,7 +121,7 @@ public final class CommonsGraph<V extend
      * @param graph the Graph which strongly connected component has to be verified.
      * @return the SCC algoritm selector
      */
-    public static <V extends Vertex, E extends Edge, G extends DirectedGraph<V, E>> SccAlgorithmSelector<V, E, G> findStronglyConnectedComponent( G graph )
+    public static <V, E, G extends DirectedGraph<V, E>> SccAlgorithmSelector<V, E, G> findStronglyConnectedComponent( G graph )
     {
         graph = checkNotNull( graph, "Strongly Connected Component cannot be calculated from a null graph" );
         return new DefaultSccAlgorithmSelector<V, E, G>( graph );
@@ -136,7 +136,7 @@ public final class CommonsGraph<V extend
      * @param graph the Graph which connected component has to be verified.
      * @return the Connectivity algorithm builder
      */
-    public static <V extends Vertex, E extends Edge, G extends Graph<V, E>> ConnectivityBuilder<V, E, G> findConnectedComponent( G graph )
+    public static <V, E, G extends Graph<V, E>> ConnectivityBuilder<V, E, G> findConnectedComponent( G graph )
     {
         graph = checkNotNull( graph, "Connected Component cannot be calculated from a null graph" );
         return new DefaultConnectivityBuilder<V, E, G>( graph );
@@ -151,7 +151,7 @@ public final class CommonsGraph<V extend
      * @param graph the Graph instance to apply graph algorithms
      * @return the graph algorithms selector
      */
-    public static <V extends Vertex, E extends Edge, G extends Graph<V, E>> VisitSourceSelector<V, E, G> visit( G graph )
+    public static <V, E, G extends Graph<V, E>> VisitSourceSelector<V, E, G> visit( G graph )
     {
         graph = checkNotNull( graph, "No algorithm can be applied on null graph!" );
         return new DefaultVisitSourceSelector<V, E, G>( graph );
@@ -164,54 +164,30 @@ public final class CommonsGraph<V extend
      * @param graphConnection the {@link GraphConnection} instance that describes vertices
      * @return a new {@link DirectedMutableGraph} instance
      */
-    public static <V extends Vertex, E extends Edge> DirectedMutableGraph<V, E> newDirectedMutableGraph( GraphConnection<V, E> graphConnection )
+    public static <V, E> DirectedMutableGraph<V, E> newDirectedMutableGraph( GraphConnection<V, E> graphConnection )
     {
         return populate( new DirectedMutableGraph<V, E>() ).withConnections( graphConnection );
     }
 
     /**
-     * Creates a new {@link DirectedMutableWeightedGraph} instance where vertices
-     * are connected as described in the input {@link GraphConnection} instance.
-     *
-     * @param graphConnection the {@link GraphConnection} instance that describes vertices
-     * @return a new {@link DirectedMutableWeightedGraph} instance
-     */
-    public static <V extends Vertex, WE extends WeightedEdge<W>, W> DirectedMutableWeightedGraph<V, WE, W> newDirectedMutableWeightedGraph( GraphConnection<V, WE> graphConnection )
-    {
-        return populate( new DirectedMutableWeightedGraph<V, WE, W>() ).withConnections( graphConnection );
-    }
-
-    /**
      * Creates a new {@link UndirectedMutableGraph} instance where vertices
      * are connected as described in the input {@link GraphConnection} instance.
      *
      * @param graphConnection the {@link GraphConnection} instance that describes vertices
      * @return a new {@link UndirectedMutableGraph} instance
      */
-    public static <V extends Vertex, E extends Edge> UndirectedMutableGraph<V, E> newUndirectedMutableGraph( GraphConnection<V, E> graphConnection )
+    public static <V, E> UndirectedMutableGraph<V, E> newUndirectedMutableGraph( GraphConnection<V, E> graphConnection )
     {
         return populate( new UndirectedMutableGraph<V, E>() ).withConnections( graphConnection );
     }
 
     /**
-     * Creates a new {@link UndirectedMutableWeightedGraph} instance where vertices
-     * are connected as described in the input {@link GraphConnection} instance.
-     *
-     * @param graphConnection the {@link GraphConnection} instance that describes vertices
-     * @return a new {@link UndirectedMutableWeightedGraph} instance
-     */
-    public static <V extends Vertex, WE extends WeightedEdge<W>, W> UndirectedMutableWeightedGraph<V, WE, W> newUndirectedMutableWeightedGraph( GraphConnection<V, WE> graphConnection )
-    {
-        return populate( new UndirectedMutableWeightedGraph<V, WE, W>() ).withConnections( graphConnection );
-    }
-
-    /**
      * Allows populate the given {@link MutableGraph}.
      *
      * @param graph the graph has to be populated
      * @return the builder to configure vertices connection
      */
-    public static <V extends Vertex, E extends Edge, G extends MutableGraph<V, E>> LinkedConnectionBuilder<V, E, G> populate( G graph )
+    public static <V, E, G extends MutableGraph<V, E>> LinkedConnectionBuilder<V, E, G> populate( G graph )
     {
         return new DefaultLinkedConnectionBuilder<V, E, G>( checkNotNull( graph, "Impossible to configure null graph!" ) );
     }
@@ -222,7 +198,7 @@ public final class CommonsGraph<V extend
      * @param graph
      * @return
      */
-    public static <V extends Vertex, E extends Edge> Graph<V, E> synchronize( Graph<V, E> graph )
+    public static <V, E> Graph<V, E> synchronize( Graph<V, E> graph )
     {
         return synchronizedObject( graph, Graph.class );
     }
@@ -233,7 +209,7 @@ public final class CommonsGraph<V extend
      * @param graph
      * @return
      */
-    public static <V extends Vertex, E extends Edge> Graph<V, E> synchronize( DirectedGraph<V, E> graph )
+    public static <V, E> Graph<V, E> synchronize( DirectedGraph<V, E> graph )
     {
         return synchronizedObject( graph, DirectedGraph.class );
     }
@@ -244,7 +220,7 @@ public final class CommonsGraph<V extend
      * @param graph
      * @return
      */
-    public static <V extends Vertex, E extends Edge> Graph<V, E> synchronize( UndirectedGraph<V, E> graph )
+    public static <V, E> Graph<V, E> synchronize( UndirectedGraph<V, E> graph )
     {
         return synchronizedObject( graph, UndirectedGraph.class );
     }
@@ -255,7 +231,7 @@ public final class CommonsGraph<V extend
      * @param graph
      * @return
      */
-    public static <V extends Vertex, E extends Edge> Graph<V, E> synchronize( MutableGraph<V, E> graph )
+    public static <V, E> Graph<V, E> synchronize( MutableGraph<V, E> graph )
     {
         return synchronizedObject( graph, MutableGraph.class );
     }
@@ -266,7 +242,7 @@ public final class CommonsGraph<V extend
      * @param graph
      * @return
      */
-    public static <V extends Vertex, WE extends WeightedEdge<W>, W> Graph<V, WE> synchronize( WeightedGraph<V, WE, W> graph )
+    public static <V, WE, W> Graph<V, WE> synchronize( WeightedGraph<V, WE, W> graph )
     {
         return synchronizedObject( graph, WeightedGraph.class );
     }

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/DirectedGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/DirectedGraph.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/DirectedGraph.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/DirectedGraph.java Wed Mar  7 09:40:01 2012
@@ -29,7 +29,7 @@ package org.apache.commons.graph;
  * @param <V> the Graph vertices type
  * @param <E> the Graph edges type
  */
-public interface DirectedGraph<V extends Vertex, E extends Edge>
+public interface DirectedGraph<V, E>
     extends Graph<V, E>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/Graph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/Graph.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/Graph.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/Graph.java Wed Mar  7 09:40:01 2012
@@ -29,7 +29,7 @@ import java.io.Serializable;
  * @param <V> the Graph vertices type
  * @param <E> the Graph edges type
  */
-public interface Graph<V extends Vertex, E extends Edge>
+public interface Graph<V, E>
     extends Serializable
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/MutableGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/MutableGraph.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/MutableGraph.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/MutableGraph.java Wed Mar  7 09:40:01 2012
@@ -25,7 +25,7 @@ package org.apache.commons.graph;
  * @param <V> the Graph vertices type
  * @param <E> the Graph edges type
  */
-public interface MutableGraph<V extends Vertex, E extends Edge>
+public interface MutableGraph<V, E>
     extends Graph<V, E>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/Path.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/Path.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/Path.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/Path.java Wed Mar  7 09:40:01 2012
@@ -26,7 +26,7 @@ package org.apache.commons.graph;
  * @param <V> the Graph vertices type
  * @param <E> the Graph edges type
  */
-public interface Path<V extends Vertex, E extends Edge>
+public interface Path<V, E>
     extends Graph<V, E>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/UndirectedGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/UndirectedGraph.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/UndirectedGraph.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/UndirectedGraph.java Wed Mar  7 09:40:01 2012
@@ -26,7 +26,7 @@ package org.apache.commons.graph;
  * @param <V> the Graph vertices type
  * @param <E> the Graph edges type
  */
-public interface UndirectedGraph<V extends Vertex, E extends Edge>
+public interface UndirectedGraph<V, E>
     extends Graph<V, E>
 {
 }

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/VertexPair.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/VertexPair.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/VertexPair.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/VertexPair.java Wed Mar  7 09:40:01 2012
@@ -28,10 +28,12 @@ import static java.lang.String.format;
  *
  * @param <V> the Graph vertices type
  */
-public final class VertexPair<V extends Vertex>
+public final class VertexPair<V>
 {
+
     /** The head vertex. */
     private final V head;
+
     /** The tail vertex. */
     private final V tail;
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/WeightedPath.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/WeightedPath.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/WeightedPath.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/WeightedPath.java Wed Mar  7 09:40:01 2012
@@ -26,8 +26,8 @@ package org.apache.commons.graph;
  * @param <WE> the Graph weighted edges type
  * @param <W> the weight type
  */
-public interface WeightedPath<V extends Vertex, WE extends WeightedEdge<W>, W>
-    extends Path<V, WE>, Weighted<W>
+public interface WeightedPath<V, E, W>
+    extends Path<V, E>
 {
 
 }

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/AbstractGraphConnection.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/AbstractGraphConnection.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/AbstractGraphConnection.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/AbstractGraphConnection.java Wed Mar  7 09:40:01 2012
@@ -21,10 +21,7 @@ package org.apache.commons.graph.builder
 
 import static org.apache.commons.graph.utils.Assertions.checkState;
 
-import org.apache.commons.graph.Edge;
-import org.apache.commons.graph.Vertex;
-
-public abstract class AbstractGraphConnection<V extends Vertex, E extends Edge>
+public abstract class AbstractGraphConnection<V, E>
     implements GraphConnection<V, E>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultGrapher.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultGrapher.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultGrapher.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultGrapher.java Wed Mar  7 09:40:01 2012
@@ -21,11 +21,9 @@ package org.apache.commons.graph.builder
 
 import static org.apache.commons.graph.utils.Assertions.checkNotNull;
 
-import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.MutableGraph;
-import org.apache.commons.graph.Vertex;
 
-final class DefaultGrapher<V extends Vertex, E extends Edge>
+final class DefaultGrapher<V, E>
     implements GraphConnector<V, E>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultHeadVertexConnector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultHeadVertexConnector.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultHeadVertexConnector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultHeadVertexConnector.java Wed Mar  7 09:40:01 2012
@@ -21,11 +21,9 @@ package org.apache.commons.graph.builder
 
 import static org.apache.commons.graph.utils.Assertions.checkNotNull;
 
-import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.MutableGraph;
-import org.apache.commons.graph.Vertex;
 
-final class DefaultHeadVertexConnector<V extends Vertex, E extends Edge>
+final class DefaultHeadVertexConnector<V, E>
     implements HeadVertexConnector<V, E>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultLinkedConnectionBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultLinkedConnectionBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultLinkedConnectionBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultLinkedConnectionBuilder.java Wed Mar  7 09:40:01 2012
@@ -21,11 +21,9 @@ package org.apache.commons.graph.builder
 
 import static org.apache.commons.graph.utils.Assertions.checkNotNull;
 
-import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.MutableGraph;
-import org.apache.commons.graph.Vertex;
 
-public final class DefaultLinkedConnectionBuilder<V extends Vertex, E extends Edge, G extends MutableGraph<V, E>>
+public final class DefaultLinkedConnectionBuilder<V, E, G extends MutableGraph<V, E>>
     implements LinkedConnectionBuilder<V, E, G>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultTailVertexConnector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultTailVertexConnector.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultTailVertexConnector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/DefaultTailVertexConnector.java Wed Mar  7 09:40:01 2012
@@ -21,11 +21,9 @@ package org.apache.commons.graph.builder
 
 import static org.apache.commons.graph.utils.Assertions.checkNotNull;
 
-import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.MutableGraph;
-import org.apache.commons.graph.Vertex;
 
-final class DefaultTailVertexConnector<V extends Vertex, E extends Edge>
+final class DefaultTailVertexConnector<V, E>
     implements TailVertexConnector<V, E>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/GraphConnection.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/GraphConnection.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/GraphConnection.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/GraphConnection.java Wed Mar  7 09:40:01 2012
@@ -19,10 +19,8 @@ package org.apache.commons.graph.builder
  * under the License.
  */
 
-import org.apache.commons.graph.Edge;
-import org.apache.commons.graph.Vertex;
 
-public interface GraphConnection<V extends Vertex, E extends Edge>
+public interface GraphConnection<V, E>
 {
 
     void connect( GraphConnector<V, E> grapher );

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/GraphConnector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/GraphConnector.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/GraphConnector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/GraphConnector.java Wed Mar  7 09:40:01 2012
@@ -19,10 +19,8 @@ package org.apache.commons.graph.builder
  * under the License.
  */
 
-import org.apache.commons.graph.Edge;
-import org.apache.commons.graph.Vertex;
 
-public interface GraphConnector<V extends Vertex, E extends Edge>
+public interface GraphConnector<V, E>
 {
 
     V addVertex( V vertex );

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/HeadVertexConnector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/HeadVertexConnector.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/HeadVertexConnector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/HeadVertexConnector.java Wed Mar  7 09:40:01 2012
@@ -19,10 +19,8 @@ package org.apache.commons.graph.builder
  * under the License.
  */
 
-import org.apache.commons.graph.Edge;
-import org.apache.commons.graph.Vertex;
 
-public interface HeadVertexConnector<V extends Vertex, E extends Edge>
+public interface HeadVertexConnector<V, E>
 {
 
     TailVertexConnector<V, E> from( V head );

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/LinkedConnectionBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/LinkedConnectionBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/LinkedConnectionBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/LinkedConnectionBuilder.java Wed Mar  7 09:40:01 2012
@@ -19,11 +19,9 @@ package org.apache.commons.graph.builder
  * under the License.
  */
 
-import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.MutableGraph;
-import org.apache.commons.graph.Vertex;
 
-public interface LinkedConnectionBuilder<V extends Vertex, E extends Edge, G extends MutableGraph<V, E>>
+public interface LinkedConnectionBuilder<V, E, G extends MutableGraph<V, E>>
 {
 
     G withConnections( GraphConnection<V, E> graphConnection );

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/TailVertexConnector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/TailVertexConnector.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/TailVertexConnector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/builder/TailVertexConnector.java Wed Mar  7 09:40:01 2012
@@ -19,10 +19,8 @@ package org.apache.commons.graph.builder
  * under the License.
  */
 
-import org.apache.commons.graph.Edge;
-import org.apache.commons.graph.Vertex;
 
-public interface TailVertexConnector<V extends Vertex, E extends Edge>
+public interface TailVertexConnector<V, E>
 {
 
     void to( V tail );

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColoredVertices.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColoredVertices.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColoredVertices.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColoredVertices.java Wed Mar  7 09:40:01 2012
@@ -35,7 +35,7 @@ import org.apache.commons.graph.Vertex;
  * @param <V> the Graph vertices type.
  * @param <C> the Color type.
  */
-public final class ColoredVertices<V extends Vertex, C>
+public final class ColoredVertices<V, C>
 {
 
     private final Map<V, C> coloredVertices = new HashMap<V, C>();

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColoringAlgorithmsSelector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColoringAlgorithmsSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColoringAlgorithmsSelector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColoringAlgorithmsSelector.java Wed Mar  7 09:40:01 2012
@@ -31,7 +31,7 @@ import org.apache.commons.graph.Vertex;
  * @param <G> the Graph type
  * @param <C> the Color vertices type
  */
-public interface ColoringAlgorithmsSelector<V extends Vertex, E extends Edge, G extends UndirectedGraph<V, E>, C>
+public interface ColoringAlgorithmsSelector<V, E, G extends UndirectedGraph<V, E>, C>
 {
 
     /**

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColorsBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColorsBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColorsBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/ColorsBuilder.java Wed Mar  7 09:40:01 2012
@@ -32,7 +32,7 @@ import org.apache.commons.graph.Vertex;
  * @param <E> the Graph edges type
  * @param <G> the Graph type
  */
-public interface ColorsBuilder<V extends Vertex, E extends Edge, G extends UndirectedGraph<V, E>>
+public interface ColorsBuilder<V, E, G extends UndirectedGraph<V, E>>
 {
 
     /**

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/DefaultColoringAlgorithmsSelector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/DefaultColoringAlgorithmsSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/DefaultColoringAlgorithmsSelector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/DefaultColoringAlgorithmsSelector.java Wed Mar  7 09:40:01 2012
@@ -38,7 +38,7 @@ import org.apache.commons.graph.Vertex;
  * @param <G> the Graph type
  * @param <C> the Color vertices type
  */
-final class DefaultColoringAlgorithmsSelector<V extends Vertex, E extends Edge, G extends UndirectedGraph<V, E>, C>
+final class DefaultColoringAlgorithmsSelector<V, E, G extends UndirectedGraph<V, E>, C>
     implements ColoringAlgorithmsSelector<V, E, G, C>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/DefaultColorsBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/DefaultColorsBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/DefaultColorsBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/DefaultColorsBuilder.java Wed Mar  7 09:40:01 2012
@@ -34,7 +34,7 @@ import org.apache.commons.graph.Vertex;
  * @param <E> the Graph edges type
  * @param <G> the Graph type
  */
-public final class DefaultColorsBuilder<V extends Vertex, E extends Edge, G extends UndirectedGraph<V, E>>
+public final class DefaultColorsBuilder<V, E, G extends UndirectedGraph<V, E>>
     implements ColorsBuilder<V, E, G>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/UncoloredOrderedVertices.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/UncoloredOrderedVertices.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/UncoloredOrderedVertices.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/coloring/UncoloredOrderedVertices.java Wed Mar  7 09:40:01 2012
@@ -34,7 +34,7 @@ import org.apache.commons.graph.Vertex;
  *
  * @param <V>
  */
-final class UncoloredOrderedVertices<V extends Vertex>
+final class UncoloredOrderedVertices<V>
     implements Comparator<Integer>, Iterable<V>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectedComponentHandler.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectedComponentHandler.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectedComponentHandler.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectedComponentHandler.java Wed Mar  7 09:40:01 2012
@@ -27,7 +27,7 @@ import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.Vertex;
 import org.apache.commons.graph.visit.BaseGraphVisitHandler;
 
-final class ConnectedComponentHandler<V extends Vertex, E extends Edge, G extends Graph<V, E>>
+final class ConnectedComponentHandler<V, E, G extends Graph<V, E>>
     extends BaseGraphVisitHandler<V, E, G, List<V>>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectivityAlgorithmsSelector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectivityAlgorithmsSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectivityAlgorithmsSelector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectivityAlgorithmsSelector.java Wed Mar  7 09:40:01 2012
@@ -32,7 +32,7 @@ import org.apache.commons.graph.Vertex;
  * @param <E> the Graph edges type
  * @param <G> the Graph type
  */
-public interface ConnectivityAlgorithmsSelector <V extends Vertex,  E extends Edge, G extends Graph<V, E> >
+public interface ConnectivityAlgorithmsSelector <V,  E, G extends Graph<V, E> >
 {
 
     /**

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectivityBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectivityBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectivityBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/ConnectivityBuilder.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 ConnectivityBuilder<V extends Vertex, E extends Edge, G extends Graph<V, E>>
+public interface ConnectivityBuilder<V, E, G extends Graph<V, E>>
 {
 
     /**

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/DefaultConnectivityAlgorithmsSelector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/DefaultConnectivityAlgorithmsSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/DefaultConnectivityAlgorithmsSelector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/DefaultConnectivityAlgorithmsSelector.java Wed Mar  7 09:40:01 2012
@@ -34,7 +34,7 @@ import org.apache.commons.graph.Vertex;
 /**
  *
  */
-final class DefaultConnectivityAlgorithmsSelector<V extends Vertex, E extends Edge, G extends Graph<V, E>>
+final class DefaultConnectivityAlgorithmsSelector<V, E, G extends Graph<V, E>>
     implements ConnectivityAlgorithmsSelector<V, E, G>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/DefaultConnectivityBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/DefaultConnectivityBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/DefaultConnectivityBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/connectivity/DefaultConnectivityBuilder.java Wed Mar  7 09:40:01 2012
@@ -30,7 +30,7 @@ import org.apache.commons.graph.Vertex;
 /**
  *
  */
-public class DefaultConnectivityBuilder<V extends Vertex, E extends Edge, G extends Graph<V, E>>
+public class DefaultConnectivityBuilder<V, E, G extends Graph<V, E>>
     implements ConnectivityBuilder<V, E, G>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/AbstractExporter.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/AbstractExporter.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/AbstractExporter.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/AbstractExporter.java Wed Mar  7 09:40:01 2012
@@ -26,7 +26,7 @@ import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.Vertex;
 
-abstract class AbstractExporter<V extends Vertex, E extends Edge, G extends Graph<V, E>>
+abstract class AbstractExporter<V, E, G extends Graph<V, E>>
 {
 
     private static final String G = "G";

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DefaultNamedExportSelector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DefaultNamedExportSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DefaultNamedExportSelector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DefaultNamedExportSelector.java Wed Mar  7 09:40:01 2012
@@ -25,7 +25,7 @@ import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.Vertex;
 
-final class DefaultNamedExportSelector<V extends Vertex, E extends Edge, G extends Graph<V, E>>
+final class DefaultNamedExportSelector<V, E, G extends Graph<V, E>>
     implements NamedExportSelctor<V, E, G>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DefaultToStreamBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DefaultToStreamBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DefaultToStreamBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DefaultToStreamBuilder.java Wed Mar  7 09:40:01 2012
@@ -32,7 +32,7 @@ import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.Vertex;
 
-public final class DefaultToStreamBuilder<V extends Vertex, E extends Edge, G extends Graph<V, E>>
+public final class DefaultToStreamBuilder<V, E, G extends Graph<V, E>>
     implements ToStreamBuilder<V, E, G>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DotExporter.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DotExporter.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DotExporter.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/DotExporter.java Wed Mar  7 09:40:01 2012
@@ -31,7 +31,7 @@ import org.apache.commons.graph.Vertex;
 import org.apache.commons.graph.VertexPair;
 import org.apache.commons.graph.WeightedEdge;
 
-final class DotExporter<V extends Vertex, E extends Edge, G extends Graph<V, E>>
+final class DotExporter<V, E, G extends Graph<V, E>>
     extends AbstractExporter<V, E, G>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/ExportSelctor.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/ExportSelctor.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/ExportSelctor.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/ExportSelctor.java Wed Mar  7 09:40:01 2012
@@ -23,7 +23,7 @@ import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.Vertex;
 
-public interface ExportSelctor<V extends Vertex, E extends Edge, G extends Graph<V, E>>
+public interface ExportSelctor<V, E, G extends Graph<V, E>>
 {
 
     /**

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/GraphMLExporter.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/GraphMLExporter.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/GraphMLExporter.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/GraphMLExporter.java Wed Mar  7 09:40:01 2012
@@ -35,7 +35,7 @@ import org.apache.commons.graph.Labeled;
 import org.apache.commons.graph.Vertex;
 import org.apache.commons.graph.Weighted;
 
-final class GraphMLExporter<V extends Vertex, E extends Edge, G extends Graph<V, E>>
+final class GraphMLExporter<V, E, G extends Graph<V, E>>
     extends AbstractExporter<V, E, G>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/NamedExportSelctor.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/NamedExportSelctor.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/NamedExportSelctor.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/NamedExportSelctor.java Wed Mar  7 09:40:01 2012
@@ -23,7 +23,7 @@ import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.Vertex;
 
-public interface NamedExportSelctor<V extends Vertex, E extends Edge, G extends Graph<V, E>>
+public interface NamedExportSelctor<V, E, G extends Graph<V, E>>
     extends ExportSelctor<V, E, G>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/ToStreamBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/ToStreamBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/ToStreamBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/export/ToStreamBuilder.java Wed Mar  7 09:40:01 2012
@@ -27,7 +27,7 @@ import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.Vertex;
 
-public interface ToStreamBuilder<V extends Vertex, E extends Edge, G extends Graph<V, E>>
+public interface ToStreamBuilder<V, E, G extends Graph<V, E>>
 {
 
     /**

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultFromHeadBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultFromHeadBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultFromHeadBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultFromHeadBuilder.java Wed Mar  7 09:40:01 2012
@@ -33,7 +33,7 @@ import org.apache.commons.graph.Weighted
  * @param <WE>
  * @param <G>
  */
-public final class DefaultFromHeadBuilder<V extends Vertex, WE extends WeightedEdge<W>, W, G extends DirectedGraph<V, WE>>
+public final class DefaultFromHeadBuilder<V, WE, W, G extends DirectedGraph<V, WE>>
     implements FromHeadBuilder<V, WE, W, G>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultMaxFlowAlgorithmSelector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultMaxFlowAlgorithmSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultMaxFlowAlgorithmSelector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultMaxFlowAlgorithmSelector.java Wed Mar  7 09:40:01 2012
@@ -39,7 +39,7 @@ import org.apache.commons.graph.weight.O
  * @param <WE>
  * @param <G>
  */
-final class DefaultMaxFlowAlgorithmSelector<V extends Vertex, WE extends WeightedEdge<W>, W, G extends DirectedGraph<V, WE>>
+final class DefaultMaxFlowAlgorithmSelector<V, WE, W, G extends DirectedGraph<V, WE>>
     implements MaxFlowAlgorithmSelector<V, WE, W, G>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultToTailBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultToTailBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultToTailBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultToTailBuilder.java Wed Mar  7 09:40:01 2012
@@ -33,7 +33,7 @@ import org.apache.commons.graph.Weighted
  * @param <WE>
  * @param <G>
  */
-final class DefaultToTailBuilder<V extends Vertex, WE extends WeightedEdge<W>, W, G extends DirectedGraph<V, WE>>
+final class DefaultToTailBuilder<V, WE, W, G extends DirectedGraph<V, WE>>
     implements ToTailBuilder<V, WE, W, G>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FlowNetworkHandler.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FlowNetworkHandler.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FlowNetworkHandler.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FlowNetworkHandler.java Wed Mar  7 09:40:01 2012
@@ -38,7 +38,7 @@ import org.apache.commons.graph.weight.O
  * @param <V> the vertex type
  * @param <W> the weight type
  */
-class FlowNetworkHandler<V extends Vertex, W>
+class FlowNetworkHandler<V, W>
     extends BaseGraphVisitHandler<V, WeightedEdge<W>, DirectedGraph<V, WeightedEdge<W>>, W>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FromHeadBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FromHeadBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FromHeadBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FromHeadBuilder.java Wed Mar  7 09:40:01 2012
@@ -23,7 +23,7 @@ import org.apache.commons.graph.Directed
 import org.apache.commons.graph.Vertex;
 import org.apache.commons.graph.WeightedEdge;
 
-public interface FromHeadBuilder<V extends Vertex, WE extends WeightedEdge<W>, W, G extends DirectedGraph<V, WE>>
+public interface FromHeadBuilder<V, WE, W, G extends DirectedGraph<V, WE>>
 {
 
     /**

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/MaxFlowAlgorithmSelector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/MaxFlowAlgorithmSelector.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/MaxFlowAlgorithmSelector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/MaxFlowAlgorithmSelector.java Wed Mar  7 09:40:01 2012
@@ -24,7 +24,7 @@ import org.apache.commons.graph.Vertex;
 import org.apache.commons.graph.WeightedEdge;
 import org.apache.commons.graph.weight.OrderedMonoid;
 
-public interface MaxFlowAlgorithmSelector<V extends Vertex, WE extends WeightedEdge<W>, W, G extends DirectedGraph<V, WE>>
+public interface MaxFlowAlgorithmSelector<V, WE, W, G extends DirectedGraph<V, WE>>
 {
 
     /**

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/ToTailBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/ToTailBuilder.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/ToTailBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/ToTailBuilder.java Wed Mar  7 09:40:01 2012
@@ -23,7 +23,7 @@ import org.apache.commons.graph.Directed
 import org.apache.commons.graph.Vertex;
 import org.apache.commons.graph.WeightedEdge;
 
-public interface ToTailBuilder<V extends Vertex, WE extends WeightedEdge<W>, W, G extends DirectedGraph<V, WE>>
+public interface ToTailBuilder<V, WE, W, G extends DirectedGraph<V, WE>>
 {
 
     /**

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseGraph.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseGraph.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseGraph.java Wed Mar  7 09:40:01 2012
@@ -28,10 +28,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.GraphException;
-import org.apache.commons.graph.Vertex;
 import org.apache.commons.graph.VertexPair;
 
 /**
@@ -43,7 +41,7 @@ import org.apache.commons.graph.VertexPa
  * @param <V> the Graph vertices type
  * @param <E> the Graph edges type
  */
-public abstract class BaseGraph<V extends Vertex, E extends Edge>
+public abstract class BaseGraph<V, E>
     implements Graph<V, E>
 {
 
@@ -107,7 +105,7 @@ public abstract class BaseGraph<V extend
         checkGraphCondition( containsVertex( source ), "Vertex %s does not exist in the Graph", source );
         checkGraphCondition( containsVertex( target ), "Vertex %s does not exist in the Graph", target );
 
-        return indexedEdges.get( new VertexPair<Vertex>( source, target ) );
+        return indexedEdges.get( new VertexPair<V>( source, target ) );
     }
 
     /**
@@ -167,7 +165,7 @@ public abstract class BaseGraph<V extend
 
         @SuppressWarnings( "unchecked" )
         // test against any Graph typed instance
-        BaseGraph<Vertex, Edge> other = (BaseGraph<Vertex, Edge>) obj;
+        BaseGraph<Object, Object> other = (BaseGraph<Object, Object>) obj;
         if ( !adjacencyList.equals( other.getAdjacencyList() ) )
         {
             return false;

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseMutableGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseMutableGraph.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseMutableGraph.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/BaseMutableGraph.java Wed Mar  7 09:40:01 2012
@@ -21,10 +21,8 @@ package org.apache.commons.graph.model;
 
 import java.util.LinkedHashSet;
 
-import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.MutableGraph;
-import org.apache.commons.graph.Vertex;
 import org.apache.commons.graph.VertexPair;
 
 /**
@@ -35,7 +33,7 @@ import org.apache.commons.graph.VertexPa
  * @param <V> the Graph vertices type
  * @param <E> the Graph edges type
  */
-public abstract class BaseMutableGraph<V extends Vertex, E extends Edge>
+public abstract class BaseMutableGraph<V, E>
     extends BaseGraph<V, E>
     implements MutableGraph<V, E>
 {
@@ -70,7 +68,7 @@ public abstract class BaseMutableGraph<V
 
         for ( V tail : getAdjacencyList().get( v ) )
         {
-            getIndexedEdges().remove( new VertexPair<Vertex>( v, tail ) );
+            getIndexedEdges().remove( new VertexPair<V>( v, tail ) );
         }
         getAdjacencyList().remove( v );
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/DirectedMutableGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/DirectedMutableGraph.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/DirectedMutableGraph.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/DirectedMutableGraph.java Wed Mar  7 09:40:01 2012
@@ -25,8 +25,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.graph.DirectedGraph;
-import org.apache.commons.graph.Edge;
-import org.apache.commons.graph.Vertex;
 import org.apache.commons.graph.VertexPair;
 
 /**
@@ -37,7 +35,7 @@ import org.apache.commons.graph.VertexPa
  * @param <V> the Graph vertices type
  * @param <E> the Graph edges type
  */
-public class DirectedMutableGraph<V extends Vertex, E extends Edge>
+public class DirectedMutableGraph<V, E>
     extends BaseMutableGraph<V, E>
     implements DirectedGraph<V, E>
 {

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/InMemoryPath.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/InMemoryPath.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/InMemoryPath.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/InMemoryPath.java Wed Mar  7 09:40:01 2012
@@ -19,20 +19,18 @@ package org.apache.commons.graph.model;
  * under the License.
  */
 
-import static org.apache.commons.graph.utils.Assertions.*;
-
-import static java.util.Arrays.asList;
 import static java.lang.String.format;
+import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableList;
+import static org.apache.commons.graph.utils.Assertions.checkArgument;
+import static org.apache.commons.graph.utils.Assertions.checkNotNull;
 
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.Path;
-import org.apache.commons.graph.Vertex;
 import org.apache.commons.graph.VertexPair;
 
 /**
@@ -42,7 +40,7 @@ import org.apache.commons.graph.VertexPa
  * @param <V> the Graph vertices type
  * @param <E> the Graph edges type
  */
-public class InMemoryPath<V extends Vertex, E extends Edge>
+public class InMemoryPath<V, E>
     implements Path<V, E>
 {
 
@@ -211,7 +209,7 @@ public class InMemoryPath<V extends Vert
     {
         return vertices.contains( v );
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -257,7 +255,7 @@ public class InMemoryPath<V extends Vert
         }
 
         @SuppressWarnings( "unchecked" ) // test against any Path typed instance
-        InMemoryPath<Vertex, Edge> other = (InMemoryPath<Vertex, Edge>) obj;
+        InMemoryPath<Object, Object> other = (InMemoryPath<Object, Object>) obj;
         if ( !source.equals( other.getSource() ) )
         {
             return false;

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/InMemoryWeightedPath.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/InMemoryWeightedPath.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/InMemoryWeightedPath.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/InMemoryWeightedPath.java Wed Mar  7 09:40:01 2012
@@ -21,8 +21,6 @@ package org.apache.commons.graph.model;
 
 import static java.lang.String.format;
 
-import org.apache.commons.graph.Vertex;
-import org.apache.commons.graph.WeightedEdge;
 import org.apache.commons.graph.WeightedPath;
 import org.apache.commons.graph.weight.Monoid;
 
@@ -34,7 +32,7 @@ import org.apache.commons.graph.weight.M
  * @param <WE> the Graph weighted edges type
  * @param <W> the weight type
  */
-public final class InMemoryWeightedPath<V extends Vertex, WE extends WeightedEdge<W>, W>
+public final class InMemoryWeightedPath<V, WE, W>
     extends InMemoryPath<V, WE>
     implements WeightedPath<V, WE, W>
 {
@@ -82,7 +80,7 @@ public final class InMemoryWeightedPath<
      */
     private void increaseWeight( WE edge )
     {
-        weight = weightOperations.append( edge.getWeight(), weight );
+        // TODO weight = weightOperations.append( edge.getWeight(), weight );
     }
 
     /**
@@ -127,7 +125,7 @@ public final class InMemoryWeightedPath<
         }
 
         @SuppressWarnings( "unchecked" ) // test against any WeightedPath typed instance
-        InMemoryWeightedPath<Vertex, WeightedEdge<W>, W> other = (InMemoryWeightedPath<Vertex, WeightedEdge<W>, W>) obj;
+        InMemoryWeightedPath<Object, Object, W> other = (InMemoryWeightedPath<Object, Object, W>) obj;
         if ( !weight.equals( other.getWeight() ) )
         {
             return false;

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/MutableSpanningTree.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/MutableSpanningTree.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/MutableSpanningTree.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/MutableSpanningTree.java Wed Mar  7 09:40:01 2012
@@ -19,9 +19,6 @@ package org.apache.commons.graph.model;
  * under the License.
  */
 
-import org.apache.commons.graph.SpanningTree;
-import org.apache.commons.graph.Vertex;
-import org.apache.commons.graph.WeightedEdge;
 import org.apache.commons.graph.weight.Monoid;
 
 /**
@@ -33,9 +30,8 @@ import org.apache.commons.graph.weight.M
  * @param <WE> the Graph weighted edges type
  * @param <W> the weight type
  */
-public final class MutableSpanningTree<V extends Vertex, WE extends WeightedEdge<W>, W>
+public final class MutableSpanningTree<V, WE, W>
     extends UndirectedMutableGraph<V, WE>
-    implements SpanningTree<V, WE, W>
 {
 
     private static final long serialVersionUID = -4371938772248573879L;
@@ -64,7 +60,7 @@ public final class MutableSpanningTree<V
     protected void decorateAddEdge( V head, WE e, V tail )
     {
         super.decorateAddEdge( head, e, tail );
-        weight = weightOperations.append( weight, e.getWeight() );
+        // TODO weight = weightOperations.append( weight, e.getWeight() );
     }
 
     /**
@@ -73,7 +69,7 @@ public final class MutableSpanningTree<V
     @Override
     protected void decorateRemoveEdge( WE e )
     {
-        weight = weightOperations.append( weight, weightOperations.inverse( e.getWeight() ) );
+        // TODO weight = weightOperations.append( weight, weightOperations.inverse( e.getWeight() ) );
     }
 
 }

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/RevertedGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/RevertedGraph.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/RevertedGraph.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/RevertedGraph.java Wed Mar  7 09:40:01 2012
@@ -22,8 +22,6 @@ package org.apache.commons.graph.model;
 import static org.apache.commons.graph.utils.Assertions.checkNotNull;
 
 import org.apache.commons.graph.DirectedGraph;
-import org.apache.commons.graph.Edge;
-import org.apache.commons.graph.Vertex;
 import org.apache.commons.graph.VertexPair;
 
 /**
@@ -35,7 +33,7 @@ import org.apache.commons.graph.VertexPa
  * @param <V> the Graph vertices type
  * @param <E> the Graph edges type
  */
-public final class RevertedGraph<V extends Vertex, E extends Edge>
+public final class RevertedGraph<V, E>
     implements DirectedGraph<V, E>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/UndirectedMutableGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/UndirectedMutableGraph.java?rev=1297912&r1=1297911&r2=1297912&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/UndirectedMutableGraph.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/model/UndirectedMutableGraph.java Wed Mar  7 09:40:01 2012
@@ -19,9 +19,7 @@ package org.apache.commons.graph.model;
  * under the License.
  */
 
-import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.UndirectedGraph;
-import org.apache.commons.graph.Vertex;
 
 /**
  * A memory-based implementation of a mutable undirected Graph.
@@ -31,7 +29,7 @@ import org.apache.commons.graph.Vertex;
  * @param <V> the Graph vertices type
  * @param <E> the Graph edges type
  */
-public class UndirectedMutableGraph<V extends Vertex, E extends Edge>
+public class UndirectedMutableGraph<V, E>
     extends BaseMutableGraph<V, E>
     implements UndirectedGraph<V, E>
 {

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/CheriyanMehlhornGabowAlgorithm.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/CheriyanMehlhornGabowAlgorithm.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/CheriyanMehlhornGabowAlgorithm.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/CheriyanMehlhornGabowAlgorithm.java Wed Mar  7 09:40:01 2012
@@ -38,7 +38,7 @@ import org.apache.commons.graph.Vertex;
  * @param <E> the Graph edges type.
  * @param <G> the directed graph type
  */
-final class CheriyanMehlhornGabowAlgorithm<V extends Vertex, E extends Edge, G extends DirectedGraph<V, E>>
+final class CheriyanMehlhornGabowAlgorithm<V, E, G extends DirectedGraph<V, E>>
     implements SccAlgorithm<V>
 {
 

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/DefaultSccAlgorithmSelector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/DefaultSccAlgorithmSelector.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/DefaultSccAlgorithmSelector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/DefaultSccAlgorithmSelector.java Wed Mar  7 09:40:01 2012
@@ -32,7 +32,7 @@ import org.apache.commons.graph.Vertex;
  * @param <E> the Graph edges type.
  * @param <G> the directed graph type
  */
-public final class DefaultSccAlgorithmSelector<V extends Vertex, E extends Edge, G extends DirectedGraph<V, E>>
+public final class DefaultSccAlgorithmSelector<V, E, G extends DirectedGraph<V, E>>
     implements SccAlgorithmSelector<V, E, G>
 {
     /** The graph. */

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/KosarajuSharirAlgorithm.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/KosarajuSharirAlgorithm.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/KosarajuSharirAlgorithm.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/scc/KosarajuSharirAlgorithm.java Wed Mar  7 09:40:01 2012
@@ -43,7 +43,7 @@ import org.apache.commons.graph.model.Re
  * @param <E> the Graph edges type.
  * @param <G> the directed graph type
  */
-final class KosarajuSharirAlgorithm<V extends Vertex, E extends Edge, G extends DirectedGraph<V, E>>
+final class KosarajuSharirAlgorithm<V, E, G extends DirectedGraph<V, E>>
     implements SccAlgorithm<V>
 {
     /** The graph. */



Mime
View raw message