[graphl-cvs] graphl/src/org/mediavirus/graphl/graph DefaultElement.java DefaultGraph.java Node.java GraphListener.java DefaultNode.java Edge.java AbstractGraph.java Graph.java DefaultEdge.java

[Flo L. <fl...@us...>]

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2618/src/org/mediavirus/graphl/graph

Modified Files:
	DefaultElement.java DefaultGraph.java Node.java 
	GraphListener.java DefaultNode.java Edge.java 
	AbstractGraph.java Graph.java DefaultEdge.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: DefaultEdge.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultEdge.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DefaultEdge.java	5 Sep 2005 15:50:40 -0000	1.14
--- DefaultEdge.java	18 Dec 2005 11:11:40 -0000	1.15
***************
*** 16,20 ****
      protected Node to;
      
!     HashMap properties = new HashMap();
      
      String id;
--- 16,20 ----
      protected Node to;
      
!     HashMap<String, String> properties = new HashMap<String, String>();
      
      String id;
***************
*** 77,97 ****
          zIndex = index;
      }
- 	/**
- 	 * The length of an Edge is an abstract value, that can be used for layouting and rendering the edge.
- 	 * @return The length of this Edge.
- 	 */
- 	public double getLength() {
- 		return length;
- 	}
- 
- 	/**
- 	 * Sets the Edge's length. The length of an Edge is an abstract value, that
- 	 * can be used for layouting and rendering the edge.
- 	 * @param length The length to set.
- 	 */
- 	public void setLength(double length) {
- 		this.length = length;
- 	}
- 
      
  	/**
--- 77,80 ----
***************
*** 100,103 ****
--- 83,87 ----
  	public void setType(String type) {
  		this.type = type;
+         setProperty(NS.graphl + "type", type);
  	}
  

Index: Node.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/Node.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Node.java	5 Sep 2005 15:42:17 -0000	1.12
--- Node.java	18 Dec 2005 11:11:40 -0000	1.13
***************
*** 16,21 ****
       * @return                              the list of edges from the node
       */
!     List getEdgesFrom();
!     List getEdgesFrom(String type);
      /**
       * Returns the list of edges to the node.
--- 16,21 ----
       * @return                              the list of edges from the node
       */
!     List<Edge> getEdgesFrom();
!     List<Edge> getEdgesFrom(String type);
      /**
       * Returns the list of edges to the node.
***************
*** 23,30 ****
       * @return                              the list of edges to the node
       */
!     List getEdgesTo();
!     List getEdgesTo(String type);
      
!     List getNeighbours(String edgeType, boolean forwardOnly);
      Node getFirstNeighbour(String edgeType, boolean forwardOnly);
  
--- 23,30 ----
       * @return                              the list of edges to the node
       */
!     List<Edge> getEdgesTo();
!     List<Edge> getEdgesTo(String type);
      
!     List<Node> getNeighbours(String edgeType, boolean forwardOnly);
      Node getFirstNeighbour(String edgeType, boolean forwardOnly);
  

Index: Graph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/Graph.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Graph.java	24 Aug 2005 16:11:50 -0000	1.6
--- Graph.java	18 Dec 2005 11:11:40 -0000	1.7
***************
*** 36,40 ****
       * @return                      the list of the nodes in the graph
       */
!     List getNodes();
      /**
       * Returns a collection of the edges in the graph. The order of the list reflects the Z-order of nodes in the graph.
--- 36,40 ----
       * @return                      the list of the nodes in the graph
       */
!     List<Node> getNodes();
      /**
       * Returns a collection of the edges in the graph. The order of the list reflects the Z-order of nodes in the graph.
***************
*** 42,46 ****
       * @return                      the list of the edges in the graph
       */
!     List getEdges();
  	
  	public Node createNode();
--- 42,46 ----
       * @return                      the list of the edges in the graph
       */
!     List<Edge> getEdges();
  	
  	public Node createNode();
***************
*** 49,53 ****
  	public Edge createEdge(Node from, Node to);
  	
! 	public void addElements(Collection nodes, Collection edges);
  
  }
