commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1299132 [1/2] - in /commons/sandbox/graph/branches/drop-marker-interfaces-feature: ./ src/main/java/org/apache/commons/graph/ src/main/java/org/apache/commons/graph/coloring/ src/main/java/org/apache/commons/graph/connectivity/ src/main/ja...
Date Sat, 10 Mar 2012 01:40:09 GMT
Author: simonetripodi
Date: Sat Mar 10 01:40:08 2012
New Revision: 1299132

URL: http://svn.apache.org/viewvc?rev=1299132&view=rev
Log:
simplified generic signatures everywhere - generics are useful to infer types in builder chains, but unused generics have been removed to simplify both maintainability and readability

Modified:
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/   (props changed)
    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/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/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/DefaultFlowWeightedEdgesBuilder.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/FlowWeightedEdgesBuilder.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/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/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/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/DefaultWeightedEdgesSelector.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/PathWeightedEdgesBuilder.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/DefaultSpanningWeightedEdgeMapperBuilder.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/SpanningWeightedEdgeMapperBuilder.java
    commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SuperVertex.java

Propchange: commons/sandbox/graph/branches/drop-marker-interfaces-feature/
------------------------------------------------------------------------------
    svn:mergeinfo = /commons/sandbox/graph/trunk:1298136

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -56,16 +56,16 @@ import org.apache.commons.graph.visit.Vi
 public final class CommonsGraph<V, E, G extends Graph<V, E>>
 {
 
-    public static <V, E, G extends Graph<V, E>> ToStreamBuilder<V, E, G> export( G graph )
+    public static <V, E, G extends Graph<V, E>> ToStreamBuilder<V, E> export( G graph )
     {
         graph = checkNotNull( graph, "Null graph can not be exported" );
-        return new DefaultToStreamBuilder<V, E, G>( graph );
+        return new DefaultToStreamBuilder<V, E>( graph );
     }
 
-    public static <V, E, G extends UndirectedGraph<V, E>> ColorsBuilder<V, E, G> coloring( G graph )
+    public static <V, E, G extends UndirectedGraph<V, E>> ColorsBuilder<V, E> coloring( G graph )
     {
         graph = checkNotNull( graph, "Coloring can not be calculated on null graph"  );
-        return new DefaultColorsBuilder<V, E, G>( graph );
+        return new DefaultColorsBuilder<V, E>( graph );
     }
 
     /**
@@ -78,10 +78,10 @@ public final class CommonsGraph<V, E, G 
      * @param graph the input edge-weighted graph
      * @return
      */
-    public static <V, WE, G extends DirectedGraph<V, WE>> FlowWeightedEdgesBuilder<V, WE, G> findMaxFlow( G graph )
+    public static <V, WE, G extends DirectedGraph<V, WE>> FlowWeightedEdgesBuilder<V, WE> findMaxFlow( G graph )
     {
         graph = checkNotNull( graph, "Max flow can not be calculated on null graph" );
-        return new DefaultFlowWeightedEdgesBuilder<V, WE, G>( graph );
+        return new DefaultFlowWeightedEdgesBuilder<V, WE>( graph );
     }
 
     /**
@@ -89,10 +89,10 @@ public final class CommonsGraph<V, E, G 
      * @param graph
      * @return
      */
-    public static <V, WE, G extends Graph<V, WE>> SpanningWeightedEdgeMapperBuilder<V, WE, G> minimumSpanningTree( G graph )
+    public static <V, WE, G extends Graph<V, WE>> SpanningWeightedEdgeMapperBuilder<V, WE> minimumSpanningTree( G graph )
     {
         graph = checkNotNull( graph, "Minimum spanning tree can not be calculated on null graph" );
-        return new DefaultSpanningWeightedEdgeMapperBuilder<V, WE, G>( graph );
+        return new DefaultSpanningWeightedEdgeMapperBuilder<V, WE>( graph );
     }
 
     /**
@@ -104,10 +104,10 @@ public final class CommonsGraph<V, E, G 
      * @param <G>
      * @param graph
      */
-    public static <V, WE, G extends Graph<V, WE>> PathWeightedEdgesBuilder<V, WE, G> findShortestPath( G graph )
+    public static <V, WE, G extends Graph<V, WE>> PathWeightedEdgesBuilder<V, WE> findShortestPath( G graph )
     {
         graph = checkNotNull( graph, "Shortest path can not be calculated on null graph" );
-        return new DefaultWeightedEdgesSelector<V, WE, G>( graph );
+        return new DefaultWeightedEdgesSelector<V, WE>( graph );
     }
 
     /**
@@ -119,10 +119,10 @@ public final class CommonsGraph<V, E, G 
      * @param graph the Graph which strongly connected component has to be verified.
      * @return the SCC algoritm selector
      */
-    public static <V, E, G extends DirectedGraph<V, E>> SccAlgorithmSelector<V, E, G> findStronglyConnectedComponent( G graph )
+    public static <V, E, G extends DirectedGraph<V, E>> SccAlgorithmSelector<V, E> findStronglyConnectedComponent( G graph )
     {
         graph = checkNotNull( graph, "Strongly Connected Component cannot be calculated from a null graph" );
-        return new DefaultSccAlgorithmSelector<V, E, G>( graph );
+        return new DefaultSccAlgorithmSelector<V, E>( graph );
     }
 
     /**
@@ -134,10 +134,10 @@ public final class CommonsGraph<V, E, G 
      * @param graph the Graph which connected component has to be verified.
      * @return the Connectivity algorithm builder
      */
-    public static <V, E, G extends Graph<V, E>> ConnectivityBuilder<V, E, G> findConnectedComponent( G graph )
+    public static <V, E, G extends Graph<V, E>> ConnectivityBuilder<V, E> findConnectedComponent( G graph )
     {
         graph = checkNotNull( graph, "Connected Component cannot be calculated from a null graph" );
-        return new DefaultConnectivityBuilder<V, E, G>( graph );
+        return new DefaultConnectivityBuilder<V, E>( graph );
     }
 
     /**

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -19,7 +19,6 @@ package org.apache.commons.graph.colorin
  * under the License.
  */
 
-import org.apache.commons.graph.UndirectedGraph;
 
 /**
  * Builder for selecting the coloring algorithm to perform.
@@ -29,7 +28,7 @@ import org.apache.commons.graph.Undirect
  * @param <G> the Graph type
  * @param <C> the Color vertices type
  */
-public interface ColoringAlgorithmsSelector<V, E, G extends UndirectedGraph<V, E>, C>
+public interface ColoringAlgorithmsSelector<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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -21,8 +21,6 @@ package org.apache.commons.graph.colorin
 
 import java.util.Set;
 
-import org.apache.commons.graph.UndirectedGraph;
-
 /**
  * Builder to specify the set of colors for coloring the graph.
  *
@@ -30,7 +28,7 @@ import org.apache.commons.graph.Undirect
  * @param <E> the Graph edges type
  * @param <G> the Graph type
  */
-public interface ColorsBuilder<V, E, G extends UndirectedGraph<V, E>>
+public interface ColorsBuilder<V, E>
 {
 
     /**
@@ -39,6 +37,6 @@ public interface ColorsBuilder<V, E, G e
      * @param colors the set of colors for coloring the graph.
      * @return the coloring algorithm selector.
      */
-    <C> ColoringAlgorithmsSelector<V, E, G, C> withColors( Set<C> colors );
+    <C> ColoringAlgorithmsSelector<V, E, C> withColors( Set<C> colors );
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -36,8 +36,8 @@ import org.apache.commons.graph.Undirect
  * @param <G> the Graph type
  * @param <C> the Color vertices type
  */
-final class DefaultColoringAlgorithmsSelector<V, E, G extends UndirectedGraph<V, E>, C>
-    implements ColoringAlgorithmsSelector<V, E, G, C>
+final class DefaultColoringAlgorithmsSelector<V, E, C>
+    implements ColoringAlgorithmsSelector<V, E, C>
 {
 
     private final UndirectedGraph<V, E> g;

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -32,13 +32,13 @@ import org.apache.commons.graph.Undirect
  * @param <E> the Graph edges type
  * @param <G> the Graph type
  */
-public final class DefaultColorsBuilder<V, E, G extends UndirectedGraph<V, E>>
-    implements ColorsBuilder<V, E, G>
+public final class DefaultColorsBuilder<V, E>
+    implements ColorsBuilder<V, E>
 {
 
-    private final G graph;
+    private final UndirectedGraph<V, E> graph;
 
-    public DefaultColorsBuilder( G graph )
+    public DefaultColorsBuilder( UndirectedGraph<V, E> graph )
     {
         this.graph = graph;
     }
@@ -46,10 +46,10 @@ public final class DefaultColorsBuilder<
     /**
      * {@inheritDoc}
      */
-    public <C> ColoringAlgorithmsSelector<V, E, G, C> withColors( Set<C> colors )
+    public <C> ColoringAlgorithmsSelector<V, E, C> withColors( Set<C> colors )
     {
         colors = checkNotNull( colors, "Colors set must be not null" );
-        return new DefaultColoringAlgorithmsSelector<V, E, G, C>( graph, colors );
+        return new DefaultColoringAlgorithmsSelector<V, E, C>( graph, colors );
     }
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -25,8 +25,8 @@ import java.util.List;
 import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.visit.BaseGraphVisitHandler;
 
-final class ConnectedComponentHandler<V, E, G extends Graph<V, E>>
-    extends BaseGraphVisitHandler<V, E, G, List<V>>
+final class ConnectedComponentHandler<V, E>
+    extends BaseGraphVisitHandler<V, E, Graph<V, E>, List<V>>
 {
 
     private final List<V> touchedVertices = new LinkedList<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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -22,15 +22,13 @@ package org.apache.commons.graph.connect
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.graph.Graph;
-
 /**
  * Builder for selecting the connectivity algorithm to perform.
  * @param <V> the Graph vertices type
  * @param <E> the Graph edges type
  * @param <G> the Graph type
  */
-public interface ConnectivityAlgorithmsSelector <V,  E, G extends Graph<V, E> >
+public interface ConnectivityAlgorithmsSelector<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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -19,16 +19,13 @@ package org.apache.commons.graph.connect
  * under the License.
  */
 
-import org.apache.commons.graph.Graph;
-
 /**
  * Builder to specify the set of vertices included into a connected component.
  *
  * @param <V> the Graph vertices type
  * @param <E> the Graph edges type
- * @param <G> the Graph type
  */
-public interface ConnectivityBuilder<V, E, G extends Graph<V, E>>
+public interface ConnectivityBuilder<V, E>
 {
 
     /**
@@ -37,13 +34,13 @@ public interface ConnectivityBuilder<V, 
      * @param vertices the set of vertices included into a connected component.
      * @return the connectivity algorithm selector.
      */
-    ConnectivityAlgorithmsSelector<V, E, G> includingVertices( V... vertices );
+    ConnectivityAlgorithmsSelector<V, E> includingVertices( V... vertices );
 
     /**
      * Find all the connected components included into the specified graph
      *
      * @return the connectivity algorithm selector.
      */
-    ConnectivityAlgorithmsSelector<V, E, G> includingAllVertices();
+    ConnectivityAlgorithmsSelector<V, E> includingAllVertices();
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -32,15 +32,15 @@ import org.apache.commons.graph.Graph;
 /**
  *
  */
-final class DefaultConnectivityAlgorithmsSelector<V, E, G extends Graph<V, E>>
-    implements ConnectivityAlgorithmsSelector<V, E, G>
+final class DefaultConnectivityAlgorithmsSelector<V, E>
+    implements ConnectivityAlgorithmsSelector<V, E>
 {
 
-    final private G graph;
+    final private Graph<V, E> graph;
 
     final private Iterable<V> includedVertices;
 
-    public DefaultConnectivityAlgorithmsSelector( G graph, Iterable<V> includedVertices )
+    public DefaultConnectivityAlgorithmsSelector( Graph<V, E> graph, Iterable<V> includedVertices )
     {
         this.graph = graph;
         this.includedVertices = includedVertices;
@@ -65,7 +65,7 @@ final class DefaultConnectivityAlgorithm
         {
             V source = untouchedVertices.remove( 0 );
 
-            connectedVertices.add( visit( graph ).from( source ).applyingDepthFirstSearch( new ConnectedComponentHandler<V, E, G>( untouchedVertices ) ) );
+            connectedVertices.add( visit( graph ).from( source ).applyingDepthFirstSearch( new ConnectedComponentHandler<V, E>( untouchedVertices ) ) );
         }
         return connectedVertices;
     }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -27,13 +27,13 @@ import org.apache.commons.graph.Graph;
 /**
  *
  */
-public class DefaultConnectivityBuilder<V, E, G extends Graph<V, E>>
-    implements ConnectivityBuilder<V, E, G>
+public class DefaultConnectivityBuilder<V, E>
+    implements ConnectivityBuilder<V, E>
 {
 
-    private final G graph;
+    private final Graph<V, E> graph;
 
-    public DefaultConnectivityBuilder( G graph )
+    public DefaultConnectivityBuilder( Graph<V, E> graph )
     {
         this.graph = graph;
     }
@@ -41,19 +41,19 @@ public class DefaultConnectivityBuilder<
     /**
      * {@inheritDoc}
      */
-    public ConnectivityAlgorithmsSelector<V, E, G> includingVertices( V... vertices )
+    public ConnectivityAlgorithmsSelector<V, E> includingVertices( V... vertices )
     {
         vertices = checkNotNull( vertices,
                                  "Graph connectivity cannote be applied on null vertices array, use no-args if you intend specify no vertices" );
-        return new DefaultConnectivityAlgorithmsSelector<V, E, G>( graph, asList( vertices ) );
+        return new DefaultConnectivityAlgorithmsSelector<V, E>( graph, asList( vertices ) );
     }
 
     /**
      * {@inheritDoc}
      */
-    public ConnectivityAlgorithmsSelector<V, E, G> includingAllVertices()
+    public ConnectivityAlgorithmsSelector<V, E> includingAllVertices()
     {
-        return new DefaultConnectivityAlgorithmsSelector<V, E, G>( graph, graph.getVertices() );
+        return new DefaultConnectivityAlgorithmsSelector<V, E>( graph, graph.getVertices() );
     }
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -24,25 +24,25 @@ import java.io.Writer;
 
 import org.apache.commons.graph.Graph;
 
-abstract class AbstractExporter<V, E, G extends Graph<V, E>>
+abstract class AbstractExporter<V, E>
 {
 
     private static final String G = "G";
 
-    private final G graph;
+    private final Graph<V, E> graph;
 
     private final Writer writer;
 
     private final String name;
 
-    public AbstractExporter( G graph, Writer writer, String name )
+    public AbstractExporter( Graph<V, E> graph, Writer writer, String name )
     {
         this.graph = graph;
         this.writer = writer;
         this.name = name != null ? name : G;
     }
 
-    protected final G getGraph()
+    protected final Graph<V, E> getGraph()
     {
         return graph;
     }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -23,22 +23,22 @@ import java.io.Writer;
 
 import org.apache.commons.graph.Graph;
 
-final class DefaultNamedExportSelector<V, E, G extends Graph<V, E>>
-    implements NamedExportSelctor<V, E, G>
+final class DefaultNamedExportSelector<V, E>
+    implements NamedExportSelctor<V, E>
 {
 
-    private final G graph;
+    private final Graph<V, E> graph;
 
     private final Writer writer;
 
     private final String name;
 
-    public DefaultNamedExportSelector( G graph, Writer writer )
+    public DefaultNamedExportSelector( Graph<V, E> graph, Writer writer )
     {
         this( graph, writer, null );
     }
 
-    public DefaultNamedExportSelector( G graph, Writer writer, String name )
+    public DefaultNamedExportSelector( Graph<V, E> graph, Writer writer, String name )
     {
         this.graph = graph;
         this.writer = writer;
@@ -48,18 +48,18 @@ final class DefaultNamedExportSelector<V
     public void usingDotNotation()
         throws GraphExportException
     {
-        new DotExporter<V, E, G>( graph, writer, name ).export();
+        new DotExporter<V, E>( graph, writer, name ).export();
     }
 
     public void usingGraphMLFormat()
         throws GraphExportException
     {
-        new GraphMLExporter<V, E, G>( graph, writer, name ).export();
+        new GraphMLExporter<V, E>( graph, writer, name ).export();
     }
 
-    public ExportSelctor<V, E, G> withName( String name )
+    public ExportSelctor<V, E> withName( String name )
     {
-        return new DefaultNamedExportSelector<V, E, G>( graph, writer, name );
+        return new DefaultNamedExportSelector<V, E>( graph, writer, name );
     }
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -30,18 +30,18 @@ import java.io.Writer;
 
 import org.apache.commons.graph.Graph;
 
-public final class DefaultToStreamBuilder<V, E, G extends Graph<V, E>>
-    implements ToStreamBuilder<V, E, G>
+public final class DefaultToStreamBuilder<V, E>
+    implements ToStreamBuilder<V, E>
 {
 
-    private final G graph;
+    private final Graph<V, E> graph;
 
-    public DefaultToStreamBuilder( G graph )
+    public DefaultToStreamBuilder( Graph<V, E> graph )
     {
         this.graph = graph;
     }
 
-    public NamedExportSelctor<V, E, G> to( File outputFile )
+    public NamedExportSelctor<V, E> to( File outputFile )
     {
         try
         {
@@ -53,15 +53,15 @@ public final class DefaultToStreamBuilde
         }
     }
 
-    public NamedExportSelctor<V, E, G> to( OutputStream outputStream )
+    public NamedExportSelctor<V, E> to( OutputStream outputStream )
     {
         return to( new OutputStreamWriter( checkNotNull( outputStream, "Impossibe to export the graph in a null stream" ) ) );
     }
 
-    public NamedExportSelctor<V, E, G> to( Writer writer )
+    public NamedExportSelctor<V, E> to( Writer writer )
     {
         writer = checkNotNull( writer, "Impossibe to export the graph in a null stream" );
-        return new DefaultNamedExportSelector<V, E, G>( graph, writer );
+        return new DefaultNamedExportSelector<V, E>( graph, writer );
     }
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -27,8 +27,8 @@ import org.apache.commons.graph.Directed
 import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.VertexPair;
 
-final class DotExporter<V, E, G extends Graph<V, E>>
-    extends AbstractExporter<V, E, G>
+final class DotExporter<V, E>
+    extends AbstractExporter<V, E>
 {
 
     private static final String GRAPH = "graph";
@@ -39,7 +39,7 @@ final class DotExporter<V, E, G extends 
 
     private static final String DICONNECTOR = "->";
 
-    public DotExporter( G graph, Writer writer, String name )
+    public DotExporter( Graph<V, E> graph, Writer writer, String name )
     {
         super( graph, writer, name );
     }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -19,9 +19,7 @@ package org.apache.commons.graph.export;
  * under the License.
  */
 
-import org.apache.commons.graph.Graph;
-
-public interface ExportSelctor<V, E, G extends Graph<V, E>>
+public interface ExportSelctor<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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -30,10 +30,9 @@ import javax.xml.stream.XMLOutputFactory
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.commons.graph.Graph;
-import org.apache.commons.graph.Weighted;
 
-final class GraphMLExporter<V, E, G extends Graph<V, E>>
-    extends AbstractExporter<V, E, G>
+final class GraphMLExporter<V, E>
+    extends AbstractExporter<V, E>
 {
 
     private static final String GRAPHML = "graphml";
@@ -84,7 +83,7 @@ final class GraphMLExporter<V, E, G exte
 
     private static final String WEIGHT = "weight";
 
-    public GraphMLExporter( G graph, Writer writer, String name )
+    public GraphMLExporter( Graph<V, E> graph, Writer writer, String name )
     {
         super( graph, writer, name );
     }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -19,12 +19,10 @@ package org.apache.commons.graph.export;
  * under the License.
  */
 
-import org.apache.commons.graph.Graph;
-
-public interface NamedExportSelctor<V, E, G extends Graph<V, E>>
-    extends ExportSelctor<V, E, G>
+public interface NamedExportSelctor<V, E>
+    extends ExportSelctor<V, E>
 {
 
-    ExportSelctor<V, E, G> withName( String name );
+    ExportSelctor<V, E> withName( String name );
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -23,9 +23,7 @@ import java.io.File;
 import java.io.OutputStream;
 import java.io.Writer;
 
-import org.apache.commons.graph.Graph;
-
-public interface ToStreamBuilder<V, E, G extends Graph<V, E>>
+public interface ToStreamBuilder<V, E>
 {
 
     /**
@@ -34,7 +32,7 @@ public interface ToStreamBuilder<V, E, G
      * @param outputFile the file where exporting the Graph to
      * @return
      */
-    NamedExportSelctor<V, E, G> to( File outputFile );
+    NamedExportSelctor<V, E> to( File outputFile );
 
     /**
      * Export the input Graph to an {@link OutputStream}.
@@ -42,7 +40,7 @@ public interface ToStreamBuilder<V, E, G
      * @param outputStream the output stream where exporting the Graph to
      * @return
      */
-    NamedExportSelctor<V, E, G> to( OutputStream outputStream );
+    NamedExportSelctor<V, E> to( OutputStream outputStream );
 
     /**
      * Export the input Graph to a {@link Writer}.
@@ -50,6 +48,6 @@ public interface ToStreamBuilder<V, E, G
      * @param writer the writer where exporting the Graph to
      * @return
      */
-    NamedExportSelctor<V, E, G> to( Writer writer );
+    NamedExportSelctor<V, E> to( Writer writer );
 
 }

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultFlowWeightedEdgesBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultFlowWeightedEdgesBuilder.java?rev=1299132&r1=1299131&r2=1299132&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultFlowWeightedEdgesBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/DefaultFlowWeightedEdgesBuilder.java Sat Mar 10 01:40:08 2012
@@ -24,21 +24,21 @@ import static org.apache.commons.graph.u
 import org.apache.commons.graph.DirectedGraph;
 import org.apache.commons.graph.Mapper;
 
-public final class DefaultFlowWeightedEdgesBuilder<V, WE, G extends DirectedGraph<V, WE>>
-    implements FlowWeightedEdgesBuilder<V, WE, G>
+public final class DefaultFlowWeightedEdgesBuilder<V, WE>
+    implements FlowWeightedEdgesBuilder<V, WE>
 {
 
-    private final G graph;
+    private final DirectedGraph<V, WE> graph;
 
-    public DefaultFlowWeightedEdgesBuilder( G graph )
+    public DefaultFlowWeightedEdgesBuilder( DirectedGraph<V, WE> graph )
     {
         this.graph = graph;
     }
 
-    public <W> FromHeadBuilder<V, WE, W, G> whereEdgesHaveWeights( Mapper<WE, W> weightedEdges )
+    public <W, M extends Mapper<WE, W>> FromHeadBuilder<V, WE, W> whereEdgesHaveWeights( M weightedEdges )
     {
         weightedEdges = checkNotNull( weightedEdges, "Function to calculate edges weight can not be null." );
-        return new DefaultFromHeadBuilder<V, WE, W, G>( graph, weightedEdges );
+        return new DefaultFromHeadBuilder<V, WE, W>( graph, weightedEdges );
     }
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -32,24 +32,24 @@ import org.apache.commons.graph.Mapper;
  * @param <WE>
  * @param <G>
  */
-final class DefaultFromHeadBuilder<V, WE, W, G extends DirectedGraph<V, WE>>
-    implements FromHeadBuilder<V, WE, W, G>
+final class DefaultFromHeadBuilder<V, WE, W>
+    implements FromHeadBuilder<V, WE, W>
 {
 
-    private final G graph;
+    private final DirectedGraph<V, WE> graph;
 
     private final Mapper<WE, W> weightedEdges;
 
-    public DefaultFromHeadBuilder( G graph, Mapper<WE, W> weightedEdges )
+    public DefaultFromHeadBuilder( DirectedGraph<V, WE> graph, Mapper<WE, W> weightedEdges )
     {
         this.graph = graph;
         this.weightedEdges = weightedEdges;
     }
 
-    public ToTailBuilder<V, WE, W, G> from( V head )
+    public ToTailBuilder<V, WE, W> from( V head )
     {
         head = checkNotNull( head, "head vertex has to be specifies when looking for the max flow" );
-        return new DefaultToTailBuilder<V, WE, W, G>( graph, weightedEdges, head );
+        return new DefaultToTailBuilder<V, WE, W>( graph, weightedEdges, head );
     }
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -37,11 +37,11 @@ import org.apache.commons.graph.weight.O
  * @param <WE>
  * @param <G>
  */
-final class DefaultMaxFlowAlgorithmSelector<V, WE, W, G extends DirectedGraph<V, WE>>
-    implements MaxFlowAlgorithmSelector<V, WE, W, G>
+final class DefaultMaxFlowAlgorithmSelector<V, WE, W>
+    implements MaxFlowAlgorithmSelector<V, WE, W>
 {
 
-    private final G graph;
+    private final DirectedGraph<V, WE> graph;
 
     private final Mapper<WE, W> weightedEdges;
 
@@ -49,7 +49,7 @@ final class DefaultMaxFlowAlgorithmSelec
 
     private final V target;
 
-    public DefaultMaxFlowAlgorithmSelector( G graph, Mapper<WE, W> weightedEdges, V source, V target )
+    public DefaultMaxFlowAlgorithmSelector( DirectedGraph<V, WE> graph, Mapper<WE, W> weightedEdges, V source, V target )
     {
         this.graph = graph;
         this.weightedEdges = weightedEdges;
@@ -113,7 +113,8 @@ final class DefaultMaxFlowAlgorithmSelec
         return flowNetworkHandler.onCompleted();
     }
 
-    private <WO extends OrderedMonoid<W>> DirectedGraph<V, EdgeWrapper<WE>> newFlowNetwok( final G graph, final WO weightOperations )
+    private <WO extends OrderedMonoid<W>> DirectedGraph<V, EdgeWrapper<WE>> newFlowNetwok( final DirectedGraph<V, WE> graph,
+                                                                                           final WO weightOperations )
     {
         return newDirectedMutableGraph( new AbstractGraphConnection<V, EdgeWrapper<WE>>()
         {

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -30,29 +30,28 @@ import org.apache.commons.graph.Mapper;
  * @param <V>
  * @param <W>
  * @param <WE>
- * @param <G>
  */
-final class DefaultToTailBuilder<V, WE, W, G extends DirectedGraph<V, WE>>
-    implements ToTailBuilder<V, WE, W, G>
+final class DefaultToTailBuilder<V, WE, W>
+    implements ToTailBuilder<V, WE, W>
 {
 
-    private final G graph;
+    private final DirectedGraph<V, WE> graph;
 
     private final Mapper<WE, W> weightedEdges;
 
     private final V head;
 
-    public DefaultToTailBuilder( G graph, Mapper<WE, W> weightedEdges, V head )
+    public DefaultToTailBuilder( DirectedGraph<V, WE> graph, Mapper<WE, W> weightedEdges, V head )
     {
         this.graph = graph;
         this.weightedEdges = weightedEdges;
         this.head = head;
     }
 
-    public MaxFlowAlgorithmSelector<V, WE, W, G> to( V tail )
+    public MaxFlowAlgorithmSelector<V, WE, W> to( V tail )
     {
         tail = checkNotNull( tail, "tail vertex has to be specifies when looking for the max flow" );
-        return new DefaultMaxFlowAlgorithmSelector<V, WE, W, G>( graph, weightedEdges, head, tail );
+        return new DefaultMaxFlowAlgorithmSelector<V, WE, W>( graph, weightedEdges, head, tail );
     }
 
 }

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FlowWeightedEdgesBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FlowWeightedEdgesBuilder.java?rev=1299132&r1=1299131&r2=1299132&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FlowWeightedEdgesBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/flow/FlowWeightedEdgesBuilder.java Sat Mar 10 01:40:08 2012
@@ -19,12 +19,11 @@ package org.apache.commons.graph.flow;
  * under the License.
  */
 
-import org.apache.commons.graph.DirectedGraph;
 import org.apache.commons.graph.Mapper;
 
-public interface FlowWeightedEdgesBuilder<V, WE, G extends DirectedGraph<V, WE>>
+public interface FlowWeightedEdgesBuilder<V, WE>
 {
 
-    <W> FromHeadBuilder<V, WE, W, G> whereEdgesHaveWeights( Mapper<WE, W> weightedEdges );
+    <W, M extends Mapper<WE, W>> FromHeadBuilder<V, WE, W> whereEdgesHaveWeights( M weightedEdges );
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -19,9 +19,7 @@ package org.apache.commons.graph.flow;
  * under the License.
  */
 
-import org.apache.commons.graph.DirectedGraph;
-
-public interface FromHeadBuilder<V, WE, W, G extends DirectedGraph<V, WE>>
+public interface FromHeadBuilder<V, WE, W>
 {
 
     /**
@@ -30,6 +28,6 @@ public interface FromHeadBuilder<V, WE, 
      * @param head
      * @return
      */
-    ToTailBuilder<V, WE, W, G> from( V head );
+    ToTailBuilder<V, WE, W> from( V head );
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -19,10 +19,9 @@ package org.apache.commons.graph.flow;
  * under the License.
  */
 
-import org.apache.commons.graph.DirectedGraph;
 import org.apache.commons.graph.weight.OrderedMonoid;
 
-public interface MaxFlowAlgorithmSelector<V, WE, W, G extends DirectedGraph<V, WE>>
+public interface MaxFlowAlgorithmSelector<V, WE, W>
 {
 
     /**

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -19,9 +19,7 @@ package org.apache.commons.graph.flow;
  * under the License.
  */
 
-import org.apache.commons.graph.DirectedGraph;
-
-public interface ToTailBuilder<V, WE, W, G extends DirectedGraph<V, WE>>
+public interface ToTailBuilder<V, WE, W>
 {
 
     /**
@@ -30,6 +28,6 @@ public interface ToTailBuilder<V, WE, W,
      * @param tail
      * @return
      */
-    MaxFlowAlgorithmSelector<V, WE, W, G> to( V tail );
+    MaxFlowAlgorithmSelector<V, WE, W> to( V tail );
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -36,11 +36,11 @@ import org.apache.commons.graph.Directed
  * @param <E> the Graph edges type.
  * @param <G> the directed graph type
  */
-final class CheriyanMehlhornGabowAlgorithm<V, E, G extends DirectedGraph<V, E>>
+final class CheriyanMehlhornGabowAlgorithm<V, E>
     implements SccAlgorithm<V>
 {
 
-    private final G graph;
+    private final DirectedGraph<V, E> graph;
 
     private final Set<V> marked = new HashSet<V>();
 
@@ -56,7 +56,7 @@ final class CheriyanMehlhornGabowAlgorit
 
     private int sscCounter = 0;
 
-    public CheriyanMehlhornGabowAlgorithm( G graph )
+    public CheriyanMehlhornGabowAlgorithm( DirectedGraph<V, E> graph )
     {
         this.graph = graph;
     }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -31,18 +31,18 @@ import org.apache.commons.graph.Graph;
  * @param <E> the Graph edges type.
  * @param <G> the directed graph type
  */
-public final class DefaultSccAlgorithmSelector<V, E, G extends DirectedGraph<V, E>>
-    implements SccAlgorithmSelector<V, E, G>
+public final class DefaultSccAlgorithmSelector<V, E>
+    implements SccAlgorithmSelector<V, E>
 {
     /** The graph. */
-    private final G graph;
+    private final DirectedGraph<V, E> graph;
 
     /**
      * Create a default {@link SccAlgorithmSelector} for the given {@link Graph}.
      *
      * @param graph the {@link Graph}.
      */
-    public DefaultSccAlgorithmSelector( final G graph )
+    public DefaultSccAlgorithmSelector( final DirectedGraph<V, E> graph )
     {
         this.graph = graph;
     }
@@ -52,7 +52,7 @@ public final class DefaultSccAlgorithmSe
      */
     public Set<V> applyingKosarajuSharir( final V source )
     {
-        return new KosarajuSharirAlgorithm<V, E, G>( graph ).perform( source );
+        return new KosarajuSharirAlgorithm<V, E>( graph ).perform( source );
     }
 
     /**
@@ -60,7 +60,7 @@ public final class DefaultSccAlgorithmSe
      */
     public Set<Set<V>> applyingKosarajuSharir()
     {
-        return applying( new KosarajuSharirAlgorithm<V, E, G>( graph ) );
+        return applying( new KosarajuSharirAlgorithm<V, E>( graph ) );
     }
 
     /**
@@ -68,7 +68,7 @@ public final class DefaultSccAlgorithmSe
      */
     public Set<Set<V>> applyingCheriyanMehlhornGabow()
     {
-        return applying( new CheriyanMehlhornGabowAlgorithm<V, E, G>( graph ) );
+        return applying( new CheriyanMehlhornGabowAlgorithm<V, E>( graph ) );
     }
 
     /**
@@ -76,7 +76,7 @@ public final class DefaultSccAlgorithmSe
      */
     public Set<Set<V>> applyingTarjan()
     {
-        return applying( new TarjanAlgorithm<V, E, G>( graph ) );
+        return applying( new TarjanAlgorithm<V, E>( 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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -42,18 +42,18 @@ import org.apache.commons.graph.model.Re
  * @param <E> the Graph edges type.
  * @param <G> the directed graph type
  */
-final class KosarajuSharirAlgorithm<V, E, G extends DirectedGraph<V, E>>
+final class KosarajuSharirAlgorithm<V, E>
     implements SccAlgorithm<V>
 {
     /** The graph. */
-    private final G graph;
+    private final DirectedGraph<V, E> graph;
 
     /**
      * Create a new {@link KosarajuSharirAlgorithm} instance for the given {@link Graph}.
      *
      * @param graph the {@link Graph} on which to apply the algorithm
      */
-    public KosarajuSharirAlgorithm( final G graph )
+    public KosarajuSharirAlgorithm( final DirectedGraph<V, E> graph )
     {
         this.graph = graph;
     }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -21,15 +21,13 @@ package org.apache.commons.graph.scc;
 
 import java.util.Set;
 
-import org.apache.commons.graph.DirectedGraph;
-
 /**
  * Allows selecting the algorithm for calculating the strongly connected component.
  *
  * @param <V> the Graph vertices type.
  * @param <E> the Graph edges type.
  */
-public interface SccAlgorithmSelector<V, E, G extends DirectedGraph<V, E>>
+public interface SccAlgorithmSelector<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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -37,15 +37,15 @@ import org.apache.commons.graph.Directed
  * @param <E> the Graph edges type.
  * @param <G> the directed graph type
  */
-final class TarjanAlgorithm<V, E, G extends DirectedGraph<V, E>>
+final class TarjanAlgorithm<V, E>
     implements SccAlgorithm<V>
 {
 
-    private final G graph;
+    private final DirectedGraph<V, E> graph;
 
     /**
      */
-    public TarjanAlgorithm( G graph )
+    public TarjanAlgorithm( DirectedGraph<V, E> graph )
     {
         this.graph = graph;
     }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -32,11 +32,11 @@ import org.apache.commons.graph.Weighted
 import org.apache.commons.graph.collections.FibonacciHeap;
 import org.apache.commons.graph.weight.OrderedMonoid;
 
-final class DefaultHeuristicBuilder<V, WE, W, G extends Graph<V, WE>, WO extends OrderedMonoid<W>>
-    implements HeuristicBuilder<V, WE, W, G, WO>
+final class DefaultHeuristicBuilder<V, WE, W>
+    implements HeuristicBuilder<V, WE, W>
 {
 
-    private final G graph;
+    private final Graph<V, WE> graph;
 
     private final Mapper<WE, W> weightedEdges;
 
@@ -44,9 +44,9 @@ final class DefaultHeuristicBuilder<V, W
 
     private final V goal;
 
-    private final WO weightOperations;
+    private final OrderedMonoid<W> weightOperations;
 
-    public DefaultHeuristicBuilder( G graph, Mapper<WE, W> weightedEdges, V source, V target, WO weightOperations )
+    public DefaultHeuristicBuilder( Graph<V, WE> graph, Mapper<WE, W> weightedEdges, V source, V target, OrderedMonoid<W> weightOperations )
     {
         this.graph = graph;
         this.weightedEdges = weightedEdges;

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -31,15 +31,15 @@ import org.apache.commons.graph.Mapper;
 import org.apache.commons.graph.WeightedPath;
 import org.apache.commons.graph.weight.OrderedMonoid;
 
-final class DefaultPathSourceSelector<V, WE, W, G extends Graph<V, WE>>
-    implements PathSourceSelector<V, WE, W, G>
+final class DefaultPathSourceSelector<V, WE, W>
+    implements PathSourceSelector<V, WE, W>
 {
 
-    private final G graph;
+    private final Graph<V, WE> graph;
 
     private final Mapper<WE, W> weightedEdges;
 
-    public DefaultPathSourceSelector( G graph, Mapper<WE, W> weightedEdges )
+    public DefaultPathSourceSelector( Graph<V, WE> graph, Mapper<WE, W> weightedEdges )
     {
         this.graph = graph;
         this.weightedEdges = weightedEdges;
@@ -140,10 +140,10 @@ final class DefaultPathSourceSelector<V,
     /**
      * {@inheritDoc}
      */
-    public TargetSourceSelector<V, WE, W, G> from( V source )
+    public TargetSourceSelector<V, WE, W> from( V source )
     {
         source = checkNotNull( source, "Shortest path can not be calculated from a null source" );
-        return new DefaultTargetSourceSelector<V, WE, W, G>( graph, weightedEdges, source );
+        return new DefaultTargetSourceSelector<V, WE, W>( graph, weightedEdges, source );
     }
 
 }
\ No newline at end of file

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -31,11 +31,11 @@ import org.apache.commons.graph.Weighted
 import org.apache.commons.graph.collections.FibonacciHeap;
 import org.apache.commons.graph.weight.OrderedMonoid;
 
-final class DefaultShortestPathAlgorithmSelector<V, WE, W, G extends Graph<V, WE>>
-    implements ShortestPathAlgorithmSelector<V, WE, W, G>
+final class DefaultShortestPathAlgorithmSelector<V, WE, W>
+    implements ShortestPathAlgorithmSelector<V, WE, W>
 {
 
-    private final G graph;
+    private final Graph<V, WE> graph;
 
     private final Mapper<WE, W> weightedEdges;
 
@@ -43,7 +43,7 @@ final class DefaultShortestPathAlgorithm
 
     private final V target;
 
-    public DefaultShortestPathAlgorithmSelector( G graph, Mapper<WE, W> weightedEdges, V source, V target )
+    public DefaultShortestPathAlgorithmSelector( Graph<V, WE> graph, Mapper<WE, W> weightedEdges, V source, V target )
     {
         this.graph = graph;
         this.weightedEdges = weightedEdges;
@@ -54,10 +54,10 @@ final class DefaultShortestPathAlgorithm
     /**
      * {@inheritDoc}
      */
-    public <WO extends OrderedMonoid<W>> HeuristicBuilder<V, WE, W, G, WO> applyingAStar( WO weightOperations )
+    public <WO extends OrderedMonoid<W>> HeuristicBuilder<V, WE, W> applyingAStar( WO weightOperations )
     {
         weightOperations = checkNotNull( weightOperations, "A* algorithm can not be applied using null weight operations" );
-        return new DefaultHeuristicBuilder<V, WE, W, G, WO>( graph, weightedEdges, source, target, weightOperations );
+        return new DefaultHeuristicBuilder<V, WE, W>( graph, weightedEdges, source, target, weightOperations );
     }
 
     /**

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -27,17 +27,17 @@ import org.apache.commons.graph.Mapper;
 import org.apache.commons.graph.WeightedPath;
 import org.apache.commons.graph.weight.OrderedMonoid;
 
-final class DefaultTargetSourceSelector<V, WE, W, G extends Graph<V, WE>>
-    implements TargetSourceSelector<V, WE, W, G>
+final class DefaultTargetSourceSelector<V, WE, W>
+    implements TargetSourceSelector<V, WE, W>
 {
 
-    private final G graph;
+    private final Graph<V, WE> graph;
 
     private final Mapper<WE, W> weightedEdges;
 
     private final V source;
 
-    public DefaultTargetSourceSelector( G graph, Mapper<WE, W> weightedEdges, V source )
+    public DefaultTargetSourceSelector( Graph<V, WE> graph, Mapper<WE, W> weightedEdges, V source )
     {
         this.graph = graph;
         this.weightedEdges = weightedEdges;
@@ -125,10 +125,10 @@ final class DefaultTargetSourceSelector<
     /**
      * {@inheritDoc}
      */
-    public ShortestPathAlgorithmSelector<V, WE, W, G> to( V target )
+    public ShortestPathAlgorithmSelector<V, WE, W> to( V target )
     {
         target = checkNotNull( target, "Shortest path can not be calculated to a null target" );
-        return new DefaultShortestPathAlgorithmSelector<V, WE, W, G>( graph, weightedEdges, source, target );
+        return new DefaultShortestPathAlgorithmSelector<V, WE, W>( graph, weightedEdges, source, target );
     }
 
 }

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultWeightedEdgesSelector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultWeightedEdgesSelector.java?rev=1299132&r1=1299131&r2=1299132&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultWeightedEdgesSelector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/DefaultWeightedEdgesSelector.java Sat Mar 10 01:40:08 2012
@@ -24,21 +24,21 @@ import static org.apache.commons.graph.u
 import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.Mapper;
 
-public final class DefaultWeightedEdgesSelector<V, WE, G extends Graph<V, WE>>
-    implements PathWeightedEdgesBuilder<V, WE, G>
+public final class DefaultWeightedEdgesSelector<V, WE>
+    implements PathWeightedEdgesBuilder<V, WE>
 {
 
-    private final G graph;
+    private final Graph<V, WE> graph;
 
-    public DefaultWeightedEdgesSelector( G graph )
+    public DefaultWeightedEdgesSelector( Graph<V, WE> graph )
     {
         this.graph = graph;
     }
 
-    public <W> PathSourceSelector<V, WE, W, G> whereEdgesHaveWeights( Mapper<WE, W> weightedEdges )
+    public <W, M extends Mapper<WE, W>> PathSourceSelector<V, WE, W> whereEdgesHaveWeights( M weightedEdges )
     {
         weightedEdges = checkNotNull( weightedEdges, "Function to calculate edges weight can not be null." );
-        return new DefaultPathSourceSelector<V, WE, W, G>( graph, weightedEdges );
+        return new DefaultPathSourceSelector<V, WE, W>( graph, weightedEdges );
     }
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -19,9 +19,7 @@ package org.apache.commons.graph.shortes
  * under the License.
  */
 
-import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.WeightedPath;
-import org.apache.commons.graph.weight.OrderedMonoid;
 
 /**
  *
@@ -30,7 +28,7 @@ import org.apache.commons.graph.weight.O
  * @param <W>
  * @param <G>
  */
-public interface HeuristicBuilder<V, WE, W, G extends Graph<V, WE>, WO extends OrderedMonoid<W>>
+public interface HeuristicBuilder<V, WE, 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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -19,7 +19,6 @@ package org.apache.commons.graph.shortes
  * under the License.
  */
 
-import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.weight.OrderedMonoid;
 
 /**
@@ -30,7 +29,7 @@ import org.apache.commons.graph.weight.O
  * @param <WE>
  * @param <G>
  */
-public interface PathSourceSelector<V, WE, W, G extends Graph<V, WE>>
+public interface PathSourceSelector<V, WE, W>
 {
 
     /**
@@ -47,6 +46,6 @@ public interface PathSourceSelector<V, W
      *
      * @param source
      */
-    TargetSourceSelector<V, WE, W, G> from( V source );
+    TargetSourceSelector<V, WE, W> from( V source );
 
 }

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PathWeightedEdgesBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PathWeightedEdgesBuilder.java?rev=1299132&r1=1299131&r2=1299132&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PathWeightedEdgesBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/shortestpath/PathWeightedEdgesBuilder.java Sat Mar 10 01:40:08 2012
@@ -19,14 +19,13 @@ package org.apache.commons.graph.shortes
  * under the License.
  */
 
-import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.Mapper;
 
 // TODO find a better name
-public interface PathWeightedEdgesBuilder<V, WE, G extends Graph<V, WE>>
+public interface PathWeightedEdgesBuilder<V, WE>
 {
 
     // TODO find a better sentence
-    <W> PathSourceSelector<V, WE, W, G> whereEdgesHaveWeights( Mapper<WE, W> weightedEdges );
+    <W, M extends Mapper<WE, W>> PathSourceSelector<V, WE, W> whereEdgesHaveWeights( M weightedEdges );
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -19,7 +19,6 @@ package org.apache.commons.graph.shortes
  * under the License.
  */
 
-import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.WeightedPath;
 import org.apache.commons.graph.weight.OrderedMonoid;
 
@@ -31,7 +30,7 @@ import org.apache.commons.graph.weight.O
  * @param <WE>
  * @param <G>
  */
-public interface ShortestPathAlgorithmSelector<V, WE, W, G extends Graph<V, WE>>
+public interface ShortestPathAlgorithmSelector<V, WE, W>
 {
 
     /**
@@ -41,7 +40,7 @@ public interface ShortestPathAlgorithmSe
      * @param weightOperations the class responsible for operations on weights
      * @return
      */
-    <WO extends OrderedMonoid<W>> HeuristicBuilder<V, WE, W, G, WO> applyingAStar( WO weightOperations );
+    <WO extends OrderedMonoid<W>> HeuristicBuilder<V, WE, W> applyingAStar( WO weightOperations );
 
     /**
      *  Calculates the shortest path using Dijkstra's algorithm.

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -19,7 +19,6 @@ package org.apache.commons.graph.shortes
  * under the License.
  */
 
-import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.weight.OrderedMonoid;
 
 /**
@@ -30,7 +29,7 @@ import org.apache.commons.graph.weight.O
  * @param <WE>
  * @param <G>
  */
-public interface TargetSourceSelector<V, WE, W, G extends Graph<V, WE>>
+public interface TargetSourceSelector<V, WE, W>
 {
 
     /**
@@ -47,6 +46,6 @@ public interface TargetSourceSelector<V,
      *
      * @param target
      */
-    ShortestPathAlgorithmSelector<V, WE, W, G> to( V target );
+    ShortestPathAlgorithmSelector<V, WE, W> to( V target );
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -46,11 +46,11 @@ import org.apache.commons.graph.weight.O
  * @param <WE> the Graph weighted edges type
  * @param <G> the input Graph type
  */
-final class DefaultSpanningTreeAlgorithmSelector<V, W, WE, G extends Graph<V, WE>>
-    implements SpanningTreeAlgorithmSelector<V, W, WE, G>
+final class DefaultSpanningTreeAlgorithmSelector<V, W, WE>
+    implements SpanningTreeAlgorithmSelector<V, W, WE>
 {
     /** The graph. */
-    private final G graph;
+    private final Graph<V, WE> graph;
 
     private final Mapper<WE, W> weightedEdges;
 
@@ -64,7 +64,7 @@ final class DefaultSpanningTreeAlgorithm
      * @param graph the {@link Graph} to be used.
      * @param source the start {@link Vertex}.
      */
-    public DefaultSpanningTreeAlgorithmSelector( final G graph, Mapper<WE, W> weightedEdges, final V source )
+    public DefaultSpanningTreeAlgorithmSelector( final Graph<V, WE> graph, Mapper<WE, W> weightedEdges, final V source )
     {
         this.graph = graph;
         this.weightedEdges = weightedEdges;
@@ -93,14 +93,14 @@ final class DefaultSpanningTreeAlgorithm
 
         final MutableSpanningTree<V, WE, W> spanningTree = new MutableSpanningTree<V, WE, W>( weightOperations, weightedEdges );
 
-        final Set<SuperVertex<V, W, WE, G>> components = new HashSet<SuperVertex<V, W, WE, G>>( graph.getOrder() );
+        final Set<SuperVertex<V, W, WE>> components = new HashSet<SuperVertex<V, W, WE>>( graph.getOrder() );
 
-        final Map<V, SuperVertex<V, W, WE, G>> mapping = new HashMap<V, SuperVertex<V, W, WE, G>>( graph.getOrder() );
+        final Map<V, SuperVertex<V, W, WE>> mapping = new HashMap<V, SuperVertex<V, W, WE>>( graph.getOrder() );
 
         for ( V v : graph.getVertices() )
         {
             // create a super vertex for each vertex
-            final SuperVertex<V, W, WE, G> sv = new SuperVertex<V, W, WE, G>( v, graph, new WeightedEdgesComparator<W, WE>( weightOperations, weightedEdges ) );
+            final SuperVertex<V, W, WE> sv = new SuperVertex<V, W, WE>( v, graph, new WeightedEdgesComparator<W, WE>( weightOperations, weightedEdges ) );
 
             components.add( sv );
 
@@ -114,7 +114,7 @@ final class DefaultSpanningTreeAlgorithm
         while ( components.size() > 1 )
         {
             final List<WE> edges = new LinkedList<WE>();
-            for ( SuperVertex<V, W, WE, G> sv : components )
+            for ( SuperVertex<V, W, WE> sv : components )
             {
                 // get the minimum edge for each component to any other component
                 final WE edge = sv.getMinimumWeightEdge();
@@ -135,8 +135,8 @@ final class DefaultSpanningTreeAlgorithm
                 final V tail = pair.getTail();
 
                 // find the super vertices corresponding to this edge
-                final SuperVertex<V, W, WE, G> headSv = mapping.get( head );
-                final SuperVertex<V, W, WE, G> tailSv = mapping.get( tail );
+                final SuperVertex<V, W, WE> headSv = mapping.get( head );
+                final SuperVertex<V, W, WE> tailSv = mapping.get( tail );
 
                 // merge them, if they are not the same
                 if ( headSv != tailSv )

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -45,15 +45,15 @@ import org.apache.commons.graph.weight.O
  * @param <WE> the Graph weighted edges type
  * @param <G> the input Graph type
  */
-final class DefaultSpanningTreeSourceSelector<V, W, WE, G extends Graph<V, WE>>
-    implements SpanningTreeSourceSelector<V, W, WE, G>
+final class DefaultSpanningTreeSourceSelector<V, W, WE>
+    implements SpanningTreeSourceSelector<V, W, WE>
 {
 
-    private final G graph;
+    private final Graph<V, WE> graph;
 
     private final Mapper<WE, W> weightedEdges;
 
-    public DefaultSpanningTreeSourceSelector( G graph, Mapper<WE, W> weightedEdges )
+    public DefaultSpanningTreeSourceSelector( Graph<V, WE> graph, Mapper<WE, W> weightedEdges )
     {
         this.graph = graph;
         this.weightedEdges = weightedEdges;
@@ -62,7 +62,7 @@ final class DefaultSpanningTreeSourceSel
     /**
      * {@inheritDoc}
      */
-    public SpanningTreeAlgorithmSelector<V, W, WE, G> fromArbitrarySource()
+    public SpanningTreeAlgorithmSelector<V, W, WE> fromArbitrarySource()
     {
         checkState( graph.getOrder() > 0, "Spanning tree cannot be calculated on an empty graph" );
         return fromSource( graph.getVertices().iterator().next() );
@@ -71,11 +71,11 @@ final class DefaultSpanningTreeSourceSel
     /**
      * {@inheritDoc}
      */
-    public SpanningTreeAlgorithmSelector<V, W, WE, G> fromSource( V source )
+    public SpanningTreeAlgorithmSelector<V, W, WE> fromSource( V source )
     {
         source = checkNotNull( source, "Spanning tree cannot be calculated without expressing the source vertex" );
         checkState( graph.containsVertex( source ), "Vertex %s does not exist in the Graph", source );
-        return new DefaultSpanningTreeAlgorithmSelector<V, W, WE, G>( graph, weightedEdges, source );
+        return new DefaultSpanningTreeAlgorithmSelector<V, W, WE>( graph, weightedEdges, source );
     }
 
     /**

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningWeightedEdgeMapperBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningWeightedEdgeMapperBuilder.java?rev=1299132&r1=1299131&r2=1299132&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningWeightedEdgeMapperBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningWeightedEdgeMapperBuilder.java Sat Mar 10 01:40:08 2012
@@ -24,21 +24,21 @@ import static org.apache.commons.graph.u
 import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.Mapper;
 
-public final class DefaultSpanningWeightedEdgeMapperBuilder<V, WE, G extends Graph<V, WE>>
-    implements SpanningWeightedEdgeMapperBuilder<V, WE, G>
+public final class DefaultSpanningWeightedEdgeMapperBuilder<V, WE>
+    implements SpanningWeightedEdgeMapperBuilder<V, WE>
 {
 
-    private final G graph;
+    private final Graph<V, WE> graph;
 
-    public DefaultSpanningWeightedEdgeMapperBuilder( G graph )
+    public DefaultSpanningWeightedEdgeMapperBuilder( Graph<V, WE> graph )
     {
         this.graph = graph;
     }
 
-    public <W> SpanningTreeSourceSelector<V, W, WE, G> whereEdgesHaveWeights( Mapper<WE, W> weightedEdges )
+    public <W> SpanningTreeSourceSelector<V, W, WE> whereEdgesHaveWeights( Mapper<WE, W> weightedEdges )
     {
         weightedEdges = checkNotNull( weightedEdges, "Function to calculate edges weight can not be null." );
-        return new DefaultSpanningTreeSourceSelector<V, W, WE, G>( graph, weightedEdges );
+        return new DefaultSpanningTreeSourceSelector<V, W, WE>( graph, weightedEdges );
     }
 
 }

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=1299132&r1=1299131&r2=1299132&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 Sat Mar 10 01:40:08 2012
@@ -19,7 +19,6 @@ package org.apache.commons.graph.spannin
  * under the License.
  */
 
-import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.SpanningTree;
 import org.apache.commons.graph.weight.OrderedMonoid;
 
@@ -31,7 +30,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, W, WE, G extends Graph<V, WE>>
+public interface SpanningTreeAlgorithmSelector<V, W, WE>
 {
 
     /**



Mime
View raw message