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 02:16:24 UTC
svn commit: r1134838 - in /commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph: ./ domain/jdepend/ domain/statemachine/ visualize/

Author: simonetripodi
Date: Sun Jun 12 00:16:24 2011
New Revision: 1134838

URL: http://svn.apache.org/viewvc?rev=1134838&view=rev
Log:
Named interface renamed to Labeled, see http://mathworld.wolfram.com/LabeledGraph.html

Added:
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Labeled.java   (contents, props changed)
      - copied, changed from r1134747, commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Named.java
Removed:
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Named.java
Modified:
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/ClassVertex.java
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/ImportEdge.java
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/OwnershipEdge.java
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/PackageVertex.java
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/statemachine/State.java
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/statemachine/Transition.java
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/visualize/TouchGraph.java

Copied: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Labeled.java (from r1134747, commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Named.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Labeled.java?p2=commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Labeled.java&p1=commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Named.java&r1=1134747&r2=1134838&rev=1134838&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Named.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/Labeled.java Sun Jun 12 00:16:24 2011
@@ -22,12 +22,12 @@ package org.apache.commons.graph;
 /**
  * Description of the Interface
  */
-public interface Named
+public interface Labeled
 {
 
     /**
      * Gets the name attribute of the Named object
      */
-    String getName();
+    String getLabel();
 
 }

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

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

Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/ClassVertex.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/ClassVertex.java?rev=1134838&r1=1134837&r2=1134838&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/ClassVertex.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/ClassVertex.java Sun Jun 12 00:16:24 2011
@@ -27,7 +27,7 @@ import org.apache.commons.graph.*;
 import org.apache.commons.graph.visualize.*;
 
 public class ClassVertex
-  implements Vertex, Named, Colored
+  implements Vertex, Labeled, Colored
 {
   private JavaClass clazz = null;
 

Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/ImportEdge.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/ImportEdge.java?rev=1134838&r1=1134837&r2=1134838&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/ImportEdge.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/ImportEdge.java Sun Jun 12 00:16:24 2011
@@ -23,7 +23,7 @@ import org.apache.commons.graph.*;
 import jdepend.framework.*;
 
 public class ImportEdge
-  implements Edge, Named
+  implements Edge, Labeled
 {
   private JavaPackage pkg = null;
   private JavaClass clz = null;

Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/OwnershipEdge.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/OwnershipEdge.java?rev=1134838&r1=1134837&r2=1134838&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/OwnershipEdge.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/OwnershipEdge.java Sun Jun 12 00:16:24 2011
@@ -23,7 +23,7 @@ import org.apache.commons.graph.*;
 import jdepend.framework.*;
 
 public class OwnershipEdge
-  implements Edge, Named
+  implements Edge, Labeled
 {
   private JavaPackage pkg = null;
   private JavaClass clz = null;

Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/PackageVertex.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/PackageVertex.java?rev=1134838&r1=1134837&r2=1134838&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/PackageVertex.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/jdepend/PackageVertex.java Sun Jun 12 00:16:24 2011
@@ -27,7 +27,7 @@ import org.apache.commons.graph.visualiz
 import jdepend.framework.*;
 
 public class PackageVertex
-  implements Vertex, Named, Colored
+  implements Vertex, Labeled, Colored
 {
   private JavaPackage pkg = null;
 

Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/statemachine/State.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/statemachine/State.java?rev=1134838&r1=1134837&r2=1134838&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/statemachine/State.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/statemachine/State.java Sun Jun 12 00:16:24 2011
@@ -6,7 +6,7 @@ import org.apache.commons.graph.*;
  * Description of the Class
  */
 public class State
-     implements Vertex, Named
+     implements Vertex, Labeled
 {
     private String name;
     private StateMachine subMachine = null;

Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/statemachine/Transition.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/statemachine/Transition.java?rev=1134838&r1=1134837&r2=1134838&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/statemachine/Transition.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/domain/statemachine/Transition.java Sun Jun 12 00:16:24 2011
@@ -6,7 +6,7 @@ import org.apache.commons.graph.*;
  * Description of the Class
  */
 public class Transition
-     implements Edge, Named
+     implements Edge, Labeled
 {
     private String name;
     private State source;

Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/visualize/TouchGraph.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/visualize/TouchGraph.java?rev=1134838&r1=1134837&r2=1134838&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/visualize/TouchGraph.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/visualize/TouchGraph.java Sun Jun 12 00:16:24 2011
@@ -181,9 +181,9 @@ public class TouchGraph
                 "\" visible=\"true\" />");
 
             String label;
-            if (v instanceof Named)
+            if (v instanceof Labeled)
             {
-                label = ((Named) v).getName();
+                label = ((Labeled) v).getName();
             }
             else
             {