You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/06/12 22:35:56 UTC
svn commit: r1134977 - in
/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph: ./
domain/basic/
Author: simonetripodi
Date: Sun Jun 12 20:35:55 2011
New Revision: 1134977
URL: http://svn.apache.org/viewvc?rev=1134977&view=rev
Log:
updated Edge typing, given the current Edge definition
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/DirectedGraph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Graph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/MutableDirectedGraph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/MutableGraph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Path.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/UndirectedGraph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedEdge.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedGraph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedPath.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/DirectedGraphImpl.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/DirectedGraphWrapper.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/GraphWrapper.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/UndirectedGraphImpl.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/WeightedGraphWrapper.java
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/DirectedGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/DirectedGraph.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/DirectedGraph.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/DirectedGraph.java Sun Jun 12 20:35:55 2011
@@ -31,7 +31,7 @@ import java.util.Set;
* @param <V> the Graph vertices type
* @param <E> the Graph edges type
*/
-public interface DirectedGraph<V extends Vertex, E extends Edge>
+public interface DirectedGraph<V extends Vertex, E extends Edge<V>>
extends Graph<V, E>
{
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Graph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Graph.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Graph.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Graph.java Sun Jun 12 20:35:55 2011
@@ -29,7 +29,7 @@ import java.util.Set;
* @param <V> the Graph vertices type
* @param <E> the Graph edges type
*/
-public interface Graph<V extends Vertex, E extends Edge>
+public interface Graph<V extends Vertex, E extends Edge<V>>
{
/**
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/MutableDirectedGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/MutableDirectedGraph.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/MutableDirectedGraph.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/MutableDirectedGraph.java Sun Jun 12 20:35:55 2011
@@ -26,7 +26,7 @@ package org.apache.commons.graph;
* @param <V> the Graph vertices type
* @param <E> the Graph edges type
*/
-public interface MutableDirectedGraph<V extends Vertex, E extends Edge>
+public interface MutableDirectedGraph<V extends Vertex, E extends Edge<V>>
extends DirectedGraph<V, E>
{
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/MutableGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/MutableGraph.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/MutableGraph.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/MutableGraph.java Sun Jun 12 20:35:55 2011
@@ -25,7 +25,7 @@ package org.apache.commons.graph;
* @param <V> the Graph vertices type
* @param <E> the Graph edges type
*/
-public interface MutableGraph<V extends Vertex, E extends Edge>
+public interface MutableGraph<V extends Vertex, E extends Edge<V>>
extends Graph<V, E>
{
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Path.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Path.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Path.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Path.java Sun Jun 12 20:35:55 2011
@@ -28,7 +28,7 @@ import java.util.List;
* @param <V> the Graph vertices type
* @param <E> the Graph edges type
*/
-public interface Path<V extends Vertex, E extends Edge>
+public interface Path<V extends Vertex, E extends Edge<V>>
{
/**
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/UndirectedGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/UndirectedGraph.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/UndirectedGraph.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/UndirectedGraph.java Sun Jun 12 20:35:55 2011
@@ -26,7 +26,7 @@ package org.apache.commons.graph;
* @param <V> the Graph vertices type
* @param <E> the Graph edges type
*/
-public interface UndirectedGraph<V extends Vertex, E extends Edge>
+public interface UndirectedGraph<V extends Vertex, E extends Edge<V>>
extends Graph<V, E>
{
}
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedEdge.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedEdge.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedEdge.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedEdge.java Sun Jun 12 20:35:55 2011
@@ -25,8 +25,8 @@ package org.apache.commons.graph;
*
* @param <W> the {@link Edge} weight.
*/
-public interface WeightedEdge
- extends Edge, Comparable<WeightedEdge>
+public interface WeightedEdge<V extends Vertex>
+ extends Edge<V>, Comparable<WeightedEdge<?>>
{
/**
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedGraph.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedGraph.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedGraph.java Sun Jun 12 20:35:55 2011
@@ -28,7 +28,7 @@ package org.apache.commons.graph;
* @param <W> the {@link Edge} weight.
* @param <WE> the Graph weighted edges type
*/
-public interface WeightedGraph<V extends Vertex, WE extends WeightedEdge>
+public interface WeightedGraph<V extends Vertex, WE extends WeightedEdge<V>>
extends Graph<V, WE>
{
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedPath.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedPath.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedPath.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/WeightedPath.java Sun Jun 12 20:35:55 2011
@@ -25,7 +25,7 @@ package org.apache.commons.graph;
* @param <V> the Graph vertices type
* @param <E> the Graph edges type
*/
-public interface WeightedPath<V extends Vertex, E extends Edge>
+public interface WeightedPath<V extends Vertex, E extends Edge<V>>
extends Path<V, E>
{
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/DirectedGraphImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/DirectedGraphImpl.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/DirectedGraphImpl.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/DirectedGraphImpl.java Sun Jun 12 20:35:55 2011
@@ -33,7 +33,6 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.graph.DirectedGraph;
-import org.apache.commons.graph.Edge;
import org.apache.commons.graph.GraphException;
import org.apache.commons.graph.MutableDirectedGraph;
import org.apache.commons.graph.Vertex;
@@ -44,7 +43,7 @@ import org.apache.commons.graph.contract
/**
* Description of the Class
*/
-public class DirectedGraphImpl<V extends Vertex, WE extends WeightedEdge>
+public class DirectedGraphImpl<V extends Vertex, WE extends WeightedEdge<V>>
implements DirectedGraph<V, WE>, WeightedGraph<V, WE>, MutableDirectedGraph<V, WE>, InvocationHandler
{
@@ -365,7 +364,7 @@ public class DirectedGraphImpl<V extends
* @param e
* @throws GraphException
*/
- private void removeEdgeI( Edge e )
+ private void removeEdgeI( WE e )
throws GraphException
{
try
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/DirectedGraphWrapper.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/DirectedGraphWrapper.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/DirectedGraphWrapper.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/DirectedGraphWrapper.java Sun Jun 12 20:35:55 2011
@@ -26,7 +26,7 @@ import org.apache.commons.graph.*;
/**
* Description of the Class
*/
-public class DirectedGraphWrapper<V extends Vertex, E extends Edge>
+public class DirectedGraphWrapper<V extends Vertex, E extends Edge<V>>
extends GraphWrapper<V, E>
implements DirectedGraph<V, E>
{
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/GraphWrapper.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/GraphWrapper.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/GraphWrapper.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/GraphWrapper.java Sun Jun 12 20:35:55 2011
@@ -29,7 +29,7 @@ import org.apache.commons.graph.*;
* @param <V> the Graph vertices type
* @param <E> the Graph edges type
*/
-public class GraphWrapper<V extends Vertex, E extends Edge>
+public class GraphWrapper<V extends Vertex, E extends Edge<V>>
implements Graph<V, E>
{
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/UndirectedGraphImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/UndirectedGraphImpl.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/UndirectedGraphImpl.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/UndirectedGraphImpl.java Sun Jun 12 20:35:55 2011
@@ -40,7 +40,7 @@ import org.apache.commons.graph.Weighted
/**
* Description of the Class
*/
-public class UndirectedGraphImpl<V extends Vertex, WE extends WeightedEdge>
+public class UndirectedGraphImpl<V extends Vertex, WE extends WeightedEdge<V>>
implements UndirectedGraph<V, WE>, WeightedGraph<V, WE>, MutableGraph<V, WE>, InvocationHandler
{
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/WeightedGraphWrapper.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/WeightedGraphWrapper.java?rev=1134977&r1=1134976&r2=1134977&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/WeightedGraphWrapper.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/basic/WeightedGraphWrapper.java Sun Jun 12 20:35:55 2011
@@ -30,7 +30,7 @@ import org.apache.commons.graph.*;
* @param <V> the Graph vertices type
* @param <E> the Graph edges type
*/
-public class WeightedGraphWrapper<V extends Vertex, WE extends WeightedEdge>
+public class WeightedGraphWrapper<V extends Vertex, WE extends WeightedEdge<V>>
extends GraphWrapper<V, WE>
implements WeightedGraph<V, WE>
{