--- 49,53 ----
  	public Edge createEdge(Node from, Node to);
  	
! 	public void addElements(Collection<Node> nodes, Collection<Edge> edges);
  
  }

Index: Edge.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/Edge.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Edge.java	17 Aug 2005 15:52:50 -0000	1.12
--- Edge.java	18 Dec 2005 11:11:40 -0000	1.13
***************
*** 29,39 ****
  	void setSource(String source);
  
-     /**
-      * Returns the length of this edge.
-      *
-      * @return                      the length of the edge
-      */
-     double getLength();
- 
  	/**
  	 * @return The edge painter that is set for rendering this edge.
--- 29,32 ----

Index: GraphListener.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/GraphListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GraphListener.java	21 Jun 2004 18:48:06 -0000	1.1
--- GraphListener.java	18 Dec 2005 11:11:40 -0000	1.2
***************
*** 33,37 ****
       * @param edges                     the edges added (may be <code>null</code>)
       */
!     void elementsAdded(Graph graph,Collection nodes,Collection edges);
      /**
       * Called when elements are removed from the graph.
--- 33,37 ----
       * @param edges                     the edges added (may be <code>null</code>)
       */
!     void elementsAdded(Graph graph, Collection<Node> nodes, Collection<Edge> edges);
      /**
       * Called when elements are removed from the graph.
***************
*** 41,44 ****
       * @param edges                     the edges added (may be <code>null</code>)
       */
!     void elementsRemoved(Graph graph,Collection nodes,Collection edges);
  }
--- 41,44 ----
       * @param edges                     the edges added (may be <code>null</code>)
       */
!     void elementsRemoved(Graph graph, Collection<Node> nodes, Collection<Edge> edges);
  }

