svn commit: r1139238 - in /commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph: model/BaseGraph.java model/BaseMutableGraph.java model/VertexPair.java shortestpath/AllVertexPairsShortestPath.java shortestpath/FloydWarshall.java utils/

[si...@apache.org]

Author: simonetripodi
Date: Fri Jun 24 10:42:05 2011
New Revision: 1139238

URL: http://svn.apache.org/viewvc?rev=1139238&view=rev
Log:
stuff under utils package moved in the model package

Added:
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/VertexPair.java   (contents, props changed)
      - copied, changed from r1139232, commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/utils/VertexPair.java
Removed:
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/utils/
Modified:
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseGraph.java
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseMutableGraph.java
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/AllVertexPairsShortestPath.java
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/FloydWarshall.java

Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseGraph.java?rev=1139238&r1=1139237&r2=1139238&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseGraph.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseGraph.java Fri Jun 24 10:42:05 2011
@@ -30,7 +30,6 @@ import java.util.Set;
 import org.apache.commons.graph.Edge;
 import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.Vertex;
-import org.apache.commons.graph.utils.VertexPair;
 
 /**
  * Basic abstract in-memory based of a simple read-only {@link Graph} implementation. Subclasses may load adjacency

Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseMutableGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseMutableGraph.java?rev=1139238&r1=1139237&r2=1139238&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseMutableGraph.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/BaseMutableGraph.java Fri Jun 24 10:42:05 2011
@@ -28,7 +28,6 @@ import org.apache.commons.graph.Graph;
 import org.apache.commons.graph.GraphException;
 import org.apache.commons.graph.MutableGraph;
 import org.apache.commons.graph.Vertex;
-import org.apache.commons.graph.utils.VertexPair;
 
 /**
  * Basic abstract in-memory based of a simple mutable {@link Graph} implementation.

Copied: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/VertexPair.java (from r1139232, commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/utils/VertexPair.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/VertexPair.java?p2=commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/VertexPair.java&p1=commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/utils/VertexPair.java&r1=1139232&r2=1139238&rev=1139238&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/utils/VertexPair.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/VertexPair.java Fri Jun 24 10:42:05 2011
@@ -1,4 +1,4 @@
-package org.apache.commons.graph.utils;
+package org.apache.commons.graph.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/VertexPair.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/VertexPair.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/model/VertexPair.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/AllVertexPairsShortestPath.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/AllVertexPairsShortestPath.java?rev=1139238&r1=1139237&r2=1139238&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/AllVertexPairsShortestPath.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/AllVertexPairsShortestPath.java Fri Jun 24 10:42:05 2011
@@ -25,7 +25,7 @@ import java.util.Map;
 import org.apache.commons.graph.Vertex;
 import org.apache.commons.graph.WeightedEdge;
 import org.apache.commons.graph.WeightedPath;
-import org.apache.commons.graph.utils.VertexPair;
+import org.apache.commons.graph.model.VertexPair;
 
 /**
  * Represents all shortest paths between all vertex pairs calculated by {@link FloydWarshall} algorithm.

Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/FloydWarshall.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/FloydWarshall.java?rev=1139238&r1=1139237&r2=1139238&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/FloydWarshall.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/FloydWarshall.java Fri Jun 24 10:42:05 2011
@@ -26,7 +26,7 @@ import org.apache.commons.graph.Vertex;
 import org.apache.commons.graph.WeightedEdge;
 import org.apache.commons.graph.WeightedGraph;
 import org.apache.commons.graph.WeightedPath;
-import org.apache.commons.graph.utils.VertexPair;
+import org.apache.commons.graph.model.VertexPair;
 
 /**
  * Contains the Floyd�Warshall's shortest paths algorithm implementation.