svn commit: r1299132 [2/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...

[si...@apache.org]

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeSourceSelector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeSourceSelector.java?rev=1299132&r1=1299131&r2=1299132&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeSourceSelector.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningTreeSourceSelector.java 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 SpanningTreeSourceSelector<V, W, WE, G extends Graph<V, WE>>
+public interface SpanningTreeSourceSelector<V, W, WE>
 {
 
     /**
@@ -39,7 +38,7 @@ public interface SpanningTreeSourceSelec
      *
      * @return the linked spanning tree algorithm builder
      */
-    SpanningTreeAlgorithmSelector<V, W, WE, G> fromArbitrarySource();
+    SpanningTreeAlgorithmSelector<V, W, WE> fromArbitrarySource();
 
     /**
      * Allows specify a source vertex to calculate the spanning tree.
@@ -47,7 +46,7 @@ public interface SpanningTreeSourceSelec
      * @param source the source vertex to calculate the spanning tree.
      * @return the linked spanning tree algorithm builder
      */
-    SpanningTreeAlgorithmSelector<V, W, WE, G> fromSource( V source );
+    SpanningTreeAlgorithmSelector<V, W, WE> fromSource( V source );
 
     /**
      * Applies the <a href="http://en.wikipedia.org/wiki/Reverse-Delete_algorithm">Reverse-Delete</a> algorithm.

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningWeightedEdgeMapperBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningWeightedEdgeMapperBuilder.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/SpanningWeightedEdgeMapperBuilder.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SpanningWeightedEdgeMapperBuilder.java Sat Mar 10 01:40:08 2012
@@ -19,12 +19,11 @@ package org.apache.commons.graph.spannin
  * under the License.
  */
 
-import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.Mapper;
 
-public interface SpanningWeightedEdgeMapperBuilder<V, WE, G extends Graph<V, WE>>
+public interface SpanningWeightedEdgeMapperBuilder<V, WE>
 {
 
-    <W> SpanningTreeSourceSelector<V, W, WE, G> whereEdgesHaveWeights( Mapper<WE, W> weightedEdges );
+    <W> SpanningTreeSourceSelector<V, W, WE> whereEdgesHaveWeights( Mapper<WE, W> weightedEdges );
 
 }

Modified: commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SuperVertex.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SuperVertex.java?rev=1299132&r1=1299131&r2=1299132&view=diff
==============================================================================
--- commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SuperVertex.java (original)
+++ commons/sandbox/graph/branches/drop-marker-interfaces-feature/src/main/java/org/apache/commons/graph/spanning/SuperVertex.java Sat Mar 10 01:40:08 2012
@@ -37,11 +37,11 @@ import org.apache.commons.graph.VertexPa
  * @param <G>  the input Graph type
  * @param <WC> the weight operations
  */
-class SuperVertex<V, W, WE, G extends Graph<V, WE>>
+class SuperVertex<V, W, WE>
     implements Iterable<V> {
 
     /** The reference to the graph. */
-    private final G graph;
+    private final Graph<V, WE> graph;
 
     /** The set of vertices combined in this {@link SuperVertex}. */
     private final Set<V> vertices;
@@ -57,7 +57,7 @@ class SuperVertex<V, W, WE, G extends Gr
      * @param graph the underlying graph
      * @param weightComparator the comparator used to sort the weighted edges
      */
-    public SuperVertex( final V source, final G graph, final WeightedEdgesComparator<W, WE> weightComparator )
+    public SuperVertex( final V source, final Graph<V, WE> graph, final WeightedEdgesComparator<W, WE> weightComparator )
     {
         this.graph = graph;
 
@@ -87,7 +87,7 @@ class SuperVertex<V, W, WE, G extends Gr
      *
      * @param other the {@link SuperVertex} to be merged into this
      */
-    public void merge( final SuperVertex<V, W, WE, G> other )
+    public void merge( final SuperVertex<V, W, WE> other )
     {
         for ( final V v : other.vertices )
         {