Index: DefaultGraph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultGraph.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DefaultGraph.java	17 Aug 2005 15:52:50 -0000	1.4
--- DefaultGraph.java	18 Dec 2005 11:11:40 -0000	1.5
***************
*** 11,17 ****
  public class DefaultGraph extends AbstractGraph {
      /** Nodes of the graph. */
!     protected List allNodes;
      /** Edges of the graph. */
!     protected List allEdges;
      
      protected boolean loading = false;
--- 11,17 ----
  public class DefaultGraph extends AbstractGraph {
      /** Nodes of the graph. */
!     protected List<Node> allNodes;
      /** Edges of the graph. */
!     protected List<Edge> allEdges;
      
      protected boolean loading = false;
***************
*** 21,26 ****
       */
      public DefaultGraph() {
!         allNodes=new LinkedList();
!         allEdges=new LinkedList();
      }
      /**
--- 21,26 ----
       */
      public DefaultGraph() {
!         allNodes=new LinkedList<Node>();
!         allEdges=new LinkedList<Edge>();
      }
      /**
***************
*** 29,33 ****
       * @return                      a collection of the nodes in the graph
       */
!     public List getNodes() {
          return allNodes;
      }
--- 29,33 ----
       * @return                      a collection of the nodes in the graph
       */
!     public List<Node> getNodes() {
          return allNodes;
      }
***************
*** 37,41 ****
       * @return                      the collection of the edges in the graph
       */
!     public List getEdges() {
          return allEdges;
      }
--- 37,41 ----
       * @return                      the collection of the edges in the graph
       */
!     public List<Edge> getEdges() {
          return allEdges;
      }
***************
*** 46,52 ****
       * @param edges                 the edges added to the graph (may be <code>null</code>)
       */
!     public synchronized void addElements(Collection nodes,Collection edges) {
          if (nodes!=null) {
!             Iterator iterator=nodes.iterator();
              while (iterator.hasNext()) {
                  DefaultNode node=(DefaultNode)iterator.next();
--- 46,52 ----
       * @param edges                 the edges added to the graph (may be <code>null</code>)
       */
!     public synchronized void addElements(Collection<Node> nodes, Collection<Edge> edges) {
          if (nodes!=null) {
!             Iterator<Node> iterator=nodes.iterator();
              while (iterator.hasNext()) {
                  DefaultNode node=(DefaultNode)iterator.next();
***************
*** 56,60 ****
          }
          if (edges!=null) {
!             Iterator iterator=edges.iterator();
              while (iterator.hasNext()) {
                  DefaultEdge edge=(DefaultEdge)iterator.next();
--- 56,60 ----
          }
          if (edges!=null) {
!             Iterator<Edge> iterator=edges.iterator();
              while (iterator.hasNext()) {
                  DefaultEdge edge=(DefaultEdge)iterator.next();
***************
*** 76,80 ****
       * @param edges                 the edges to delete (may be <code>null</code>)
       */
!     public synchronized void deleteElements(Collection nodes,Collection edges) {
          if (nodes!=null) {
              Iterator iterator=nodes.iterator();
--- 76,80 ----
       * @param edges                 the edges to delete (may be <code>null</code>)
       */
!     public synchronized void deleteElements(Collection<Node> nodes, Collection<Edge> edges) {
          if (nodes!=null) {
              Iterator iterator=nodes.iterator();

Index: AbstractGraph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/AbstractGraph.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractGraph.java	11 Jan 2005 13:26:41 -0000	1.3
--- AbstractGraph.java	18 Dec 2005 11:11:40 -0000	1.4
***************
*** 68,72 ****
       * @param edges                 the collection of edges
       */
!     protected void fireElementsAdded(Collection nodes,Collection edges) {
          EventListener[] listeners=m_listeners.getListeners(GraphListener.class);
          for (int i=0;i<listeners.length;i++)
--- 68,72 ----
       * @param edges                 the collection of edges
       */
!     protected void fireElementsAdded(Collection<Node> nodes, Collection<Edge> edges) {
          EventListener[] listeners=m_listeners.getListeners(GraphListener.class);
          for (int i=0;i<listeners.length;i++)
***************
*** 79,83 ****
       * @param edges                 the collection of edges
       */
!     protected void fireElementsRemoved(Collection nodes,Collection edges) {
          EventListener[] listeners=m_listeners.getListeners(GraphListener.class);
          for (int i=0;i<listeners.length;i++)
--- 79,83 ----
       * @param edges                 the collection of edges
       */
!     protected void fireElementsRemoved(Collection<Node> nodes, Collection<Edge> edges) {
          EventListener[] listeners=m_listeners.getListeners(GraphListener.class);
          for (int i=0;i<listeners.length;i++)

Index: DefaultNode.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultNode.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DefaultNode.java	5 Sep 2005 15:50:40 -0000	1.16
--- DefaultNode.java	18 Dec 2005 11:11:40 -0000	1.17
***************
*** 14,20 ****
  public class DefaultNode extends DefaultElement implements Node {
      /** The list of edges from the node. */
!     protected List edgesFrom;
      /** The list of edges to the node. */
!     protected List edgesTo;
      /** The x location of the node. */
      protected double posX;
--- 14,20 ----
  public class DefaultNode extends DefaultElement implements Node {
      /** The list of edges from the node. */
!     protected List<Edge> edgesFrom;
      /** The list of edges to the node. */
!     protected List<Edge> edgesTo;
      /** The x location of the node. */
      protected double posX;
***************
*** 62,67 ****
       */
      public DefaultNode() {
!         edgesFrom=new LinkedList();
!         edgesTo=new LinkedList();
      }
      /**
--- 62,67 ----
       */
      public DefaultNode() {
!         edgesFrom=new LinkedList<Edge>();
!         edgesTo=new LinkedList<Edge>();
      }
      /**
***************
*** 70,74 ****
       * @return                              the list of edges from the node
       */
!     public List getEdgesFrom() {
          return edgesFrom;
      }
--- 70,74 ----
       * @return                              the list of edges from the node
       */
!     public List<Edge> getEdgesFrom() {
          return edgesFrom;
      }
***************
*** 78,82 ****
       * @return                              the list of edges to the node
       */
!     public List getEdgesTo() {
          return edgesTo;
      }
--- 78,82 ----
       * @return                              the list of edges to the node
       */
!     public List<Edge> getEdgesTo() {
          return edgesTo;
      }
***************
*** 179,187 ****
  	}
  
! 	public List getEdgesFrom(String type) {
! 		List edges = new ArrayList(2);
! 		Iterator allEdges = edgesFrom.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = (Edge) allEdges.next();
  			if (type.equals(edge.getType())) edges.add(edge);
  		}
--- 179,187 ----
  	}
  
! 	public List<Edge> getEdgesFrom(String type) {
! 		List<Edge> edges = new ArrayList<Edge>(2);
! 		Iterator<Edge> allEdges = edgesFrom.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = allEdges.next();
  			if (type.equals(edge.getType())) edges.add(edge);
  		}
***************
*** 189,197 ****
  	}
  
! 	public List getEdgesTo(String type) {
! 		List edges = new ArrayList(2);
! 		Iterator allEdges = edgesTo.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = (Edge) allEdges.next();
  			if (type.equals(edge.getType())) edges.add(edge);
  		}
--- 189,197 ----
  	}
  
! 	public List<Edge> getEdgesTo(String type) {
! 		List<Edge> edges = new ArrayList<Edge>(2);
! 		Iterator<Edge> allEdges = edgesTo.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = allEdges.next();
  			if (type.equals(edge.getType())) edges.add(edge);
  		}
***************
*** 199,207 ****
  	}
  
! 	public List getNeighbours(String edgeType, boolean forwardOnly) {
! 		List nodes = new ArrayList(2);
! 		Iterator allEdges = edgesFrom.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = (Edge) allEdges.next();
  			if (edgeType.equals(edge.getType())) nodes.add(edge.getTo());
  		}
--- 199,207 ----
  	}
  
! 	public List<Node> getNeighbours(String edgeType, boolean forwardOnly) {
! 		List<Node> nodes = new ArrayList<Node>(2);
! 		Iterator<Edge> allEdges = edgesFrom.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = allEdges.next();
  			if (edgeType.equals(edge.getType())) nodes.add(edge.getTo());
  		}
***************
*** 209,213 ****
  			allEdges = edgesTo.iterator();
  			while (allEdges.hasNext()) {
! 				Edge edge = (Edge) allEdges.next();
  				if (edgeType.equals(edge.getType())) nodes.add(edge.getFrom());
  			}			
--- 209,213 ----
  			allEdges = edgesTo.iterator();
  			while (allEdges.hasNext()) {
! 				Edge edge = allEdges.next();
  				if (edgeType.equals(edge.getType())) nodes.add(edge.getFrom());
  			}			
***************
*** 217,223 ****
  
  	public Node getFirstNeighbour(String edgeType, boolean forwardOnly) {
! 		Iterator allEdges = edgesFrom.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = (Edge) allEdges.next();
  			if (edgeType.equals(edge.getType())) return edge.getTo();
  		}
--- 217,223 ----
  
  	public Node getFirstNeighbour(String edgeType, boolean forwardOnly) {
! 		Iterator<Edge> allEdges = edgesFrom.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = allEdges.next();
  			if (edgeType.equals(edge.getType())) return edge.getTo();
  		}
***************
*** 225,229 ****
  			allEdges = edgesTo.iterator();
  			while (allEdges.hasNext()) {
! 				Edge edge = (Edge) allEdges.next();
  				if (edgeType.equals(edge.getType())) return edge.getFrom();
  			}			
--- 225,229 ----
  			allEdges = edgesTo.iterator();
  			while (allEdges.hasNext()) {
! 				Edge edge = allEdges.next();
  				if (edgeType.equals(edge.getType())) return edge.getFrom();
  			}			

Index: DefaultElement.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultElement.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DefaultElement.java	5 Sep 2005 15:50:40 -0000	1.4
--- DefaultElement.java	18 Dec 2005 11:11:40 -0000	1.5
***************
*** 14,18 ****
  public abstract class DefaultElement implements GraphElement {
  
!     HashMap properties = new HashMap();
  
  	public String getProperty(String name) {
--- 14,18 ----
  public abstract class DefaultElement implements GraphElement {
  
!     HashMap<String, String> properties = new HashMap<String, String>();
  
  	public String getProperty(String name) {